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 de87f21ac..a60cca0b9 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 @@ -31,16 +31,16 @@ object ThemeUtil { private fun getSelectedStaticThemeColor(): Int { val themeIndex = preferences.getInt(Settings.PREF_STATIC_THEME_COLOR, 0) val themes = arrayOf( - R.style.Theme_Citra_Blue, - R.style.Theme_Citra_Cyan, - R.style.Theme_Citra_Red, - R.style.Theme_Citra_Green, - R.style.Theme_Citra_Lime, - R.style.Theme_Citra_Yellow, - R.style.Theme_Citra_Orange, - R.style.Theme_Citra_Violet, - R.style.Theme_Citra_Pink, - R.style.Theme_Citra_Gray + R.style.Theme_Lime_Blue, + 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, + R.style.Theme_Lime_Pink, + R.style.Theme_Lime_Gray ) return themes[themeIndex] } diff --git a/src/android/app/src/main/res/drawable/gamelist_divider.xml b/src/android/app/src/main/res/drawable/gamelist_divider.xml index a1cec8e41..2249d2934 100644 --- a/src/android/app/src/main/res/drawable/gamelist_divider.xml +++ b/src/android/app/src/main/res/drawable/gamelist_divider.xml @@ -6,6 +6,6 @@ android:width="1dp" android:height="1dp" /> - + 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 735dc65e6..3d5af1438 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 @@ -2,261 +2,261 @@ - #B7C4FF - #002681 - #0039B5 - #DCE1FF - #C2C5DD - #2B3042 - #424659 - #DEE1F9 - #E4BADA - #43273F - #5C3D56 - #FFD7F5 - #1B1B1F - #E4E1E6 - #1B1B1F - #E4E1E6 - #45464F - #C6C5D0 - #90909A - #1B1B1F - #E4E1E6 - #154FE2 - #B7C4FF + #B7C4FF + #002681 + #0039B5 + #DCE1FF + #C2C5DD + #2B3042 + #424659 + #DEE1F9 + #E4BADA + #43273F + #5C3D56 + #FFD7F5 + #1B1B1F + #E4E1E6 + #1B1B1F + #E4E1E6 + #45464F + #C6C5D0 + #90909A + #1B1B1F + #E4E1E6 + #154FE2 + #B7C4FF - #B7FFF7 - #007D81 - #00A0B5 - #DCFFFB - #C2DDDB - #2B3F42 - #425659 - #DEF9F7 - #BAE1E4 - #274341 - #3D5C5C - #D7FFFE - #1B1F1E - #E1E6E5 - #1B1F1F - #E1E6E5 - #454F4D - #C5D0CF - #909A98 - #1B1F1F - #E1E6E5 - #15E2D1 - #B7C4FF + #B7FFF7 + #007D81 + #00A0B5 + #DCFFFB + #C2DDDB + #2B3F42 + #425659 + #DEF9F7 + #BAE1E4 + #274341 + #3D5C5C + #D7FFFE + #1B1F1E + #E1E6E5 + #1B1F1F + #E1E6E5 + #454F4D + #C5D0CF + #909A98 + #1B1F1F + #E1E6E5 + #15E2D1 + #B7C4FF - #FFB7B7 - #810000 - #B50000 - #FFDCDC - #DDC2C2 - #422B2B - #594242 - #F9DEDE - #E4BABA - #432727 - #5C3D3D - #FFD7D7 - #1F1B1B - #E6E1E1 - #1F1B1B - #E6E1E1 - #4F4545 - #D0C5C5 - #9A9090 - #1F1B1B - #E6E1E1 - #E21515 - #FFB7B7 + #FFB7B7 + #810000 + #B50000 + #FFDCDC + #DDC2C2 + #422B2B + #594242 + #F9DEDE + #E4BABA + #432727 + #5C3D3D + #FFD7D7 + #1F1B1B + #E6E1E1 + #1F1B1B + #E6E1E1 + #4F4545 + #D0C5C5 + #9A9090 + #1F1B1B + #E6E1E1 + #E21515 + #FFB7B7 - #B7FFBE - #00811C - #06B500 - #DCFFE0 - #C2DDC8 - #2B422E - #425946 - #DEF9E5 - #BAE4BC - #284327 - #3D5C47 - #1B1F1B - #E1E6E1 - #1B1F1B - #E1E6E1 - #454F45 - #C6D0C5 - #909A90 - #1B1F1B - #E1E6E2 - #15E218 - #B7FFC7 + #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 - #817F00 - #B5A300 - #FFFDDC - #DDDDC2 - #42422B - #595942 - #F7F9DE - #E0E4BA - #424327 - #5C583D - #FFFBD7 - #1F1F1B - #E6E6E1 - #1F1F1B - #E6E5E1 - #4F4E45 - #D0D0C5 - #9A9990 - #1B1B1F - #E6E6E1 - #DBE215 - #FFFBB7 + #FFEDB7 + #817F00 + #B5A300 + #FFFDDC + #DDDDC2 + #42422B + #595942 + #F7F9DE + #E0E4BA + #424327 + #5C583D + #FFFBD7 + #1F1F1B + #E6E6E1 + #1F1F1B + #E6E5E1 + #4F4E45 + #D0D0C5 + #9A9990 + #1B1B1F + #E6E6E1 + #DBE215 + #FFFBB7 - #FFCBB7 - #812500 - #B55400 - #FFEBDC - #DDCDC2 - #42342B - #594A42 - #F9E6DE - #E4CCBA - #433127 - #5C463D - #FFEFD7 - #1F1D1B - #E6E3E1 - #1F1D1B - #E6E3E1 - #4F4A45 - #D0CAC5 - #9A9490 - #1F1D1B - #E6E3E1 - #E26E15 - #FFD4B7 + #FFCBB7 + #812500 + #B55400 + #FFEBDC + #DDCDC2 + #42342B + #594A42 + #F9E6DE + #E4CCBA + #433127 + #5C463D + #FFEFD7 + #1F1D1B + #E6E3E1 + #1F1D1B + #E6E3E1 + #4F4A45 + #D0CAC5 + #9A9490 + #1F1D1B + #E6E3E1 + #E26E15 + #FFD4B7 - #DAB7FF - #350068 - #5A00B5 - #F4DCFF - #D2C2DD - #342B42 - #594265 - #E9DEF9 - #DACCE4 - #402743 - #5C4E5C - #FFD7FF - #1F1B1F - #E6E4E6 - #1F1B1F - #E6E4E6 - #4F454F - #D0C6D0 - #9A909A - #1F1B1F - #E6E4E6 - #B154E2 - #DAB7FF + #DAB7FF + #350068 + #5A00B5 + #F4DCFF + #D2C2DD + #342B42 + #594265 + #E9DEF9 + #DACCE4 + #402743 + #5C4E5C + #FFD7FF + #1F1B1F + #E6E4E6 + #1F1B1F + #E6E4E6 + #4F454F + #D0C6D0 + #9A909A + #1F1B1F + #E6E4E6 + #B154E2 + #DAB7FF - #FFB7C5 - #81001E - #B50033 - #FFDCE6 - #DDC2C7 - #422B34 - #594249 - #FCF9DEE6 - #E4BAC4 - #432730 - #5C3D49 - #FFD7DF - #1F1B1C - #E6E1E2 - #1F1B1C - #E6E1E2 - #4F4547 - #D0C5C8 - #9A9093 - #1F1B1C - #E6E1E2 - #E21556 - #FFB7D6 + #FFB7C5 + #81001E + #B50033 + #FFDCE6 + #DDC2C7 + #422B34 + #594249 + #FCF9DEE6 + #E4BAC4 + #432730 + #5C3D49 + #FFD7DF + #1F1B1C + #E6E1E2 + #1F1B1C + #E6E1E2 + #4F4547 + #D0C5C8 + #9A9093 + #1F1B1C + #E6E1E2 + #E21556 + #FFB7D6 - #B7B7B7 - #2B2B2B - #424242 - #E1E1E1 - #C2C2C2 - #424242 - #656565 - #EDEDED - #DADADA - #3F3F3F - #565656 - #F5F5F5 - #1B1B1B - #E4E4E4 - #1B1B1B - #E4E4E4 - #454545 - #C6C6C6 - #909090 - #1B1B1B - #E4E4E4 - #B7B7B7 - #B7B7B7 + #B7B7B7 + #2B2B2B + #424242 + #E1E1E1 + #C2C2C2 + #424242 + #656565 + #EDEDED + #DADADA + #3F3F3F + #565656 + #F5F5F5 + #1B1B1B + #E4E4E4 + #1B1B1B + #E4E4E4 + #454545 + #C6C6C6 + #909090 + #1B1B1B + #E4E4E4 + #B7B7B7 + #B7B7B7 - #C6C5D0 - #FFB4AB - #93000A - #690005 - #FFDAD6 - #000000 - #000000 + #C6C5D0 + #FFB4AB + #93000A + #690005 + #FFDAD6 + #000000 + #000000 \ No newline at end of file diff --git a/src/android/app/src/main/res/values-v29/themes.xml b/src/android/app/src/main/res/values-v29/themes.xml index c460f40aa..e43fb2ccd 100644 --- a/src/android/app/src/main/res/values-v29/themes.xml +++ b/src/android/app/src/main/res/values-v29/themes.xml @@ -1,9 +1,9 @@ - - - - - - - - - - - - - \ No newline at end of file