From 6cbb02f02db5ca8eb8cb3fab7e1e7e4bcdae077f Mon Sep 17 00:00:00 2001 From: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com> Date: Sun, 14 Nov 2021 22:23:44 +0700 Subject: [PATCH] Adapt M3 Typography (#6228) --- .../res/layout-sw720dp/manga_info_header.xml | 12 +++++------ app/src/main/res/layout/categories_item.xml | 2 +- app/src/main/res/layout/chapters_item.xml | 4 ++-- .../layout/common_dialog_with_checkbox.xml | 2 +- app/src/main/res/layout/common_view_empty.xml | 4 ++-- app/src/main/res/layout/download_item.xml | 6 +++--- .../res/layout/extension_detail_header.xml | 10 +++++----- app/src/main/res/layout/extension_item.xml | 8 ++++---- .../layout/global_search_controller_card.xml | 4 ++-- .../global_search_controller_card_item.xml | 4 ++-- app/src/main/res/layout/history_item.xml | 4 ++-- app/src/main/res/layout/licenses_item.xml | 6 +++--- .../main/res/layout/manga_chapters_header.xml | 2 +- app/src/main/res/layout/manga_info_header.xml | 12 +++++------ app/src/main/res/layout/manga_summary.xml | 2 +- .../res/layout/navigation_view_checkbox.xml | 2 +- .../layout/navigation_view_checkedtext.xml | 2 +- .../main/res/layout/navigation_view_radio.xml | 2 +- .../res/layout/navigation_view_spinner.xml | 2 +- .../main/res/layout/navigation_view_text.xml | 2 +- app/src/main/res/layout/pref_tracker_item.xml | 2 +- app/src/main/res/layout/reader_activity.xml | 2 +- .../layout/reader_color_filter_settings.xml | 20 +++++++++---------- .../res/layout/reader_transition_view.xml | 6 +++--- .../settings_search_controller_card.xml | 2 +- .../layout/source_comfortable_grid_item.xml | 2 +- .../res/layout/source_compact_grid_item.xml | 2 +- .../res/layout/source_grid_item_badges.xml | 10 +++++----- app/src/main/res/layout/source_list_item.xml | 12 +++++------ .../layout/source_main_controller_item.xml | 4 ++-- app/src/main/res/layout/track_item.xml | 12 +++++------ .../main/res/layout/track_search_dialog.xml | 2 +- app/src/main/res/layout/track_search_item.xml | 16 +++++++-------- app/src/main/res/layout/updates_item.xml | 4 ++-- app/src/main/res/values/styles.xml | 4 ++-- app/src/main/res/values/themes.xml | 2 +- 36 files changed, 97 insertions(+), 97 deletions(-) diff --git a/app/src/main/res/layout-sw720dp/manga_info_header.xml b/app/src/main/res/layout-sw720dp/manga_info_header.xml index c76ab43d83..1d6ac9ce00 100644 --- a/app/src/main/res/layout-sw720dp/manga_info_header.xml +++ b/app/src/main/res/layout-sw720dp/manga_info_header.xml @@ -69,14 +69,14 @@ android:layout_marginBottom="4dp" android:gravity="center" android:text="@string/manga_info_full_title_label" - android:textAppearance="?attr/textAppearanceHeadline6" + android:textAppearance="?attr/textAppearanceTitleLarge" android:textIsSelectable="false" /> @@ -112,7 +112,7 @@ android:layout_height="match_parent" android:ellipsize="end" android:maxLines="1" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" android:textIsSelectable="false" tools:text="Status" /> @@ -123,7 +123,7 @@ android:layout_marginStart="4dp" android:layout_marginEnd="4dp" android:text="•" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" android:textIsSelectable="false" tools:ignore="HardcodedText" /> @@ -134,7 +134,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="1" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" android:textIsSelectable="false" tools:text="Source" /> diff --git a/app/src/main/res/layout/categories_item.xml b/app/src/main/res/layout/categories_item.xml index 876cb1c3b9..c781589dba 100644 --- a/app/src/main/res/layout/categories_item.xml +++ b/app/src/main/res/layout/categories_item.xml @@ -34,7 +34,7 @@ android:layout_weight="1" android:ellipsize="end" android:maxLines="1" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" tools:text="Category Title" /> diff --git a/app/src/main/res/layout/chapters_item.xml b/app/src/main/res/layout/chapters_item.xml index 4011bf0399..cad01eb1e9 100644 --- a/app/src/main/res/layout/chapters_item.xml +++ b/app/src/main/res/layout/chapters_item.xml @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="1" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" app:layout_constraintBottom_toTopOf="@+id/chapter_description" app:layout_constraintEnd_toStartOf="@+id/download" app:layout_constraintStart_toEndOf="@+id/bookmark_icon" @@ -46,7 +46,7 @@ android:layout_marginTop="6dp" android:ellipsize="end" android:singleLine="true" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/download" diff --git a/app/src/main/res/layout/common_dialog_with_checkbox.xml b/app/src/main/res/layout/common_dialog_with_checkbox.xml index feef0c7bcb..5a4f3fe9d0 100644 --- a/app/src/main/res/layout/common_dialog_with_checkbox.xml +++ b/app/src/main/res/layout/common_dialog_with_checkbox.xml @@ -10,7 +10,7 @@ android:id="@+id/description" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?attr/textAppearanceBody2" /> + android:textAppearance="?attr/textAppearanceBodyMedium" /> @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:layout_margin="16dp" android:gravity="center" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" tools:text="Label" /> diff --git a/app/src/main/res/layout/download_item.xml b/app/src/main/res/layout/download_item.xml index a7b47d396e..cfd6dbfc3d 100644 --- a/app/src/main/res/layout/download_item.xml +++ b/app/src/main/res/layout/download_item.xml @@ -37,7 +37,7 @@ android:layout_toEndOf="@id/reorder" android:ellipsize="end" android:maxLines="1" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" app:layout_constraintEnd_toStartOf="@+id/download_progress_text" app:layout_constraintStart_toEndOf="@+id/reorder" app:layout_constraintTop_toTopOf="parent" @@ -51,7 +51,7 @@ android:layout_toEndOf="@id/reorder" android:ellipsize="end" android:maxLines="1" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textSize="12sp" app:layout_constraintEnd_toStartOf="@+id/menu" app:layout_constraintStart_toStartOf="@+id/manga_full_title" @@ -75,7 +75,7 @@ android:layout_height="wrap_content" android:layout_toEndOf="@id/manga_full_title" android:maxLines="1" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:textColorSecondary" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@+id/manga_full_title" diff --git a/app/src/main/res/layout/extension_detail_header.xml b/app/src/main/res/layout/extension_detail_header.xml index 2b634881b2..6de2d38fe2 100644 --- a/app/src/main/res/layout/extension_detail_header.xml +++ b/app/src/main/res/layout/extension_detail_header.xml @@ -40,7 +40,7 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:elevation="3dp" - android:textAppearance="?attr/textAppearanceSubtitle1" + android:textAppearance="?attr/textAppearanceTitleMedium" app:layout_constraintStart_toEndOf="@id/icon" app:layout_constraintTop_toTopOf="parent" tools:text="Tachiyomi: Extension" /> @@ -53,7 +53,7 @@ android:layout_weight="1" android:elevation="3dp" android:gravity="center" - android:textAppearance="?attr/textAppearanceCaption" + android:textAppearance="?attr/textAppearanceBodySmall" app:layout_constraintStart_toStartOf="@id/title" app:layout_constraintTop_toBottomOf="@id/title" tools:text="Version: 1.0.0" /> @@ -66,7 +66,7 @@ android:layout_weight="1" android:elevation="3dp" android:gravity="center" - android:textAppearance="?attr/textAppearanceCaption" + android:textAppearance="?attr/textAppearanceBodySmall" app:layout_constraintStart_toStartOf="@id/title" app:layout_constraintTop_toBottomOf="@id/version" tools:text="Language: English" /> @@ -80,7 +80,7 @@ android:elevation="3dp" android:gravity="center" android:text="@string/ext_nsfw_warning" - android:textAppearance="?attr/textAppearanceCaption" + android:textAppearance="?attr/textAppearanceBodySmall" android:textColor="?attr/colorError" android:visibility="gone" app:layout_constraintStart_toStartOf="@id/title" @@ -94,7 +94,7 @@ android:elevation="3dp" android:ellipsize="middle" android:singleLine="true" - android:textAppearance="?attr/textAppearanceCaption" + android:textAppearance="?attr/textAppearanceBodySmall" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/title" app:layout_constraintTop_toBottomOf="@id/nsfw" diff --git a/app/src/main/res/layout/extension_item.xml b/app/src/main/res/layout/extension_item.xml index 83084190b3..b76c9437de 100644 --- a/app/src/main/res/layout/extension_item.xml +++ b/app/src/main/res/layout/extension_item.xml @@ -27,7 +27,7 @@ android:layout_marginEnd="4dp" android:ellipsize="end" android:maxLines="1" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" app:layout_constraintBottom_toTopOf="@id/lang" app:layout_constraintEnd_toStartOf="@id/ext_button" app:layout_constraintStart_toEndOf="@id/icon" @@ -40,7 +40,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" - android:textAppearance="?attr/textAppearanceCaption" + android:textAppearance="?attr/textAppearanceBodySmall" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/icon" app:layout_constraintTop_toBottomOf="@+id/name" @@ -53,7 +53,7 @@ android:layout_height="wrap_content" android:layout_marginStart="4dp" android:maxLines="1" - android:textAppearance="?attr/textAppearanceCaption" + android:textAppearance="?attr/textAppearanceBodySmall" app:layout_constraintStart_toEndOf="@id/lang" app:layout_constraintTop_toBottomOf="@+id/name" tools:text="Version" /> @@ -64,7 +64,7 @@ android:layout_height="wrap_content" android:layout_marginStart="4dp" android:maxLines="1" - android:textAppearance="?attr/textAppearanceCaption" + android:textAppearance="?attr/textAppearanceBodySmall" android:textColor="?attr/colorError" app:layout_constraintStart_toEndOf="@id/version" app:layout_constraintTop_toBottomOf="@+id/name" diff --git a/app/src/main/res/layout/global_search_controller_card.xml b/app/src/main/res/layout/global_search_controller_card.xml index a1794195db..2fde508d9c 100644 --- a/app/src/main/res/layout/global_search_controller_card.xml +++ b/app/src/main/res/layout/global_search_controller_card.xml @@ -17,7 +17,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" app:layout_constraintBottom_toTopOf="@+id/subtitle" app:layout_constraintEnd_toStartOf="@+id/title_more_icon" app:layout_constraintStart_toStartOf="parent" @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:maxLines="1" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textSize="12sp" android:visibility="gone" android:textColor="?android:attr/textColorSecondary" diff --git a/app/src/main/res/layout/global_search_controller_card_item.xml b/app/src/main/res/layout/global_search_controller_card_item.xml index 177c951cbd..6b097b0a41 100644 --- a/app/src/main/res/layout/global_search_controller_card_item.xml +++ b/app/src/main/res/layout/global_search_controller_card_item.xml @@ -55,7 +55,7 @@ android:paddingEnd="3dp" android:paddingBottom="1dp" android:text="@string/in_library" - android:textAppearance="?attr/textAppearanceCaption" + android:textAppearance="?attr/textAppearanceBodySmall" android:textColor="?attr/colorOnSecondary" android:visibility="gone" tools:visibility="visible" /> @@ -71,7 +71,7 @@ android:ellipsize="end" android:maxLines="2" android:padding="4dp" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" android:textSize="12sp" app:layout_constraintEnd_toEndOf="@+id/card" app:layout_constraintStart_toStartOf="@+id/card" diff --git a/app/src/main/res/layout/history_item.xml b/app/src/main/res/layout/history_item.xml index c2dd46f187..ab407a01bd 100644 --- a/app/src/main/res/layout/history_item.xml +++ b/app/src/main/res/layout/history_item.xml @@ -42,7 +42,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="2" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" tools:text="Title" /> diff --git a/app/src/main/res/layout/licenses_item.xml b/app/src/main/res/layout/licenses_item.xml index 41b933b0bc..5cb22d1567 100644 --- a/app/src/main/res/layout/licenses_item.xml +++ b/app/src/main/res/layout/licenses_item.xml @@ -12,14 +12,14 @@ android:id="@+id/name" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" tools:text="Library name" /> @@ -27,7 +27,7 @@ android:id="@+id/license" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" tools:text="Apache Version 2.0" /> diff --git a/app/src/main/res/layout/manga_chapters_header.xml b/app/src/main/res/layout/manga_chapters_header.xml index a5ea57e17a..aac308b0a3 100644 --- a/app/src/main/res/layout/manga_chapters_header.xml +++ b/app/src/main/res/layout/manga_chapters_header.xml @@ -16,7 +16,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/chapters" - android:textAppearance="?attr/textAppearanceSubtitle1" + android:textAppearance="?attr/textAppearanceTitleMedium" android:textIsSelectable="false" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/btn_chapters_filter" diff --git a/app/src/main/res/layout/manga_info_header.xml b/app/src/main/res/layout/manga_info_header.xml index e241c006e9..1afb04ee51 100644 --- a/app/src/main/res/layout/manga_info_header.xml +++ b/app/src/main/res/layout/manga_info_header.xml @@ -73,7 +73,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/manga_info_full_title_label" - android:textAppearance="?attr/textAppearanceHeadline6" + android:textAppearance="?attr/textAppearanceTitleLarge" android:textIsSelectable="false" /> @@ -91,7 +91,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2dp" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" android:textColor="?android:attr/textColorSecondary" android:textIsSelectable="false" tools:text="Artist" /> @@ -117,7 +117,7 @@ android:layout_height="match_parent" android:ellipsize="end" android:maxLines="1" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" android:textIsSelectable="false" tools:text="Status" /> @@ -128,7 +128,7 @@ android:layout_marginStart="4dp" android:layout_marginEnd="4dp" android:text="•" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" android:textIsSelectable="false" tools:ignore="HardcodedText" /> @@ -139,7 +139,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="1" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" android:textIsSelectable="false" tools:text="Source" /> diff --git a/app/src/main/res/layout/manga_summary.xml b/app/src/main/res/layout/manga_summary.xml index 0559e8a6ed..89d192bf2a 100644 --- a/app/src/main/res/layout/manga_summary.xml +++ b/app/src/main/res/layout/manga_summary.xml @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:ellipsize="end" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" android:textIsSelectable="false" app:firstBaselineToTopHeight="0dp" diff --git a/app/src/main/res/layout/navigation_view_checkbox.xml b/app/src/main/res/layout/navigation_view_checkbox.xml index 1fbe7a7b38..882a7d85d7 100644 --- a/app/src/main/res/layout/navigation_view_checkbox.xml +++ b/app/src/main/res/layout/navigation_view_checkbox.xml @@ -18,7 +18,7 @@ android:gravity="center_vertical|start" android:maxLines="1" android:paddingHorizontal="16dp" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" tools:text="Title" /> diff --git a/app/src/main/res/layout/navigation_view_checkedtext.xml b/app/src/main/res/layout/navigation_view_checkedtext.xml index 68a8c8b7d0..70b8729f7a 100644 --- a/app/src/main/res/layout/navigation_view_checkedtext.xml +++ b/app/src/main/res/layout/navigation_view_checkedtext.xml @@ -16,7 +16,7 @@ android:drawablePadding="16dp" android:gravity="center_vertical|start" android:maxLines="1" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" tools:text="Title" /> diff --git a/app/src/main/res/layout/navigation_view_radio.xml b/app/src/main/res/layout/navigation_view_radio.xml index a81dbc27d8..4f8d00e9d1 100644 --- a/app/src/main/res/layout/navigation_view_radio.xml +++ b/app/src/main/res/layout/navigation_view_radio.xml @@ -17,6 +17,6 @@ android:gravity="center_vertical|start" android:maxLines="1" android:paddingHorizontal="16dp" - android:textAppearance="?attr/textAppearanceBody2" /> + android:textAppearance="?attr/textAppearanceBodyMedium" /> diff --git a/app/src/main/res/layout/navigation_view_spinner.xml b/app/src/main/res/layout/navigation_view_spinner.xml index 75966ee36d..3d8d35efd2 100644 --- a/app/src/main/res/layout/navigation_view_spinner.xml +++ b/app/src/main/res/layout/navigation_view_spinner.xml @@ -17,7 +17,7 @@ android:ellipsize="end" android:maxLines="1" android:paddingEnd="8dp" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" tools:text="Filter:" /> diff --git a/app/src/main/res/layout/navigation_view_text.xml b/app/src/main/res/layout/navigation_view_text.xml index bdc767b11c..3b18c56073 100644 --- a/app/src/main/res/layout/navigation_view_text.xml +++ b/app/src/main/res/layout/navigation_view_text.xml @@ -23,7 +23,7 @@ android:imeOptions="actionDone" android:inputType="text" android:maxLines="1" - android:textAppearance="?attr/textAppearanceBody2" /> + android:textAppearance="?attr/textAppearanceBodyMedium" /> diff --git a/app/src/main/res/layout/pref_tracker_item.xml b/app/src/main/res/layout/pref_tracker_item.xml index bc5787ad6b..f1406ef176 100644 --- a/app/src/main/res/layout/pref_tracker_item.xml +++ b/app/src/main/res/layout/pref_tracker_item.xml @@ -36,7 +36,7 @@ android:ellipsize="end" android:maxLines="1" android:paddingHorizontal="16dp" - android:textAppearance="?attr/textAppearanceSubtitle1" + android:textAppearance="?attr/textAppearanceTitleMedium" tools:text="MyAnimeList" /> diff --git a/app/src/main/res/layout/reader_color_filter_settings.xml b/app/src/main/res/layout/reader_color_filter_settings.xml index 9033c7a98a..27633f5bb3 100644 --- a/app/src/main/res/layout/reader_color_filter_settings.xml +++ b/app/src/main/res/layout/reader_color_filter_settings.xml @@ -30,7 +30,7 @@ android:layout_height="wrap_content" android:paddingStart="16dp" android:text="@string/color_filter_r_value" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" app:layout_constraintBottom_toBottomOf="@id/slider_color_filter_red" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/slider_color_filter_red" /> @@ -54,7 +54,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_marginEnd="16dp" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" app:layout_constraintBottom_toBottomOf="@id/slider_color_filter_red" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/slider_color_filter_red" @@ -68,7 +68,7 @@ android:layout_height="wrap_content" android:paddingStart="16dp" android:text="@string/color_filter_g_value" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" app:layout_constraintBottom_toBottomOf="@id/slider_color_filter_green" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/slider_color_filter_green" /> @@ -92,7 +92,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_marginEnd="16dp" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" app:layout_constraintBottom_toBottomOf="@id/slider_color_filter_green" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/slider_color_filter_green" @@ -106,7 +106,7 @@ android:layout_height="wrap_content" android:paddingStart="16dp" android:text="@string/color_filter_b_value" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" app:layout_constraintBottom_toBottomOf="@id/slider_color_filter_blue" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/slider_color_filter_blue" /> @@ -130,7 +130,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_marginEnd="16dp" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" app:layout_constraintBottom_toBottomOf="@id/slider_color_filter_blue" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/slider_color_filter_blue" @@ -144,7 +144,7 @@ android:layout_height="wrap_content" android:paddingStart="16dp" android:text="@string/color_filter_a_value" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" app:layout_constraintBottom_toBottomOf="@id/slider_color_filter_alpha" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/slider_color_filter_alpha" /> @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_marginEnd="16dp" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" app:layout_constraintBottom_toBottomOf="@id/slider_color_filter_alpha" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/slider_color_filter_alpha" @@ -226,7 +226,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingStart="16dp" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" android:tint="?attr/colorOnBackground" app:layout_constraintBottom_toBottomOf="@id/slider_brightness" app:layout_constraintStart_toStartOf="parent" @@ -252,7 +252,7 @@ android:layout_width="30dp" android:layout_height="wrap_content" android:layout_marginEnd="16dp" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" app:layout_constraintBottom_toBottomOf="@id/slider_brightness" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/slider_brightness" diff --git a/app/src/main/res/layout/reader_transition_view.xml b/app/src/main/res/layout/reader_transition_view.xml index c2cbdb1f85..2634120c5d 100644 --- a/app/src/main/res/layout/reader_transition_view.xml +++ b/app/src/main/res/layout/reader_transition_view.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" - android:textAppearance="?attr/textAppearanceSubtitle1" + android:textAppearance="?attr/textAppearanceTitleMedium" tools:text="Top" /> @@ -44,7 +44,7 @@ android:id="@+id/lower_text" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textAppearance="?attr/textAppearanceSubtitle1" + android:textAppearance="?attr/textAppearanceTitleMedium" tools:text="Bottom" /> diff --git a/app/src/main/res/layout/settings_search_controller_card.xml b/app/src/main/res/layout/settings_search_controller_card.xml index 6a074fa013..b07d41d75c 100644 --- a/app/src/main/res/layout/settings_search_controller_card.xml +++ b/app/src/main/res/layout/settings_search_controller_card.xml @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="1" - android:textAppearance="?attr/textAppearanceCaption" + android:textAppearance="?attr/textAppearanceBodySmall" android:textColor="?android:attr/textColorPrimary" tools:text="Location" /> diff --git a/app/src/main/res/layout/source_comfortable_grid_item.xml b/app/src/main/res/layout/source_comfortable_grid_item.xml index 0fc5d10201..393481ed90 100644 --- a/app/src/main/res/layout/source_comfortable_grid_item.xml +++ b/app/src/main/res/layout/source_comfortable_grid_item.xml @@ -53,7 +53,7 @@ android:ellipsize="end" android:maxLines="2" android:padding="4dp" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" android:textSize="12sp" android:textColor="@color/source_comfortable_item_title" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/source_compact_grid_item.xml b/app/src/main/res/layout/source_compact_grid_item.xml index 08bab770bb..e093f7e7f2 100644 --- a/app/src/main/res/layout/source_compact_grid_item.xml +++ b/app/src/main/res/layout/source_compact_grid_item.xml @@ -46,7 +46,7 @@ android:shadowDx="0" android:shadowDy="0" android:shadowRadius="4" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" android:textSize="12sp" android:textColor="@color/md_white_1000" tools:text="Sample name" /> diff --git a/app/src/main/res/layout/source_grid_item_badges.xml b/app/src/main/res/layout/source_grid_item_badges.xml index b3ee9f72d5..ddc11d8eda 100644 --- a/app/src/main/res/layout/source_grid_item_badges.xml +++ b/app/src/main/res/layout/source_grid_item_badges.xml @@ -24,7 +24,7 @@ android:paddingEnd="3dp" android:paddingBottom="1dp" android:text="@string/local_source_badge" - android:textAppearance="?attr/textAppearanceCaption" + android:textAppearance="?attr/textAppearanceBodySmall" android:textColor="?attr/colorOnTertiary" android:visibility="gone" tools:visibility="visible" /> @@ -39,7 +39,7 @@ android:paddingTop="1dp" android:paddingEnd="3dp" android:paddingBottom="1dp" - android:textAppearance="?attr/textAppearanceCaption" + android:textAppearance="?attr/textAppearanceBodySmall" android:textColor="?attr/colorOnTertiary" android:visibility="gone" tools:text="120" @@ -55,7 +55,7 @@ android:paddingTop="1dp" android:paddingEnd="3dp" android:paddingBottom="1dp" - android:textAppearance="?attr/textAppearanceCaption" + android:textAppearance="?attr/textAppearanceBodySmall" android:textColor="?attr/colorOnSecondary" android:visibility="gone" tools:text="120" @@ -72,7 +72,7 @@ android:paddingEnd="3dp" android:paddingBottom="1dp" android:text="@string/in_library" - android:textAppearance="?attr/textAppearanceCaption" + android:textAppearance="?attr/textAppearanceBodySmall" android:textColor="?attr/colorOnSecondary" android:visibility="gone" tools:visibility="visible" /> @@ -100,7 +100,7 @@ android:paddingTop="1dp" android:paddingEnd="3dp" android:paddingBottom="1dp" - android:textAppearance="?attr/textAppearanceCaption" + android:textAppearance="?attr/textAppearanceBodySmall" android:textColor="?attr/colorOnTertiary" android:visibility="gone" tools:text="EN" diff --git a/app/src/main/res/layout/source_list_item.xml b/app/src/main/res/layout/source_list_item.xml index 99794b1b1f..8bf98840f5 100644 --- a/app/src/main/res/layout/source_list_item.xml +++ b/app/src/main/res/layout/source_list_item.xml @@ -29,7 +29,7 @@ android:layout_marginEnd="8dp" android:ellipsize="end" android:maxLines="1" - android:textAppearance="?attr/textAppearanceSubtitle1" + android:textAppearance="?attr/textAppearanceTitleMedium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/badges" app:layout_constraintHorizontal_bias="0.007" @@ -59,7 +59,7 @@ android:paddingEnd="3dp" android:paddingBottom="1dp" android:text="@string/local_source_badge" - android:textAppearance="?attr/textAppearanceCaption" + android:textAppearance="?attr/textAppearanceBodySmall" android:textColor="?attr/colorOnTertiary" android:visibility="gone" tools:visibility="visible" /> @@ -74,7 +74,7 @@ android:paddingTop="1dp" android:paddingEnd="3dp" android:paddingBottom="1dp" - android:textAppearance="?attr/textAppearanceCaption" + android:textAppearance="?attr/textAppearanceBodySmall" android:textColor="?attr/colorOnTertiary" android:visibility="gone" tools:text="122" @@ -90,7 +90,7 @@ android:paddingTop="1dp" android:paddingEnd="3dp" android:paddingBottom="1dp" - android:textAppearance="?attr/textAppearanceCaption" + android:textAppearance="?attr/textAppearanceBodySmall" android:textColor="?attr/colorOnSecondary" android:visibility="gone" tools:text="130" @@ -107,7 +107,7 @@ android:paddingEnd="3dp" android:paddingBottom="1dp" android:text="@string/in_library" - android:textAppearance="?attr/textAppearanceCaption" + android:textAppearance="?attr/textAppearanceBodySmall" android:textColor="?attr/colorOnSecondary" android:visibility="gone" tools:visibility="visible" /> @@ -123,7 +123,7 @@ android:paddingEnd="3dp" android:paddingBottom="1dp" tools:text="EN" - android:textAppearance="?attr/textAppearanceCaption" + android:textAppearance="?attr/textAppearanceBodySmall" android:textColor="?attr/colorOnTertiary" android:visibility="gone" tools:visibility="visible" /> diff --git a/app/src/main/res/layout/source_main_controller_item.xml b/app/src/main/res/layout/source_main_controller_item.xml index ca0bbe0314..c86b09598d 100644 --- a/app/src/main/res/layout/source_main_controller_item.xml +++ b/app/src/main/res/layout/source_main_controller_item.xml @@ -27,7 +27,7 @@ android:maxLines="1" android:paddingStart="0dp" android:paddingEnd="8dp" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" app:layout_constraintBottom_toTopOf="@id/subtitle" app:layout_constraintEnd_toStartOf="@+id/source_latest" app:layout_constraintStart_toEndOf="@+id/image" @@ -40,7 +40,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:maxLines="1" - android:textAppearance="?attr/textAppearanceCaption" + android:textAppearance="?attr/textAppearanceBodySmall" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/source_latest" diff --git a/app/src/main/res/layout/track_item.xml b/app/src/main/res/layout/track_item.xml index c796bef9aa..3efed6043f 100644 --- a/app/src/main/res/layout/track_item.xml +++ b/app/src/main/res/layout/track_item.xml @@ -60,7 +60,7 @@ android:gravity="center_vertical" android:maxLines="1" android:paddingHorizontal="16dp" - android:textAppearance="?attr/textAppearanceSubtitle1" + android:textAppearance="?attr/textAppearanceTitleMedium" tools:text="Title" /> @@ -171,7 +171,7 @@ android:gravity="center" android:maxLines="1" android:padding="12dp" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" tools:text="4/16/2020" /> diff --git a/app/src/main/res/layout/track_search_dialog.xml b/app/src/main/res/layout/track_search_dialog.xml index 12329e3ad4..8a740cb8a1 100644 --- a/app/src/main/res/layout/track_search_dialog.xml +++ b/app/src/main/res/layout/track_search_dialog.xml @@ -66,7 +66,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:visibility="gone" tools:text="@string/no_results_found" /> diff --git a/app/src/main/res/layout/track_search_item.xml b/app/src/main/res/layout/track_search_item.xml index 4f470cc8bf..37dcae453b 100644 --- a/app/src/main/res/layout/track_search_item.xml +++ b/app/src/main/res/layout/track_search_item.xml @@ -38,7 +38,7 @@ android:layout_marginEnd="36dp" android:ellipsize="end" android:maxLines="2" - android:textAppearance="?attr/textAppearanceHeadline6" + android:textAppearance="?attr/textAppearanceTitleLarge" android:textSize="17sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/track_search_cover" @@ -51,7 +51,7 @@ android:layout_height="wrap_content" android:maxLines="1" android:text="@string/track_type" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" app:layout_constraintStart_toStartOf="@+id/track_search_title" app:layout_constraintTop_toBottomOf="@id/track_search_title" /> @@ -62,7 +62,7 @@ android:layout_marginStart="4dp" android:layout_marginEnd="12dp" android:maxLines="1" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/track_search_type" @@ -75,7 +75,7 @@ android:layout_height="wrap_content" android:maxLines="1" android:text="@string/track_start_date" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" app:layout_constraintStart_toStartOf="@+id/track_search_type" app:layout_constraintTop_toBottomOf="@id/track_search_type" /> @@ -87,7 +87,7 @@ android:layout_marginEnd="12dp" android:ellipsize="end" android:maxLines="1" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/track_search_start" @@ -101,7 +101,7 @@ android:ellipsize="end" android:maxLines="1" android:text="@string/track_status" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" app:layout_constraintStart_toStartOf="@+id/track_search_start" app:layout_constraintTop_toBottomOf="@id/track_search_start" /> @@ -113,7 +113,7 @@ android:layout_marginEnd="12dp" android:ellipsize="end" android:maxLines="1" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/track_search_status" @@ -129,7 +129,7 @@ android:layout_marginEnd="12dp" android:ellipsize="end" android:maxLines="4" - android:textAppearance="?attr/textAppearanceCaption" + android:textAppearance="?attr/textAppearanceBodySmall" android:textColor="?android:attr/textColorSecondary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/updates_item.xml b/app/src/main/res/layout/updates_item.xml index 4547d16e28..4428075071 100644 --- a/app/src/main/res/layout/updates_item.xml +++ b/app/src/main/res/layout/updates_item.xml @@ -29,7 +29,7 @@ android:layout_marginStart="16dp" android:ellipsize="end" android:maxLines="1" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" app:layout_constraintBottom_toTopOf="@+id/chapter_title" app:layout_constraintEnd_toStartOf="@+id/download" app:layout_constraintStart_toEndOf="@+id/manga_cover" @@ -58,7 +58,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="1" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 1eab251d49..648f48988a 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -131,7 +131,7 @@ 24dp - ?attr/textAppearanceCaption + ?attr/textAppearanceBodySmall 30dp @@ -267,7 +267,7 @@ diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index be5de9ad9d..43e167d325 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -76,7 +76,7 @@ @color/filter_light - ?attr/textAppearanceSubtitle1 + ?attr/textAppearanceBodyLarge @style/TextAppearance.Tachiyomi.Preference.Secondary