diff options
Diffstat (limited to 'app/src/main/res')
29 files changed, 40 insertions, 75 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" diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 6132f18c..14519473 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -391,7 +391,6 @@ <string name="settings_customize_dark_theme_title">"Tmavý motiv"</string> <string name="settings_customize_amoled_theme_title">"Amoled"</string> <string name="settings_manage_themes_title">"Spravovat motivy"</string> - <string name="settings_custom_theme_cannot_apply_to_settings_page_summary">"Vlastní motivy nemohou být použity na stránku nastavení (kromě nástrojové lišty, stavové lišty a navigační lišty)."</string> <string name="settings_advanced_master_title">"Pokročilé"</string> <string name="settings_delete_all_subreddits_data_in_database_title">"Odstranit všechny subreddity v databázi"</string> <string name="settings_delete_all_users_data_in_database_title">"Odstranit všechny uživatele v databázi"</string> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 866c0547..e099d98d 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -421,7 +421,6 @@ Tippen für Neuversuch."</string> <string name="settings_customize_dark_theme_title">"Dunkles Thema"</string> <string name="settings_customize_amoled_theme_title">"AMOLED-Thema"</string> <string name="settings_manage_themes_title">"Themen verwalten"</string> - <string name="settings_custom_theme_cannot_apply_to_settings_page_summary">"Benutzerdefinierte Themen können nicht auf die Einstellungs-Seite angewandt werden (ausgenommen Werkzeug-, Status- und Navigationsleiste)."</string> <string name="settings_advanced_master_title">"Erweitert"</string> <string name="settings_delete_all_subreddits_data_in_database_title">"Alle Subreddits aus der Datenbank löschen"</string> <string name="settings_delete_all_users_data_in_database_title">"Alle Benutzer aus der Datenbank löschen"</string> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 19098830..2eb93d6b 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -411,7 +411,6 @@ Premio means prize, so it's better suited the first word instead of the second o <string name="settings_customize_dark_theme_title">"Tema Oscuro"</string> <string name="settings_customize_amoled_theme_title">"Tema AMOLED"</string> <string name="settings_manage_themes_title">"Administrar Temas"</string> - <string name="settings_custom_theme_cannot_apply_to_settings_page_summary">"Los temas no pueden ser aplicados a la página de configuración (a excepción de la barra de herramientas, la barra de estado y la barra de navegación)."</string> <string name="settings_advanced_master_title">"Avanzado"</string> <string name="settings_delete_all_subreddits_data_in_database_title">"Borrar Todos los subreddits en la base de datos"</string> <string name="settings_delete_all_users_data_in_database_title">"Borrar todos los usuarios en la base de datos"</string> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 61a9ded4..75269275 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -450,7 +450,6 @@ peut ne pas fonctionner sur Android 11"</string> <string name="settings_customize_dark_theme_title">"Thème Sombre"</string> <string name="settings_customize_amoled_theme_title">"Thème Amoled"</string> <string name="settings_manage_themes_title">"Gérer les Thèmes"</string> - <string name="settings_custom_theme_cannot_apply_to_settings_page_summary">"Les thèmes personnalisés ne peuvent pas être appliqués à la page des paramètres (sauf la barre d'outils, la barre d'état et barre de navigation.)"</string> <string name="settings_advanced_master_title">"Avancés"</string> <string name="settings_delete_all_subreddits_data_in_database_title">"Supprimer Tous les Subreddits de la Base de Données"</string> <string name="settings_delete_all_users_data_in_database_title">"Supprimer Tous les Utilisateurs de la Base de Données"</string> diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index c33ac216..0f47d9ab 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -440,7 +440,6 @@ Behavior --> <string name="settings_customize_dark_theme_title">"गहरी थीम "</string> <string name="settings_customize_amoled_theme_title">"अमोलेड थीम "</string> <string name="settings_manage_themes_title">"थीम्स नियंत्रण "</string> - <string name="settings_custom_theme_cannot_apply_to_settings_page_summary">"अनुकूलित थीम सेटिंग्स पृष्ट(टूलबार, स्टैटस बार एवं नेवीगेशन बार के अलावा) पर लागू नहीं की जा सकती।"</string> <string name="settings_advanced_master_title">"उन्नत "</string> <string name="settings_delete_all_subreddits_data_in_database_title">"डेटाबेस से सभी सबरैडिट्स मिटा दें "</string> <string name="settings_delete_all_users_data_in_database_title">"डेटाबेस से सभी यूजर्स हटा दें "</string> diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 5e90c23d..821d4dc4 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -410,7 +410,6 @@ <string name="settings_customize_dark_theme_title">"Tamna tema"</string> <string name="settings_customize_amoled_theme_title">"Amoled tema"</string> <string name="settings_manage_themes_title">"Upravljaj temama"</string> - <string name="settings_custom_theme_cannot_apply_to_settings_page_summary">"Vlastite teme se ne mogu primijeniti na stranicu postavki (osim alatne trake, trake statusa i navigacijske trake)"</string> <string name="settings_advanced_master_title">"Napredno"</string> <string name="settings_delete_all_subreddits_data_in_database_title">"Obriši sve podreddite u bazi podataka"</string> <string name="settings_delete_all_users_data_in_database_title">"Obriši sve korisnike u bazi podataka"</string> diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index d72b53bc..825e7624 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -395,7 +395,6 @@ <string name="settings_customize_dark_theme_title">"Sötét téma"</string> <string name="settings_customize_amoled_theme_title">"Amoled téma"</string> <string name="settings_manage_themes_title">"Témák kezelése"</string> - <string name="settings_custom_theme_cannot_apply_to_settings_page_summary">"Egyedi témákat nem lehet használni a beállítások aldalán (kivéve az eszköztáron, státusz sávon és navigációs sávon)."</string> <string name="settings_advanced_master_title">"Haladó"</string> <string name="settings_delete_all_subreddits_data_in_database_title">"Adatbázisban szereplő összes subreddit törlése"</string> <string name="settings_delete_all_users_data_in_database_title">"Adatbázisban szereplő összes felhasználó törlése"</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 2b86c7dc..a144a2cd 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -384,7 +384,6 @@ Tocca per riprovare."</string> <string name="settings_customize_dark_theme_title">"Tema Scuro"</string> <string name="settings_customize_amoled_theme_title">"Tema Amoled"</string> <string name="settings_manage_themes_title">"Gestisci i temi"</string> - <string name="settings_custom_theme_cannot_apply_to_settings_page_summary">"I temi personalizzati non possono essere applicati alla pagina delle impostazioni (tranne barra degli strumenti, barra di stato e barra di navigazione)."</string> <string name="settings_advanced_master_title">"Avanzate"</string> <string name="settings_delete_all_subreddits_data_in_database_title">"Elimina Tutti i Subreddit nel Database"</string> <string name="settings_delete_all_users_data_in_database_title">"Elimina Tutti gli Utenti nel Database"</string> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c0fc088b..76cd86eb 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -443,7 +443,6 @@ <string name="settings_customize_dark_theme_title">"ダークテーマ"</string> <string name="settings_customize_amoled_theme_title">"AMOLEDテーマ"</string> <string name="settings_manage_themes_title">"テーマの管理"</string> - <string name="settings_custom_theme_cannot_apply_to_settings_page_summary">"カスタムテーマは設定画面には適用できません (ツールバー、ステータスバー、ナビゲーションバーを除く)"</string> <string name="settings_advanced_master_title">"高度な設定"</string> <string name="settings_delete_all_subreddits_data_in_database_title">"データベース中の全てのSubreddit情報を削除"</string> <string name="settings_delete_all_users_data_in_database_title">"データベース中の全てのユーザー情報を削除"</string> diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index d97318ee..ab122c9c 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -8,6 +8,5 @@ <color name="playButtonBackgroundColor">#FFFFFF</color> <color name="roundedBottomSheetPrimaryBackground">#242424</color> <color name="primaryTextColor">#FFFFFF</color> - <color name="settingsSubtitleColor">#4DFFFFFF</color> <color name="dividerColor">#69666c</color> </resources> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index c58b2a25..0f2dada4 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -394,7 +394,6 @@ Druk om opnieuw te proberen."</string> <string name="settings_customize_dark_theme_title">"Donker thema"</string> <string name="settings_customize_amoled_theme_title">"Amoled-thema"</string> <string name="settings_manage_themes_title">"Thema's beheren"</string> - <string name="settings_custom_theme_cannot_apply_to_settings_page_summary">"Aangepaste thema's kunnen niet worden toegepast op de instellingenpagina (behalve de werkbalk, statusbalk en navigatiebalk)."</string> <string name="settings_advanced_master_title">"Geavanceerd"</string> <string name="settings_delete_all_subreddits_data_in_database_title">"Alle subreddits verwijderen uit databank"</string> <string name="settings_delete_all_users_data_in_database_title">"Alle gebruikers verwijderen uit databank"</string> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index a57a9786..7b98017a 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -389,8 +389,6 @@ <string name="settings_customize_dark_theme_title">"Ciemny motyw"</string> <string name="settings_customize_amoled_theme_title">"Amoledowy motyw"</string> <string name="settings_manage_themes_title">"Zarządzaj motywami"</string> - <string name="settings_custom_theme_cannot_apply_to_settings_page_summary">"Niestandardowe motywy nie mogą być zaaplikowane do strony ustawień -(z wyjątkiem paska narzędzi, paska stanu i paska nawigacji)."</string> <string name="settings_advanced_master_title">"Zaawansowane"</string> <string name="settings_delete_all_subreddits_data_in_database_title">"Usuń wszystkie Subreddity w bazie danych"</string> <string name="settings_delete_all_users_data_in_database_title">"Usuń wszystkich użytkowników w bazie danych"</string> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index e309275e..ac6a4d6a 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -393,7 +393,6 @@ Toque para tentar novamente."</string> <string name="settings_customize_dark_theme_title">"Tema Escuro"</string> <string name="settings_customize_amoled_theme_title">"Tema Amoled"</string> <string name="settings_manage_themes_title">"Gerenciar Temas"</string> - <string name="settings_custom_theme_cannot_apply_to_settings_page_summary">"Temas personalizados não podem ser aplicados à página de configurações (exceto barra de ferramentas, barra de status e barra de navegação)."</string> <string name="settings_advanced_master_title">"Avançado"</string> <string name="settings_delete_all_subreddits_data_in_database_title">"Excluir Todos os Subreddits no Banco de Dados"</string> <string name="settings_delete_all_users_data_in_database_title">"Excluir Todos os Usuários no Banco de Dados"</string> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 26d31902..5c58d2df 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -398,7 +398,6 @@ Toque para tentar novamente."</string> <string name="settings_customize_dark_theme_title">"Tema Escuro"</string> <string name="settings_customize_amoled_theme_title">"Tema Amoled"</string> <string name="settings_manage_themes_title">"Gerir Temas"</string> - <string name="settings_custom_theme_cannot_apply_to_settings_page_summary">"Temas personalizados não podem ser aplicados à página de definições (exceto à barra de ferramentas, barra de estado e barra de navegação)."</string> <string name="settings_advanced_master_title">"Avançado"</string> <string name="settings_delete_all_subreddits_data_in_database_title">"Eliminar Todas as Comunidades da BD"</string> <string name="settings_delete_all_users_data_in_database_title">"Eliminar Todos os Utilizadores da BD"</string> diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 55217113..2a475aac 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -387,7 +387,6 @@ Atinge pentru a reîncerca."</string> <string name="settings_customize_dark_theme_title">"Temă întunecată"</string> <string name="settings_customize_amoled_theme_title">"Temă Amoled"</string> <string name="settings_manage_themes_title">"Gestionați temele"</string> - <string name="settings_custom_theme_cannot_apply_to_settings_page_summary">"Temele personalizate nu pot fi aplicate la pagina de setări (cu excepția barei de instrumente, a barei de stare și a barei de navigare)."</string> <string name="settings_advanced_master_title">"Avansat"</string> <string name="settings_delete_all_subreddits_data_in_database_title">"Ștergeți toate subredditele din baza de date"</string> <string name="settings_delete_all_users_data_in_database_title">"Ștergeți toți utilizatorii din baza de date"</string> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 147bc243..704c59ee 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -399,7 +399,6 @@ <string name="settings_customize_dark_theme_title">"Тёмная тема"</string> <string name="settings_customize_amoled_theme_title">"Тема AMOLED"</string> <string name="settings_manage_themes_title">"Менеджер тем"</string> - <string name="settings_custom_theme_cannot_apply_to_settings_page_summary">"Пользовательские темы не применяются к странице настроек (кроме панели инструментов, строки состояния и панели навигации)."</string> <string name="settings_advanced_master_title">"Дополнительные"</string> <string name="settings_delete_all_subreddits_data_in_database_title">"Удалить все сабреддиты из базы данных"</string> <string name="settings_delete_all_users_data_in_database_title">"Удалить всех пользователей из базы данных"</string> diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml index cbdbeca8..19308eb3 100644 --- a/app/src/main/res/values-tr-rTR/strings.xml +++ b/app/src/main/res/values-tr-rTR/strings.xml @@ -406,7 +406,6 @@ Tekrar denemek için tıklayın."</string> <string name="settings_customize_dark_theme_title">"Koyu Tema"</string> <string name="settings_customize_amoled_theme_title">"Amoled Tema"</string> <string name="settings_manage_themes_title">"Temaları Yönetin"</string> - <string name="settings_custom_theme_cannot_apply_to_settings_page_summary">"Özel temalar ayarlar sayfasına uygulanamaz (araç çubuğu, durum çubuğu ve navigasyon çubuğu hariç)."</string> <string name="settings_advanced_master_title">"Gelişmiş"</string> <string name="settings_delete_all_subreddits_data_in_database_title">"Veritabanındaki Tüm Subredditleri Sil"</string> <string name="settings_delete_all_users_data_in_database_title">"Veritabanındaki Tüm Kullanıcıları Sil"</string> diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index d4624613..23cae648 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -387,7 +387,6 @@ <string name="settings_customize_dark_theme_title">"Темна тема"</string> <string name="settings_customize_amoled_theme_title">"Тема Amoled"</string> <string name="settings_manage_themes_title">"Керувати темами"</string> - <string name="settings_custom_theme_cannot_apply_to_settings_page_summary">"Власні теми не застосовуються до сторінки налаштувань (окрім панелі засобів, стрічки стану і панелі переходів)."</string> <string name="settings_advanced_master_title">"Розширені"</string> <string name="settings_delete_all_subreddits_data_in_database_title">"Видалити всі сабредити з бази даних"</string> <string name="settings_delete_all_users_data_in_database_title">"Видалити всіх користувачів із бази даних"</string> diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index fd989442..7ef0732c 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -400,7 +400,6 @@ Nhấn để thử lại."</string> <string name="settings_customize_dark_theme_title">"Chủ đề tối"</string> <string name="settings_customize_amoled_theme_title">"Chủ đề Amoled"</string> <string name="settings_manage_themes_title">"Quản lý chủ đề"</string> - <string name="settings_custom_theme_cannot_apply_to_settings_page_summary">"Các chủ đề tuỳ chỉnh không thể được áp dụng cho trang cài đặt (trừ thanh công cụ, thanh trạng thái và thanh điều hướng)."</string> <string name="settings_advanced_master_title">"Nâng cao"</string> <string name="settings_delete_all_subreddits_data_in_database_title">"Xoá tất cả subreddit trong cơ sở dữ liệu"</string> <string name="settings_delete_all_users_data_in_database_title">"Xoá tất cả người dùng trong cơ sở dữ liệu"</string> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 5dac4031..d9e962bd 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -405,7 +405,6 @@ <string name="settings_customize_dark_theme_title">"黑暗主题"</string> <string name="settings_customize_amoled_theme_title">"Amoled 主题"</string> <string name="settings_manage_themes_title">"管理主题"</string> - <string name="settings_custom_theme_cannot_apply_to_settings_page_summary">"自定义主题无法应用于设置页面（工具栏、状态栏和导航栏除外）"</string> <string name="settings_advanced_master_title">"高级"</string> <string name="settings_delete_all_subreddits_data_in_database_title">"删除数据库中的所有版块"</string> <string name="settings_delete_all_users_data_in_database_title">"删除数据库中的所有用户"</string> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 9085c9e0..074ab268 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -9,6 +9,5 @@ <color name="roundedBottomSheetPrimaryBackground">#FFFFFF</color> <color name="roundedBottomSheetPrimaryNavigationBarColor">#000000</color> <color name="primaryTextColor">#000000</color> - <color name="settingsSubtitleColor">#42000000</color> <color name="dividerColor">#E0E0E0</color> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 89129fa9..ee96d717 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -490,7 +490,6 @@ <string name="settings_enable_material_you_summary">Personalize Infinity based on Your Wallpaper</string> <string name="settings_apply_material_you_title">Apply Material You</string> <string name="settings_apply_material_you_summary">In case Infinity did not change the theme</string> - <string name="settings_custom_theme_cannot_apply_to_settings_page_summary">Custom themes cannot be applied to settings page (except toolbar, status bar and navigation bar).</string> <string name="settings_advanced_master_title">Advanced</string> <string name="settings_delete_all_subreddits_data_in_database_title">Delete All Subreddits in Database</string> <string name="settings_delete_all_users_data_in_database_title">Delete All Users in Database</string> diff --git a/app/src/main/res/xml/theme_preferences.xml b/app/src/main/res/xml/theme_preferences.xml index 6c8b9504..ab02e39b 100644 --- a/app/src/main/res/xml/theme_preferences.xml +++ b/app/src/main/res/xml/theme_preferences.xml @@ -41,11 +41,6 @@ app:icon="@drawable/ic_edit_24dp" app:title="@string/settings_manage_themes_title" /> - <ml.docilealligator.infinityforreddit.customviews.CustomFontPreference - app:icon="@drawable/ic_info_preference_24dp" - app:summary="@string/settings_custom_theme_cannot_apply_to_settings_page_summary" - app:enabled="false" /> - <ml.docilealligator.infinityforreddit.customviews.CustomFontPreferenceCategory app:title="@string/settings_category_material_you_title" /> |