github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed tracking cardview + readded AMOLED theme. (#798)

Browse source 
* Fixed cardview margin for sources

* Added AMOLED again

* changed padding to margin
This commit is contained in:
Bram van de Kerkhof 2017-05-16 10:18:46 +02:00 committed by inorichi
parent 55be9b9ca5
commit 062788f222
7 changed files with 71 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
View file

@ -50,8 +50,8 @@ class SettingsGeneralController : SettingsController() {
intListPreference { intListPreference {
key = Keys.theme key = Keys.theme
titleRes = R.string.pref_theme titleRes = R.string.pref_theme
entriesRes = arrayOf(R.string.light_theme, R.string.dark_theme) entriesRes = arrayOf(R.string.light_theme, R.string.dark_theme, R.string.amoled_theme)
entryValues = arrayOf("1", "2") entryValues = arrayOf("1", "2", "3")
defaultValue = "1" defaultValue = "1"
summary = "%s" summary = "%s"

6
app/src/main/res/layout/fragment_recently_read.xml
View file

@ -9,10 +9,8 @@
android:id="@+id/recycler" android:id="@+id/recycler"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingBottom="4dp" android:layout_marginBottom="4dp"
android:paddingTop="4dp" android:layout_marginTop="4dp"
android:paddingStart="2dp"
android:paddingEnd="2dp"
tools:listitem="@layout/item_recently_read"> tools:listitem="@layout/item_recently_read">
</android.support.v7.widget.RecyclerView> </android.support.v7.widget.RecyclerView>

9
app/src/main/res/layout/fragment_track.xml
View file

@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<android.support.v4.widget.SwipeRefreshLayout <android.support.v4.widget.SwipeRefreshLayout
@ -8,12 +10,15 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginBottom="4dp"
android:layout_marginTop="4dp"
android:orientation="vertical"> android:orientation="vertical">
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/track_recycler" android:id="@+id/track_recycler"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent"
tools:listitem="@layout/item_track"/>
</android.support.v4.widget.SwipeRefreshLayout> </android.support.v4.widget.SwipeRefreshLayout>

21
app/src/main/res/layout/item_recently_read.xml
View file

@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.CardView <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/cv_manga" android:id="@+id/cv_manga"
style="@style/Theme.Widget.CardView" style="@style/Theme.Widget.CardView.Item"
> android:padding="0dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -16,7 +15,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:clickable="true" android:clickable="true"
android:contentDescription="@string/description_cover" android:contentDescription="@string/description_cover"
android:scaleType="centerCrop"/> android:scaleType="centerCrop" />
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -27,28 +26,28 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:padding="@dimen/card_margin"> android:padding="@dimen/material_component_cards_primary_title_top_padding">
<TextView <TextView
android:id="@+id/manga_title" android:id="@+id/manga_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxLines="2" android:maxLines="2"
android:textAppearance="@style/TextAppearance.Medium.Title"/> android:textAppearance="@style/TextAppearance.Medium.Title" />
<TextView <TextView
android:id="@+id/manga_source" android:id="@+id/manga_source"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/manga_title" android:layout_below="@id/manga_title"
android:textAppearance="@style/TextAppearance.Medium.Body2"/> android:textAppearance="@style/TextAppearance.Medium.Body2" />
<TextView <TextView
android:id="@+id/last_read" android:id="@+id/last_read"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/manga_source" android:layout_below="@id/manga_source"
android:textAppearance="@style/TextAppearance.Medium.Body2.Hint"/> android:textAppearance="@style/TextAppearance.Medium.Body2.Hint" />
</RelativeLayout> </RelativeLayout>
<TextView <TextView
@ -62,7 +61,7 @@
android:clickable="true" android:clickable="true"
android:padding="8dp" android:padding="8dp"
android:text="@string/action_remove" android:text="@string/action_remove"
android:textAppearance="@style/TextAppearance.Medium.Button.Negative"/> android:textAppearance="@style/TextAppearance.Medium.Button.Negative" />
<TextView <TextView
android:id="@+id/resume" android:id="@+id/resume"
@ -74,7 +73,7 @@
android:background="?attr/selectable_list_drawable" android:background="?attr/selectable_list_drawable"
android:padding="8dp" android:padding="8dp"
android:text="@string/action_resume" android:text="@string/action_resume"
android:textAppearance="@style/TextAppearance.Medium.Button"/> android:textAppearance="@style/TextAppearance.Medium.Button" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </android.support.v7.widget.CardView>

76
app/src/main/res/layout/item_track.xml
View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.CardView <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/track" android:id="@+id/track"
style="@style/Theme.Widget.CardView"> style="@style/Theme.Widget.CardView.Item"
android:padding="0dp">
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -14,10 +14,10 @@
android:id="@+id/logo" android:id="@+id/logo"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="0dp" android:layout_height="0dp"
tools:background="#2E51A2" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"> tools:background="#2E51A2">
<ImageView <ImageView
android:id="@+id/track_logo" android:id="@+id/track_logo"
@ -32,29 +32,29 @@
android:id="@+id/title_container" android:id="@+id/title_container"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="16dp"
android:background="?attr/selectable_list_drawable" android:background="?attr/selectable_list_drawable"
android:clickable="true" android:clickable="true"
app:layout_constraintTop_toTopOf="parent" android:padding="16dp"
app:layout_constraintLeft_toRightOf="@+id/logo" app:layout_constraintLeft_toRightOf="@+id/logo"
app:layout_constraintRight_toRightOf="parent"> app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView <TextView
style="@style/TextAppearance.Regular.Body1" style="@style/TextAppearance.Regular.Body1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/title"/> android:text="@string/title" />
<TextView <TextView
android:id="@+id/track_title" android:id="@+id/track_title"
style="@style/TextAppearance.Medium.Button" style="@style/TextAppearance.Medium.Button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginLeft="4dp" android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:ellipsize="middle"
android:gravity="end" android:gravity="end"
android:maxLines="1" android:maxLines="1"
android:ellipsize="middle"
android:text="@string/action_edit" /> android:text="@string/action_edit" />
</LinearLayout> </LinearLayout>
@ -63,25 +63,25 @@
android:id="@+id/divider1" android:id="@+id/divider1"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginEnd="16dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:background="?android:attr/divider" android:background="?android:attr/divider"
app:layout_constraintTop_toBottomOf="@+id/title_container"
app:layout_constraintLeft_toRightOf="@+id/logo" app:layout_constraintLeft_toRightOf="@+id/logo"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
android:layout_marginStart="16dp" app:layout_constraintTop_toBottomOf="@+id/title_container" />
android:layout_marginLeft="16dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp" />
<LinearLayout <LinearLayout
android:id="@+id/status_container" android:id="@+id/status_container"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="16dp"
android:background="?attr/selectable_list_drawable" android:background="?attr/selectable_list_drawable"
android:clickable="true" android:clickable="true"
app:layout_constraintTop_toBottomOf="@+id/divider1" android:padding="16dp"
app:layout_constraintLeft_toRightOf="@+id/logo" app:layout_constraintLeft_toRightOf="@+id/logo"
app:layout_constraintRight_toRightOf="parent"> app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider1">
<TextView <TextView
style="@style/TextAppearance.Regular.Body1" style="@style/TextAppearance.Regular.Body1"
@ -94,8 +94,8 @@
style="@style/TextAppearance.Regular.Body1.Secondary" style="@style/TextAppearance.Regular.Body1.Secondary"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginLeft="4dp" android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:gravity="end" android:gravity="end"
tools:text="Reading" /> tools:text="Reading" />
@ -105,25 +105,25 @@
android:id="@+id/divider2" android:id="@+id/divider2"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginEnd="16dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:background="?android:attr/divider" android:background="?android:attr/divider"
app:layout_constraintTop_toBottomOf="@+id/status_container"
app:layout_constraintLeft_toRightOf="@+id/logo" app:layout_constraintLeft_toRightOf="@+id/logo"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
android:layout_marginStart="16dp" app:layout_constraintTop_toBottomOf="@+id/status_container" />
android:layout_marginLeft="16dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp" />
<LinearLayout <LinearLayout
android:id="@+id/chapters_container" android:id="@+id/chapters_container"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="16dp"
android:background="?attr/selectable_list_drawable" android:background="?attr/selectable_list_drawable"
android:clickable="true" android:clickable="true"
app:layout_constraintTop_toBottomOf="@+id/divider2" android:padding="16dp"
app:layout_constraintLeft_toRightOf="@+id/logo" app:layout_constraintLeft_toRightOf="@+id/logo"
app:layout_constraintRight_toRightOf="parent"> app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider2">
<TextView <TextView
style="@style/TextAppearance.Regular.Body1" style="@style/TextAppearance.Regular.Body1"
@ -136,8 +136,8 @@
style="@style/TextAppearance.Regular.Body1.Secondary" style="@style/TextAppearance.Regular.Body1.Secondary"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginLeft="4dp" android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:gravity="end" android:gravity="end"
tools:text="12/24" /> tools:text="12/24" />
@ -147,25 +147,25 @@
android:id="@+id/divider3" android:id="@+id/divider3"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginEnd="16dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:background="?android:attr/divider" android:background="?android:attr/divider"
app:layout_constraintTop_toBottomOf="@+id/chapters_container"
app:layout_constraintLeft_toRightOf="@+id/logo" app:layout_constraintLeft_toRightOf="@+id/logo"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
android:layout_marginStart="16dp" app:layout_constraintTop_toBottomOf="@+id/chapters_container" />
android:layout_marginLeft="16dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp" />
<LinearLayout <LinearLayout
android:id="@+id/score_container" android:id="@+id/score_container"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="16dp"
android:background="?attr/selectable_list_drawable" android:background="?attr/selectable_list_drawable"
android:clickable="true" android:clickable="true"
app:layout_constraintTop_toBottomOf="@+id/divider3" android:padding="16dp"
app:layout_constraintLeft_toRightOf="@+id/logo" app:layout_constraintLeft_toRightOf="@+id/logo"
app:layout_constraintRight_toRightOf="parent"> app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider3">
<TextView <TextView
style="@style/TextAppearance.Regular.Body1" style="@style/TextAppearance.Regular.Body1"
@ -178,8 +178,8 @@
style="@style/TextAppearance.Regular.Body1.Secondary" style="@style/TextAppearance.Regular.Body1.Secondary"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginLeft="4dp" android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:gravity="end" android:gravity="end"
tools:text="10" /> tools:text="10" />

2
app/src/main/res/values/dimens.xml
View file

@ -7,7 +7,7 @@
<dimen name="margin_left">16dp</dimen> <dimen name="margin_left">16dp</dimen>
<dimen name="margin_right">16dp</dimen> <dimen name="margin_right">16dp</dimen>
<dimen name="fab_margin">16dp</dimen> <dimen name="fab_margin">16dp</dimen>
<dimen name="card_margin">16dp</dimen> <dimen name="space_between_cards">4dp</dimen>
<dimen name="fab_size">56dp</dimen> <dimen name="fab_size">56dp</dimen>
<dimen name="dialog_content_padding">24dp</dimen> <dimen name="dialog_content_padding">24dp</dimen>

16
app/src/main/res/values/styles.xml
View file

@ -146,12 +146,18 @@
<style name="Theme.Widget.CardView" parent="CardView"> <style name="Theme.Widget.CardView" parent="CardView">
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:padding">@dimen/material_component_cards_top_and_bottom_padding</item>
<item name="android:layout_marginTop">@dimen/material_component_cards_space_between_cards</item>
<item name="android:layout_marginBottom">@dimen/material_component_cards_space_between_cards</item>
<item name="android:layout_marginStart">@dimen/material_component_cards_space_between_cards</item>
<item name="android:layout_marginEnd">@dimen/material_component_cards_space_between_cards</item>
<item name="cardBackgroundColor">?attr/background_card</item> <item name="cardBackgroundColor">?attr/background_card</item>
<item name="cardElevation">3dp</item> <item name="cardElevation">2dp</item>
<item name="cardUseCompatPadding">true</item> </style>
<item name="cardCornerRadius">2dp</item>
<item name="android:layout_marginLeft">2dp</item> <style name="Theme.Widget.CardView.Item">
<item name="android:layout_marginRight">2dp</item> <item name="android:layout_marginTop">@dimen/space_between_cards</item>
<item name="android:layout_marginBottom">@dimen/space_between_cards</item>
</style> </style>
<style name="Theme.Widget.GridView"> <style name="Theme.Widget.GridView">