diff --git a/app/build.gradle b/app/build.gradle
index 890003d1b52a3e20765587aaba075c457998537c..769c0773b66b6ce5f66bb60a447197c05ec0a2d8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -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'
}
diff --git a/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java b/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
index 136d0f7381ebd57938c8e6d9e46cb131e2c4d935..8146ea88325062fc8704b7025a976dfa8f7f3ec6 100644
--- a/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
+++ b/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
@@ -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);
}
}
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index e59cff81ab8dc8142182e4d25cd60f27eceb7077..013b4e094a98058379b2e381b90d24e779c6c36d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,15 +6,15 @@
@android:color/white
- #1E1E1E
- @lineageos.platform:color/color_default_accent
+ @color/e_floating_background_dark
+ @color/e_accent_dark
#4F000000
- #121212
+ @color/e_background_dark
@android:color/white
- #CCFFFFFF
- #8CFFFFFF
+ @color/e_primary_text_color_dark
+ @color/e_secondary_text_color_dark
- #61000000
- #61FFFFFF
+ @color/e_disabled_color_light
+ @color/e_disabled_color_dark
#E5000000
diff --git a/build.gradle b/build.gradle
index 7e4f410fd14f73ddd009a9b52f4e464df35e5a7e..f3b60a1fabe3f2a429f053e80ce80cb9c3037b7b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,5 +13,6 @@ allprojects {
repositories {
google()
mavenCentral()
+ maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven' }
}
}
diff --git a/e-ui-sdk.jar b/e-ui-sdk.jar
deleted file mode 100644
index ee43ada5ea59706f7e7660b03bef8c8dfb026749..0000000000000000000000000000000000000000
Binary files a/e-ui-sdk.jar and /dev/null differ