diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SettingsActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SettingsActivity.java index c1183636..20e215e7 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SettingsActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SettingsActivity.java @@ -35,6 +35,7 @@ import ml.docilealligator.infinityforreddit.settings.InterfacePreferenceFragment import ml.docilealligator.infinityforreddit.settings.MainPreferenceFragment; import ml.docilealligator.infinityforreddit.settings.NsfwAndSpoilerFragment; import ml.docilealligator.infinityforreddit.settings.PostHistoryFragment; +import ml.docilealligator.infinityforreddit.settings.PostPreferenceFragment; import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils; public class SettingsActivity extends BaseActivity implements @@ -104,6 +105,8 @@ public class SettingsActivity extends BaseActivity implements setTitle(R.string.settings_font_title); } else if (fragment instanceof GesturesAndButtonsPreferenceFragment) { setTitle(R.string.settings_gestures_and_buttons_title); + } else if (fragment instanceof PostPreferenceFragment) { + setTitle(R.string.settings_category_post_title); } }); } diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 2c65f6e0..764afcf1 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -24,15 +24,15 @@ - Light Theme - Dark Theme - Device Default + @string/light_theme + @string/dark_theme + @string/device_default - Light Theme - Dark Theme - Set by Battery Saver + @string/light_theme + @string/dark_theme + @string/set_by_battery_saver @@ -42,10 +42,10 @@ - Card Layout - Card Layout 2 - Compact Layout - Gallery Layout + @string/post_layout_card + @string/post_layout_card_2 + @string/post_layout_compact + @string/post_layout_gallery @@ -56,9 +56,9 @@ - Always On - Only on Wifi - Never + @string/always_on + @string/only_on_wifi + @string/never @@ -88,10 +88,10 @@ - Small - Normal - Large - Extra Large + @string/small + @string/normal + @string/large + @string/extra_large @@ -102,10 +102,10 @@ - Small - Normal - Large - Extra Large + @string/small + @string/normal + @string/large + @string/extra_large @@ -116,11 +116,11 @@ - Small - Normal - Large - Extra Large - Enormously Large + @string/small + @string/normal + @string/large + @string/extra_large + @string/enormously_large @@ -132,7 +132,7 @@ - Default + @string/default_in_array Balsamiq Sans Balsamiq Sans Bold Noto Sans @@ -166,17 +166,17 @@ - Home - Popular - All - Subreddit - MultiReddit - User - Upvoted - Downvoted - Hidden - Saved - Gilded + @string/home + @string/popular + @string/all + @string/subreddit + @string/multi_reddit + @string/user + @string/upvoted + @string/downvoted + @string/hidden + @string/saved + @string/gilded @@ -247,51 +247,51 @@ - Subscriptions - Multireddits - Inbox - Profile - Submit posts - Refresh - Change sort type - Change post layout - Search - Go to Subreddit - Go to User - Random - Hide Read Posts - Filter Posts + @string/subscriptions + @string/multi_reddits + @string/inbox + @string/profile + @string/submit_post + @string/refresh + @string/change_sort_type + @string/change_post_layout + @string/search + @string/go_to_subreddit + @string/go_to_user + @string/random + @string/hide_read_posts + @string/filter_posts - Home - Subscriptions - Inbox - Profile - Multireddits - Submit posts - Refresh - Change sort type - Change post layout - Search - Go to Subreddit - Go to User - Random - Hide Read Posts - Filter Posts + @string/home + @string/subscriptions + @string/inbox + @string/profile + @string/multi_reddits + @string/submit_post + @string/refresh + @string/change_sort_type + @string/change_post_layout + @string/search + @string/go_to_subreddit + @string/go_to_user + @string/random + @string/hide_read_posts + @string/filter_posts - Submit posts - Refresh - Change sort type - Change post layout - Search - Go to Subreddit - Go to User - Random - Hide Read Posts - Filter Posts + @string/submit_post + @string/refresh + @string/change_sort_type + @string/change_post_layout + @string/search + @string/go_to_subreddit + @string/go_to_user + @string/random + @string/hide_read_posts + @string/filter_posts @@ -306,9 +306,9 @@ - Off - Only on Cellular Data - Always on + @string/off + @string/only_on_cellular_data + @string/always_on @@ -318,8 +318,8 @@ - Upvote - Downvote + @string/upvote + @string/downvote diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e6a546f7..254384a7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -637,6 +637,8 @@ Light Theme Dark Theme + Device Default + Set by Battery Saver Name (Max 50 Characters) Description @@ -1068,4 +1070,16 @@ Error fetching v.redd.it video: Cannot get the post Error fetching v.redd.it video: Cannot get the post id + Always On + Only on Wifi + Never + Normal + Extra Large + Enormously Large + Default + Off + Only on Cellular Data + Upvote + Downvote + diff --git a/app/src/main/res/xml/interface_preferences.xml b/app/src/main/res/xml/interface_preferences.xml index 6387a850..a834ac10 100644 --- a/app/src/main/res/xml/interface_preferences.xml +++ b/app/src/main/res/xml/interface_preferences.xml @@ -33,9 +33,10 @@ app:title="@string/settings_enable_bottom_app_bar_title" app:summary="@string/settings_enable_bottom_app_bar_summary" /> - + - +