diff options
Diffstat (limited to 'app/src/main/res/layout')
6 files changed, 40 insertions, 47 deletions
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" /> <View android:layout_width="match_parent" @@ -37,7 +35,6 @@ android:paddingStart="72dp" android:paddingEnd="16dp" android:text="@string/settings_main_activity_bottom_app_bar_group_summary" - android:textColor="@color/colorAccent" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" /> @@ -55,6 +52,7 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/main_activity_option_count_title_text_view_customize_bottom_app_bar_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginEnd="16dp" @@ -90,6 +88,7 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/main_activity_option_1_title_text_view_customize_bottom_app_bar_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginEnd="16dp" @@ -123,6 +122,7 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/main_activity_option_2_title_text_view_customize_bottom_app_bar_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginEnd="16dp" @@ -156,6 +156,7 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/main_activity_option_3_title_text_view_customize_bottom_app_bar_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginEnd="16dp" @@ -189,6 +190,7 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/main_activity_option_4_title_text_view_customize_bottom_app_bar_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginEnd="16dp" @@ -222,6 +224,7 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/main_activity_fab_title_text_view_customize_bottom_app_bar_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginEnd="16dp" @@ -255,7 +258,6 @@ android:paddingStart="72dp" android:paddingEnd="16dp" android:text="@string/settings_other_activities_bottom_app_bar_group_summary" - android:textColor="@color/colorAccent" android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" /> @@ -273,6 +275,7 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/other_activities_option_count_title_text_view_customize_bottom_app_bar_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginEnd="16dp" @@ -308,6 +311,7 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/other_activities_option_1_title_text_view_customize_bottom_app_bar_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginEnd="16dp" @@ -341,6 +345,7 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/other_activities_option_2_title_text_view_customize_bottom_app_bar_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginEnd="16dp" @@ -374,6 +379,7 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/other_activities_option_3_title_text_view_customize_bottom_app_bar_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginEnd="16dp" @@ -407,6 +413,7 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/other_activities_option_4_title_text_view_customize_bottom_app_bar_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginEnd="16dp" @@ -440,6 +447,7 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/other_activities_fab_title_text_view_customize_bottom_app_bar_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginEnd="16dp" diff --git a/app/src/main/res/layout/fragment_customize_main_page_tabs.xml b/app/src/main/res/layout/fragment_customize_main_page_tabs.xml index 0d710862..1c3f627d 100644 --- a/app/src/main/res/layout/fragment_customize_main_page_tabs.xml +++ b/app/src/main/res/layout/fragment_customize_main_page_tabs.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" /> <View android:layout_width="match_parent" @@ -43,12 +41,12 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/tab_count_title_text_view_customize_main_page_tabs_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:layout_gravity="center_vertical" android:text="@string/settings_tab_count" - android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_16" 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"> <TextView + android:id="@+id/show_tab_names_title_text_view_customize_main_page_tabs_fragment" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="16dp" android:layout_gravity="center_vertical" android:text="@string/settings_show_tab_names" - android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_16" android:fontFamily="?attr/font_family" /> @@ -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"> <TextView + android:id="@+id/tab_1_title_title_text_view_customize_main_page_tabs_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/settings_tab_title" - android:textColor="@color/primaryTextColor" android:textSize="?attr/font_16" android:fontFamily="?attr/font_family" /> @@ -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"> <TextView + android:id="@+id/tab_1_type_title_text_view_customize_main_page_tabs_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/settings_tab_post_type" - android:textColor="@color/primaryTextColor" android:textSize="?attr/font_16" android:fontFamily="?attr/font_family" /> @@ -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"> <TextView + android:id="@+id/tab_2_title_title_text_view_customize_main_page_tabs_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/settings_tab_title" - android:textColor="@color/primaryTextColor" android:textSize="?attr/font_16" android:fontFamily="?attr/font_family" /> @@ -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"> <TextView + android:id="@+id/tab_2_type_title_text_view_customize_main_page_tabs_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/settings_tab_post_type" - android:textColor="@color/primaryTextColor" android:textSize="?attr/font_16" android:fontFamily="?attr/font_family" /> @@ -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"> <TextView + android:id="@+id/tab_3_title_title_text_view_customize_main_page_tabs_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/settings_tab_title" - android:textColor="@color/primaryTextColor" android:textSize="?attr/font_16" android:fontFamily="?attr/font_family" /> @@ -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"> <TextView + android:id="@+id/tab_3_type_title_text_view_customize_main_page_tabs_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/settings_tab_post_type" - android:textColor="@color/primaryTextColor" android:textSize="?attr/font_16" android:fontFamily="?attr/font_family" /> @@ -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" /> <LinearLayout android:id="@+id/show_favorite_multireddits_linear_layout_customize_main_page_tabs_fragment" @@ -535,13 +514,13 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/show_favorite_multireddits_title_text_view_customize_main_page_tabs_fragment" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="16dp" android:layout_gravity="center_vertical" android:text="@string/settings_more_tabs_show_favorite_multireddits_title" - android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_16" android:fontFamily="?attr/font_family" /> @@ -566,13 +545,13 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/show_multireddits_title_text_view_customize_main_page_tabs_fragment" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="16dp" android:layout_gravity="center_vertical" android:text="@string/settings_more_tabs_show_multireddits_title" - android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_16" android:fontFamily="?attr/font_family" /> @@ -597,13 +576,13 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/show_favorite_subscribed_subreddits_title_text_view_customize_main_page_tabs_fragment" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="16dp" android:layout_gravity="center_vertical" android:text="@string/settings_more_tabs_show_favorite_subscribed_subreddits_title" - android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_16" android:fontFamily="?attr/font_family" /> @@ -628,13 +607,13 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/show_subscribed_subreddits_title_text_view_customize_main_page_tabs_fragment" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="16dp" android:layout_gravity="center_vertical" android:text="@string/settings_more_tabs_show_subscribed_subreddits_title" - android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_16" android:fontFamily="?attr/font_family" /> 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"> <LinearLayout + android:id="@+id/linear_layout_font_preview_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> 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"> <TextView + android:id="@+id/enable_nsfw_text_view_nsfw_and_spoiler_fragment" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="16dp" android:layout_gravity="center_vertical" - app:drawableStartCompat="@drawable/ic_nsfw_on_24dp" android:drawablePadding="32dp" android:text="@string/settings_enable_nsfw_title" android:textColor="?attr/primaryTextColor" @@ -60,6 +60,7 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/blur_nsfw_text_view_nsfw_and_spoiler_fragment" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" @@ -92,6 +93,7 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/do_not_blur_nsfw_text_view_nsfw_and_spoiler_fragment" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" @@ -123,6 +125,7 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/blur_spoiler_text_view_nsfw_and_spoiler_fragment" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" @@ -147,6 +150,7 @@ android:background="@color/dividerColor" /> <TextView + android:id="@+id/dangerous_text_view_nsfw_and_spoiler_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="16dp" diff --git a/app/src/main/res/layout/fragment_post_history.xml b/app/src/main/res/layout/fragment_post_history.xml index 8ced3790..8105129c 100644 --- a/app/src/main/res/layout/fragment_post_history.xml +++ b/app/src/main/res/layout/fragment_post_history.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" /> <View android:layout_width="match_parent" @@ -42,6 +40,7 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/mark_posts_as_read_text_view_post_history_fragment" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" @@ -74,6 +73,7 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/mark_posts_as_read_after_voting_text_view_post_history_fragment" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" @@ -105,6 +105,7 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/mark_posts_as_read_on_scroll_text_view_post_history_fragment" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" @@ -136,6 +137,7 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/hide_read_posts_automatically_text_view_post_history_fragment" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" diff --git a/app/src/main/res/layout/item_filter_fragment_header.xml b/app/src/main/res/layout/item_filter_fragment_header.xml index af3b2b00..f5a6b870 100644 --- a/app/src/main/res/layout/item_filter_fragment_header.xml +++ b/app/src/main/res/layout/item_filter_fragment_header.xml @@ -6,16 +6,15 @@ android:orientation="vertical"> <TextView + android:id="@+id/info_text_view_item_filter_fragment_header" android:layout_width="match_parent" android:layout_height="wrap_content" 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" /> <View android:layout_width="match_parent" |