yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimize themes.xml

Browse Source
This commit is contained in:
seven332 committed 2018-10-18 18:42:19 +08:00
1 parent 596f95e463
commit ab2a066992
3 files changed
+50 -124
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/res/values-v19/themes.xml
+3 -21
View File
@@ -17,40 +17,22 @@
<resources>
<style name="AppTheme.Dark.NoActionBar.TranslucentDecor">
<item name="android:windowTranslucentStatus">true</item>
<item name="android:windowTranslucentNavigation">true</item>
<item name="android:windowContentOverlay">@null</item>
</style>
<style name="AppTheme.Main" parent="AppTheme.NoActionBar">
<style name="AppTheme.NoActionBar.Translucent">
<item name="android:windowTranslucentStatus">true</item>
<item name="android:windowTranslucentNavigation">false</item>
<item name="android:windowContentOverlay">@null</item>
<item name="colorDivider">@color/divider_light</item>
<item name="colorToolbar">@color/colorPrimary</item>
</style>
<style name="AppTheme.Main.Dark" parent="AppTheme.Dark.NoActionBar">
<item name="colorPrimaryDark">@android:color/black</item>
<style name="AppTheme.Dark.NoActionBar.Translucent">
<item name="android:windowTranslucentStatus">true</item>
<item name="android:windowTranslucentNavigation">false</item>
<item name="android:windowContentOverlay">@null</item>
<item name="colorDivider">@color/divider_dark</item>
<item name="colorToolbar">?android:attr/colorBackground</item>
</style>
<style name="AppTheme.Main.Black" parent="AppTheme.Dark.NoActionBar">
<item name="colorPrimary">@android:color/black</item>
<item name="colorPrimaryDark">@android:color/black</item>
<item name="colorAccent">@android:color/black</item>
<style name="AppTheme.Black.NoActionBar.Translucent">
<item name="android:windowTranslucentStatus">true</item>
<item name="android:windowTranslucentNavigation">false</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowBackground">@android:color/black</item>
<item name="android:colorBackground">@android:color/black</item>
<item name="colorDivider">@color/divider_dark</item>
<item name="colorToolbar">?android:attr/colorBackground</item>
</style>
</resources>
app/src/main/res/values-v21/themes.xml
+3 -15
View File
@@ -17,31 +17,19 @@
<resources>
<style name="AppTheme.Main" parent="AppTheme.NoActionBar">
<style name="AppTheme.NoActionBar.Translucent">
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="colorDivider">@color/divider_light</item>
<item name="colorToolbar">@color/colorPrimary</item>
</style>
<style name="AppTheme.Main.Dark" parent="AppTheme.Dark.NoActionBar">
<item name="colorPrimaryDark">@android:color/black</item>
<style name="AppTheme.Dark.NoActionBar.Translucent">
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="colorDivider">@color/divider_dark</item>
<item name="colorToolbar">?android:attr/colorBackground</item>
</style>
<style name="AppTheme.Main.Black" parent="AppTheme.Dark.NoActionBar">
<item name="colorPrimary">@android:color/black</item>
<item name="colorPrimaryDark">@android:color/black</item>
<item name="colorAccent">@android:color/black</item>
<style name="AppTheme.Black.NoActionBar.Translucent">
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowBackground">@android:color/black</item>
<item name="android:colorBackground">@android:color/black</item>
<item name="colorDivider">@color/divider_dark</item>
<item name="colorToolbar">?android:attr/colorBackground</item>
</style>
</resources>
app/src/main/res/values/themes.xml
+44 -88
View File
@@ -26,6 +26,9 @@
<item name="colorAccent">@color/colorAccent</item>
<item name="actionBarStyle">@style/ActionBarStyle</item>
<item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
<item name="colorDivider">@color/divider_light</item>
<item name="colorToolbar">@color/colorPrimary</item>
</style>
<style name="AppTheme.NoActionBar">
@@ -33,30 +36,20 @@
<item name="windowNoTitle">true</item>
</style>
<style name="AppTheme.Translucent">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowIsTranslucent">true</item>
<!-- Note that we use the base animation style here (that is no
animations) because we really have no idea how this kind of
activity will be used. -->
<item name="android:windowAnimationStyle">@android:style/Animation</item>
</style>
<style name="AppTheme.Translucent.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="AppTheme.NoActionBar.Translucent"/>
<!-- =============== -->
<!-- Base Dark Theme -->
<!-- =============== -->
<style name="AppTheme.Dark" parent="Theme.AppCompat">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorPrimaryDark">@android:color/black</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="actionBarStyle">@style/ActionBarStyle.Dark</item>
<item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
<item name="colorDivider">@color/divider_dark</item>
<item name="colorToolbar">?android:attr/colorBackground</item>
</style>
<style name="AppTheme.Dark.NoActionBar">
@@ -64,95 +57,58 @@
<item name="windowNoTitle">true</item>
</style>
<style name="AppTheme.Dark.NoActionBar.TranslucentDecor">
<!-- Only available on API 19 and above -->
<style name="AppTheme.Dark.NoActionBar.Translucent"/>
<!-- =============== -->
<!-- Base Black Theme -->
<!-- =============== -->
<style name="AppTheme.Black" parent="Theme.AppCompat">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@android:color/black</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="actionBarStyle">@style/ActionBarStyle.Dark</item>
<item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
<item name="android:windowBackground">@android:color/black</item>
<item name="android:colorBackground">@android:color/black</item>
<item name="colorDivider">@color/divider_dark</item>
<item name="colorToolbar">?android:attr/colorBackground</item>
</style>
<style name="AppTheme.Black.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="AppTheme.Black.NoActionBar.Translucent"/>
<!-- ========= -->
<!-- App Theme -->
<!-- ========= -->
<style name="AppTheme.Main" parent="AppTheme.NoActionBar">
<item name="colorDivider">@color/divider_light</item>
<item name="colorToolbar">@color/colorPrimary</item>
</style>
<style name="AppTheme.Main" parent="AppTheme.NoActionBar.Translucent"/>
<style name="AppTheme.Main.Dark" parent="AppTheme.Dark.NoActionBar">
<item name="colorPrimaryDark">@android:color/black</item>
<item name="colorDivider">@color/divider_dark</item>
<item name="colorToolbar">?android:attr/colorBackground</item>
</style>
<style name="AppTheme.Main.Dark" parent="AppTheme.Dark.NoActionBar.Translucent"/>
<style name="AppTheme.Main.Black" parent="AppTheme.Dark.NoActionBar">
<item name="colorPrimary">@android:color/black</item>
<item name="colorPrimaryDark">@android:color/black</item>
<item name="colorAccent">@android:color/black</item>
<item name="android:windowBackground">@android:color/black</item>
<item name="android:colorBackground">@android:color/black</item>
<item name="colorDivider">@color/divider_dark</item>
<item name="colorToolbar">?android:attr/colorBackground</item>
</style>
<style name="AppTheme.Main.Black" parent="AppTheme.Black.NoActionBar.Translucent"/>
<style name="AppTheme.Toolbar" parent="AppTheme.NoActionBar">
<item name="colorDivider">@color/divider_light</item>
<item name="colorToolbar">@color/colorPrimary</item>
</style>
<style name="AppTheme.Toolbar" parent="AppTheme.NoActionBar"/>
<style name="AppTheme.Toolbar.Dark" parent="AppTheme.Dark.NoActionBar">
<item name="colorPrimaryDark">@android:color/black</item>
<item name="colorDivider">@color/divider_dark</item>
<item name="colorToolbar">?android:attr/colorBackground</item>
</style>
<style name="AppTheme.Toolbar.Dark" parent="AppTheme.Dark.NoActionBar"/>
<style name="AppTheme.Toolbar.Black" parent="AppTheme.Dark.NoActionBar">
<item name="colorPrimary">@android:color/black</item>
<item name="colorPrimaryDark">@android:color/black</item>
<item name="colorAccent">@android:color/black</item>
<item name="android:windowBackground">@android:color/black</item>
<item name="android:colorBackground">@android:color/black</item>
<item name="colorDivider">@color/divider_dark</item>
<item name="colorToolbar">?android:attr/colorBackground</item>
</style>
<style name="AppTheme.Toolbar.Black" parent="AppTheme.Black.NoActionBar"/>
<style name="AppTheme.Gallery" parent="AppTheme.Dark.NoActionBar">
<item name="colorPrimaryDark">@android:color/black</item>
<item name="android:windowBackground">@color/gallery_background</item>
<item name="colorDivider">@color/divider_dark</item>
<item name="colorToolbar">?android:attr/colorBackground</item>
</style>
<style name="AppTheme.Gallery" parent="AppTheme.Dark.NoActionBar"/>
<style name="AppTheme.Gallery.Dark">
</style>
<style name="AppTheme.Gallery.Dark" parent="AppTheme.Dark.NoActionBar"/>
<style name="AppTheme.Gallery.Black" parent="AppTheme.Dark.NoActionBar">
<item name="colorPrimary">@android:color/black</item>
<item name="colorPrimaryDark">@android:color/black</item>
<item name="colorAccent">@android:color/black</item>
<item name="android:windowBackground">@android:color/black</item>
<item name="android:colorBackground">@android:color/black</item>
<item name="colorDivider">@color/divider_dark</item>
<item name="colorToolbar">?android:attr/colorBackground</item>
</style>
<style name="AppTheme.Gallery.Black" parent="AppTheme.Black.NoActionBar"/>
<style name="AppTheme.Settings" parent="AppTheme">
<item name="colorDivider">@color/divider_light</item>
<item name="colorToolbar">@color/colorPrimary</item>
</style>
<style name="AppTheme.Settings" parent="AppTheme"/>
<style name="AppTheme.Settings.Dark" parent="AppTheme.Dark">
<item name="colorPrimaryDark">@android:color/black</item>
<item name="colorDivider">@color/divider_dark</item>
<item name="colorToolbar">?android:attr/colorBackground</item>
</style>
<style name="AppTheme.Settings.Dark" parent="AppTheme.Dark"/>
<style name="AppTheme.Settings.Black" parent="AppTheme.Dark">
<item name="colorPrimary">@android:color/black</item>
<item name="colorPrimaryDark">@android:color/black</item>
<item name="colorAccent">@android:color/black</item>
<item name="android:windowBackground">@android:color/black</item>
<item name="android:colorBackground">@android:color/black</item>
<item name="colorDivider">@color/divider_dark</item>
<item name="colorToolbar">?android:attr/colorBackground</item>
</style>
<style name="AppTheme.Settings.Black" parent="AppTheme.Black"/>
<!-- ============ -->
<!-- Widget Theme -->