Changing to base themes

This commit is contained in:
HarryJohnso 2019-09-17 21:21:48 +10:00
parent e43d304d83
commit 4cdf2c1448
2 changed files with 12 additions and 113 deletions

View file

@ -1,124 +1,17 @@
<resources> <resources>
<!-- Definitions -->
<attr name="windowBackground" format="reference" />
<attr name="cardStyle" format="reference" />
<attr name="dialogTheme" format="reference" />
<attr name="colorGithub" format="reference" />
<attr name="colorPaypal" format="reference" />
<attr name="thumbnailBackground" format="reference" />
<!-- General styles -->
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="Theme.Intro.Solid" parent="Theme.Intro">
<item name="android:windowIsTranslucent">false</item>
</style>
<!-- Light application theme --> <!-- Light application theme -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> <style name="AppTheme" parent="AppBaseTheme">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="windowBackground">?android:attr/colorBackground</item>
<item name="colorGithub">@color/github_dark</item>
<item name="colorPaypal">@color/paypal_dark</item>
<item name="thumbnailBackground">@android:color/transparent</item>
<item name="cardStyle">@style/CardViewStyle</item>
<item name="dialogTheme">@style/DialogTheme</item>
<item name="about_libraries_card">@color/cardview_light_background</item>
<item name="about_libraries_title_openSource">@color/about_libraries_text_openSource</item>
<item name="about_libraries_text_openSource">@color/about_libraries_text_openSource</item>
<item name="about_libraries_dividerDark_openSource">@color/about_libraries_dividerDark_openSource</item>
<item name="about_libraries_dividerLight_openSource">@color/about_libraries_dividerLight_openSource</item>
<item name="android:navigationBarColor">@android:color/white</item> <item name="android:navigationBarColor">@android:color/white</item>
<item name="android:windowLightNavigationBar">true</item> <item name="android:windowLightNavigationBar">true</item>
</style> </style>
<style name="AppTheme.NoActionBar"> <style name="AppTheme.Dark" parent="AppBaseTheme.Dark">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="CardViewStyle" parent="CardView">
<item name="contentPadding">@dimen/activity_margin</item>
</style>
<style name="DialogTheme" parent="Theme.AppCompat.Light.Dialog.MinWidth">
<item name="colorAccent">@color/colorAccent</item>
</style>
<!-- Dark application theme. -->
<style name="AppTheme.Dark" parent="Theme.AppCompat">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="windowBackground">?android:attr/colorBackground</item>
<item name="thumbnailBackground">@color/dark_thumbnail_background</item>
<item name="colorGithub">@color/github_light</item>
<item name="colorPaypal">@color/paypal_light</item>
<item name="cardStyle">@style/CardViewStyle</item>
<item name="dialogTheme">@style/DialogTheme.Dark</item>
<item name="about_libraries_card">@color/cardview_dark_background</item>
<item name="about_libraries_title_openSource">@color/about_libraries_text_openSource_dark</item>
<item name="about_libraries_text_openSource">@color/about_libraries_text_openSource_dark</item>
<item name="about_libraries_dividerDark_openSource">@color/about_libraries_dividerDark_openSource_dark</item>
<item name="about_libraries_dividerLight_openSource">@color/about_libraries_dividerLight_openSource_dark</item>
<item name="android:navigationBarColor">@android:color/black</item> <item name="android:navigationBarColor">@android:color/black</item>
<item name="android:windowLightNavigationBar">false</item> <item name="android:windowLightNavigationBar">false</item>
</style> </style>
<style name="AppTheme.Dark.NoActionBar"> <style name="AppTheme.Black" parent="AppBaseTheme.Black">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="DialogTheme.Dark" parent="Theme.AppCompat.Dialog.MinWidth">
<item name="colorAccent">@color/colorAccent</item>
</style>
<!-- Black application theme. -->
<style name="AppTheme.Black" parent="Theme.AppCompat">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="windowBackground">@android:color/black</item>
<item name="thumbnailBackground">@color/dark_thumbnail_background</item>
<item name="colorGithub">@color/github_light</item>
<item name="colorPaypal">@color/paypal_light</item>
<item name="cardStyle">@style/CardViewStyle.Black</item>
<item name="dialogTheme">@style/DialogTheme.Dark</item>
<item name="about_libraries_card">@android:color/black</item>
<item name="about_libraries_title_openSource">@color/about_libraries_text_openSource_dark</item>
<item name="about_libraries_text_openSource">@color/about_libraries_text_openSource_dark</item>
<item name="about_libraries_dividerDark_openSource">@color/about_libraries_dividerDark_openSource_dark</item>
<item name="about_libraries_dividerLight_openSource">@color/about_libraries_dividerLight_openSource_dark</item>
<item name="android:navigationBarColor">@android:color/black</item> <item name="android:navigationBarColor">@android:color/black</item>
<item name="android:windowLightNavigationBar">false</item> <item name="android:windowLightNavigationBar">false</item>
</style> </style>
<style name="CardViewStyle.Black">
<item name="cardBackgroundColor">@android:color/black</item>
</style>
<style name="AppTheme.Black.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
</resources> </resources>

View file

@ -16,7 +16,7 @@
</style> </style>
<!-- Light application theme --> <!-- Light application theme -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> <style name="AppBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccent</item>
@ -37,6 +37,8 @@
<item name="about_libraries_dividerLight_openSource">@color/about_libraries_dividerLight_openSource</item> <item name="about_libraries_dividerLight_openSource">@color/about_libraries_dividerLight_openSource</item>
</style> </style>
<style name="AppTheme" parent="AppBaseTheme"/>
<style name="AppTheme.NoActionBar"> <style name="AppTheme.NoActionBar">
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
@ -51,7 +53,7 @@
</style> </style>
<!-- Dark application theme. --> <!-- Dark application theme. -->
<style name="AppTheme.Dark" parent="Theme.AppCompat"> <style name="AppBaseTheme.Dark" parent="Theme.AppCompat">
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccent</item>
@ -72,6 +74,8 @@
<item name="about_libraries_dividerLight_openSource">@color/about_libraries_dividerLight_openSource_dark</item> <item name="about_libraries_dividerLight_openSource">@color/about_libraries_dividerLight_openSource_dark</item>
</style> </style>
<style name="AppTheme.Dark" parent = "AppBaseTheme.Dark"/>
<style name="AppTheme.Dark.NoActionBar"> <style name="AppTheme.Dark.NoActionBar">
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
@ -82,7 +86,7 @@
</style> </style>
<!-- Black application theme. --> <!-- Black application theme. -->
<style name="AppTheme.Black" parent="Theme.AppCompat"> <style name="AppBaseTheme.Black" parent="Theme.AppCompat">
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccent</item>
@ -103,6 +107,8 @@
<item name="about_libraries_dividerLight_openSource">@color/about_libraries_dividerLight_openSource_dark</item> <item name="about_libraries_dividerLight_openSource">@color/about_libraries_dividerLight_openSource_dark</item>
</style> </style>
<style name="AppTheme.Black" parent="AppBaseTheme.Black"/>
<style name="CardViewStyle.Black"> <style name="CardViewStyle.Black">
<item name="cardBackgroundColor">@android:color/black</item> <item name="cardBackgroundColor">@android:color/black</item>
</style> </style>