r4sas
/
lightning-i2p
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity
Browse Source

Cleaned up styles and themes

master
Anthony Restaino 8 years ago
parent
edc040e5bd
commit
3a31738bbd
2 changed files with 68 additions and 158 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 101
      app/src/main/res/values-v21/styles.xml
  2. 125
      app/src/main/res/values/styles.xml

101
app/src/main/res/values-v21/styles.xml
Unescape View File

@ -1,78 +1,33 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"> <resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="Theme.SettingsTheme" parent="Theme.AppCompat.Light"> <!-- Settings themes -->
<style name="Theme.SettingsTheme" parent="Theme.LightTheme">
<!-- customize the color palette -->
<item name="android:windowBackground">@null</item> <item name="android:windowBackground">@null</item>
<item name="toolbarSettingsBackground">@color/primary_color</item> <item name="toolbarSettingsBackground">@color/primary_color</item>
<item name="listBackground">?attr/listChoiceBackgroundIndicator</item>
<item name="colorPrimary">@color/primary_color</item>
<item name="colorPrimaryDark">@color/secondary_color_settings</item>
<item name="colorAccent">@color/accent_color</item>
<item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="android:windowContentOverlay">@null</item>
<item name="dividerColor">@color/divider_light</item>
<item name="alertDialogTheme">@style/AppCompatDialogStyle.Light</item>
</style> </style>
<style name="Theme.SettingsTheme.Dark" parent="Theme.AppCompat"> <style name="Theme.SettingsTheme.Dark" parent="Theme.DarkTheme">
<!-- customize the color palette -->
<item name="android:windowBackground">@null</item> <item name="android:windowBackground">@null</item>
<item name="toolbarSettingsBackground">@color/primary_color_dark</item> <item name="toolbarSettingsBackground">@color/primary_color_dark</item>
<item name="listBackground">?attr/listChoiceBackgroundIndicator</item>
<item name="colorPrimary">@color/primary_color_dark</item> <!-- Dark settings has a special primary dark -->
<item name="colorPrimaryDark">@color/secondary_color_settings_dark</item> <item name="colorPrimaryDark">@color/secondary_color_settings_dark</item>
<item name="colorAccent">@color/accent_color</item>
<item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="android:windowContentOverlay">@null</item>
<item name="dividerColor">@color/divider_dark</item>
<item name="alertDialogTheme">@style/AppCompatDialogStyle.Dark</item>
</style> </style>
<style name="Theme.SettingsTheme.Black" parent="Theme.AppCompat"> <style name="Theme.SettingsTheme.Black" parent="Theme.BlackTheme">
<!-- customize the color palette -->
<item name="android:windowBackground">@null</item> <item name="android:windowBackground">@null</item>
<item name="toolbarSettingsBackground">@color/black</item> <item name="toolbarSettingsBackground">@color/black</item>
<item name="listBackground">?attr/listChoiceBackgroundIndicator</item>
<item name="colorPrimary">@color/black</item>
<item name="colorPrimaryDark">@color/black</item>
<item name="colorAccent">@color/accent_color</item>
<item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="android:windowContentOverlay">@null</item>
<item name="dividerColor">@color/divider_dark</item>
<item name="alertDialogTheme">@style/AppCompatDialogStyle.Black</item>
</style> </style>
<style name="Theme.LightTheme" parent="Theme.AppCompat.Light"> <!-- Regular themes -->
<style name="Theme.LightTheme" parent="Theme.BaseLightTheme">
<!-- customize the color palette -->
<item name="searchBackground">@drawable/card_bg</item> <item name="searchBackground">@drawable/card_bg</item>
<item name="listBackground">?attr/listChoiceBackgroundIndicator</item> <item name="listBackground">?attr/listChoiceBackgroundIndicator</item>
<item name="colorPrimary">@color/primary_color</item>
<item name="colorPrimaryDark">@color/transparent</item>
<item name="colorAccent">@color/accent_color</item>
<item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="progressBackgroundColor">#00000000</item> <item name="progressBackgroundColor">#00000000</item>
<item name="android:windowContentOverlay">@null</item>
<item name="progressColor">@color/gray_medium</item>
<item name="numberColor">@color/gray_dark</item>
<item name="autoCompleteTitleColor">@color/black</item>
<item name="autoCompleteUrlColor">@color/gray_medium</item>
<item name="actionOverflowButtonStyle">@style/overFlowButtonStyle</item>
<item name="drawerBackground">@color/drawer_background</item>
<item name="dividerColor">@color/divider_light</item>
<item name="selectedBackground">@drawable/list_bg_light</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item> <item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@color/secondary_color</item> <item name="android:statusBarColor">@color/secondary_color</item>
<item name="android:windowTranslucentStatus">false</item> <item name="android:windowTranslucentStatus">false</item>
<item name="alertDialogTheme">@style/AppCompatDialogStyle.Light</item>
<!-- READ THIS: <!-- READ THIS:
windowTranslucentStatus will set a semitransparent color to the status bar windowTranslucentStatus will set a semitransparent color to the status bar
primaryColorDark will set a color below the actual status bar color that primaryColorDark will set a color below the actual status bar color that
@ -81,56 +36,22 @@
--> -->
</style> </style>
<style name="Theme.DarkTheme" parent="Theme.AppCompat"> <style name="Theme.DarkTheme" parent="Theme.BaseDarkTheme">
<!-- customize the color palette -->
<item name="searchBackground">@drawable/card_bg</item> <item name="searchBackground">@drawable/card_bg</item>
<item name="listBackground">?attr/listChoiceBackgroundIndicator</item> <item name="listBackground">?attr/listChoiceBackgroundIndicator</item>
<item name="colorPrimary">@color/primary_color_dark</item>
<item name="colorPrimaryDark">@color/transparent</item>
<item name="colorAccent">@color/accent_color</item>
<item name="windowNoTitle">true</item>
<item name="progressBackgroundColor">#00000000</item> <item name="progressBackgroundColor">#00000000</item>
<item name="windowActionBar">false</item>
<item name="android:windowContentOverlay">@null</item>
<item name="progressColor">@color/gray_medium</item>
<item name="numberColor">@color/gray_dark</item>
<item name="autoCompleteTitleColor">@color/black</item>
<item name="autoCompleteUrlColor">@color/gray_medium</item>
<item name="actionOverflowButtonStyle">@style/overFlowButtonStyle</item>
<item name="drawerBackground">@color/drawer_background_dark</item>
<item name="dividerColor">@color/divider_dark</item>
<item name="selectedBackground">@drawable/list_bg_dark</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item> <item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@color/secondary_color</item> <item name="android:statusBarColor">@color/secondary_color</item>
<item name="android:windowTranslucentStatus">false</item> <item name="android:windowTranslucentStatus">false</item>
<item name="alertDialogTheme">@style/AppCompatDialogStyle.Dark</item>
</style> </style>
<style name="Theme.BlackTheme" parent="Theme.AppCompat"> <style name="Theme.BlackTheme" parent="Theme.BaseBlackTheme">
<!-- customize the color palette -->
<item name="searchBackground">@drawable/card_bg</item> <item name="searchBackground">@drawable/card_bg</item>
<item name="colorPrimary">@color/black</item>
<item name="colorPrimaryDark">@color/black</item>
<item name="colorAccent">@color/accent_color</item>
<item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="progressBackgroundColor">#00000000</item>
<item name="listBackground">?attr/listChoiceBackgroundIndicator</item> <item name="listBackground">?attr/listChoiceBackgroundIndicator</item>
<item name="android:windowContentOverlay">@null</item> <item name="progressBackgroundColor">#00000000</item>
<item name="progressColor">@color/gray_medium</item>
<item name="numberColor">@color/gray_dark</item>
<item name="autoCompleteTitleColor">@color/black</item>
<item name="autoCompleteUrlColor">@color/gray_medium</item>
<item name="actionOverflowButtonStyle">@style/overFlowButtonStyle</item>
<item name="drawerBackground">@color/black</item>
<item name="dividerColor">@color/black</item>
<item name="selectedBackground">@drawable/list_bg_dark</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item> <item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@color/black</item> <item name="android:statusBarColor">@color/black</item>
<item name="android:windowTranslucentStatus">false</item> <item name="android:windowTranslucentStatus">false</item>
<item name="alertDialogTheme">@style/AppCompatDialogStyle.Black</item>
</style> </style>
</resources> </resources>

125
app/src/main/res/values/styles.xml
Unescape View File

@ -1,120 +1,109 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"> <resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="Theme.SettingsTheme" parent="Theme.AppCompat.Light"> <!-- Settings themes -->
<style name="Theme.SettingsTheme" parent="Theme.LightTheme">
<!-- customize the color palette -->
<item name="android:windowBackground">@null</item> <item name="android:windowBackground">@null</item>
<item name="toolbarSettingsBackground">@drawable/toolbar_elevate</item> <item name="toolbarSettingsBackground">@drawable/toolbar_elevate</item>
<item name="listBackground">@drawable/list_bg</item>
<item name="colorPrimary">@color/primary_color</item>
<item name="colorPrimaryDark">@color/secondary_color_settings</item>
<item name="colorAccent">@color/accent_color</item>
<item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="android:windowContentOverlay">@null</item>
<item name="dividerColor">@color/divider_light</item>
<item name="alertDialogTheme">@style/AppCompatDialogStyle.Light</item>
</style> </style>
<style name="Theme.SettingsTheme.Dark" parent="Theme.AppCompat"> <style name="Theme.SettingsTheme.Dark" parent="Theme.DarkTheme">
<!-- customize the color palette -->
<item name="android:windowBackground">@null</item> <item name="android:windowBackground">@null</item>
<item name="toolbarSettingsBackground">@drawable/toolbar_elevate_dark</item> <item name="toolbarSettingsBackground">@drawable/toolbar_elevate_dark</item>
<item name="listBackground">@drawable/list_bg</item>
<item name="colorPrimary">@color/primary_color_dark</item> <!-- Dark settings has a special primary dark -->
<item name="colorPrimaryDark">@color/secondary_color_settings_dark</item> <item name="colorPrimaryDark">@color/secondary_color_settings_dark</item>
<item name="colorAccent">@color/accent_color</item>
<item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="android:windowContentOverlay">@null</item>
<item name="dividerColor">@color/divider_dark</item>
<item name="alertDialogTheme">@style/AppCompatDialogStyle.Dark</item>
</style> </style>
<style name="Theme.SettingsTheme.Black" parent="Theme.AppCompat"> <style name="Theme.SettingsTheme.Black" parent="Theme.BlackTheme">
<!-- customize the color palette -->
<item name="android:windowBackground">@null</item> <item name="android:windowBackground">@null</item>
<item name="toolbarSettingsBackground">@drawable/toolbar_elevate_black</item> <item name="toolbarSettingsBackground">@drawable/toolbar_elevate_black</item>
</style>
<!-- Regular themes -->
<style name="Theme.LightTheme" parent="Theme.BaseLightTheme">
<item name="searchBackground">@drawable/card_bg_elevate</item>
<item name="listBackground">@drawable/list_bg</item> <item name="listBackground">@drawable/list_bg</item>
<item name="colorPrimary">@color/black</item> <item name="progressBackgroundColor">@color/secondary_color</item>
<item name="colorPrimaryDark">@color/black</item>
<item name="colorAccent">@color/accent_color</item>
<item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="android:windowContentOverlay">@null</item>
<item name="dividerColor">@color/divider_dark</item>
<item name="alertDialogTheme">@style/AppCompatDialogStyle.Black</item>
</style> </style>
<style name="Theme.LightTheme" parent="Theme.AppCompat.Light"> <style name="Theme.DarkTheme" parent="Theme.BaseDarkTheme">
<item name="searchBackground">@drawable/card_bg_elevate</item>
<item name="listBackground">@drawable/list_bg</item>
<item name="progressBackgroundColor">@color/secondary_color</item>
</style>
<!-- customize the color palette --> <style name="Theme.BlackTheme" parent="Theme.BaseBlackTheme">
<item name="searchBackground">@drawable/card_bg_elevate</item> <item name="searchBackground">@drawable/card_bg_elevate</item>
<item name="listBackground">@drawable/list_bg</item> <item name="listBackground">@drawable/list_bg</item>
<item name="progressBackgroundColor">@color/black</item>
</style>
<!-- Base Themes -->
<style name="Theme.BaseLightTheme" parent="Theme.AppCompat.Light">
<!-- Theme Colors -->
<item name="colorPrimary">@color/primary_color</item> <item name="colorPrimary">@color/primary_color</item>
<item name="colorPrimaryDark">@color/secondary_color</item> <item name="colorPrimaryDark">@color/secondary_color</item>
<item name="colorAccent">@color/accent_color</item> <item name="colorAccent">@color/accent_color</item>
<item name="drawerBackground">@color/drawer_background</item>
<item name="dividerColor">@color/divider_light</item>
<item name="selectedBackground">@drawable/list_bg_light</item>
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>
<item name="progressBackgroundColor">@color/secondary_color</item>
<item name="android:windowContentOverlay">@null</item> <item name="android:windowContentOverlay">@null</item>
<item name="progressColor">@color/gray_medium</item>
<item name="numberColor">@color/gray_dark</item> <!-- Overflow menu -->
<item name="autoCompleteTitleColor">@color/black</item>
<item name="autoCompleteUrlColor">@color/gray_medium</item>
<item name="actionOverflowButtonStyle">@style/overFlowButtonStyle</item> <item name="actionOverflowButtonStyle">@style/overFlowButtonStyle</item>
<item name="drawerBackground">@color/drawer_background</item>
<item name="dividerColor">@color/divider_light</item> <!-- Alert dialogs -->
<item name="selectedBackground">@drawable/list_bg_light</item>
<item name="alertDialogTheme">@style/AppCompatDialogStyle.Light</item> <item name="alertDialogTheme">@style/AppCompatDialogStyle.Light</item>
</style> </style>
<style name="Theme.DarkTheme" parent="Theme.AppCompat"> <style name="Theme.BaseDarkTheme" parent="Theme.AppCompat">
<!-- customize the color palette --> <!-- Theme colors -->
<item name="searchBackground">@drawable/card_bg_elevate</item>
<item name="colorPrimary">@color/primary_color_dark</item> <item name="colorPrimary">@color/primary_color_dark</item>
<item name="colorPrimaryDark">@color/secondary_color</item> <item name="colorPrimaryDark">@color/secondary_color</item>
<item name="colorAccent">@color/accent_color</item> <item name="colorAccent">@color/accent_color</item>
<item name="drawerBackground">@color/drawer_background_dark</item>
<item name="dividerColor">@color/divider_dark</item>
<item name="selectedBackground">@drawable/list_bg_dark</item>
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>
<item name="progressBackgroundColor">@color/secondary_color</item>
<item name="listBackground">@drawable/list_bg</item>
<item name="android:windowContentOverlay">@null</item> <item name="android:windowContentOverlay">@null</item>
<item name="progressColor">@color/gray_medium</item>
<item name="numberColor">@color/gray_dark</item> <!-- Overflow menu -->
<item name="autoCompleteTitleColor">@color/black</item>
<item name="autoCompleteUrlColor">@color/gray_medium</item>
<item name="actionOverflowButtonStyle">@style/overFlowButtonStyle</item> <item name="actionOverflowButtonStyle">@style/overFlowButtonStyle</item>
<item name="drawerBackground">@color/drawer_background_dark</item>
<item name="dividerColor">@color/divider_dark</item> <!-- Alert dialogs -->
<item name="selectedBackground">@drawable/list_bg_dark</item>
<item name="alertDialogTheme">@style/AppCompatDialogStyle.Dark</item> <item name="alertDialogTheme">@style/AppCompatDialogStyle.Dark</item>
</style> </style>
<style name="Theme.BlackTheme" parent="Theme.AppCompat"> <style name="Theme.BaseBlackTheme" parent="Theme.AppCompat">
<!-- customize the color palette --> <!-- Theme Colors -->
<item name="searchBackground">@drawable/card_bg_elevate</item>
<item name="colorPrimary">@color/black</item> <item name="colorPrimary">@color/black</item>
<item name="colorPrimaryDark">@color/black</item> <item name="colorPrimaryDark">@color/black</item>
<item name="colorAccent">@color/accent_color</item> <item name="colorAccent">@color/accent_color</item>
<item name="drawerBackground">@color/black</item>
<item name="dividerColor">@color/black</item>
<item name="selectedBackground">@drawable/list_bg_dark</item>
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>
<item name="progressBackgroundColor">@color/black</item>
<item name="listBackground">@drawable/list_bg</item>
<item name="android:windowContentOverlay">@null</item> <item name="android:windowContentOverlay">@null</item>
<item name="progressColor">@color/gray_medium</item>
<item name="numberColor">@color/gray_dark</item> <!-- Overflow menu -->
<item name="autoCompleteTitleColor">@color/black</item>
<item name="autoCompleteUrlColor">@color/gray_medium</item>
<item name="actionOverflowButtonStyle">@style/overFlowButtonStyle</item> <item name="actionOverflowButtonStyle">@style/overFlowButtonStyle</item>
<item name="drawerBackground">@color/black</item>
<item name="dividerColor">@color/black</item> <!-- Alert dialogs -->
<item name="selectedBackground">@drawable/list_bg_dark</item>
<item name="alertDialogTheme">@style/AppCompatDialogStyle.Black</item> <item name="alertDialogTheme">@style/AppCompatDialogStyle.Black</item>
</style> </style>

Write Preview
Loading…
Cancel
Save