Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3daa90f9 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch 'epic34-s-app_redesign' into 'master' 

Integrate elib

See merge request !47
parents 7ff43a6e 2830edcb

app/build.gradle

+1 −5
Original line number Diff line number Diff line
@@ -45,14 +45,9 @@ android { 
    }

    //useLibrary 'android.test.mock'



    aaptOptions {

        additionalParameters '-I', 'e-ui-sdk.jar'

    }



}



dependencies {

    compileOnly files("../e-ui-sdk.jar")

    //noinspection GradleCompatible

    implementation 'androidx.legacy:legacy-support-v4:1.0.0'

    implementation "androidx.constraintlayout:constraintlayout:2.1.3"
@@ -63,6 +58,7 @@ dependencies { 
    implementation 'androidx.appcompat:appcompat:1.4.1'



    implementation 'androidx.exifinterface:exifinterface:1.3.3'

    implementation 'foundation.e:elib:0.0.1-alpha11'



    testImplementation 'junit:junit:4.13.1'

}

app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java

+2 −2
Original line number Diff line number Diff line
@@ -2499,7 +2499,7 @@ public class MainUI { 
        if (MyDebug.LOG)

            Log.d(TAG, "flash_value: " + flash_value);

        if (main_activity.getMainUI().showCycleFlashIcon()) {

            popup.setImageResource(lineageos.platform.R.drawable.ic_menu);

            popup.setImageResource(R.drawable.ic_more);

        } else if (flash_value != null && flash_value.equals("flash_off")) {

            popup.setImageResource(R.drawable.popup_camera_flash_off);

        } else if (flash_value != null && (flash_value.equals("flash_torch") || flash_value.equals("flash_frontscreen_torch"))) {
@@ -2511,7 +2511,7 @@ public class MainUI { 
        } else if (flash_value != null && flash_value.equals("flash_red_eye")) {

            popup.setImageResource(R.drawable.popup_camera_flash_red_eye);

        } else {

            popup.setImageResource(lineageos.platform.R.drawable.ic_menu);

            popup.setImageResource(R.drawable.ic_more);

        }

    }

app/src/main/res/values/colors.xml

+7 −7
Original line number Diff line number Diff line
@@ -6,15 +6,15 @@ 
    <color name="white">@android:color/white</color>





    <color name="color_default_foreground">#1E1E1E</color>

    <color name="color_default_accent">@lineageos.platform:color/color_default_accent</color>

    <color name="color_default_foreground">@color/e_floating_background_dark</color>

    <color name="color_default_accent">@color/e_accent_dark</color>

    <color name="navigation_background">#4F000000</color>

    <color name="color_default_background">#121212</color>

    <color name="color_default_background">@color/e_background_dark</color>

    <color name="color_default_icon">@android:color/white</color>

    <color name="color_default_primary_text">#CCFFFFFF</color>

    <color name="color_default_secondary_text">#8CFFFFFF</color>

    <color name="color_default_primary_text">@color/e_primary_text_color_dark</color>

    <color name="color_default_secondary_text">@color/e_secondary_text_color_dark</color>



    <color name="color_toast_bg">#61000000</color>

    <color name="color_popup_title_bg">#61FFFFFF</color>

    <color name="color_toast_bg">@color/e_disabled_color_light</color>

    <color name="color_popup_title_bg">@color/e_disabled_color_dark</color>

    <color name="color_popup_bg">#E5000000</color>

</resources>

build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -13,5 +13,6 @@ allprojects { 
    repositories {

        google()

        mavenCentral()

        maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven' }

    }

}

e-ui-sdk.jar

deleted100644 → 0
−114 KiB

File deleted.

View file