Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-22 18:31:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Theme fixes

Browse Source
This commit is contained in:
inorichi 2016-01-05 13:54:00 +01:00
parent 8000d67871
commit 060da4185e
9 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/res/layout/activity_main.xml
View File

@ -8,8 +8,7 @@
<android.support.design.widget.AppBarLayout <android.support.design.widget.AppBarLayout
android:id="@+id/appbar" android:id="@+id/appbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:theme="@style/ThemeOverlay.AppTheme.Dark">
<include layout="@layout/toolbar" /> <include layout="@layout/toolbar" />

3
app/src/main/res/layout/activity_manga.xml
View File

@ -8,8 +8,7 @@
<android.support.design.widget.AppBarLayout <android.support.design.widget.AppBarLayout
android:id="@+id/appbar" android:id="@+id/appbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:theme="@style/ThemeOverlay.AppTheme.Dark">
<include layout="@layout/toolbar" /> <include layout="@layout/toolbar" />

2
app/src/main/res/layout/fragment_manga_chapters.xml
View File

@ -37,7 +37,7 @@
android:paddingLeft="12dp" android:paddingLeft="12dp"
android:paddingRight="12dp" android:paddingRight="12dp"
android:gravity="top|start" android:gravity="top|start"
android:theme="@style/ThemeOverlay.AppTheme.Dark"> android:theme="@style/AppTheme.Popup">
<ImageView <ImageView
android:id="@+id/action_sort" android:id="@+id/action_sort"

2
app/src/main/res/layout/library_tab_layout.xml
View File

@ -5,7 +5,7 @@
android:id="@+id/tabs" android:id="@+id/tabs"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.AppTheme.Dark" android:theme="@style/AppTheme.Overlay.Dark"
android:background="@color/colorPrimary" android:background="@color/colorPrimary"
android:elevation="4dp" android:elevation="4dp"
app:tabGravity="center" app:tabGravity="center"

4
app/src/main/res/layout/reader_menu.xml
View File

@ -13,7 +13,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:background="@color/reader_menu_background" android:background="@color/reader_menu_background"
android:theme="@style/ThemeOverlay.AppTheme.Dark" android:theme="@style/AppTheme.Overlay.Dark"
app:popupTheme="@style/AppTheme.Popup" app:popupTheme="@style/AppTheme.Popup"
android:elevation="4dp" /> android:elevation="4dp" />
@ -47,7 +47,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:theme="@style/ThemeOverlay.AppTheme.Dark" android:theme="@style/AppTheme.Overlay.Dark"
/> />
<TextView <TextView

2
app/src/main/res/layout/tab_layout.xml
View File

@ -5,7 +5,7 @@
android:id="@+id/tabs" android:id="@+id/tabs"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.AppTheme.Dark" android:theme="@style/AppTheme.Overlay.Dark"
app:tabGravity="fill" app:tabGravity="fill"
android:background="@color/colorPrimary" android:background="@color/colorPrimary"
android:elevation="4dp" android:elevation="4dp"

5
app/src/main/res/layout/toolbar.xml
View File

@ -6,6 +6,5 @@
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:background="@color/colorPrimary" android:background="@color/colorPrimary"
android:elevation="4dp" android:elevation="4dp"
android:theme="@style/ThemeOverlay.AppTheme.Dark" android:theme="@style/AppTheme.ActionBar"
app:layout_scrollFlags="scroll|enterAlways|snap" app:layout_scrollFlags="scroll|enterAlways|snap"/>
app:popupTheme="@style/AppTheme.Popup" />

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

@ -1,15 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="AppTheme" parent="AppTheme.Base">
<item name="android:windowContentTransitions">true</item>
<item name="android:windowAllowEnterTransitionOverlap">true</item>
<item name="android:windowAllowReturnTransitionOverlap">true</item>
<item name="android:windowSharedElementEnterTransition">@android:transition/move</item>
<item name="android:windowSharedElementExitTransition">@android:transition/move</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="android:colorBackground">@color/colorBackgroundLight</item>
<item name="android:colorForeground">@color/colorPrimary</item>
<item name="colorAccent">@color/accent</item>
</style>
</resources> </resources>

43
app/src/main/res/values/styles.xml
View File

@ -1,23 +1,24 @@
<resources> <resources>
<style name="AppTheme" parent="AppTheme.Base"> <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<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>
<item name="colorButtonNormal">@color/colorPrimary</item> <item name="colorButtonNormal">@color/colorPrimary</item>
<item name="alertDialogTheme">@style/AlertDialogStyle</item>
<item name="android:background">@color/white</item> <item name="android:itemTextAppearance">@style/OptionsMenuTextColor</item>
<item name="android:textColor">@color/primary_text</item> <item name="android:textColor">@color/primary_text</item>
<item name="android:textColorPrimary">@color/primary_text</item>
<item name="colorControlNormal">@color/white</item>
</style> </style>
<style name="AppTheme.Base" parent="Theme.AppCompat.Light.NoActionBar"> <style name="AppTheme.ActionBar" parent="AppTheme">
<item name="android:windowActionModeOverlay">true</item> <item name="android:textColorPrimary">@color/white</item>
<item name="windowActionModeOverlay">true</item> <item name="android:itemTextAppearance">@style/OptionsMenuTextColor</item>
<item name="android:spinnerItemStyle">@style/ActionBarSpinner</item>
</style> </style>
<style name="ThemeOverlay.AppTheme.Dark" parent="ThemeOverlay.AppCompat.Dark.ActionBar"> <style name="AppTheme.Overlay.Dark" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="colorAccent">@color/white</item> <item name="colorAccent">@color/white</item>
<item name="android:windowActionModeOverlay">true</item> <item name="android:windowActionModeOverlay">true</item>
<item name="windowActionModeOverlay">true</item> <item name="windowActionModeOverlay">true</item>
@ -26,14 +27,32 @@
<item name="actionModeBackground">@color/colorPrimarySuperDark</item> <item name="actionModeBackground">@color/colorPrimarySuperDark</item>
</style> </style>
<style name="AppTheme.Popup" parent="@style/ThemeOverlay.AppTheme.Dark"> <style name="AlertDialogStyle" parent="Theme.AppCompat.Light.Dialog.Alert">
<item name="android:windowTitleStyle">@style/DialogTitleText</item>
<item name="colorAccent">@color/primary</item>
</style>
<style name="DialogTitleText">
<item name="android:textColor">@color/primary_text</item>
<item name="android:textAppearance">@style/TextAppearance.AppCompat.Title</item>
</style>
<style name="OptionsMenuTextColor" parent="@android:style/TextAppearance.Widget.IconMenu.Item">
<item name="android:textColor">@android:color/black</item>
</style>
<style name="ActionBarSpinner" parent="@style/Widget.AppCompat.TextView.SpinnerItem">
<item name="android:textColor">@color/white</item>
<item name="android:textColorHint">@color/hint_foreground_material_dark</item>
</style>
<style name="AppTheme.Popup" parent="@style/AppTheme.Overlay.Dark">
<item name="colorAccent">@color/white</item> <item name="colorAccent">@color/white</item>
<item name="android:background">@color/colorPrimary</item> <item name="android:background">@color/colorPrimary</item>
<item name="android:textColor">@color/white</item> <item name="android:textColor">@color/white</item>
</style> </style>
<style name="AppTheme.GridView" parent="AppTheme"> <style name="AppTheme.GridView" parent="AppTheme">
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:padding">10dp</item> <item name="android:padding">10dp</item>
<item name="android:layout_height">match_parent</item> <item name="android:layout_height">match_parent</item>
@ -58,7 +77,7 @@
<item name="alertDialogTheme">@style/FilePickerAlertDialogTheme</item> <item name="alertDialogTheme">@style/FilePickerAlertDialogTheme</item>
<item name="nnf_toolbarTheme">@style/ThemeOverlay.AppTheme.Dark</item> <item name="nnf_toolbarTheme">@style/AppTheme.Overlay.Dark</item>
</style> </style>
<style name="FilePickerAlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert"> <style name="FilePickerAlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">