mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-10-30 05:47:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rewrote Theme

Browse Source
This commit is contained in:
NoodleMage
2016-03-12 14:22:40 +01:00
committed by NoodleMage
parent 98d420d5aa
commit 5ef5f9b45f
112 changed files with 1078 additions and 1536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/res/drawable-hdpi/reader_background_checkbox_selected.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 227 B

BIN
app/src/main/res/drawable-hdpi/reader_background_checkbox_unselected.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 249 B

BIN
app/src/main/res/drawable-ldpi/reader_background_checkbox_selected.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 136 B

BIN
app/src/main/res/drawable-ldpi/reader_background_checkbox_unselected.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 153 B

BIN
app/src/main/res/drawable-mdpi/reader_background_checkbox_selected.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 142 B

BIN
app/src/main/res/drawable-mdpi/reader_background_checkbox_unselected.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 148 B

23
app/src/main/res/drawable-v21/list_item_selector_dark.xml Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/colorAccent"
>
<item>
<selector>
<item android:state_selected="true">
<color android:color="@color/selectorColorDark" />
</item>
<item android:state_activated="true">
<color android:color="@color/selectorColorDark" />
</item>
<item>
<color android:color="@color/backgroundDark" />
</item>
</selector>
</item>
</ripple>

23
app/src/main/res/drawable-v21/list_item_selector_light.xml Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/colorAccent"
>
<item>
<selector>
<item android:state_selected="true">
<color android:color="@color/selectorColorLight" />
</item>
<item android:state_activated="true">
<color android:color="@color/selectorColorLight" />
</item>
<item>
<color android:color="@color/backgroundLight" />
</item>
</selector>
</item>
</ripple>

14
app/src/main/res/drawable-v21/selector_chapter_light.xml
View File

@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:exitFadeDuration="@android:integer/config_shortAnimTime"
android:color="?android:attr/colorControlHighlight">
<item android:id="@android:id/mask"
android:drawable="@color/list_choice_pressed_bg_light" />
<item>
<selector>
<item android:state_activated="true" android:drawable="@color/list_choice_pressed_bg_light"/>
</selector>
</item>
</ripple>

5
app/src/main/res/drawable-v21/touchable_background_white.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/line_grey">
<item android:drawable="@color/white"/>
</ripple>

0
app/src/main/res/drawable-xhdpi/card_background.9.png Executable file → Normal file
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 755 B

After

Width:  |  Height:  |  Size: 755 B

BIN
app/src/main/res/drawable-xxhdpi/reader_background_checkbox_selected.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 366 B

BIN
app/src/main/res/drawable-xxhdpi/reader_background_checkbox_unselected.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 387 B

BIN
app/src/main/res/drawable-xxxhdpi/reader_background_checkbox_selected.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 434 B

BIN
app/src/main/res/drawable-xxxhdpi/reader_background_checkbox_unselected.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 499 B

BIN
app/src/main/res/drawable/header.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.6 KiB

1
app/src/main/res/drawable/ic_book_grey_128dp.xml → app/src/main/res/drawable/ic_book_black_128dp.xml
View File

@@ -1,7 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="128dp"
android:height="128dp"
android:alpha=".38"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path

1
app/src/main/res/drawable/ic_book_grey_24dp.xml → app/src/main/res/drawable/ic_book_black_24dp.xml
View File

@@ -1,7 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:alpha=".54"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path

1
app/src/main/res/drawable/ic_explore_grey_24dp.xml → app/src/main/res/drawable/ic_explore_black_24dp.xml
View File

@@ -1,7 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:alpha=".54"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path

1
app/src/main/res/drawable/ic_file_download_grey_128dp.xml → app/src/main/res/drawable/ic_file_download_black_128dp.xml
View File

@@ -1,7 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="128dp"
android:height="128dp"
android:alpha=".38"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path

1
app/src/main/res/drawable/ic_file_download_grey_24dp.xml → app/src/main/res/drawable/ic_file_download_black_24dp.xml
View File

@@ -1,7 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:alpha=".54"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path

1
app/src/main/res/drawable/ic_history_grey_128dp.xml → app/src/main/res/drawable/ic_history_black_128dp.xml
View File

@@ -1,7 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="128dp"
android:height="128dp"
android:alpha=".38"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path

1
app/src/main/res/drawable/ic_history_grey_24dp.xml → app/src/main/res/drawable/ic_history_black_24dp.xml
View File

@@ -1,7 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:alpha=".54"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path

9
app/src/main/res/drawable/ic_history_blue_24dp.xml
View File

@@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF54759e"
android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
</vector>

4
app/src/main/res/drawable/ic_file_download_blue_24dp.xml → app/src/main/res/drawable/ic_reader_background_checkbox_black_24dp.xml
View File

@@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF54759e"
android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
android:fillColor="#FF000000"
android:pathData="M19,3H5C3.9,3,3,3.9,3,5v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V5C21,3.9,20.1,3,19,3z"/>
</vector>

4
app/src/main/res/drawable/ic_book_blue_24dp.xml → app/src/main/res/drawable/ic_reader_background_checkbox_white_24dp.xml
View File

@@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF54759e"
android:pathData="M18,2H6c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2zM6,4h5v8l-2.5,-1.5L6,12V4z"/>
android:fillColor="#FFFFFFFF"
android:pathData="M19,3H5C3.9,3,3,3.9,3,5v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V5C21,3.9,20.1,3,19,3z"/>
</vector>

1
app/src/main/res/drawable/ic_settings_grey_24dp.xml → app/src/main/res/drawable/ic_settings_black_24dp.xml
View File

@@ -1,7 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:alpha=".54"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path

0
app/src/main/res/drawable/test.png → app/src/main/res/drawable/icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

2
app/src/main/res/drawable/line_divider.xml → app/src/main/res/drawable/line_divider_dark.xml
View File

@@ -6,6 +6,6 @@
android:width="1dp"
android:height="1dp" />
<solid android:color="@color/divider" />
<solid android:color="@color/dividerDark" />
</shape>

11
app/src/main/res/drawable/line_divider_light.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size
android:width="1dp"
android:height="1dp" />
<solid android:color="@color/dividerLight" />
</shape>

10
app/src/main/res/drawable/selector_chapter_light.xml → app/src/main/res/drawable/list_item_selector_dark.xml
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<selector android:exitFadeDuration="@android:integer/config_longAnimTime"
xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true" android:drawable="@color/list_choice_pressed_bg_light"/>
<item android:state_pressed="true" android:drawable="@color/list_choice_pressed_bg_light"/>
<item android:state_activated="true" android:drawable="@color/list_choice_pressed_bg_light"/>
<item android:drawable="@android:color/transparent"/>
<item android:state_focused="true" android:drawable="@color/selectorColorDark"/>
<item android:state_pressed="true" android:drawable="@color/selectorColorDark"/>
<item android:state_activated="true" android:drawable="@color/selectorColorDark"/>
<item android:drawable="@android:color/background_dark"/>
</selector>

19
app/src/main/res/drawable/list_item_selector_light.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--<selector android:exitFadeDuration="@android:integer/config_longAnimTime"-->
<!--xmlns:android="http://schemas.android.com/apk/res/android">-->
<!--<item android:state_focused="true" android:drawable="?attr/colorAccent"/>-->
<!--<item android:state_pressed="true" android:drawable="?attr/colorAccent"/>-->
<!--<item android:state_activated="true" android:drawable="?attr/colorAccent"/>-->
<!--<item android:drawable="?android:attr/colorBackground"/>-->
<!--</selector>-->
<selector android:exitFadeDuration="@android:integer/config_longAnimTime"
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true" android:drawable="@color/selectorColorLight"/>
<item android:state_pressed="true" android:drawable="@color/selectorColorLight"/>
<item android:state_activated="true" android:drawable="@color/selectorColorLight"/>
<item android:drawable="@color/backgroundLight"/>
</selector>

4
app/src/main/res/drawable/reader_background_checkbox.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:drawable="@drawable/reader_background_checkbox_selected" />
<item android:drawable="@drawable/reader_background_checkbox_unselected" />
<item android:state_checked="true" android:drawable="@drawable/ic_reader_background_checkbox_black_24dp" />
<item android:drawable="@drawable/ic_reader_background_checkbox_white_24dp" />
</selector>

6
app/src/main/res/drawable/touchable_background_white.xml
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/super_light_grey" android:state_pressed="true"/>
<item android:drawable="@color/super_light_grey" android:state_focused="true"/>
<item android:drawable="@color/white"/>
</selector>

17
app/src/main/res/layout/activity_edit_categories.xml
View File

@@ -2,9 +2,9 @@
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:gravity="center">
<include layout="@layout/toolbar"/>
@@ -15,20 +15,13 @@
android:layout_marginTop="?attr/actionBarSize"
android:id="@+id/recycler"
android:choiceMode="multipleChoice"
android:listSelector="@color/list_choice_pressed_bg_light"
tools:listitem="@layout/item_edit_categories"/>
tools:listitem="@layout/item_edit_categories"
/>
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_height="@dimen/fab_size"
android:layout_width="@dimen/fab_size"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
android:scaleType="fitCenter"
app:srcCompat="@drawable/ic_add_white_24dp"
app:backgroundTint="@color/colorPrimary"
app:layout_anchor="@id/recycler"
app:layout_anchorGravity="bottom|right|end"
app:layout_behavior="eu.kanade.tachiyomi.ui.base.fab.FABAnimationUpDown"/>
app:srcCompat="@drawable/ic_add_white_24dp"
style="@style/Theme.Widget.FAB"/>
</android.support.design.widget.CoordinatorLayout>

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

@@ -34,7 +34,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center">
<ImageView
<android.support.v7.widget.AppCompatImageView
android:id="@+id/image_view"
android:layout_width="128dp"
android:layout_height="128dp"
@@ -42,25 +42,24 @@
<TextView
android:id="@+id/text_label"
style="@style/TextAppearance.Medium.Body2.Hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/image_view"
android:layout_centerHorizontal="true"
android:alpha=".87"
android:textSize="24sp"/>
android:layout_centerHorizontal="true"/>
</RelativeLayout>
</FrameLayout>
</RelativeLayout>
<android.support.design.widget.NavigationView
android:id="@+id/nav_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start"
android:fitsSystemWindows="true"
android:theme="?attr/navigation_view_theme"
app:headerLayout="@layout/navigation_header"
app:menu="@menu/menu_navigation"/>
</android.support.v4.widget.DrawerLayout>

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

@@ -1,18 +1,18 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
tools:context="eu.kanade.tachiyomi.ui.manga.MangaActivity">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
tools:context="eu.kanade.tachiyomi.ui.manga.MangaActivity">
<android.support.design.widget.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include layout="@layout/toolbar" />
<include layout="@layout/toolbar"/>
<include layout="@layout/tab_layout" />
<include layout="@layout/tab_layout"/>
</android.support.design.widget.AppBarLayout>

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

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<include layout="@layout/toolbar"/>

17
app/src/main/res/layout/activity_reader.xml
View File

@@ -1,7 +1,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center">
<FrameLayout
android:id="@+id/reader"
@@ -10,14 +10,13 @@
</FrameLayout>
<TextView
android:id="@+id/page_number"
style="@style/TextAppearance.Regular.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="4dp"
android:layout_gravity="bottom|left"
android:background="@color/page_number_background"
android:textColor="@color/primary_text"
android:textSize="12sp"
android:id="@+id/page_number"/>
android:layout_gravity="bottom|start"
android:background="?android:attr/colorBackground"
android:padding="4dp"/>
<include layout="@layout/reader_menu"/>

41
app/src/main/res/layout/card_myanimelist_personal.xml
View File

@@ -9,7 +9,7 @@
android:id="@+id/myanimelist_title_layout"
android:layout_width="match_parent"
android:layout_height="?android:listPreferredItemHeightSmall"
android:background="?attr/selectableItemBackground"
android:background="?attr/selectable_list_drawable"
android:clickable="true"
android:paddingLeft="?android:listPreferredItemPaddingLeft"
android:paddingRight="?android:listPreferredItemPaddingRight">
@@ -18,7 +18,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="Title"/>
android:text="Title"
style="@style/TextAppearance.Regular.Body1"/>
<TextView
android:id="@+id/myanimelist_title"
@@ -26,7 +27,8 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="Edit..."/>
android:text="Edit"
style="@style/TextAppearance.Medium.Button"/>
</RelativeLayout>
@@ -35,23 +37,25 @@
android:layout_width="fill_parent"
android:layout_height="1dp"
android:layout_below="@id/myanimelist_title_layout"
android:background="@color/list_choice_pressed_bg_light" />
android:background="?android:attr/divider" />
<RelativeLayout
android:id="@+id/myanimelist_status_layout"
android:layout_width="match_parent"
android:layout_height="?android:listPreferredItemHeightSmall"
android:layout_below="@id/divider1"
android:background="?attr/selectableItemBackground"
android:background="?attr/selectable_list_drawable"
android:clickable="true"
android:paddingLeft="?android:listPreferredItemPaddingLeft"
android:paddingRight="?android:listPreferredItemPaddingRight">
android:paddingRight="?android:listPreferredItemPaddingRight"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="Status"/>
android:text="Status"
style="@style/TextAppearance.Regular.Body1"/>
<TextView
android:id="@+id/myanimelist_status"
@@ -59,7 +63,8 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
tools:text="Reading"/>
tools:text="Reading"
style="@style/TextAppearance.Regular.Body1.Secondary"/>
</RelativeLayout>
@@ -68,14 +73,14 @@
android:layout_width="fill_parent"
android:layout_height="1dp"
android:layout_below="@id/myanimelist_status_layout"
android:background="@color/list_choice_pressed_bg_light" />
android:background="?android:attr/divider" />
<RelativeLayout
android:id="@+id/myanimelist_chapters_layout"
android:layout_width="match_parent"
android:layout_height="?android:listPreferredItemHeightSmall"
android:layout_below="@id/divider2"
android:background="?attr/selectableItemBackground"
android:background="?attr/selectable_list_drawable"
android:clickable="true"
android:paddingLeft="?android:listPreferredItemPaddingLeft"
android:paddingRight="?android:listPreferredItemPaddingRight">
@@ -84,7 +89,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="Chapters"/>
android:text="Chapters"
style="@style/TextAppearance.Regular.Body1"/>
<TextView
android:id="@+id/myanimelist_chapters"
@@ -92,7 +98,8 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
tools:text="12/24"/>
tools:text="12/24"
style="@style/TextAppearance.Regular.Body1.Secondary"/>
</RelativeLayout>
@@ -101,14 +108,14 @@
android:layout_width="fill_parent"
android:layout_height="1dp"
android:layout_below="@id/myanimelist_chapters_layout"
android:background="@color/list_choice_pressed_bg_light" />
android:background="?android:attr/divider" />
<RelativeLayout
android:id="@+id/myanimelist_score_layout"
android:layout_width="match_parent"
android:layout_height="?android:listPreferredItemHeightSmall"
android:layout_below="@id/divider3"
android:background="?attr/selectableItemBackground"
android:background="?attr/selectable_list_drawable"
android:clickable="true"
android:paddingLeft="?android:listPreferredItemPaddingLeft"
android:paddingRight="?android:listPreferredItemPaddingRight">
@@ -117,7 +124,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="@string/score"/>
android:text="@string/score"
style="@style/TextAppearance.Regular.Body1"/>
<TextView
android:id="@+id/myanimelist_score"
@@ -125,7 +133,8 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
tools:text="10"/>
tools:text="10"
style="@style/TextAppearance.Regular.Body1.Secondary"/>
</RelativeLayout>

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

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
android:id="@+id/image_view"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/image_view" />
android:layout_height="match_parent"/>

10
app/src/main/res/layout/dialog_myanimelist_chapters.xml
View File

@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">
<eu.kanade.tachiyomi.widget.MinMaxNumberPicker
android:id="@+id/chapters_picker"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:id="@+id/chapters_picker"
app:min="0"
app:max="9999"/>
app:max="9999"
app:min="0"/>
</LinearLayout>

10
app/src/main/res/layout/dialog_myanimelist_score.xml
View File

@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">
<eu.kanade.tachiyomi.widget.MinMaxNumberPicker
android:id="@+id/score_picker"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:id="@+id/score_picker"
app:min="0"
app:max="10"/>
app:max="10"
app:min="0"/>
</LinearLayout>

33
app/src/main/res/layout/dialog_myanimelist_search.xml
View File

@@ -1,31 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center"
android:orientation="horizontal"
android:paddingLeft="@dimen/margin_left"
android:paddingRight="@dimen/margin_right"
android:orientation="horizontal">
android:paddingRight="@dimen/margin_right">
<EditText
android:id="@+id/myanimelist_search_field"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:id="@+id/myanimelist_search_field"
android:hint="@string/title_hint" />
<!--
<ImageButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_clear_grey600_24dp"/>
-->
android:hint="@string/title_hint"/>
</LinearLayout>
@@ -34,21 +27,21 @@
style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:paddingTop="32dp"
android:paddingBottom="32dp"
android:layout_gravity="center_vertical|center_horizontal"
android:paddingBottom="32dp"
android:paddingTop="32dp"
android:visibility="gone"/>
<ListView
android:id="@+id/myanimelist_search_results"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/myanimelist_search_results"
android:scrollbarStyle="outsideOverlay"
android:choiceMode="singleChoice"
android:clipToPadding="false"
android:divider="@null"
android:dividerHeight="0dp"
android:clipToPadding="false"
android:choiceMode="singleChoice"
android:listSelector="@color/list_choice_pressed_bg_light"
android:listSelector="?attr/selectable_list_drawable"
android:scrollbarStyle="outsideOverlay"
android:visibility="gone"/>
</LinearLayout>

6
app/src/main/res/layout/dialog_myanimelist_search_item.xml
View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/myanimelist_result_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/myanimelist_result_title"
android:padding="10dp"/>
</LinearLayout>

32
app/src/main/res/layout/fragment_catalogue.xml
View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical"
tools:context="eu.kanade.tachiyomi.ui.catalogue.CatalogueFragment">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical"
tools:context="eu.kanade.tachiyomi.ui.catalogue.CatalogueFragment">
<ProgressBar
android:id="@+id/progress"
@@ -15,22 +15,24 @@
android:layout_gravity="center_vertical|center_horizontal"
android:visibility="gone"/>
<ViewSwitcher
android:id="@+id/switcher"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:id="@+id/switcher">
android:layout_weight="1">
<eu.kanade.tachiyomi.widget.AutofitRecyclerView
android:id="@+id/catalogue_grid"
style="@style/AppTheme.GridView"
android:columnWidth="140dp"
tools:listitem="@layout/item_catalogue_grid" />
<android.support.v7.widget.RecyclerView
style="@style/Theme.Widget.GridView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/catalogue_list"/>
android:columnWidth="140dp"
tools:listitem="@layout/item_catalogue_grid"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/catalogue_list"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</ViewSwitcher>

9
app/src/main/res/layout/fragment_download_queue.xml
View File

@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/recycler">
android:id="@+id/recycler"
tools:listitem="@layout/item_download">
</android.support.v7.widget.RecyclerView>

10
app/src/main/res/layout/fragment_library.xml
View File

@@ -1,12 +1,12 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v4.view.ViewPager
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/view_pager">
android:layout_height="match_parent">
</android.support.v4.view.ViewPager>

12
app/src/main/res/layout/fragment_library_category.xml
View File

@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<eu.kanade.tachiyomi.widget.AutofitRecyclerView
android:id="@+id/recycler"
style="@style/AppTheme.GridView"
style="@style/Theme.Widget.GridView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:columnWidth="140dp"
tools:listitem="@layout/item_catalogue_grid" />
tools:listitem="@layout/item_catalogue_grid"/>
</FrameLayout>

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

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical">
<android.support.v4.widget.SwipeRefreshLayout
@@ -20,7 +20,6 @@
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:descendantFocusability="blocksDescendants"
android:background="@color/white"
tools:listitem="@layout/item_chapter">
</android.support.v7.widget.RecyclerView>
@@ -33,12 +32,11 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_alignParentBottom="true"
android:background="@color/colorPrimary"
android:background="?attr/colorPrimary"
android:elevation="4dp"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:gravity="top|start"
android:theme="@style/AppTheme.Popup">
android:paddingLeft="12dp"
android:paddingRight="12dp">
<ImageView
android:id="@+id/sort_btn"
@@ -61,10 +59,11 @@
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_margin="10dp"
android:background="@color/white"/>
android:background="@color/md_white_1000"/>
<CheckBox
<android.support.v7.widget.AppCompatCheckBox
android:id="@+id/show_unread"
style="@style/Theme.Widget.CheckBox.Light"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
@@ -72,8 +71,9 @@
android:text="@string/action_show_unread"
android:title="@string/action_show_unread"/>
<CheckBox
<android.support.v7.widget.AppCompatCheckBox
android:id="@+id/show_downloaded"
style="@style/Theme.Widget.CheckBox.Light"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
@@ -85,19 +85,18 @@
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_margin="10dp"
android:background="@color/white"/>
android:background="@color/md_white_1000"/>
</LinearLayout>
<ImageView
<android.support.v7.widget.AppCompatImageView
android:id="@+id/next_unread_btn"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:background="?android:selectableItemBackground"
app:srcCompat="@drawable/ic_play_arrow_white_36dp"
android:title="@string/action_next_unread"/>
android:layout_alignParentRight="true"
android:title="@string/action_next_unread"
app:srcCompat="@drawable/ic_play_arrow_white_36dp"/>
</RelativeLayout>

88
app/src/main/res/layout/fragment_manga_info.xml
View File

@@ -67,17 +67,24 @@
<TextView
android:id="@+id/manga_author_label"
style="@style/manga_detail_label"
style="@style/TextAppearance.Medium.Body2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:paddingRight="10dp"
android:singleLine="true"
android:text="@string/manga_info_author_label"
android:textIsSelectable="false"
/>
<TextView
android:id="@+id/manga_author"
style="@style/manga_detail_text"
style="@style/TextAppearance.Regular.Body1.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:textIsSelectable="false"
/>
</LinearLayout>
@@ -90,17 +97,24 @@
<TextView
android:id="@+id/manga_artist_label"
style="@style/manga_detail_label"
style="@style/TextAppearance.Medium.Body2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:paddingRight="10dp"
android:singleLine="true"
android:text="@string/manga_info_artist_label"
android:textIsSelectable="false"
/>
<TextView
android:id="@+id/manga_artist"
style="@style/manga_detail_text"
style="@style/TextAppearance.Regular.Body1.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:textIsSelectable="false"
/>
</LinearLayout>
@@ -113,17 +127,24 @@
<TextView
android:id="@+id/manga_chapters_label"
style="@style/manga_detail_label"
style="@style/TextAppearance.Medium.Body2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:paddingRight="10dp"
android:singleLine="true"
android:text="@string/manga_info_chapters_label"
android:textIsSelectable="false"
/>
<TextView
android:id="@+id/manga_chapters"
style="@style/manga_detail_text"
style="@style/TextAppearance.Regular.Body1.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:textIsSelectable="false"
/>
</LinearLayout>
@@ -136,17 +157,24 @@
<TextView
android:id="@+id/manga_status_label"
style="@style/manga_detail_label"
style="@style/TextAppearance.Medium.Body2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:paddingRight="10dp"
android:singleLine="true"
android:text="@string/manga_info_status_label"
android:textIsSelectable="false"
/>
<TextView
android:id="@+id/manga_status"
style="@style/manga_detail_text"
style="@style/TextAppearance.Regular.Body1.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:textIsSelectable="false"
/>
</LinearLayout>
@@ -159,17 +187,24 @@
<TextView
android:id="@+id/manga_source_label"
style="@style/manga_detail_label"
style="@style/TextAppearance.Medium.Body2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:paddingRight="10dp"
android:singleLine="true"
android:text="@string/manga_info_source_label"
android:textIsSelectable="false"
/>
<TextView
android:id="@+id/manga_source"
style="@style/manga_detail_text"
style="@style/TextAppearance.Regular.Body1.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:textIsSelectable="false"
/>
</LinearLayout>
@@ -182,18 +217,24 @@
<TextView
android:id="@+id/manga_genres_label"
style="@style/manga_detail_label"
style="@style/TextAppearance.Medium.Body2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:paddingRight="10dp"
android:singleLine="true"
android:text="@string/manga_info_genres_label"
android:textIsSelectable="false"
/>
<TextView
android:id="@+id/manga_genres"
style="@style/manga_detail_text"
style="@style/TextAppearance.Regular.Body1.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="false"
android:textIsSelectable="false"
/>
</LinearLayout>
</RelativeLayout>
@@ -218,17 +259,23 @@
<TextView
android:id="@+id/manga_summary_label"
style="@style/manga_detail_label"
style="@style/TextAppearance.Medium.Body2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/description"/>
android:ellipsize="end"
android:paddingRight="10dp"
android:singleLine="true"
android:text="@string/description"
android:textIsSelectable="false"/>
<TextView
android:id="@+id/manga_summary"
style="@style/manga_detail_text"
style="@style/TextAppearance.Regular.Body1.Secondary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="false"
android:textIsSelectable="false"
/>
</LinearLayout>
@@ -241,12 +288,11 @@
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab_favorite"
android:layout_width="@dimen/fab_size"
android:layout_height="@dimen/fab_size"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@drawable/ic_bookmark_border_white_24dp"
app:backgroundTint="@color/colorPrimary"
style="@style/Theme.Widget.FAB"
android:layout_gravity=""
app:layout_anchor="@id/top_view"
app:layout_anchorGravity="bottom|right|end"/>
app:layout_anchorGravity="bottom|right|end"
app:layout_behavior=""
app:srcCompat="@drawable/ic_bookmark_border_white_24dp"/>
</android.support.design.widget.CoordinatorLayout>

8
app/src/main/res/layout/fragment_myanimelist.xml
View File

@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/swipe_refresh"
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/swipe_refresh"
android:paddingTop="@dimen/margin_top"
android:orientation="vertical"
android:paddingBottom="@dimen/margin_bottom"
android:paddingLeft="@dimen/margin_left"
android:paddingRight="@dimen/margin_right"
android:paddingLeft="@dimen/margin_left">
android:paddingTop="@dimen/margin_top">
<ScrollView
android:layout_width="match_parent"

1
app/src/main/res/layout/fragment_recent_chapters.xml
View File

@@ -10,7 +10,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:descendantFocusability="blocksDescendants"
android:background="@color/white"
tools:listitem="@layout/item_recent_chapter">
</android.support.v7.widget.RecyclerView>

32
app/src/main/res/layout/item_catalogue_grid.xml
View File

@@ -5,7 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/selector_chapter_light">
android:background="?attr/selectable_list_drawable">
<RelativeLayout
android:layout_width="match_parent"
@@ -21,8 +21,8 @@
android:id="@+id/thumbnail"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
tools:background="@color/md_red_100"
android:background="?android:attr/colorBackground"
tools:background="?android:attr/colorBackground"
tools:src="@mipmap/ic_launcher"/>
<View
@@ -32,37 +32,26 @@
android:background="@drawable/gradient_shape"
app:layout_heightPercent="50%"/>
</android.support.percent.PercentFrameLayout>
<TextView
android:id="@+id/unreadText"
style="@style/TextAppearance.Regular.Caption.Light"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:background="@color/manga_unread_bg"
android:background="?attr/colorAccent"
android:paddingBottom="1dp"
android:paddingLeft="3dp"
android:paddingRight="3dp"
android:paddingTop="1dp"
android:textColor="@color/white"
android:textSize="12sp"
android:visibility="gone"/>
<!--<com.mikepenz.iconics.view.IconicsImageView-->
<!--android:id="@+id/favorite_sticker"-->
<!--android:layout_width="24dp"-->
<!--android:layout_height="24dp"-->
<!--android:layout_alignEnd="@+id/image_container"-->
<!--android:layout_alignRight="@+id/image_container"-->
<!--android:layout_alignTop="@+id/image_container"-->
<!--android:layout_marginEnd="5dp"-->
<!--android:layout_marginRight="5dp"-->
<!--android:layout_marginTop="5dp"-->
<!--android:visibility="invisible"/>-->
<eu.kanade.tachiyomi.widget.PTSansTextView
android:id="@+id/title"
style="@style/TextAppearance.Regular.Body1.Light"
app:typeface="ptsansNarrowBold"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/image_container"
@@ -71,13 +60,10 @@
android:lineSpacingExtra="-4dp"
android:maxLines="2"
android:padding="8dp"
android:shadowColor="@color/primary_text"
android:shadowColor="@color/textColorPrimaryLight"
android:shadowDx="0"
android:shadowDy="0"
android:shadowRadius="4"
android:textColor="@color/white"
android:textSize="14sp"
app:typeface="ptsansNarrowBold"
tools:text="Sample name"/>
</RelativeLayout>

7
app/src/main/res/layout/item_catalogue_list.xml
View File

@@ -3,14 +3,15 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="?android:listPreferredItemHeightSmall"
android:background="@drawable/selector_chapter_light">
android:background="?attr/selectable_list_drawable">
<TextView
android:id="@+id/title"
style="@style/TextAppearance.Regular.Body1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingLeft="?android:listPreferredItemPaddingLeft"
android:paddingRight="?android:listPreferredItemPaddingLeft"
android:id="@+id/title"/>
android:paddingRight="?android:listPreferredItemPaddingLeft"/>
</FrameLayout>

17
app/src/main/res/layout/item_chapter.xml
View File

@@ -4,7 +4,7 @@
android:layout_width="fill_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@drawable/selector_chapter_light">
android:background="?attr/selectable_list_drawable">
<RelativeLayout
@@ -31,7 +31,7 @@
android:layout_centerHorizontal="true"
android:ellipsize="marquee"
android:singleLine="true"
android:textSize="12sp"
style="@style/TextAppearance.Regular.Caption.Hint"
tools:text="Pages: 45"/>
<TextView
@@ -40,7 +40,7 @@
android:layout_height="fill_parent"
android:ellipsize="marquee"
android:singleLine="true"
android:textSize="12sp"
style="@style/TextAppearance.Regular.Body1"
tools:text="22/02/2016"/>
<TextView
@@ -51,8 +51,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textAllCaps="true"
android:textColor="@color/accent_text"
android:textSize="12sp"/>
style="@style/TextAppearance.Regular.Caption.Hint"/>
</RelativeLayout>
<TextView
@@ -70,7 +69,7 @@
android:ellipsize="middle"
android:gravity="center_vertical"
android:maxLines="1"
android:textSize="17sp"
style="@style/TextAppearance.Regular.SubHeading"
tools:text="Title"/>
@@ -88,14 +87,14 @@
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingRight="?android:attr/listPreferredItemPaddingRight">
<ImageView
<android.support.v7.widget.AppCompatImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_alignParentEnd="false"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:background="?android:selectableItemBackground"
app:srcCompat="@drawable/ic_more_horiz_black_24dp"/>
app:srcCompat="@drawable/ic_more_horiz_black_24dp"
android:tint="?android:attr/textColorPrimary"/>
</RelativeLayout>

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

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp">
@@ -25,7 +25,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/download_progress_text"
android:layout_gravity="left" />
android:layout_gravity="start" />
</LinearLayout>

14
app/src/main/res/layout/item_edit_categories.xml
View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeightLarge"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:background="@drawable/selector_chapter_light">
android:background="?attr/selectable_list_drawable"
>
<ImageView
android:id="@+id/image"
android:layout_width="50dp"
@@ -21,7 +21,7 @@
android:layout_marginRight="@dimen/margin_right"
android:layout_marginEnd="@dimen/margin_right"/>
<ImageView
<android.support.v7.widget.AppCompatImageView
android:id="@+id/reorder"
android:layout_width="50dp"
android:layout_height="50dp"
@@ -33,7 +33,8 @@
android:layout_centerInParent="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
app:srcCompat="@drawable/ic_reorder_grey_24dp"/>
app:srcCompat="@drawable/ic_reorder_grey_24dp"
android:tint="?android:attr/textColorPrimary"/>
<TextView
android:id="@+id/title"
@@ -46,8 +47,7 @@
android:layout_centerInParent="true"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="@color/primary_text"
android:textAppearance="@style/TextAppearance.Regular.SubHeading"
tools:text="Title"/>
</RelativeLayout>

13
app/src/main/res/layout/item_recent_chapter.xml
View File

@@ -3,8 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@drawable/selector_chapter_light">
xmlns:app="http://schemas.android.com/apk/res-auto">
<RelativeLayout
@@ -31,7 +30,6 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textAllCaps="true"
android:textColor="@color/accent_text"
android:textSize="12sp"/>
</RelativeLayout>
@@ -51,7 +49,7 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textAppearance="@style/TextAppearance.Regular.Body1"
tools:text="My manga"/>
<TextView
@@ -60,7 +58,7 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textAppearance="@style/TextAppearance.Regular.Caption"
tools:text="Title"/>
</LinearLayout>
@@ -82,7 +80,7 @@
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingLeft="?android:attr/listPreferredItemPaddingLeft">
<ImageView
<android.support.v7.widget.AppCompatImageView
android:id="@+id/chapterMenu"
android:layout_width="24dp"
android:layout_height="24dp"
@@ -90,7 +88,8 @@
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:background="?android:selectableItemBackground"
app:srcCompat="@drawable/ic_more_horiz_black_24dp"/>
app:srcCompat="@drawable/ic_more_horiz_black_24dp"
android:tint="?android:attr/textColorPrimary"/>
</RelativeLayout>

12
app/src/main/res/layout/item_recent_chapter_section.xml
View File

@@ -4,22 +4,20 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="32dp"
android:background="?attr/colorPrimary"
android:gravity="center_vertical"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
android:paddingRight="?android:attr/listPreferredItemPaddingRight"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:background="@color/colorPrimary">
android:paddingStart="?android:attr/listPreferredItemPaddingStart">
<TextView
android:id="@+id/section_text"
style="@style/TextAppearance.Regular.SubHeading.Light.Bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="16sp"
android:id="@+id/section_text"
android:layout_gravity="center_vertical"
android:textStyle="bold" />
android:singleLine="true"/>
</FrameLayout>

10
app/src/main/res/layout/item_webtoon_reader.xml
View File

@@ -5,9 +5,9 @@
android:layout_height="wrap_content">
<FrameLayout
android:id="@+id/frame_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/frame_container">
android:layout_height="match_parent">
<ProgressBar
android:id="@+id/progress"
@@ -17,12 +17,12 @@
android:layout_gravity="center_vertical|center_horizontal"/>
<Button
android:id="@+id/retry_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/retry_button"
android:text="@string/action_retry"
android:layout_gravity="center_vertical|center_horizontal"
android:visibility="gone" />
android:text="@string/action_retry"
android:visibility="gone"/>
</FrameLayout>

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

@@ -5,10 +5,9 @@
android:id="@+id/tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.Overlay.Dark"
android:background="@color/colorPrimary"
android:visibility="gone"
android:theme="@style/Theme.ActionBar.Tab"
app:tabIndicatorColor="@android:color/white"
app:tabGravity="center"
app:tabMode="scrollable"
app:tabMinWidth="75dp"
app:tabIndicatorColor="@color/white"/>
app:tabMinWidth="75dp"/>

8
app/src/main/res/layout/listitem_dir.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout android:id="@+id/nnf_item_container"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/nnf_item_container"
android:layout_width="match_parent"
android:layout_height="?android:listPreferredItemHeight"
android:background="?selectableItemBackground"
@@ -21,7 +21,7 @@
android:src="@drawable/nnf_ic_file_folder"
android:tint="?attr/colorAccent"
android:visibility="visible"
tools:ignore="ContentDescription" />
tools:ignore="ContentDescription"/>
<TextView
android:id="@android:id/text1"
@@ -33,5 +33,5 @@
android:maxLines="1"
android:padding="8dp"
android:singleLine="true"
android:text="@string/nnf_name" />
android:text="@string/nnf_name"/>
</LinearLayout>

26
app/src/main/res/layout/navigation_header.xml
View File

@@ -1,24 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="192dp"
android:layout_height="@dimen/navigation_drawer_header_height"
android:gravity="bottom"
android:theme="@style/ThemeOverlay.AppCompat.Dark">
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="centerCrop"
android:background="@drawable/header" />
android:layout_height="match_parent"
android:background="?attr/colorPrimary"
android:scaleType="centerCrop"/>
<ImageView
android:layout_marginLeft="16dp"
android:layout_marginTop="@dimen/navigation_drawer_header_margin"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="@dimen/navigation_drawer_header_margin"
android:scaleType="centerCrop"
android:src="@drawable/test" />
android:src="@drawable/icon"/>
<!--
<LinearLayout
android:layout_width="match_parent"
android:layout_height="52dp"
@@ -34,17 +35,20 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_vertical"
android:text="Desarrollador Android"
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
android:text="John Doe"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:visibility="gone"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_vertical"
android:text="thedahnark@gmail.com"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
android:text="email@email.com"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:visibility="gone"/>
</LinearLayout>
-->
</FrameLayout>

45
app/src/main/res/layout/pref_account_login.xml
View File

@@ -1,25 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="24dp">
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="24dp">
<TextView
android:id="@+id/dialog_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/dialog_title"
android:textStyle="bold"
android:layout_gravity="center_horizontal"
android:textSize="16sp"
android:layout_gravity="center_horizontal" />
android:textStyle="bold"/>
<View android:id="@+id/titleDivider"
<View
android:id="@+id/titleDivider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_grey"
android:layout_marginBottom="24dp"
android:layout_marginTop="6dp"
android:layout_marginBottom="24dp"/>
android:background="@color/dividerLight"/>
<TextView
android:layout_width="match_parent"
@@ -27,9 +28,9 @@
android:text="@string/username"/>
<EditText
android:id="@+id/username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/username" />
android:layout_height="wrap_content"/>
<TextView
android:layout_width="match_parent"
@@ -38,28 +39,28 @@
android:text="@string/password"/>
<EditText
android:id="@+id/password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:ems="10"
android:id="@+id/password" />
android:inputType="textPassword"/>
<CheckBox
android:id="@+id/show_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/show_password"
android:id="@+id/show_password"
android:layout_marginTop="10dp"/>
android:layout_marginTop="10dp"
android:text="@string/show_password"/>
<com.dd.processbutton.iml.ActionProcessButton
android:id="@+id/login"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:layout_marginTop="20dp"
android:text="@string/login"
android:id="@+id/login"
android:textColor="@android:color/white"
app:pb_textComplete="@string/login_success"
app:pb_textProgress="@string/loading"
app:pb_textError="@string/invalid_login"
android:layout_marginTop="20dp"/>
app:pb_textProgress="@string/loading"/>
</LinearLayout>

22
app/src/main/res/layout/pref_library_columns.xml
View File

@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="@dimen/dialog_margin_top_content"
android:orientation="horizontal"
android:paddingBottom="@dimen/dialog_content_padding"
android:paddingLeft="@dimen/dialog_content_padding"
android:paddingRight="@dimen/dialog_content_padding"
android:paddingBottom="@dimen/dialog_content_padding">
android:paddingTop="@dimen/dialog_margin_top_content">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
android:gravity="center">
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
@@ -25,8 +25,8 @@
android:id="@+id/portrait_columns"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:min="0"
app:max="10"/>
app:max="10"
app:min="0"/>
</LinearLayout>
@@ -34,8 +34,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
android:gravity="center">
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
@@ -46,8 +46,8 @@
android:id="@+id/landscape_columns"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:min="0"
app:max="10"/>
app:max="10"
app:min="0"/>
</LinearLayout>

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

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/image_view"
<ImageView android:id="@+id/image_view"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content">

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

@@ -1,29 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/reader_menu"
android:visibility="gone"
tools:visibility="visible">
<RelativeLayout android:id="@+id/reader_menu"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"
tools:visibility="visible">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/reader_menu_background"
android:theme="@style/AppTheme.Overlay.Dark"
app:popupTheme="@style/AppTheme.Popup"
android:elevation="4dp" />
android:background="?colorPrimary"
android:elevation="4dp"
android:theme="?attr/actionBarTheme"/>
<LinearLayout
android:id="@+id/reader_menu_bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/reader_menu_bottom"
android:background="@color/reader_menu_background"
android:orientation="vertical"
android:layout_alignParentBottom="true">
android:layout_alignParentBottom="true"
android:background="?colorPrimary"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
@@ -33,87 +32,85 @@
android:id="@+id/current_page"
android:layout_width="32dp"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_gravity="center_vertical"
android:textColor="@color/light_grey"
android:textSize="15sp"
android:gravity="center_horizontal"
android:layout_marginBottom="12dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp" />
android:gravity="center_horizontal"
android:textSize="15sp"/>
<SeekBar
android:id="@+id/page_seeker"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:theme="@style/AppTheme.Overlay.Dark"
android:layout_weight="1"
/>
<TextView
android:id="@+id/total_pages"
android:layout_width="32dp"
android:layout_height="wrap_content"
android:layout_marginRight="8dp"
android:layout_gravity="center_vertical"
android:textColor="@color/light_grey"
android:textSize="15sp"
android:gravity="center_horizontal" />
android:layout_marginRight="8dp"
android:gravity="center_horizontal"
android:textSize="15sp"/>
</LinearLayout>
<View android:background="#777777"
<View
android:layout_width="match_parent"
android:layout_height="1dp" />
android:layout_height="1dp"
android:background="#777777"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize">
<ImageButton
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
<android.support.v7.widget.AppCompatImageButton
android:id="@+id/lock_orientation"
app:srcCompat="@drawable/ic_screen_rotation_white_24dp"
android:layout_gravity="center_vertical"
android:background="?android:selectableItemBackground" />
<ImageButton
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:background="?android:selectableItemBackground"
app:srcCompat="@drawable/ic_screen_rotation_white_24dp"/>
<android.support.v7.widget.AppCompatImageButton
android:id="@+id/reader_zoom_selector"
app:srcCompat="@drawable/ic_crop_original_white_24dp"
android:layout_gravity="center_vertical"
android:background="?android:selectableItemBackground"/>
<ImageButton
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:background="?android:selectableItemBackground"
app:srcCompat="@drawable/ic_crop_original_white_24dp"/>
<android.support.v7.widget.AppCompatImageButton
android:id="@+id/reader_scale_type_selector"
app:srcCompat="@drawable/ic_zoom_out_map_white_24dp"
android:layout_gravity="center_vertical"
android:background="?android:selectableItemBackground" />
<ImageButton
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:background="?android:selectableItemBackground"
app:srcCompat="@drawable/ic_zoom_out_map_white_24dp"/>
<android.support.v7.widget.AppCompatImageButton
android:id="@+id/reader_selector"
app:srcCompat="@drawable/ic_view_carousel_white_24dp"
android:layout_gravity="center_vertical"
android:background="?android:selectableItemBackground" />
<ImageButton
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:id="@+id/reader_extra_settings"
app:srcCompat="@drawable/ic_more_vert_white_24dp"
android:layout_gravity="center_vertical"
android:background="?android:selectableItemBackground" />
android:layout_weight="1"
android:background="?android:selectableItemBackground"
app:srcCompat="@drawable/ic_view_carousel_white_24dp"/>
<android.support.v7.widget.AppCompatImageButton
android:id="@+id/reader_extra_settings"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:background="?android:selectableItemBackground"
app:srcCompat="@drawable/ic_more_vert_white_24dp"/>
</LinearLayout>

76
app/src/main/res/layout/reader_popup.xml
View File

@@ -1,69 +1,89 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/reader_menu_background"
android:paddingRight="10dp"
android:paddingLeft="5dp"
android:paddingTop="5dp"
android:paddingBottom="5dp">
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="?attr/colorPrimary"
android:orientation="vertical"
android:paddingBottom="5dp"
android:paddingLeft="5dp"
android:paddingRight="10dp"
android:paddingTop="5dp">
<LinearLayout
android:id="@+id/image_decoder_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/image_decoder_container">
android:layout_height="wrap_content">
<TextView
android:id="@+id/image_decoder_initial"
android:layout_width="32dp"
android:layout_height="wrap_content"
android:textSize="16sp"
android:gravity="center"
android:textColor="@color/colorAccent"/>
android:textColor="@color/colorAccent"
style="@style/TextAppearance.Regular.SubHeading"/>
<TextView
android:id="@+id/image_decoder"
style="@style/reader_menu_settings_item"
android:text="@string/pref_image_decoder"/>
android:layout_width="wrap_content"
android:layout_height="36dp"
android:gravity="center"
android:text="@string/pref_image_decoder"
style="@style/TextAppearance.Regular.Body1.Light"/>
</LinearLayout>
<CheckBox
<android.support.v7.widget.AppCompatCheckBox
android:id="@+id/reader_theme"
style="@style/reader_menu_settings_item"
android:button="@drawable/reader_background_checkbox"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:gravity="center"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:text="@string/pref_reader_theme"/>
<CheckBox
<android.support.v7.widget.AppCompatCheckBox
android:id="@+id/enable_transitions"
style="@style/reader_menu_settings_item"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:gravity="center"
android:text="@string/pref_enable_transitions"/>
<CheckBox
<android.support.v7.widget.AppCompatCheckBox
android:id="@+id/show_page_number"
style="@style/reader_menu_settings_item"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:gravity="center"
android:text="@string/pref_show_page_number"/>
<CheckBox
<android.support.v7.widget.AppCompatCheckBox
android:id="@+id/hide_status_bar"
style="@style/reader_menu_settings_item"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:gravity="center"
android:text="@string/pref_hide_status_bar"/>
<CheckBox
<android.support.v7.widget.AppCompatCheckBox
android:id="@+id/keep_screen_on"
style="@style/reader_menu_settings_item"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:gravity="center"
android:text="@string/pref_keep_screen_on"/>
<CheckBox
<android.support.v7.widget.AppCompatCheckBox
android:id="@+id/custom_brightness"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/reader_menu_settings_item"
android:text="@string/pref_custom_brightness"
android:id="@+id/custom_brightness" />
android:gravity="center"
android:text="@string/pref_custom_brightness"/>
<SeekBar
android:id="@+id/brightness_seekbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/brightness_seekbar" />
style="@style/TextAppearance.Regular.Body1.Light"/>
</LinearLayout>

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

@@ -5,7 +5,6 @@
android:id="@+id/tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.Overlay.Dark"
app:tabGravity="fill"
android:background="@color/colorPrimary"
app:tabIndicatorColor="@color/white"/>
android:theme="@style/Theme.ActionBar.Tab.Filled"
app:tabIndicatorColor="@android:color/white"
/>

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

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/colorPrimary"
android:theme="@style/AppTheme.ActionBar"/>
android:background="?attr/colorPrimary"
android:theme="?attr/actionBarTheme"/>

12
app/src/main/res/menu/menu_navigation.xml
View File

@@ -5,26 +5,26 @@
<item
android:checked="true"
android:id="@+id/nav_drawer_library"
android:icon="@drawable/ic_book_grey_24dp"
android:icon="@drawable/ic_book_black_24dp"
android:title="@string/label_library" />
<item
android:id="@+id/nav_drawer_recent_updates"
android:icon="@drawable/ic_history_grey_24dp"
android:icon="@drawable/ic_history_black_24dp"
android:title="@string/label_recent_updates" />
<item
android:id="@+id/nav_drawer_catalogues"
android:icon="@drawable/ic_explore_grey_24dp"
android:icon="@drawable/ic_explore_black_24dp"
android:title="@string/label_catalogues" />
<item
android:id="@+id/nav_drawer_downloads"
android:icon="@drawable/ic_file_download_grey_24dp"
android:icon="@drawable/ic_file_download_black_24dp"
android:title="@string/label_download_queue" />
</group>
<group android:id="@+id/group_settings"
android:checkableBehavior="single">
android:checkableBehavior="none">
<item
android:id="@+id/nav_drawer_settings"
android:icon="@drawable/ic_settings_grey_24dp"
android:icon="@drawable/ic_settings_black_24dp"
android:title="@string/label_settings" />
</group>
</menu>

5
app/src/main/res/values-land/dimens.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="navigation_drawer_header_height">135dp</dimen>
</resources>

5
app/src/main/res/values-sw600dp/dimens.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="navigation_drawer_header_height">180dp</dimen>
</resources>

7
app/src/main/res/values-v21/keys.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- String Fonts -->
<string name="font_roboto_medium">sans-serif-medium</string>
<string name="font_roboto_regular">sans-serif-regular</string>
</resources>

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

@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="AppTheme" parent="AppTheme.Base">
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
</style>
</resources>

22
app/src/main/res/values-v21/themes.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--===========-->
<!-- Main Theme-->
<!--===========-->
<style name="Theme.Tachiyomi" parent="Theme.Base">
<!-- Attributes specific for SDK 21 and up -->
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@color/colorPrimaryDark</item>
<item name="android:navigationBarColor">@color/colorPrimaryDark</item>
</style>
<!--============-->
<!-- Dark Theme -->
<!--============-->
<style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark">
<!-- Attributes specific for SDK 21 and up -->
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@color/colorPrimaryDark</item>
<item name="android:navigationBarColor">@color/colorPrimaryDark</item>
</style>
</resources>

18
app/src/main/res/values/arrays.xml
View File

@@ -22,15 +22,19 @@
<item>@string/webtoon_viewer</item>
</string-array>
<string-array name="download_slots">
<string-array name="themes_values">
<item>1</item>
<item>2</item>
<item>3</item>
</string-array>
<string-array name="themes">
<item>@string/light_theme</item>
<item>@string/dark_theme</item>
</string-array>
<string-array name="reader_themes">
<item>@string/white_theme</item>
<item>@string/black_theme</item>
<item>@string/white_background</item>
<item>@string/black_background</item>
</string-array>
<string-array name="reader_themes_values">
@@ -38,6 +42,12 @@
<item>1</item>
</string-array>
<string-array name="download_slots">
<item>1</item>
<item>2</item>
<item>3</item>
</string-array>
<string-array name="image_decoders">
<item>@string/rapid_decoder</item>
<item>@string/skia_decoder</item>

5
app/src/main/res/values/attrs.xml
View File

@@ -16,4 +16,9 @@
<attr name="min" format="integer"/>
<attr name="max" format="integer"/>
</declare-styleable>
<attr name="navigation_view_theme" format="reference"/>
<attr name="selectable_list_drawable" format="reference|integer" />
<attr name="divider_drawable" format="reference|integer" />
<attr name="status_bar_trans" format="reference|color"/>
</resources>

744
app/src/main/res/values/colors.xml
View File

@@ -1,719 +1,61 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorAccent">@color/md_blue_A400</color>
<!-- Application Colors -->
<color name="colorPrimary">#54759e</color>
<color name="colorPrimaryDark">#435e7e</color>
<color name="colorPrimarySuperDark">@color/md_blue_grey_900</color>
<color name="colorPrimaryLight">@color/md_blue_grey_100</color>
<color name="colorPrimaryDarkTrans">#40435e7e</color>
<color name="colorAccent">@color/md_blue_400</color>
<color name="colorBackgroundLight">@color/md_blue_grey_50</color>
<!-- Light Theme -->
<color name="textColorPrimaryLight">@color/md_black_1000_87</color>
<color name="textColorSecondaryLight">@color/md_black_1000_54</color>
<color name="textColorHintLight">@color/md_black_1000_38</color>
<color name="dividerLight">@color/md_black_1000_12</color>
<color name="primary">@color/colorPrimary</color>
<color name="primary_dark">@color/colorPrimaryDark</color>
<color name="primary_light">@color/colorPrimaryLight</color>
<color name="color_ripple">#E9F1FF</color>
<color name="statusBarLight">@color/md_grey_300</color>
<color name="appBarLight">@color/md_grey_100</color>
<color name="backgroundLight">@color/md_grey_50</color>
<color name="dialogLight">@color/md_white_1000</color>
<color name="divider">@color/md_light_dividers</color>
<color name="selectorColorLight">@color/md_blue_400_38</color>
<color name="white">@color/md_white_1000</color>
<color name="primary_text">#000000</color>
<color name="secondary_text">#000000</color>
<color name="hint_text">#000000</color>
<color name="accent_text">@color/md_green_900</color>
<!-- Dark Theme -->
<color name="textColorPrimaryDark">@color/md_white_1000</color>
<color name="textColorSecondaryDark">@color/md_white_1000_70</color>
<color name="textColorHintDark">@color/md_white_1000_50</color>
<color name="dividerDark">@color/md_white_1000_12</color>
<color name="list_choice_pressed_bg_light">@color/colorPrimaryLight</color>
<color name="statusBarDark">@color/md_black_1000</color>
<color name="appBarDark">@color/md_grey_900</color>
<color name="backgroundDark">#303030</color>
<color name="dialogDark">@color/md_grey_800</color>
<color name="manga_unread_bg">@color/colorAccent</color>
<color name="manga_cover_title_background">#55333333</color>
<color name="selectorColorDark">@color/md_blue_400_50</color>
<color name="super_light_grey">@color/md_grey_50</color>
<color name="line_grey">@color/md_light_dividers</color>
<color name="light_grey">@color/md_grey_300</color>
<color name="page_number_background">#AAE9E9E9</color>
<color name="page_number_background_black">#99252525</color>
<color name="reader_menu_background">@color/colorPrimarySuperDark</color>
<!-- Text Colors -->
<color name="md_black_1000_87">#DE000000</color>
<color name="md_black_1000_54">#8A000000</color>
<color name="md_black_1000_38">#61000000</color>
<color name="md_black_1000_12">#1F000000</color>
<color name="md_light_dividers">@color/md_blue_400</color>
<color name="md_white_1000">#FFFFFFFF</color>
<color name="md_white_1000_70">#B3FFFFFF</color>
<color name="md_white_1000_50">#80FFFFFF</color>
<color name="md_white_1000_12">#1FFFFFFF</color>
<!-- google's material design colours from
http://www.google.com/design/spec/style/color.html#color-ui-color-palette -->
<!--reds-->
<array name="reds">
<item>@color/md_red_500</item>
<item>@color/md_red_50</item>
<item>@color/md_red_100</item>
<item>@color/md_red_200</item>
<item>@color/md_red_300</item>
<item>@color/md_red_400</item>
<item>@color/md_red_600</item>
<item>@color/md_red_700</item>
<item>@color/md_red_800</item>
<item>@color/md_red_900</item>
<item>@color/md_red_A100</item>
<item>@color/md_red_A200</item>
<item>@color/md_red_A400</item>
<item>@color/md_red_A700</item>
</array>
<color name="md_red_50">#ffebee</color>
<color name="md_red_100">#ffcdd2</color>
<color name="md_red_200">#ef9a9a</color>
<color name="md_red_300">#e57373</color>
<color name="md_red_400">#ef5350</color>
<color name="md_red_500">#f44336</color>
<color name="md_red_600">#e53935</color>
<color name="md_red_700">#d32f2f</color>
<color name="md_red_800">#c62828</color>
<color name="md_red_900">#b71c1c</color>
<color name="md_red_A100">#ff8a80</color>
<color name="md_red_A200">#ff5252</color>
<color name="md_red_A400">#ff1744</color>
<color name="md_red_A700">#d50000</color>
<color name="md_red_500_25">#40f44336</color>
<color name="md_red_500_50">#80f44336</color>
<color name="md_red_500_75">#c0f44336</color>
<!-- pinks -->
<array name="pinks">
<item>@color/md_pink_500</item>
<item>@color/md_pink_50</item>
<item>@color/md_pink_100</item>
<item>@color/md_pink_200</item>
<item>@color/md_pink_300</item>
<item>@color/md_pink_400</item>
<item>@color/md_pink_600</item>
<item>@color/md_pink_700</item>
<item>@color/md_pink_800</item>
<item>@color/md_pink_900</item>
<item>@color/md_pink_A100</item>
<item>@color/md_pink_A200</item>
<item>@color/md_pink_A400</item>
<item>@color/md_pink_A700</item>
</array>
<color name="md_pink_50">#fce4ec</color>
<color name="md_pink_100">#f8bbd0</color>
<color name="md_pink_200">#f48fb1</color>
<color name="md_pink_300">#f06292</color>
<color name="md_pink_400">#ec407a</color>
<color name="md_pink_500">#e91e63</color>
<color name="md_pink_600">#d81b60</color>
<color name="md_pink_700">#c2185b</color>
<color name="md_pink_800">#ad1457</color>
<color name="md_pink_900">#880e4f</color>
<color name="md_pink_A100">#ff80ab</color>
<color name="md_pink_A200">#ff4081</color>
<color name="md_pink_A400">#f50057</color>
<color name="md_pink_A700">#c51162</color>
<color name="md_pink_500_25">#40e91e63</color>
<color name="md_pink_500_50">#80e91e63</color>
<color name="md_pink_500_75">#c0e91e63</color>
<!-- purples -->
<array name="purples">
<item>@color/md_purple_500</item>
<item>@color/md_purple_50</item>
<item>@color/md_purple_100</item>
<item>@color/md_purple_200</item>
<item>@color/md_purple_300</item>
<item>@color/md_purple_400</item>
<item>@color/md_purple_600</item>
<item>@color/md_purple_700</item>
<item>@color/md_purple_800</item>
<item>@color/md_purple_900</item>
<item>@color/md_purple_A100</item>
<item>@color/md_purple_A200</item>
<item>@color/md_purple_A400</item>
<item>@color/md_purple_A700</item>
</array>
<color name="md_purple_50">#f3e5f5</color>
<color name="md_purple_100">#e1bee7</color>
<color name="md_purple_200">#ce93d8</color>
<color name="md_purple_300">#ba68c8</color>
<color name="md_purple_400">#ab47bc</color>
<color name="md_purple_500">#9c27b0</color>
<color name="md_purple_600">#8e24aa</color>
<color name="md_purple_700">#7b1fa2</color>
<color name="md_purple_800">#6a1b9a</color>
<color name="md_purple_900">#4a148c</color>
<color name="md_purple_A100">#ea80fc</color>
<color name="md_purple_A200">#e040fb</color>
<color name="md_purple_A400">#d500f9</color>
<color name="md_purple_A700">#aa00ff</color>
<color name="md_purple_500_25">#409c27b0</color>
<color name="md_purple_500_50">#809c27b0</color>
<color name="md_purple_500_75">#c09c27b0</color>
<!-- deep purples -->
<array name="deep_purples">
<item>@color/md_deep_purple_500</item>
<item>@color/md_deep_purple_50</item>
<item>@color/md_deep_purple_100</item>
<item>@color/md_deep_purple_200</item>
<item>@color/md_deep_purple_300</item>
<item>@color/md_deep_purple_400</item>
<item>@color/md_deep_purple_600</item>
<item>@color/md_deep_purple_700</item>
<item>@color/md_deep_purple_800</item>
<item>@color/md_deep_purple_900</item>
<item>@color/md_deep_purple_A100</item>
<item>@color/md_deep_purple_A200</item>
<item>@color/md_deep_purple_A400</item>
<item>@color/md_deep_purple_A700</item>
</array>
<color name="md_deep_purple_50">#ede7f6</color>
<color name="md_deep_purple_100">#d1c4e9</color>
<color name="md_deep_purple_200">#b39ddb</color>
<color name="md_deep_purple_300">#9575cd</color>
<color name="md_deep_purple_400">#7e57c2</color>
<color name="md_deep_purple_500">#673ab7</color>
<color name="md_deep_purple_600">#5e35b1</color>
<color name="md_deep_purple_700">#512da8</color>
<color name="md_deep_purple_800">#4527a0</color>
<color name="md_deep_purple_900">#311b92</color>
<color name="md_deep_purple_A100">#b388ff</color>
<color name="md_deep_purple_A200">#7c4dff</color>
<color name="md_deep_purple_A400">#651fff</color>
<color name="md_deep_purple_A700">#6200ea</color>
<color name="md_deep_purple_500_25">#40673ab7</color>
<color name="md_deep_purple_500_50">#80673ab7</color>
<color name="md_deep_purple_500_75">#c0673ab7</color>
<!-- indigos -->
<array name="indigos">
<item>@color/md_indigo_500</item>
<item>@color/md_indigo_50</item>
<item>@color/md_indigo_100</item>
<item>@color/md_indigo_200</item>
<item>@color/md_indigo_300</item>
<item>@color/md_indigo_400</item>
<item>@color/md_indigo_600</item>
<item>@color/md_indigo_700</item>
<item>@color/md_indigo_800</item>
<item>@color/md_indigo_900</item>
<item>@color/md_indigo_A100</item>
<item>@color/md_indigo_A200</item>
<item>@color/md_indigo_A400</item>
<item>@color/md_indigo_A700</item>
</array>
<color name="md_indigo_50">#e8eaf6</color>
<color name="md_indigo_100">#c5cae9</color>
<color name="md_indigo_200">#9fa8da</color>
<color name="md_indigo_300">#7986cb</color>
<color name="md_indigo_400">#5c6bc0</color>
<color name="md_indigo_500">#3f51b5</color>
<color name="md_indigo_600">#3949ab</color>
<color name="md_indigo_700">#303f9f</color>
<color name="md_indigo_800">#283593</color>
<color name="md_indigo_900">#1a237e</color>
<color name="md_indigo_A100">#8c9eff</color>
<color name="md_indigo_A200">#536dfe</color>
<color name="md_indigo_A400">#3d5afe</color>
<color name="md_indigo_A700">#304ffe</color>
<color name="md_indigo_500_25">#403f51b5</color>
<color name="md_indigo_500_50">#803f51b5</color>
<color name="md_indigo_500_75">#c03f51b5</color>
<!--blues-->
<array name="blues">
<item>@color/md_blue_500</item>
<item>@color/md_blue_50</item>
<item>@color/md_blue_100</item>
<item>@color/md_blue_200</item>
<item>@color/md_blue_300</item>
<item>@color/md_blue_400</item>
<item>@color/md_blue_600</item>
<item>@color/md_blue_700</item>
<item>@color/md_blue_800</item>
<item>@color/md_blue_900</item>
<item>@color/md_blue_A100</item>
<item>@color/md_blue_A200</item>
<item>@color/md_blue_A400</item>
<item>@color/md_blue_A700</item>
</array>
<color name="md_blue_50">#e3f2fd</color>
<color name="md_blue_100">#bbdefb</color>
<color name="md_blue_200">#90caf9</color>
<color name="md_blue_300">#64b5f6</color>
<color name="md_blue_400">#42a5f5</color>
<color name="md_blue_500">#2196f3</color>
<color name="md_blue_600">#1e88e5</color>
<color name="md_blue_700">#1976d2</color>
<color name="md_blue_800">#1565c0</color>
<color name="md_blue_900">#0d47a1</color>
<color name="md_blue_A100">#82b1ff</color>
<color name="md_blue_A200">#448aff</color>
<color name="md_blue_A400">#2979ff</color>
<color name="md_blue_A700">#2962ff</color>
<color name="md_blue_500_25">#402196f3</color>
<color name="md_blue_500_50">#802196f3</color>
<color name="md_blue_500_75">#c02196f3</color>
<!-- light blues-->
<array name="light_blues">
<item>@color/md_light_blue_500</item>
<item>@color/md_light_blue_50</item>
<item>@color/md_light_blue_100</item>
<item>@color/md_light_blue_200</item>
<item>@color/md_light_blue_300</item>
<item>@color/md_light_blue_400</item>
<item>@color/md_light_blue_600</item>
<item>@color/md_light_blue_700</item>
<item>@color/md_light_blue_800</item>
<item>@color/md_light_blue_900</item>
<item>@color/md_light_blue_A100</item>
<item>@color/md_light_blue_A200</item>
<item>@color/md_light_blue_A400</item>
<item>@color/md_light_blue_A700</item>
</array>
<color name="md_light_blue_50">#e1f5fe</color>
<color name="md_light_blue_100">#b3e5fc</color>
<color name="md_light_blue_200">#81d4fa</color>
<color name="md_light_blue_300">#4fc3f7</color>
<color name="md_light_blue_400">#29b6f6</color>
<color name="md_light_blue_500">#03a9f4</color>
<color name="md_light_blue_600">#039be5</color>
<color name="md_light_blue_700">#0288d1</color>
<color name="md_light_blue_800">#0277bd</color>
<color name="md_light_blue_900">#01579b</color>
<color name="md_light_blue_A100">#80d8ff</color>
<color name="md_light_blue_A200">#40c4ff</color>
<color name="md_light_blue_A400">#00b0ff</color>
<color name="md_light_blue_A700">#0091ea</color>
<color name="md_light_blue_500_25">#4003a9f4</color>
<color name="md_light_blue_500_50">#8003a9f4</color>
<color name="md_light_blue_500_75">#c003a9f4</color>
<!-- cyans -->
<array name="cyans">
<item>@color/md_cyan_500</item>
<item>@color/md_cyan_50</item>
<item>@color/md_cyan_100</item>
<item>@color/md_cyan_200</item>
<item>@color/md_cyan_300</item>
<item>@color/md_cyan_400</item>
<item>@color/md_cyan_600</item>
<item>@color/md_cyan_700</item>
<item>@color/md_cyan_800</item>
<item>@color/md_cyan_900</item>
<item>@color/md_cyan_A100</item>
<item>@color/md_cyan_A200</item>
<item>@color/md_cyan_A400</item>
<item>@color/md_cyan_A700</item>
</array>
<color name="md_cyan_50">#e0f7fa</color>
<color name="md_cyan_100">#b2ebf2</color>
<color name="md_cyan_200">#80deea</color>
<color name="md_cyan_300">#4dd0e1</color>
<color name="md_cyan_400">#26c6da</color>
<color name="md_cyan_500">#00bcd4</color>
<color name="md_cyan_600">#00acc1</color>
<color name="md_cyan_700">#0097a7</color>
<color name="md_cyan_800">#00838f</color>
<color name="md_cyan_900">#006064</color>
<color name="md_cyan_A100">#84ffff</color>
<color name="md_cyan_A200">#18ffff</color>
<color name="md_cyan_A400">#00e5ff</color>
<color name="md_cyan_A700">#00b8d4</color>
<color name="md_cyan_500_25">#4000bcd4</color>
<color name="md_cyan_500_50">#8000bcd4</color>
<color name="md_cyan_500_75">#c000bcd4</color>
<!-- teals -->
<array name="teals">
<item>@color/md_teal_500</item>
<item>@color/md_teal_50</item>
<item>@color/md_teal_100</item>
<item>@color/md_teal_200</item>
<item>@color/md_teal_300</item>
<item>@color/md_teal_400</item>
<item>@color/md_teal_600</item>
<item>@color/md_teal_700</item>
<item>@color/md_teal_800</item>
<item>@color/md_teal_900</item>
<item>@color/md_teal_A100</item>
<item>@color/md_teal_A200</item>
<item>@color/md_teal_A400</item>
<item>@color/md_teal_A700</item>
</array>
<color name="md_teal_50">#e0f2f1</color>
<color name="md_teal_100">#b2dfdb</color>
<color name="md_teal_200">#80cbc4</color>
<color name="md_teal_300">#4db6ac</color>
<color name="md_teal_400">#26a69a</color>
<color name="md_teal_500">#009688</color>
<color name="md_teal_600">#00897b</color>
<color name="md_teal_700">#00796b</color>
<color name="md_teal_800">#00695c</color>
<color name="md_teal_900">#004d40</color>
<color name="md_teal_A100">#a7ffeb</color>
<color name="md_teal_A200">#64ffda</color>
<color name="md_teal_A400">#1de9b6</color>
<color name="md_teal_A700">#00bfa5</color>
<color name="md_teal_500_25">#40009688</color>
<color name="md_teal_500_50">#80009688</color>
<color name="md_teal_500_75">#c8009688</color>
<!-- greens -->
<array name="greens">
<item>@color/md_green_500</item>
<item>@color/md_green_50</item>
<item>@color/md_green_100</item>
<item>@color/md_green_200</item>
<item>@color/md_green_300</item>
<item>@color/md_green_400</item>
<item>@color/md_green_600</item>
<item>@color/md_green_700</item>
<item>@color/md_green_800</item>
<item>@color/md_green_900</item>
<item>@color/md_green_A100</item>
<item>@color/md_green_A200</item>
<item>@color/md_green_A400</item>
<item>@color/md_green_A700</item>
</array>
<color name="md_green_50">#e8f5e9</color>
<color name="md_green_100">#c8e6c9</color>
<color name="md_green_200">#a5d6a7</color>
<color name="md_green_300">#81c784</color>
<color name="md_green_400">#66bb6a</color>
<color name="md_green_500">#4caf50</color>
<color name="md_green_600">#43a047</color>
<color name="md_green_700">#388e3c</color>
<color name="md_green_800">#2e7d32</color>
<color name="md_green_900">#1b5e20</color>
<color name="md_green_A100">#b9f6ca</color>
<color name="md_green_A200">#69f0ae</color>
<color name="md_green_A400">#00e676</color>
<color name="md_green_A700">#00c853</color>
<color name="md_green_500_25">#404caf50</color>
<color name="md_green_500_50">#804caf50</color>
<color name="md_green_500_75">#c04caf50</color>
<!--light greens-->
<array name="light_greens">
<item>@color/md_light_green_500</item>
<item>@color/md_light_green_50</item>
<item>@color/md_light_green_100</item>
<item>@color/md_light_green_200</item>
<item>@color/md_light_green_300</item>
<item>@color/md_light_green_400</item>
<item>@color/md_light_green_600</item>
<item>@color/md_light_green_700</item>
<item>@color/md_light_green_800</item>
<item>@color/md_light_green_900</item>
<item>@color/md_light_green_A100</item>
<item>@color/md_light_green_A200</item>
<item>@color/md_light_green_A400</item>
<item>@color/md_light_green_A700</item>
</array>
<color name="md_light_green_50">#f1f8e9</color>
<color name="md_light_green_100">#dcedc8</color>
<color name="md_light_green_200">#c5e1a5</color>
<color name="md_light_green_300">#aed581</color>
<color name="md_light_green_400">#9ccc65</color>
<color name="md_light_green_500">#8bc34a</color>
<color name="md_light_green_600">#7cb342</color>
<color name="md_light_green_700">#689f38</color>
<color name="md_light_green_800">#558b2f</color>
<color name="md_light_green_900">#33691e</color>
<color name="md_light_green_A100">#ccff90</color>
<color name="md_light_green_A200">#b2ff59</color>
<color name="md_light_green_A400">#76ff03</color>
<color name="md_light_green_A700">#64dd17</color>
<color name="md_light_green_500_25">#408bc34a</color>
<color name="md_light_green_500_50">#808bc34a</color>
<color name="md_light_green_500_75">#c88bc34a</color>
<!-- limes -->
<array name="limes">
<item>@color/md_lime_500</item>
<item>@color/md_lime_50</item>
<item>@color/md_lime_100</item>
<item>@color/md_lime_200</item>
<item>@color/md_lime_300</item>
<item>@color/md_lime_400</item>
<item>@color/md_lime_600</item>
<item>@color/md_lime_700</item>
<item>@color/md_lime_800</item>
<item>@color/md_lime_900</item>
<item>@color/md_lime_A100</item>
<item>@color/md_lime_A200</item>
<item>@color/md_lime_A400</item>
<item>@color/md_lime_A700</item>
</array>
<color name="md_lime_50">#f9fbe7</color>
<color name="md_lime_100">#f0f4c3</color>
<color name="md_lime_200">#e6ee9c</color>
<color name="md_lime_300">#dce775</color>
<color name="md_lime_400">#d4e157</color>
<color name="md_lime_500">#cddc39</color>
<color name="md_lime_600">#c0ca33</color>
<color name="md_lime_700">#afb42b</color>
<color name="md_lime_800">#9e9d24</color>
<color name="md_lime_900">#827717</color>
<color name="md_lime_A100">#f4ff81</color>
<color name="md_lime_A200">#eeff41</color>
<color name="md_lime_A400">#c6ff00</color>
<color name="md_lime_A700">#aeea00</color>
<color name="md_lime_500_25">#40cddc39</color>
<color name="md_lime_500_50">#80cddc39</color>
<color name="md_lime_500_75">#c0cddc39</color>
<!--yellows -->
<array name="yellows">
<item>@color/md_yellow_500</item>
<item>@color/md_yellow_50</item>
<item>@color/md_yellow_100</item>
<item>@color/md_yellow_200</item>
<item>@color/md_yellow_300</item>
<item>@color/md_yellow_400</item>
<item>@color/md_yellow_600</item>
<item>@color/md_yellow_700</item>
<item>@color/md_yellow_800</item>
<item>@color/md_yellow_900</item>
<item>@color/md_yellow_A100</item>
<item>@color/md_yellow_A200</item>
<item>@color/md_yellow_A400</item>
<item>@color/md_yellow_A700</item>
</array>
<color name="md_yellow_50">#fffde7</color>
<color name="md_yellow_100">#fff9c4</color>
<color name="md_yellow_200">#fff59d</color>
<color name="md_yellow_300">#fff176</color>
<color name="md_yellow_400">#ffee58</color>
<color name="md_yellow_500">#ffeb3b</color>
<color name="md_yellow_600">#fdd835</color>
<color name="md_yellow_700">#fbc02d</color>
<color name="md_yellow_800">#f9a825</color>
<color name="md_yellow_900">#f57f17</color>
<color name="md_yellow_A100">#ffff8d</color>
<color name="md_yellow_A200">#ffff00</color>
<color name="md_yellow_A400">#ffea00</color>
<color name="md_yellow_A700">#ffd600</color>
<color name="md_yellow_500_25">#40ffeb3b</color>
<color name="md_yellow_500_50">#80ffeb3b</color>
<color name="md_yellow_500_75">#c0ffeb3b</color>
<!-- ambers -->
<array name="ambers">
<item>@color/md_amber_500</item>
<item>@color/md_amber_50</item>
<item>@color/md_amber_100</item>
<item>@color/md_amber_200</item>
<item>@color/md_amber_300</item>
<item>@color/md_amber_400</item>
<item>@color/md_amber_600</item>
<item>@color/md_amber_700</item>
<item>@color/md_amber_800</item>
<item>@color/md_amber_900</item>
<item>@color/md_amber_A100</item>
<item>@color/md_amber_A200</item>
<item>@color/md_amber_A400</item>
<item>@color/md_amber_A700</item>
</array>
<color name="md_amber_50">#fff8e1</color>
<color name="md_amber_100">#ffecb3</color>
<color name="md_amber_200">#ffe082</color>
<color name="md_amber_300">#ffd54f</color>
<color name="md_amber_400">#ffca28</color>
<color name="md_amber_500">#ffc107</color>
<color name="md_amber_600">#ffb300</color>
<color name="md_amber_700">#ffa000</color>
<color name="md_amber_800">#ff8f00</color>
<color name="md_amber_900">#ff6f00</color>
<color name="md_amber_A100">#ffe57f</color>
<color name="md_amber_A200">#ffd740</color>
<color name="md_amber_A400">#ffc400</color>
<color name="md_amber_A700">#ffab00</color>
<color name="md_amber_500_25">#40ffc107</color>
<color name="md_amber_500_50">#80ffc107</color>
<color name="md_amber_500_75">#c0ffc107</color>
<!-- oranges -->
<array name="oranges">
<item>@color/md_orange_500</item>
<item>@color/md_orange_50</item>
<item>@color/md_orange_100</item>
<item>@color/md_orange_200</item>
<item>@color/md_orange_300</item>
<item>@color/md_orange_400</item>
<item>@color/md_orange_600</item>
<item>@color/md_orange_700</item>
<item>@color/md_orange_800</item>
<item>@color/md_orange_900</item>
<item>@color/md_orange_A100</item>
<item>@color/md_orange_A200</item>
<item>@color/md_orange_A400</item>
<item>@color/md_orange_A700</item>
</array>
<color name="md_orange_50">#fff3e0</color>
<color name="md_orange_100">#ffe0b2</color>
<color name="md_orange_200">#ffcc80</color>
<color name="md_orange_300">#ffb74d</color>
<color name="md_orange_400">#ffa726</color>
<color name="md_orange_500">#ff9800</color>
<color name="md_orange_600">#fb8c00</color>
<color name="md_orange_700">#f57c00</color>
<color name="md_orange_800">#ef6c00</color>
<color name="md_orange_900">#e65100</color>
<color name="md_orange_A100">#ffd180</color>
<color name="md_orange_A200">#ffab40</color>
<color name="md_orange_A400">#ff9100</color>
<color name="md_orange_A700">#ff6d00</color>
<color name="md_orange_500_25">#40ff9800</color>
<color name="md_orange_500_50">#80ff9800</color>
<color name="md_orange_500_75">#c0ff9800</color>
<!-- deep oranges -->
<array name="deep_oranges">
<item>@color/md_deep_orange_500</item>
<item>@color/md_deep_orange_50</item>
<item>@color/md_deep_orange_100</item>
<item>@color/md_deep_orange_200</item>
<item>@color/md_deep_orange_300</item>
<item>@color/md_deep_orange_400</item>
<item>@color/md_deep_orange_600</item>
<item>@color/md_deep_orange_700</item>
<item>@color/md_deep_orange_800</item>
<item>@color/md_deep_orange_900</item>
<item>@color/md_deep_orange_A100</item>
<item>@color/md_deep_orange_A200</item>
<item>@color/md_deep_orange_A400</item>
<item>@color/md_deep_orange_A700</item>
</array>
<color name="md_deep_orange_50">#fbe9e7</color>
<color name="md_deep_orange_100">#ffccbc</color>
<color name="md_deep_orange_200">#ffab91</color>
<color name="md_deep_orange_300">#ff8a65</color>
<color name="md_deep_orange_400">#ff7043</color>
<color name="md_deep_orange_500">#ff5722</color>
<color name="md_deep_orange_600">#f4511e</color>
<color name="md_deep_orange_700">#e64a19</color>
<color name="md_deep_orange_800">#d84315</color>
<color name="md_deep_orange_900">#bf360c</color>
<color name="md_deep_orange_A100">#ff9e80</color>
<color name="md_deep_orange_A200">#ff6e40</color>
<color name="md_deep_orange_A400">#ff3d00</color>
<color name="md_deep_orange_A700">#dd2c00</color>
<color name="md_deep_orange_500_25">#40ff5722</color>
<color name="md_deep_orange_500_50">#80ff5722</color>
<color name="md_deep_orange_500_75">#c0ff5722</color>
<!-- browns -->
<array name="browns">
<item>@color/md_brown_500</item>
<item>@color/md_brown_50</item>
<item>@color/md_brown_100</item>
<item>@color/md_brown_200</item>
<item>@color/md_brown_300</item>
<item>@color/md_brown_400</item>
<item>@color/md_brown_600</item>
<item>@color/md_brown_700</item>
<item>@color/md_brown_800</item>
<item>@color/md_brown_900</item>
</array>
<color name="md_brown_50">#efebe9</color>
<color name="md_brown_100">#d7ccc8</color>
<color name="md_brown_200">#bcaaa4</color>
<color name="md_brown_300">#a1887f</color>
<color name="md_brown_400">#8d6e63</color>
<color name="md_brown_500">#795548</color>
<color name="md_brown_600">#6d4c41</color>
<color name="md_brown_700">#5d4037</color>
<color name="md_brown_800">#4e342e</color>
<color name="md_brown_900">#3e2723</color>
<color name="md_brown_500_25">#40795548</color>
<color name="md_brown_500_50">#80795548</color>
<color name="md_brown_500_75">#c0795548</color>
<!--grey-->
<array name="greys">
<item>@color/md_grey_500</item>
<item>@color/md_grey_50</item>
<item>@color/md_grey_100</item>
<item>@color/md_grey_200</item>
<item>@color/md_grey_300</item>
<item>@color/md_grey_400</item>
<item>@color/md_grey_600</item>
<item>@color/md_grey_700</item>
<item>@color/md_grey_800</item>
<item>@color/md_grey_900</item>
<item>@color/md_black_1000</item>
<item>@color/md_white_1000</item>
</array>
<color name="md_grey_50">#fafafa</color>
<color name="md_grey_100">#f5f5f5</color>
<color name="md_grey_200">#eeeeee</color>
<color name="md_grey_300">#e0e0e0</color>
<color name="md_grey_400">#bdbdbd</color>
<color name="md_grey_500">#9e9e9e</color>
<color name="md_grey_600">#757575</color>
<color name="md_grey_700">#616161</color>
<!-- Material Design Colors -->
<color name="md_black_1000">#000000</color>
<color name="md_grey_50">#FAFAFA</color>
<color name="md_grey_100">#F5F5F5</color>
<color name="md_grey_300">#E0E0E0</color>
<color name="md_grey_800">#424242</color>
<color name="md_grey_900">#212121</color>
<color name="md_grey_500_25">#409e9e9e</color>
<color name="md_grey_500_50">#809e9e9e</color>
<color name="md_grey_500_75">#c09e9e9e</color>
<color name="md_white_1000">#ffffff</color>
<color name="md_white_1000_10">#1affffff</color>
<color name="md_white_1000_15">#22ffffff</color>
<color name="md_white_1000_20">#33ffffff</color>
<color name="md_white_1000_25">#40ffffff</color>
<color name="md_white_1000_50">#80ffffff</color>
<color name="md_white_1000_60">#99ffffff</color>
<color name="md_white_1000_75">#c0ffffff</color>
<color name="md_black_1000_10">#1a000000</color>
<color name="md_black_1000_15">#26000000</color>
<color name="md_black_1000_20">#33000000</color>
<color name="md_black_1000_25">#40000000</color>
<color name="md_black_1000_50">#80000000</color>
<color name="md_black_1000_75">#c0000000</color>
<color name="md_black_1000">#000000</color>
<!--blue grey-->
<array name="blue_greys">
<item>@color/md_blue_grey_500</item>
<item>@color/md_blue_grey_50</item>
<item>@color/md_blue_grey_100</item>
<item>@color/md_blue_grey_200</item>
<item>@color/md_blue_grey_300</item>
<item>@color/md_blue_grey_400</item>
<item>@color/md_blue_grey_600</item>
<item>@color/md_blue_grey_700</item>
<item>@color/md_blue_grey_800</item>
<item>@color/md_blue_grey_900</item>
</array>
<color name="md_blue_grey_50">#eceff1</color>
<color name="md_blue_grey_100">#cfd8dc</color>
<color name="md_blue_grey_200">#b0bec5</color>
<color name="md_blue_grey_300">#90a4ae</color>
<color name="md_blue_grey_400">#78909c</color>
<color name="md_blue_grey_500">#607d8b</color>
<color name="md_blue_grey_600">#546e7a</color>
<color name="md_blue_grey_700">#455a64</color>
<color name="md_blue_grey_800">#37474f</color>
<color name="md_blue_grey_900">#263238</color>
<color name="md_blue_grey_500_25">#40607d8b</color>
<color name="md_blue_grey_500_50">#80607d8b</color>
<color name="md_blue_grey_500_75">#c0607d8b</color>
<!--Texts-->
<array name="texts_white">
<item>@color/md_text_white</item>
<item>@color/md_text_white_87</item>
<item>@color/md_secondary_text_icons_white</item>
<item>@color/md_disabled_hint_text_white</item>
<item>@color/md_divider_white</item>
</array>
<color name="md_text_white">#ffffffff</color>
<color name="md_text_white_87">#dfffffff</color>
<color name="md_secondary_text_icons_white">#b3ffffff</color>
<color name="md_disabled_hint_text_white">#4dffffff</color>
<color name="md_divider_white">#1fffffff</color>
<array name="texts_black">
<item>@color/md_text</item>
<item>@color/md_secondary_text_icons</item>
<item>@color/md_disabled_hint_text</item>
<item>@color/md_divider</item>
</array>
<color name="md_text">#df000000</color>
<color name="md_secondary_text_icons">#8a000000</color>
<color name="md_disabled_hint_text">#4c000000</color>
<color name="md_divider">#1f000000</color>
<!--Falcon-->
<array name="falcon">
<item>@color/md_falcon_400</item>
<item>@color/md_falcon_500</item>
<item>@color/md_falcon_700</item>
</array>
<color name="md_falcon_400">#ff38628b</color>
<color name="md_falcon_500">#384e77</color>
<color name="md_falcon_700">#2b3e5f</color>
<color name="md_falcon_A400">#598bae</color>
<color name="md_falcon_500_25">#40384e77</color>
<color name="md_falcon_500_50">#80384e77</color>
<color name="md_falcon_500_75">#c0384e77</color>
<color name="md_falcon_A400_25">#40598bae</color>
<color name="md_statusbar_translucent">#4000</color>
<color name="md_blue_400">#42A5F5</color>
<color name="md_blue_400_50">#8042A5F5</color>
<color name="md_blue_400_38">#6142A5F5</color>
<color name="md_blue_grey_900">#263238</color>
</resources>

19
app/src/main/res/values/dimens.xml
View File

@@ -1,16 +1,16 @@
<resources>
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">0dp</dimen>
<dimen name="activity_vertical_margin">0dp</dimen>
<dimen name="margin_top">0dp</dimen>
<dimen name="margin_bottom">0dp</dimen>
<dimen name="margin_left">0dp</dimen>
<dimen name="margin_right">0dp</dimen>
<dimen name="fab_margin">0dp</dimen>
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="margin_top">16dp</dimen>
<dimen name="margin_bottom">16dp</dimen>
<dimen name="margin_left">16dp</dimen>
<dimen name="margin_right">16dp</dimen>
<dimen name="fab_margin">16dp</dimen>
<dimen name="fab_size">56dp</dimen>
<dimen name="dialog_content_padding">0dp</dimen>
<dimen name="dialog_margin_top_content">0dp</dimen>
<dimen name="dialog_content_padding">24dp</dimen>
<dimen name="dialog_margin_top_content">20dp</dimen>
<dimen name="text_headline">24sp</dimen>
<dimen name="text_large_title">22sp</dimen>
@@ -21,6 +21,7 @@
<!--Nav header-->
<dimen name="navigation_drawer_header_height">158dp</dimen>
<dimen name="navigation_drawer_header_margin">16dp</dimen>
</resources>

5
app/src/main/res/values/keys.xml
View File

@@ -15,6 +15,7 @@
<string name="pref_update_only_non_completed_key">pref_update_only_non_completed_key</string>
<string name="pref_auto_update_manga_sync_key">pref_auto_update_manga_sync_key</string>
<string name="pref_ask_update_manga_sync_key">pref_ask_update_manga_sync_key</string>
<string name="pref_theme_key">pref_theme_key</string>
<string name="pref_default_viewer_key">pref_default_viewer_key</string>
<string name="pref_image_scale_type_key">pref_image_scale_type_key</string>
@@ -46,4 +47,8 @@
<string name="pref_display_catalogue_as_list">pref_display_catalogue_as_list</string>
<string name="pref_last_catalogue_source_key">pref_last_catalogue_source_key</string>
<!-- String Fonts -->
<string name="font_roboto_medium">sans-serif</string>
<string name="font_roboto_regular">sans-serif</string>
</resources>

8
app/src/main/res/values/strings.xml
View File

@@ -86,6 +86,10 @@
<string name="update_48hour">Every 2 days</string>
<string name="pref_auto_update_manga_sync">Sync chapters after reading</string>
<string name="pref_ask_update_manga_sync">Confirm before updating</string>
<string name="pref_theme">Application Theme</string>
<string name="light_theme">Main Theme</string>
<string name="dark_theme">Dark Theme</string>
<!-- Reader section -->
<string name="pref_hide_status_bar">Hide status bar</string>
@@ -96,8 +100,8 @@
<string name="pref_seamless_mode">Seamless chapter transitions</string>
<string name="pref_keep_screen_on">Keep screen on</string>
<string name="pref_reader_theme">Background color</string>
<string name="white_theme">White</string>
<string name="black_theme">Black</string>
<string name="white_background">White</string>
<string name="black_background">Black</string>
<string name="pref_viewer_type">Default viewer</string>
<string name="default_viewer">Default</string>
<string name="left_to_right_viewer">Left to right</string>

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

@@ -1,68 +1,128 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="AppTheme" parent="AppTheme.Base">
</style>
<style name="AppTheme.Base" parent="Theme.AppCompat.Light.NoActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="alertDialogTheme">@style/AlertDialogStyle</item>
<item name="android:textColor">@color/primary_text</item>
<item name="windowActionModeOverlay">true</item>
<item name="android:navigationBarColor" tools:targetApi="lollipop">@color/colorPrimaryDark</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
</style>
<style name="AppTheme.BrandedLaunch" parent="AppTheme">
<item name="android:windowBackground">@drawable/branded_logo</item>
</style>
<style name="AppTheme.ActionBar" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="android:spinnerItemStyle">@style/ActionBarSpinner</item>
<item name="android:spinnerDropDownItemStyle">@style/ActionBarSpinnerItem</item>
<item name="actionModeBackground">@color/colorPrimarySuperDark</item>
<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
<!--========-->
<!--Toolbars-->
<!--========-->
<style name="Theme.ActionBar" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
<item name="colorAccent">@color/colorAccent</item>
</style>
<style name="AppTheme.Overlay.Dark" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="colorAccent">@color/white</item>
<!--====-->
<!--Tabs-->
<!--====-->
<style name="Theme.ActionBar.Tab" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="tabIndicatorColor">@android:color/white</item>
</style>
<style name="AlertDialogStyle" parent="Theme.AppCompat.Light.Dialog.Alert">
<item name="android:windowTitleStyle">@style/DialogTitleText</item>
<item name="colorAccent">@color/primary</item>
<style name="Theme.ActionBar.Tab.Filled">
<item name="tabGravity">fill</item>
</style>
<style name="DialogTitleText">
<item name="android:textColor">@color/primary_text</item>
<item name="android:textAppearance">@style/TextAppearance.AppCompat.Title</item>
<!--==============-->
<!--NavigationView-->
<!--==============-->
<style name="Theme.Widget.NavigationView"/>
<style name="Theme.Widget.NavigationView.Dark">
<item name="colorControlHighlight">@color/md_grey_900</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>
<!--===============-->
<!--Text Appearance-->
<!--===============-->
<style name="TextAppearance" parent="@android:style/TextAppearance">
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
<style name="ActionBarSpinnerItem" parent="@style/Widget.AppCompat.DropDownItem.Spinner">
<item name="android:background">@color/background_material_light</item>
<style name="TextAppearance.Regular">
<item name="android:fontFamily">@string/font_roboto_regular</item>
</style>
<style name="AppTheme.Popup" parent="@style/AppTheme.Overlay.Dark">
<item name="colorAccent">@color/white</item>
<item name="android:background">@color/colorPrimary</item>
<item name="android:textColor">@color/white</item>
<style name="TextAppearance.Regular.Body1">
<item name="android:textSize">14sp</item>
</style>
<style name="AppTheme.GridView" parent="AppTheme">
<item name="android:layout_width">match_parent</item>
<style name="TextAppearance.Regular.Body1.Bold">
<item name="android:textStyle">bold</item>
</style>
<style name="TextAppearance.Regular.Body1.Light">
<item name="android:textColor">@color/textColorPrimaryDark</item>
</style>
<style name="TextAppearance.Regular.Body1.Secondary">
<item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
<style name="TextAppearance.Regular.Caption">
<item name="android:textSize">12sp</item>
</style>
<style name="TextAppearance.Regular.Caption.Light">
<item name="android:textColor">@color/textColorPrimaryDark</item>
</style>
<style name="TextAppearance.Regular.Caption.Hint">
<item name="android:textColor">?android:attr/textColorHint</item>
</style>
<style name="TextAppearance.Regular.SubHeading">
<item name="android:textSize">16sp</item>
</style>
<style name="TextAppearance.Regular.SubHeading.Light">
<item name="android:textColor">@color/textColorPrimaryDark</item>
</style>
<style name="TextAppearance.Regular.SubHeading.Light.Bold">
<item name="android:textStyle">bold</item>
</style>
<style name="TextAppearance.Medium">
<item name="android:fontFamily">@string/font_roboto_medium</item>
</style>
<style name="TextAppearance.Medium.Title">
<item name="android:textSize">20sp</item>
</style>
<style name="TextAppearance.Medium.Body2">
<item name="android:textSize">14sp</item>
</style>
<style name="TextAppearance.Medium.Body2.Hint">
<item name="android:textColor">?android:attr/textColorHint</item>
</style>
<style name="TextAppearance.Medium.Button">
<item name="android:textSize">14sp</item>
<item name="android:textAllCaps">true</item>
<item name="android:textColor">?attr/colorAccent</item>
</style>
<!--=======-->
<!--Widgets-->
<!--=======-->
<style name="Theme.Widget"/>
<style name="Theme.Widget.FAB">
<item name="android:layout_height">@dimen/fab_size</item>
<item name="android:layout_width">@dimen/fab_size</item>
<item name="android:layout_gravity">bottom|end</item>
<item name="android:layout_margin">@dimen/fab_margin</item>
<item name="android:scaleType">fitCenter</item>
<item name="layout_anchorGravity">bottom|right|end</item>
<item name="android:tint">@color/md_white_1000</item>
<item name="layout_behavior">eu.kanade.tachiyomi.ui.base.fab.FABAnimationUpDown</item>
</style>
<style name="Theme.Widget.GridView">
<item name="android:padding">5dp</item>
<item name="android:layout_height">match_parent</item>
<item name="android:clipToPadding">false</item>
<item name="android:gravity">top|left</item>
<item name="android:smoothScrollbar">true</item>
<item name="android:cacheColorHint">#00000000</item>
<item name="android:cacheColorHint">?android:attr/textColorHint</item>
<item name="android:fastScrollEnabled">true</item>
<item name="android:horizontalSpacing">0dp</item>
<item name="android:verticalSpacing">0dp</item>
@@ -71,40 +131,54 @@
<item name="android:scrollbarStyle">outsideOverlay</item>
</style>
<style name="Theme.Widget.CheckBox"/>
<style name="Theme.Widget.CheckBox.Light" parent="TextAppearance.Regular.Body1.Light">
<item name="buttonTint">@color/md_white_1000</item>
</style>
<!--===-->
<!--OLD-->
<!--===-->
<style name="AlertDialogStyle" parent="Theme.AppCompat.Light.Dialog.Alert">
<item name="android:windowTitleStyle">@style/DialogTitleText</item>
<item name="colorAccent">?attr/colorPrimary</item>
</style>
<style name="DialogTitleText">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textAppearance">@style/TextAppearance.AppCompat.Title</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="ActionBarSpinnerItem" parent="@style/Widget.AppCompat.DropDownItem.Spinner">-->
<!--<item name="android:background">@color/background_material_light</item>-->
<!--</style>-->
<style name="FilePickerTheme" parent="NNF_BaseTheme.Light">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="colorButtonNormal">@color/colorPrimary</item>
<item name="colorPrimary">?attr/colorPrimary</item>
<item name="colorPrimaryDark">?attr/colorPrimaryDark</item>
<item name="colorAccent">?attr/colorAccent</item>
<item name="colorButtonNormal">?attr/colorPrimary</item>
<item name="android:textSize">14sp</item>
<item name="alertDialogTheme">@style/FilePickerAlertDialogTheme</item>
<item name="nnf_toolbarTheme">@style/AppTheme.Overlay.Dark</item>
<item name="nnf_toolbarTheme">?attr/actionBarTheme</item>
</style>
<style name="FilePickerAlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
</style>
<style name="manga_detail_label">
<item name="android:textSize">15sp</item>
<item name="android:textStyle">bold</item>
<item name="android:textColor">#ff58595b</item>
<item name="android:ellipsize">end</item>
<item name="android:paddingRight">10dp</item>
<item name="android:singleLine">true</item>
<item name="android:textIsSelectable">false</item>
</style>
<style name="manga_detail_text">
<item name="android:textSize">15sp</item>
<item name="android:textStyle">normal</item>
<item name="android:textColor">#ff808285</item>
<item name="android:ellipsize">end</item>
<item name="android:singleLine">true</item>
<item name="android:textIsSelectable">false</item>
</style>
<style name="reader_settings_popup_animation">
<item name="android:windowEnterAnimation">@anim/enter_from_right</item>
<item name="android:windowExitAnimation">@anim/exit_to_right</item>
@@ -115,11 +189,6 @@
<item name="android:windowExitAnimation">@anim/exit_to_left</item>
</style>
<style name="reader_menu_settings_item">
<item name="android:textColor">@color/md_grey_300</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">36dp</item>
<item name="android:gravity">center</item>
</style>
</resources>

93
app/src/main/res/values/themes.xml Normal file
View File

@@ -0,0 +1,93 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--============-->
<!-- Base Theme -->
<!--============-->
<style name="Theme"/>
<!--==============-->
<!-- Light Themes -->
<!--=======-======-->
<style name="Theme.Base" parent="Theme.AppCompat.Light.NoActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:textColorPrimary">@color/textColorPrimaryLight</item>
<item name="android:textColorSecondary">@color/textColorSecondaryLight</item>
<item name="android:textColorHint">@color/textColorHintLight</item>
<item name="android:textColorPrimaryInverse">@color/textColorPrimaryDark</item>
<item name="android:textColorSecondaryInverse">@color/textColorSecondaryDark</item>
<item name="android:textColorHintInverse">@color/textColorHintDark</item>
<item name="android:colorBackground">@color/backgroundLight</item>
<item name="android:listSelector">@color/colorAccent</item>
<item name="android:divider">@color/dividerLight</item>
<!-- Themes -->
<item name="windowActionModeOverlay">true</item>
<item name="actionModeBackground">?colorPrimaryDark</item>
<item name="actionBarTheme">@style/Theme.ActionBar</item>
<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<!-- Custom Attributes-->
<item name="selectable_list_drawable">@drawable/list_item_selector_light</item>
<item name="divider_drawable">@drawable/line_divider_light</item>
<item name="status_bar_trans">@color/colorPrimaryDarkTrans</item>
</style>
<style name="Theme.Tachiyomi" parent="Theme.Base">
<!-- Attributes specific for SDK 16 to SDK 20 -->
</style>
<!--=============-->
<!-- Dark Themes -->
<!--=============-->
<style name="Theme.Base.Dark" parent="Theme.AppCompat.NoActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:textColorPrimary">@color/textColorPrimaryDark</item>
<item name="android:textColorSecondary">@color/textColorSecondaryDark</item>
<item name="android:textColorHint">@color/textColorHintDark</item>
<item name="android:textColorPrimaryInverse">@color/textColorPrimaryLight</item>
<item name="android:textColorSecondaryInverse">@color/textColorSecondaryLight</item>
<item name="android:textColorHintInverse">@color/textColorHintLight</item>
<item name="android:colorBackground">@color/backgroundDark</item>
<item name="android:listSelector">@color/colorAccent</item>
<item name="android:divider">@color/dividerDark</item>
<!-- Themes -->
<item name="windowActionModeOverlay">true</item>
<item name="actionModeBackground">?colorPrimaryDark</item>
<item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<!-- Custom Attributes-->
<item name="navigation_view_theme">@style/Theme.Widget.NavigationView.Dark</item>
<item name="selectable_list_drawable">@drawable/list_item_selector_dark</item>
<item name="divider_drawable">@drawable/line_divider_dark</item>
<item name="status_bar_trans">@color/colorPrimaryDarkTrans</item>
</style>
<style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark">
<!-- Attributes specific for SDK 16 to SDK 20 -->
</style>
<!--==============-->
<!-- Reader Theme -->
<!--==============-->
<style name="Theme.Reader" parent="Theme.Base.Dark">
<item name="colorPrimary">@color/md_blue_grey_900</item>
</style>
<!--===============-->
<!-- Launch Screen -->
<!--===============-->
<style name="Theme.BrandedLaunch">
<item name="android:windowBackground">@drawable/branded_logo</item>
</style>
</resources>

8
app/src/main/res/xml/pref_general.xml
View File

@@ -16,6 +16,14 @@
android:defaultValue="0"
android:summary="%s"/>
<eu.kanade.tachiyomi.widget.preference.IntListPreference
android:title="@string/pref_theme"
android:key="@string/pref_theme_key"
android:entries="@array/themes"
android:entryValues="@array/themes_values"
android:defaultValue="1"
android:summary="%s"/>
<SwitchPreferenceCompat
android:key="@string/pref_update_only_non_completed_key"
android:title="@string/pref_update_only_non_completed"