From 7d8e32320f867504e28429ede1aec419e10c3db2 Mon Sep 17 00:00:00 2001 From: Docile-Alligator <25734209+Docile-Alligator@users.noreply.github.com> Date: Mon, 15 Aug 2022 21:10:42 +1000 Subject: Apply custom theme to settings page. --- .../layout/fragment_customize_bottom_app_bar.xml | 18 +++++--- .../layout/fragment_customize_main_page_tabs.xml | 49 +++++++--------------- app/src/main/res/layout/fragment_font_preview.xml | 1 + .../main/res/layout/fragment_nsfw_and_spoiler.xml | 6 ++- app/src/main/res/layout/fragment_post_history.xml | 8 ++-- .../res/layout/item_filter_fragment_header.xml | 5 +-- 6 files changed, 40 insertions(+), 47 deletions(-) (limited to 'app/src/main/res/layout') diff --git a/app/src/main/res/layout/fragment_customize_bottom_app_bar.xml b/app/src/main/res/layout/fragment_customize_bottom_app_bar.xml index 3473e057..196e61a0 100644 --- a/app/src/main/res/layout/fragment_customize_bottom_app_bar.xml +++ b/app/src/main/res/layout/fragment_customize_bottom_app_bar.xml @@ -18,11 +18,9 @@ android:padding="16dp" android:drawablePadding="32dp" android:text="@string/restart_app_see_changes" - android:textColor="@color/settingsSubtitleColor" android:gravity="center_vertical" android:textSize="?attr/font_default" - android:fontFamily="?attr/font_family" - app:drawableStartCompat="@drawable/ic_info_preference_24dp" /> + android:fontFamily="?attr/font_family" /> @@ -55,6 +52,7 @@ android:background="?attr/selectableItemBackground"> @@ -273,6 +275,7 @@ android:background="?attr/selectableItemBackground"> + android:fontFamily="?attr/font_family" /> @@ -58,7 +56,6 @@ android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:layout_gravity="center_vertical" - android:textColor="?attr/secondaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" /> @@ -77,13 +74,13 @@ android:background="?attr/selectableItemBackground"> @@ -109,7 +106,6 @@ android:paddingStart="72dp" android:paddingEnd="16dp" android:text="@string/settings_tab_1_summary" - android:textColor="@color/colorAccent" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" /> @@ -127,10 +123,10 @@ android:background="?attr/selectableItemBackground"> @@ -138,7 +134,6 @@ android:id="@+id/tab_1_title_summary_text_view_customize_main_page_tabs_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textColor="?attr/secondaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" /> @@ -158,10 +153,10 @@ android:background="?attr/selectableItemBackground"> @@ -169,7 +164,6 @@ android:id="@+id/tab_1_type_summary_text_view_customize_main_page_tabs_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textColor="?attr/secondaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" /> @@ -194,7 +188,6 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:fontFamily="?attr/font_family" - android:textColor="@color/primaryTextColor" android:textSize="?attr/font_16" app:layout_constraintEnd_toStartOf="@id/tab_1_name_add_image_view_customize_main_page_tabs_fragment" app:layout_constraintStart_toStartOf="parent" @@ -205,7 +198,6 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:fontFamily="?attr/font_family" - android:textColor="?attr/secondaryTextColor" android:textSize="?attr/font_default" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/tab_1_name_add_image_view_customize_main_page_tabs_fragment" @@ -241,7 +233,6 @@ android:paddingStart="72dp" android:paddingEnd="16dp" android:text="@string/settings_tab_2_summary" - android:textColor="@color/colorAccent" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" /> @@ -259,10 +250,10 @@ android:background="?attr/selectableItemBackground"> @@ -270,7 +261,6 @@ android:id="@+id/tab_2_title_summary_text_view_customize_main_page_tabs_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textColor="?attr/secondaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" /> @@ -290,10 +280,10 @@ android:background="?attr/selectableItemBackground"> @@ -301,7 +291,6 @@ android:id="@+id/tab_2_type_summary_text_view_customize_main_page_tabs_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textColor="?attr/secondaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" /> @@ -325,7 +314,6 @@ android:id="@+id/tab_2_name_title_text_view_customize_main_page_tabs_fragment" android:layout_width="0dp" android:layout_height="wrap_content" - android:textColor="@color/primaryTextColor" android:textSize="?attr/font_16" android:fontFamily="?attr/font_family" app:layout_constraintTop_toTopOf="parent" @@ -336,7 +324,6 @@ android:id="@+id/tab_2_name_summary_text_view_customize_main_page_tabs_fragment" android:layout_width="0dp" android:layout_height="wrap_content" - android:textColor="?attr/secondaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" app:layout_constraintTop_toBottomOf="@id/tab_2_name_title_text_view_customize_main_page_tabs_fragment" @@ -373,7 +360,6 @@ android:paddingStart="72dp" android:paddingEnd="16dp" android:text="@string/settings_tab_3_summary" - android:textColor="@color/colorAccent" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" /> @@ -391,10 +377,10 @@ android:background="?attr/selectableItemBackground"> @@ -402,7 +388,6 @@ android:id="@+id/tab_3_title_summary_text_view_customize_main_page_tabs_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textColor="?attr/secondaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" /> @@ -422,10 +407,10 @@ android:background="?attr/selectableItemBackground"> @@ -433,7 +418,6 @@ android:id="@+id/tab_3_type_summary_text_view_customize_main_page_tabs_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textColor="?attr/secondaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" /> @@ -457,7 +441,6 @@ android:id="@+id/tab_3_name_title_text_view_customize_main_page_tabs_fragment" android:layout_width="0dp" android:layout_height="wrap_content" - android:textColor="@color/primaryTextColor" android:textSize="?attr/font_16" android:fontFamily="?attr/font_family" app:layout_constraintTop_toTopOf="parent" @@ -468,7 +451,6 @@ android:id="@+id/tab_3_name_summary_text_view_customize_main_page_tabs_fragment" android:layout_width="0dp" android:layout_height="wrap_content" - android:textColor="?attr/secondaryTextColor" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" app:layout_constraintTop_toBottomOf="@id/tab_3_name_title_text_view_customize_main_page_tabs_fragment" @@ -505,7 +487,6 @@ android:paddingStart="72dp" android:paddingEnd="16dp" android:text="@string/settings_more_tabs_summary" - android:textColor="@color/colorAccent" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" /> @@ -516,11 +497,9 @@ android:padding="16dp" android:drawablePadding="32dp" android:text="@string/settings_more_tabs_info_summary" - android:textColor="@color/settingsSubtitleColor" android:gravity="center_vertical" android:textSize="?attr/font_default" - android:fontFamily="?attr/font_family" - app:drawableStartCompat="@drawable/ic_info_preference_24dp" /> + android:fontFamily="?attr/font_family" /> @@ -566,13 +545,13 @@ android:background="?attr/selectableItemBackground"> @@ -597,13 +576,13 @@ android:background="?attr/selectableItemBackground"> @@ -628,13 +607,13 @@ android:background="?attr/selectableItemBackground"> diff --git a/app/src/main/res/layout/fragment_font_preview.xml b/app/src/main/res/layout/fragment_font_preview.xml index c5eba3d4..4eeba171 100644 --- a/app/src/main/res/layout/fragment_font_preview.xml +++ b/app/src/main/res/layout/fragment_font_preview.xml @@ -6,6 +6,7 @@ tools:context=".settings.FontPreviewFragment"> diff --git a/app/src/main/res/layout/fragment_nsfw_and_spoiler.xml b/app/src/main/res/layout/fragment_nsfw_and_spoiler.xml index 76fec79d..7ee168c5 100644 --- a/app/src/main/res/layout/fragment_nsfw_and_spoiler.xml +++ b/app/src/main/res/layout/fragment_nsfw_and_spoiler.xml @@ -26,12 +26,12 @@ android:background="?attr/selectableItemBackground"> + android:fontFamily="?attr/font_family" /> + android:fontFamily="?attr/font_family" />