From 2b632fd6c531fd6fb5f5777bf67651fe79efa6d6 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sun, 14 Nov 2021 18:43:38 -0500 Subject: [PATCH] Adapt M3 Typography SY --- .../main/res/layout/changelog_header_layout.xml | 2 +- app/src/main/res/layout/changelog_row_layout.xml | 4 ++-- .../main/res/layout/description_adapter_8m.xml | 2 +- .../main/res/layout/description_adapter_eh.xml | 16 ++++++++-------- .../main/res/layout/description_adapter_hb.xml | 2 +- .../main/res/layout/description_adapter_hi.xml | 6 +++--- .../main/res/layout/description_adapter_md.xml | 2 +- .../main/res/layout/description_adapter_nh.xml | 10 +++++----- .../main/res/layout/description_adapter_pe.xml | 6 +++--- .../main/res/layout/description_adapter_pu.xml | 10 +++++----- .../main/res/layout/description_adapter_ts.xml | 12 ++++++------ .../res/layout/edit_merged_settings_item.xml | 2 +- .../main/res/layout/eh_activity_intercept.xml | 2 +- app/src/main/res/layout/eh_smart_search.xml | 2 +- app/src/main/res/layout/index_controller.xml | 4 ++-- .../main/res/layout/latest_controller_card.xml | 4 ++-- app/src/main/res/layout/metadata_view_item.xml | 4 ++-- .../main/res/layout/migration_bottom_sheet.xml | 4 ++-- app/src/main/res/layout/migration_manga_card.xml | 8 ++++---- .../main/res/layout/migration_source_item.xml | 2 +- .../layout/source_enhanced_ehentai_list_item.xml | 6 +++--- 21 files changed, 55 insertions(+), 55 deletions(-) diff --git a/app/src/main/res/layout/changelog_header_layout.xml b/app/src/main/res/layout/changelog_header_layout.xml index f81c55338..f26d73102 100755 --- a/app/src/main/res/layout/changelog_header_layout.xml +++ b/app/src/main/res/layout/changelog_header_layout.xml @@ -19,7 +19,7 @@ android:paddingTop="@dimen/chglib_material_keyline1" android:paddingBottom="@dimen/chglib_material_keyline1" android:textAllCaps="false" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" android:textColor="?attr/colorAccent" /> diff --git a/app/src/main/res/layout/changelog_row_layout.xml b/app/src/main/res/layout/changelog_row_layout.xml index 79d290999..4052c2706 100755 --- a/app/src/main/res/layout/changelog_row_layout.xml +++ b/app/src/main/res/layout/changelog_row_layout.xml @@ -16,7 +16,7 @@ android:paddingStart="@dimen/chglib_material_keyline1" android:paddingEnd="0dp" android:text="@string/changelog_row_bulletpoint" - android:textAppearance="?attr/textAppearanceHeadline6" /> + android:textAppearance="?attr/textAppearanceTitleLarge" /> diff --git a/app/src/main/res/layout/description_adapter_8m.xml b/app/src/main/res/layout/description_adapter_8m.xml index a1f86258e..9f30ebe3d 100644 --- a/app/src/main/res/layout/description_adapter_8m.xml +++ b/app/src/main/res/layout/description_adapter_8m.xml @@ -14,7 +14,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/description_adapter_eh.xml b/app/src/main/res/layout/description_adapter_eh.xml index 402e95c39..e39719a70 100644 --- a/app/src/main/res/layout/description_adapter_eh.xml +++ b/app/src/main/res/layout/description_adapter_eh.xml @@ -27,7 +27,7 @@ android:paddingTop="4dp" android:paddingEnd="8dp" android:paddingBottom="4dp" - android:textAppearance="?attr/textAppearanceBody2" /> + android:textAppearance="?attr/textAppearanceBodyMedium" /> @@ -36,7 +36,7 @@ android:id="@+id/pages" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_marginStart="8dp" - android:textAppearance="?attr/textAppearanceCaption" + android:textAppearance="?attr/textAppearanceBodySmall" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/rating_bar" /> @@ -101,7 +101,7 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginTop="16dp" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/rating_layout" /> @@ -111,7 +111,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" app:layout_constraintBottom_toBottomOf="@+id/rating_layout" app:layout_constraintEnd_toEndOf="parent" @@ -122,7 +122,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" app:layout_constraintBottom_toBottomOf="@+id/language" app:layout_constraintEnd_toEndOf="parent" @@ -135,7 +135,7 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginTop="16dp" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/language" /> @@ -145,7 +145,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" app:layout_constraintBottom_toBottomOf="@+id/visible" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/description_adapter_hb.xml b/app/src/main/res/layout/description_adapter_hb.xml index 3058f7cb3..d3d2cc50f 100644 --- a/app/src/main/res/layout/description_adapter_hb.xml +++ b/app/src/main/res/layout/description_adapter_hb.xml @@ -9,7 +9,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/description_adapter_hi.xml b/app/src/main/res/layout/description_adapter_hi.xml index 56e89113f..641d239d0 100644 --- a/app/src/main/res/layout/description_adapter_hi.xml +++ b/app/src/main/res/layout/description_adapter_hi.xml @@ -27,7 +27,7 @@ android:paddingTop="4dp" android:paddingEnd="8dp" android:paddingBottom="4dp" - android:textAppearance="?attr/textAppearanceBody2" /> + android:textAppearance="?attr/textAppearanceBodyMedium" /> @@ -52,7 +52,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -62,7 +62,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" app:layout_constraintBottom_toBottomOf="@+id/language" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/description_adapter_md.xml b/app/src/main/res/layout/description_adapter_md.xml index d84407b0b..c5224cfb2 100644 --- a/app/src/main/res/layout/description_adapter_md.xml +++ b/app/src/main/res/layout/description_adapter_md.xml @@ -9,7 +9,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/rating_bar" diff --git a/app/src/main/res/layout/description_adapter_nh.xml b/app/src/main/res/layout/description_adapter_nh.xml index 40cfed64a..9f4852eb3 100644 --- a/app/src/main/res/layout/description_adapter_nh.xml +++ b/app/src/main/res/layout/description_adapter_nh.xml @@ -27,7 +27,7 @@ android:paddingTop="4dp" android:paddingEnd="8dp" android:paddingBottom="4dp" - android:textAppearance="?attr/textAppearanceBody2" /> + android:textAppearance="?attr/textAppearanceBodyMedium" /> @@ -36,7 +36,7 @@ android:id="@+id/pages" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -65,7 +65,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -75,7 +75,7 @@ android:id="@+id/favorites" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -87,7 +87,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/description_adapter_pe.xml b/app/src/main/res/layout/description_adapter_pe.xml index 2f6d6e541..6ddff5033 100644 --- a/app/src/main/res/layout/description_adapter_pe.xml +++ b/app/src/main/res/layout/description_adapter_pe.xml @@ -28,7 +28,7 @@ android:paddingTop="4dp" android:paddingEnd="8dp" android:paddingBottom="4dp" - android:textAppearance="?attr/textAppearanceBody2" /> + android:textAppearance="?attr/textAppearanceBodyMedium" /> @@ -50,7 +50,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - android:textAppearance="?attr/textAppearanceBody2"/> + android:textAppearance="?attr/textAppearanceBodyMedium"/> @@ -73,7 +73,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary"/> diff --git a/app/src/main/res/layout/description_adapter_pu.xml b/app/src/main/res/layout/description_adapter_pu.xml index 91f5afa75..a43cc67e8 100644 --- a/app/src/main/res/layout/description_adapter_pu.xml +++ b/app/src/main/res/layout/description_adapter_pu.xml @@ -27,7 +27,7 @@ android:paddingTop="4dp" android:paddingEnd="8dp" android:paddingBottom="4dp" - android:textAppearance="?attr/textAppearanceBody2" /> + android:textAppearance="?attr/textAppearanceBodyMedium" /> @@ -40,7 +40,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" /> @@ -68,7 +68,7 @@ app:layout_constraintBottom_toBottomOf="@+id/size" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/size" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" /> @@ -106,7 +106,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_marginStart="8dp" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" /> diff --git a/app/src/main/res/layout/description_adapter_ts.xml b/app/src/main/res/layout/description_adapter_ts.xml index defccf3bd..d5758c80d 100644 --- a/app/src/main/res/layout/description_adapter_ts.xml +++ b/app/src/main/res/layout/description_adapter_ts.xml @@ -27,7 +27,7 @@ android:paddingTop="4dp" android:paddingEnd="8dp" android:paddingBottom="4dp" - android:textAppearance="?attr/textAppearanceBody2" /> + android:textAppearance="?attr/textAppearanceBodyMedium" /> @@ -40,7 +40,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" /> @@ -68,7 +68,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/uploader" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" /> @@ -91,7 +91,7 @@ android:layout_marginStart="16dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textColor="?android:attr/textColorSecondary" /> diff --git a/app/src/main/res/layout/edit_merged_settings_item.xml b/app/src/main/res/layout/edit_merged_settings_item.xml index 2694284ef..d284f44f1 100644 --- a/app/src/main/res/layout/edit_merged_settings_item.xml +++ b/app/src/main/res/layout/edit_merged_settings_item.xml @@ -66,7 +66,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="2" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" tools:text="Title" /> + android:textAppearance="?attr/textAppearanceTitleLarge" /> + android:textAppearance="?attr/textAppearanceTitleLarge" /> + android:textAppearance="?attr/textAppearanceBodyMedium" /> \ No newline at end of file diff --git a/app/src/main/res/layout/migration_bottom_sheet.xml b/app/src/main/res/layout/migration_bottom_sheet.xml index f270efd92..cdaf3e39a 100644 --- a/app/src/main/res/layout/migration_bottom_sheet.xml +++ b/app/src/main/res/layout/migration_bottom_sheet.xml @@ -27,7 +27,7 @@ android:layout_marginStart="6dp" android:layout_marginTop="8dp" android:text="@string/data_to_include_in_migration" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -87,7 +87,7 @@ android:layout_marginStart="6dp" android:layout_marginTop="8dp" android:text="@string/action_settings" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" app:layout_constraintStart_toStartOf="@+id/migration_data_scrollView" app:layout_constraintTop_toBottomOf="@+id/migration_data_scrollView" /> diff --git a/app/src/main/res/layout/migration_manga_card.xml b/app/src/main/res/layout/migration_manga_card.xml index e392c7002..e3be83624 100644 --- a/app/src/main/res/layout/migration_manga_card.xml +++ b/app/src/main/res/layout/migration_manga_card.xml @@ -58,7 +58,7 @@ android:paddingTop="1dp" android:paddingEnd="3dp" android:paddingBottom="1dp" - android:textAppearance="?attr/textAppearanceBody2" + android:textAppearance="?attr/textAppearanceBodyMedium" android:textSize="12sp" android:textColor="?attr/colorOnSecondary" android:visibility="gone" @@ -79,7 +79,7 @@ android:shadowDy="0" android:shadowRadius="4" android:textColor="@color/md_white_1000" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" android:textSize="12sp" tools:text="Sample name" /> @@ -117,7 +117,7 @@ app:layout_constraintLeft_toLeftOf="parent" android:ellipsize="end" android:maxLines="1" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" tools:layout_editor_absoluteY="57dp" /> diff --git a/app/src/main/res/layout/migration_source_item.xml b/app/src/main/res/layout/migration_source_item.xml index 553f43a23..21b4dbe8b 100644 --- a/app/src/main/res/layout/migration_source_item.xml +++ b/app/src/main/res/layout/migration_source_item.xml @@ -24,7 +24,7 @@ android:ellipsize="end" android:maxLines="1" android:layout_gravity="center_vertical" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" tools:text="Title"/> @@ -69,7 +69,7 @@ android:layout_marginTop="8dp" android:ellipsize="end" android:maxLines="2" - android:textAppearance="?attr/textAppearanceSubtitle2" + android:textAppearance="?attr/textAppearanceTitleSmall" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/card" app:layout_constraintTop_toTopOf="parent" @@ -106,7 +106,7 @@ android:paddingTop="4dp" android:paddingEnd="8dp" android:paddingBottom="4dp" - android:textAppearance="?attr/textAppearanceBody2" /> + android:textAppearance="?attr/textAppearanceBodyMedium" />