diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/ui/main/MainActivity.kt b/src/android/app/src/main/java/io/github/lime3ds/android/ui/main/MainActivity.kt index da88b7e25..0e80a8c8c 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/ui/main/MainActivity.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/ui/main/MainActivity.kt @@ -66,7 +66,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider { override fun onCreate(savedInstanceState: Bundle?) { val splashScreen = installSplashScreen() - splashScreen.setKeepOnScreenCondition { + splashScreen.setKeepOnScreenCondition { !DirectoryInitialization.areCitraDirectoriesReady() && PermissionsHandler.hasWriteAccess(this) } diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/utils/ThemeUtil.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/ThemeUtil.kt index a60cca0b9..b22fff756 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/utils/ThemeUtil.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/ThemeUtil.kt @@ -35,7 +35,6 @@ object ThemeUtil { R.style.Theme_Lime_Cyan, R.style.Theme_Lime_Red, R.style.Theme_Lime_Green, - R.style.Theme_Lime_Lime, R.style.Theme_Lime_Yellow, R.style.Theme_Lime_Orange, R.style.Theme_Lime_Violet, diff --git a/src/android/app/src/main/res/values-night/citra_colors.xml b/src/android/app/src/main/res/values-night/citra_colors.xml index 3d5af1438..154acd91d 100644 --- a/src/android/app/src/main/res/values-night/citra_colors.xml +++ b/src/android/app/src/main/res/values-night/citra_colors.xml @@ -77,53 +77,29 @@ #FFB7B7 - #B7FFBE - #00811C - #06B500 - #DCFFE0 - #C2DDC8 - #2B422E - #425946 - #DEF9E5 - #BAE4BC - #284327 - #3D5C47 - #1B1F1B - #E1E6E1 - #1B1F1B - #E1E6E1 - #454F45 - #C6D0C5 - #909A90 - #1B1F1B - #E1E6E2 - #15E218 - #B7FFC7 - - - #D0FFB7 - #368100 - #1BB500 - #E5FFDC - #CDDDC2 - #32422B - #4B5942 - #E9F9DE - #CAE4BA - #2F4327 - #455C3D - #E8FFD7 - #1C1F1B - #E2E6E1 - #1C1F1B - #E2E6E1 - #494F45 - #C9D0C5 - #959A90 - #1D1F1B - #E2E6E1 - #82E215 - #CDFFB7 + #D0FFB7 + #368100 + #1BB500 + #E5FFDC + #CDDDC2 + #32422B + #4B5942 + #E9F9DE + #CAE4BA + #2F4327 + #455C3D + #E8FFD7 + #1C1F1B + #E2E6E1 + #1C1F1B + #E2E6E1 + #494F45 + #C9D0C5 + #959A90 + #1D1F1B + #E2E6E1 + #82E215 + #CDFFB7 #FFEDB7 diff --git a/src/android/app/src/main/res/values/arrays.xml b/src/android/app/src/main/res/values/arrays.xml index cb0d5ad02..2ac19d238 100644 --- a/src/android/app/src/main/res/values/arrays.xml +++ b/src/android/app/src/main/res/values/arrays.xml @@ -217,7 +217,6 @@ Cyan Red Green - Lime Yellow Orange Violet @@ -234,7 +233,6 @@ 6 7 8 - 9 diff --git a/src/android/app/src/main/res/values/lime_colors.xml b/src/android/app/src/main/res/values/lime_colors.xml index 66abcbd41..034ffb540 100644 --- a/src/android/app/src/main/res/values/lime_colors.xml +++ b/src/android/app/src/main/res/values/lime_colors.xml @@ -45,28 +45,6 @@ #FFB7B7 #E21515 - - #1FAA59 - #C6F6D5 - #012D12 - #4D8066 - #D4EDE1 - #1A3328 - #3D7267 - #BCECE0 - #1C4039 - #FBFFFC - #1B1F1B - #FBFFFC - #1B1F1B - #E1ECE1 - #454F46 - #768077 - #F0F4F0 - #303430 - #B7FFB8 - #1FAA59 - #15E2D1 #DCFFFE @@ -89,27 +67,27 @@ #B7FFF7 #15E2C3 - - #5DE215 - #E9FFDC - #185100 - #595D72 - #E9F9DE - #1F2C16 - #547564 - #D7FFEA - #122C20 - #FBFFFB - #1C1F1B - #FBFFFB - #1B1F1B - #E2ECE1 - #464F45 - #778076 - #F0F4F0 - #313430 - #BCFFB7 - #41E215 + + #5DE215 + #E9FFDC + #185100 + #595D72 + #E9F9DE + #1F2C16 + #547564 + #D7FFEA + #122C20 + #FBFFFB + #1C1F1B + #FBFFFB + #1B1F1B + #E2ECE1 + #464F45 + #778076 + #F0F4F0 + #313430 + #BCFFB7 + #41E215 #CDE2C015 @@ -242,9 +220,6 @@ #FFFFFF #FFFFFF #FFFFFF - #FFFFFF - #FFFFFF - #FFFFFF #FFFFFF #FFFFFF #FFFFFF diff --git a/src/android/app/src/main/res/values/themes.xml b/src/android/app/src/main/res/values/themes.xml index b9734c355..0f74013e9 100644 --- a/src/android/app/src/main/res/values/themes.xml +++ b/src/android/app/src/main/res/values/themes.xml @@ -201,32 +201,6 @@ @color/lime_inversePrimary_cyan - -