diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/fragment_view_imgur_images.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/menu/view_post_detail_activity.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/menu/view_user_detail_activity.xml | 20 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 7 | ||||
| -rw-r--r-- | app/src/main/res/xml/about_preferences.xml | 5 |
5 files changed, 22 insertions, 16 deletions
diff --git a/app/src/main/res/layout/fragment_view_imgur_images.xml b/app/src/main/res/layout/fragment_view_imgur_images.xml index 20110897..36286c05 100644 --- a/app/src/main/res/layout/fragment_view_imgur_images.xml +++ b/app/src/main/res/layout/fragment_view_imgur_images.xml @@ -16,8 +16,7 @@ <com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView android:id="@+id/image_view_view_imgur_image_fragment" android:layout_width="match_parent" - android:layout_height="match_parent" - app:quickScaleEnabled="false" /> + android:layout_height="match_parent" /> <LinearLayout android:id="@+id/load_image_error_linear_layout_view_imgur_image_fragment" diff --git a/app/src/main/res/menu/view_post_detail_activity.xml b/app/src/main/res/menu/view_post_detail_activity.xml index 29c49e1f..52afcc23 100644 --- a/app/src/main/res/menu/view_post_detail_activity.xml +++ b/app/src/main/res/menu/view_post_detail_activity.xml @@ -79,8 +79,7 @@ android:id="@+id/action_report_view_post_detail_activity" android:orderInCategory="12" android:title="@string/action_report" - app:showAsAction="never" - android:visible="false"/> + app:showAsAction="never" /> <item android:id="@+id/action_see_removed_view_post_detail_activity" diff --git a/app/src/main/res/menu/view_user_detail_activity.xml b/app/src/main/res/menu/view_user_detail_activity.xml index 50170f31..a06c2677 100644 --- a/app/src/main/res/menu/view_user_detail_activity.xml +++ b/app/src/main/res/menu/view_user_detail_activity.xml @@ -33,14 +33,24 @@ app:showAsAction="never" /> <item - android:id="@+id/action_share_view_user_detail_activity" + android:id="@+id/action_send_private_message_view_user_detail_activity" android:orderInCategory="6" - android:title="@string/action_share" + android:title="@string/action_send_private_message" app:showAsAction="never" /> <item - android:id="@+id/action_send_private_message_view_user_detail_activity" - android:orderInCategory="6" - android:title="@string/action_send_private_message" + android:id="@+id/action_share_view_user_detail_activity" + android:orderInCategory="7" + android:title="@string/action_share" app:showAsAction="never" /> + + <item + android:id="@+id/action_report_view_user_detail_activity" + android:orderInCategory="8" + android:title="@string/action_report" /> + + <item + android:id="@+id/action_block_user_view_user_detail_activity" + android:orderInCategory="9" + android:title="@string/action_block_user" /> </menu> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 447922e7..05c1c9de 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -68,6 +68,7 @@ <string name="action_see_removed">See Removed</string> <string name="action_set_wallpaper">Set as Wallpaper</string> <string name="action_send_private_message">Send Private Message</string> + <string name="action_block_user">Block User</string> <string name="parse_json_response_error">Error occurred when parsing the JSON response</string> <string name="retrieve_token_error">Error Retrieving the token</string> @@ -441,8 +442,6 @@ <string name="settings_subreddit_summary">r/Infinity_For_Reddit</string> <string name="settings_share_title">Share</string> <string name="settings_share_summary">Share this app to other people if you enjoy it</string> - <string name="settings_crash_reports_title">Crash Reports</string> - <string name="settings_crash_reports_summary">See the error logs and send them to me when you report bugs</string> <string name="settings_version_title">Infinity For Reddit</string> <string name="settings_version_summary">Version %s</string> <string name="settings_category_customization_title">Customization</string> @@ -850,4 +849,8 @@ <string name="login_activity_2fa_prompt">If you have 2-factor authentication enabled, kindly type your password like the following: <password>:<2FA code>.\nExample: yourpass:123456</string> + <string name="block_user">Block User</string> + <string name="block_user_success">Blocked</string> + <string name="block_user_failed">Failed to block user</string> + </resources> diff --git a/app/src/main/res/xml/about_preferences.xml b/app/src/main/res/xml/about_preferences.xml index 6561eec3..a73f9aaa 100644 --- a/app/src/main/res/xml/about_preferences.xml +++ b/app/src/main/res/xml/about_preferences.xml @@ -46,11 +46,6 @@ app:summary="@string/settings_share_summary" /> <Preference - app:title="@string/settings_crash_reports_title" - app:summary="@string/settings_crash_reports_summary" - app:fragment="ml.docilealligator.infinityforreddit.Settings.CrashReportsFragment" /> - - <Preference android:key="version" app:title="@string/settings_version_title" app:summary="@string/settings_version_summary" /> |