mirror of
https://github.com/Lime3DS/Lime3DS.git
synced 2025-01-07 15:48:12 +01:00
android: Removed Lime theme gave its values to the Green theme
This commit is contained in:
parent
3225aec595
commit
0a6bea8f0c
@ -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)
|
||||
}
|
||||
|
@ -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,
|
||||
|
@ -77,53 +77,29 @@
|
||||
<color name="lime_surfaceTint_red">#FFB7B7</color>
|
||||
|
||||
<!-- Green Theme Colors -->
|
||||
<color name="lime_primary_green">#B7FFBE</color>
|
||||
<color name="lime_onPrimary_green">#00811C</color>
|
||||
<color name="lime_primaryContainer_green">#06B500</color>
|
||||
<color name="lime_onPrimaryContainer_green">#DCFFE0</color>
|
||||
<color name="lime_secondary_green">#C2DDC8</color>
|
||||
<color name="lime_onSecondary_green">#2B422E</color>
|
||||
<color name="lime_secondaryContainer_green">#425946</color>
|
||||
<color name="lime_onSecondaryContainer_green">#DEF9E5</color>
|
||||
<color name="lime_tertiary_green">#BAE4BC</color>
|
||||
<color name="lime_onTertiary_green">#284327</color>
|
||||
<color name="lime_tertiaryContainer_green">#3D5C47</color>
|
||||
<color name="lime_background_green">#1B1F1B</color>
|
||||
<color name="lime_onBackground_green">#E1E6E1</color>
|
||||
<color name="lime_surface_green">#1B1F1B</color>
|
||||
<color name="lime_onSurface_green">#E1E6E1</color>
|
||||
<color name="lime_surfaceVariant_green">#454F45</color>
|
||||
<color name="lime_onSurfaceVariant_green">#C6D0C5</color>
|
||||
<color name="lime_outline_green">#909A90</color>
|
||||
<color name="lime_inverseOnSurface_green">#1B1F1B</color>
|
||||
<color name="lime_inverseSurface_green">#E1E6E2</color>
|
||||
<color name="lime_inversePrimary_green">#15E218</color>
|
||||
<color name="lime_surfaceTint_green">#B7FFC7</color>
|
||||
|
||||
<!-- Lime Theme Colors -->
|
||||
<color name="lime_primary_lime">#D0FFB7</color>
|
||||
<color name="lime_onPrimary_lime">#368100</color>
|
||||
<color name="lime_primaryContainer_lime">#1BB500</color>
|
||||
<color name="lime_onPrimaryContainer_lime">#E5FFDC</color>
|
||||
<color name="lime_secondary_lime">#CDDDC2</color>
|
||||
<color name="lime_onSecondary_lime">#32422B</color>
|
||||
<color name="lime_secondaryContainer_lime">#4B5942</color>
|
||||
<color name="lime_onSecondaryContainer_lime">#E9F9DE</color>
|
||||
<color name="lime_tertiary_lime">#CAE4BA</color>
|
||||
<color name="lime_onTertiary_lime">#2F4327</color>
|
||||
<color name="lime_tertiaryContainer_lime">#455C3D</color>
|
||||
<color name="lime_onTertiaryContainer_lime">#E8FFD7</color>
|
||||
<color name="lime_background_lime">#1C1F1B</color>
|
||||
<color name="lime_onBackground_lime">#E2E6E1</color>
|
||||
<color name="lime_surface_lime">#1C1F1B</color>
|
||||
<color name="lime_onSurface_lime">#E2E6E1</color>
|
||||
<color name="lime_surfaceVariant_lime">#494F45</color>
|
||||
<color name="lime_onSurfaceVariant_lime">#C9D0C5</color>
|
||||
<color name="lime_outline_lime">#959A90</color>
|
||||
<color name="lime_inverseOnSurface_lime">#1D1F1B</color>
|
||||
<color name="lime_inverseSurface_lime">#E2E6E1</color>
|
||||
<color name="lime_inversePrimary_lime">#82E215</color>
|
||||
<color name="lime_surfaceTint_lime">#CDFFB7</color>
|
||||
<color name="lime_primary_green">#D0FFB7</color>
|
||||
<color name="lime_onPrimary_green">#368100</color>
|
||||
<color name="lime_primaryContainer_green">#1BB500</color>
|
||||
<color name="lime_onPrimaryContainer_green">#E5FFDC</color>
|
||||
<color name="lime_secondary_green">#CDDDC2</color>
|
||||
<color name="lime_onSecondary_green">#32422B</color>
|
||||
<color name="lime_secondaryContainer_green">#4B5942</color>
|
||||
<color name="lime_onSecondaryContainer_green">#E9F9DE</color>
|
||||
<color name="lime_tertiary_green">#CAE4BA</color>
|
||||
<color name="lime_onTertiary_green">#2F4327</color>
|
||||
<color name="lime_tertiaryContainer_green">#455C3D</color>
|
||||
<color name="lime_onTertiaryContainer_green">#E8FFD7</color>
|
||||
<color name="lime_background_green">#1C1F1B</color>
|
||||
<color name="lime_onBackground_green">#E2E6E1</color>
|
||||
<color name="lime_surface_green">#1C1F1B</color>
|
||||
<color name="lime_onSurface_green">#E2E6E1</color>
|
||||
<color name="lime_surfaceVariant_green">#494F45</color>
|
||||
<color name="lime_onSurfaceVariant_green">#C9D0C5</color>
|
||||
<color name="lime_outline_green">#959A90</color>
|
||||
<color name="lime_inverseOnSurface_green">#1D1F1B</color>
|
||||
<color name="lime_inverseSurface_green">#E2E6E1</color>
|
||||
<color name="lime_inversePrimary_green">#82E215</color>
|
||||
<color name="lime_surfaceTint_green">#CDFFB7</color>
|
||||
|
||||
<!-- Yellow Theme Colors -->
|
||||
<color name="lime_primary_yellow">#FFEDB7</color>
|
||||
|
@ -217,7 +217,6 @@
|
||||
<item>Cyan</item>
|
||||
<item>Red</item>
|
||||
<item>Green</item>
|
||||
<item>Lime</item>
|
||||
<item>Yellow</item>
|
||||
<item>Orange</item>
|
||||
<item>Violet</item>
|
||||
@ -234,7 +233,6 @@
|
||||
<item>6</item>
|
||||
<item>7</item>
|
||||
<item>8</item>
|
||||
<item>9</item>
|
||||
</integer-array>
|
||||
|
||||
<string-array name="themeModeEntries">
|
||||
|
@ -45,28 +45,6 @@
|
||||
<color name="lime_inversePrimary_red">#FFB7B7</color>
|
||||
<color name="lime_surfaceTint_red">#E21515</color>
|
||||
|
||||
<!-- Green Theme Colors -->
|
||||
<color name="lime_primary_green">#1FAA59</color>
|
||||
<color name="lime_primaryContainer_green">#C6F6D5</color>
|
||||
<color name="lime_onPrimaryContainer_green">#012D12</color>
|
||||
<color name="lime_secondary_green">#4D8066</color>
|
||||
<color name="lime_secondaryContainer_green">#D4EDE1</color>
|
||||
<color name="lime_onSecondaryContainer_green">#1A3328</color>
|
||||
<color name="lime_tertiary_green">#3D7267</color>
|
||||
<color name="lime_tertiaryContainer_green">#BCECE0</color>
|
||||
<color name="lime_onTertiaryContainer_green">#1C4039</color>
|
||||
<color name="lime_background_green">#FBFFFC</color>
|
||||
<color name="lime_onBackground_green">#1B1F1B</color>
|
||||
<color name="lime_surface_green">#FBFFFC</color>
|
||||
<color name="lime_onSurface_green">#1B1F1B</color>
|
||||
<color name="lime_surfaceVariant_green">#E1ECE1</color>
|
||||
<color name="lime_onSurfaceVariant_green">#454F46</color>
|
||||
<color name="lime_outline_green">#768077</color>
|
||||
<color name="lime_inverseOnSurface_green">#F0F4F0</color>
|
||||
<color name="lime_inverseSurface_green">#303430</color>
|
||||
<color name="lime_inversePrimary_green">#B7FFB8</color>
|
||||
<color name="lime_surfaceTint_green">#1FAA59</color>
|
||||
|
||||
<!-- Cyan Theme Colors -->
|
||||
<color name="lime_primary_cyan">#15E2D1</color>
|
||||
<color name="lime_primaryContainer_cyan">#DCFFFE</color>
|
||||
@ -89,27 +67,27 @@
|
||||
<color name="lime_inversePrimary_cyan">#B7FFF7</color>
|
||||
<color name="lime_surfaceTint_cyan">#15E2C3</color>
|
||||
|
||||
<!-- Lime Theme Colors -->
|
||||
<color name="lime_primary_lime">#5DE215</color>
|
||||
<color name="lime_primaryContainer_lime">#E9FFDC</color>
|
||||
<color name="lime_onPrimaryContainer_lime">#185100</color>
|
||||
<color name="lime_secondary_lime">#595D72</color>
|
||||
<color name="lime_secondaryContainer_lime">#E9F9DE</color>
|
||||
<color name="lime_onSecondaryContainer_lime">#1F2C16</color>
|
||||
<color name="lime_tertiary_lime">#547564</color>
|
||||
<color name="lime_tertiaryContainer_lime">#D7FFEA</color>
|
||||
<color name="lime_onTertiaryContainer_lime">#122C20</color>
|
||||
<color name="lime_background_lime">#FBFFFB</color>
|
||||
<color name="lime_onBackground_lime">#1C1F1B</color>
|
||||
<color name="lime_surface_lime">#FBFFFB</color>
|
||||
<color name="lime_onSurface_lime">#1B1F1B</color>
|
||||
<color name="lime_surfaceVariant_lime">#E2ECE1</color>
|
||||
<color name="lime_onSurfaceVariant_lime">#464F45</color>
|
||||
<color name="lime_outline_lime">#778076</color>
|
||||
<color name="lime_inverseOnSurface_lime">#F0F4F0</color>
|
||||
<color name="lime_inverseSurface_lime">#313430</color>
|
||||
<color name="lime_inversePrimary_lime">#BCFFB7</color>
|
||||
<color name="lime_surfaceTint_lime">#41E215</color>
|
||||
<!-- Green Theme Colors -->
|
||||
<color name="lime_primary_green">#5DE215</color>
|
||||
<color name="lime_primaryContainer_green">#E9FFDC</color>
|
||||
<color name="lime_onPrimaryContainer_green">#185100</color>
|
||||
<color name="lime_secondary_green">#595D72</color>
|
||||
<color name="lime_secondaryContainer_green">#E9F9DE</color>
|
||||
<color name="lime_onSecondaryContainer_green">#1F2C16</color>
|
||||
<color name="lime_tertiary_green">#547564</color>
|
||||
<color name="lime_tertiaryContainer_green">#D7FFEA</color>
|
||||
<color name="lime_onTertiaryContainer_green">#122C20</color>
|
||||
<color name="lime_background_green">#FBFFFB</color>
|
||||
<color name="lime_onBackground_green">#1C1F1B</color>
|
||||
<color name="lime_surface_green">#FBFFFB</color>
|
||||
<color name="lime_onSurface_green">#1B1F1B</color>
|
||||
<color name="lime_surfaceVariant_green">#E2ECE1</color>
|
||||
<color name="lime_onSurfaceVariant_green">#464F45</color>
|
||||
<color name="lime_outline_green">#778076</color>
|
||||
<color name="lime_inverseOnSurface_green">#F0F4F0</color>
|
||||
<color name="lime_inverseSurface_green">#313430</color>
|
||||
<color name="lime_inversePrimary_green">#BCFFB7</color>
|
||||
<color name="lime_surfaceTint_green">#41E215</color>
|
||||
|
||||
<!-- Yellow Theme Colors -->
|
||||
<color name="lime_primary_yellow">#CDE2C015</color>
|
||||
@ -242,9 +220,6 @@
|
||||
<color name="lime_onPrimary_cyan">#FFFFFF</color>
|
||||
<color name="lime_onSecondary_cyan">#FFFFFF</color>
|
||||
<color name="lime_onTertiary_cyan">#FFFFFF</color>
|
||||
<color name="lime_onPrimary_lime">#FFFFFF</color>
|
||||
<color name="lime_onSecondary_lime">#FFFFFF</color>
|
||||
<color name="lime_onTertiary_lime">#FFFFFF</color>
|
||||
<color name="lime_onPrimary_yellow">#FFFFFF</color>
|
||||
<color name="lime_onSecondary_yellow">#FFFFFF</color>
|
||||
<color name="lime_onTertiary_yellow">#FFFFFF</color>
|
||||
|
@ -201,32 +201,6 @@
|
||||
<item name="colorPrimaryInverse">@color/lime_inversePrimary_cyan</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Lime.Lime" parent="Theme.Lime">
|
||||
<!-- Lime Theme Colors -->
|
||||
<item name="colorPrimary">@color/lime_primary_lime</item>
|
||||
<item name="colorOnPrimary">@color/lime_onPrimary_lime</item>
|
||||
<item name="colorPrimaryContainer">@color/lime_primaryContainer_lime</item>
|
||||
<item name="colorOnPrimaryContainer">@color/lime_onPrimaryContainer_lime</item>
|
||||
<item name="colorSecondary">@color/lime_secondary_lime</item>
|
||||
<item name="colorOnSecondary">@color/lime_onSecondary_lime</item>
|
||||
<item name="colorSecondaryContainer">@color/lime_secondaryContainer_lime</item>
|
||||
<item name="colorOnSecondaryContainer">@color/lime_onSecondaryContainer_lime</item>
|
||||
<item name="colorTertiary">@color/lime_tertiary_lime</item>
|
||||
<item name="colorOnTertiary">@color/lime_onTertiary_lime</item>
|
||||
<item name="colorTertiaryContainer">@color/lime_tertiaryContainer_lime</item>
|
||||
<item name="colorOnTertiaryContainer">@color/lime_onTertiaryContainer_lime</item>
|
||||
<item name="android:colorBackground">@color/lime_background_lime</item>
|
||||
<item name="colorOnBackground">@color/lime_onBackground_lime</item>
|
||||
<item name="colorSurface">@color/lime_surface_lime</item>
|
||||
<item name="colorOnSurface">@color/lime_onSurface_lime</item>
|
||||
<item name="colorSurfaceVariant">@color/lime_surfaceVariant_lime</item>
|
||||
<item name="colorOnSurfaceVariant">@color/lime_onSurfaceVariant_lime</item>
|
||||
<item name="colorOutline">@color/lime_outline_lime</item>
|
||||
<item name="colorOnSurfaceInverse">@color/lime_inverseOnSurface_lime</item>
|
||||
<item name="colorSurfaceInverse">@color/lime_inverseSurface_lime</item>
|
||||
<item name="colorPrimaryInverse">@color/lime_inversePrimary_lime</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Lime.Gray" parent="Theme.Lime">
|
||||
<!-- Gray Theme Colors -->
|
||||
<item name="colorPrimary">@color/lime_primary_gray</item>
|
||||
|
Loading…
Reference in New Issue
Block a user