From 89e934f5a7d6d87562b1b2ad175fc43dfabc9b71 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Fri, 21 Jun 2019 10:20:09 +0800
Subject: Zoom up to 10x in ViewImageActivity. Minor bugs fixed.

---
 .../docilealligator/infinityforreddit/ViewImageActivity.java   | 10 +++++-----
 .../infinityforreddit/ViewSubredditDetailActivity.java         |  3 +++
 .../infinityforreddit/ViewUserDetailActivity.java              |  3 +++
 app/src/main/res/values/strings.xml                            |  3 +++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewImageActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewImageActivity.java
index 69ed511a..08dc356c 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewImageActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewImageActivity.java
@@ -113,7 +113,7 @@ public class ViewImageActivity extends AppCompatActivity {
             }
         });
 
-        final float pxHeight = getResources().getDisplayMetrics().heightPixels;
+        float pxHeight = getResources().getDisplayMetrics().heightPixels;
 
         int activityColorFrom = getResources().getColor(android.R.color.black);
         int actionBarColorFrom = getResources().getColor(R.color.transparentActionBarColor);
@@ -303,7 +303,7 @@ public class ViewImageActivity extends AppCompatActivity {
             }
         });
 
-        mImageView.getController().getSettings().setPanEnabled(true);
+        mImageView.getController().getSettings().setMaxZoom(10f).setDoubleTapZoom(2f).setPanEnabled(true);
 
         mImageView.setOnClickListener(view -> {
             if (isActionBarHidden) {
@@ -398,7 +398,7 @@ public class ViewImageActivity extends AppCompatActivity {
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         if(requestCode == PERMISSION_REQUEST_WRITE_EXTERNAL_STORAGE && grantResults.length > 0) {
             if(grantResults[0] == PackageManager.PERMISSION_DENIED) {
-                Toast.makeText(this, "No storage permission to save this file", Toast.LENGTH_SHORT).show();
+                Toast.makeText(this, R.string.no_storage_permission, Toast.LENGTH_SHORT).show();
             } else if(grantResults[0] == PackageManager.PERMISSION_GRANTED && isDownloading) {
                 saveImage();
             }
@@ -422,9 +422,9 @@ public class ViewImageActivity extends AppCompatActivity {
                                 super.onPostExecute(aVoid);
                                 isDownloading = false;
                                 if(saveSuccess) {
-                                    Toast.makeText(ViewImageActivity.this, "Download completed", Toast.LENGTH_SHORT).show();
+                                    Toast.makeText(ViewImageActivity.this, R.string.download_completed, Toast.LENGTH_SHORT).show();
                                 } else {
-                                    Toast.makeText(ViewImageActivity.this, "Download failed", Toast.LENGTH_SHORT).show();
+                                    Toast.makeText(ViewImageActivity.this, R.string.download_failed, Toast.LENGTH_SHORT).show();
                                 }
                             }
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewSubredditDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewSubredditDetailActivity.java
index ccc9b6de..58f01eaf 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewSubredditDetailActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewSubredditDetailActivity.java
@@ -154,6 +154,9 @@ public class ViewSubredditDetailActivity extends AppCompatActivity {
                 }
 
                 String subredditFullName = "r/" + subredditData.getName();
+                if(!title.equals(subredditFullName)) {
+                    getSupportActionBar().setTitle(subredditFullName);
+                }
                 subredditNameTextView.setText(subredditFullName);
                 String nSubscribers = getString(R.string.subscribers_number_detail, subredditData.getNSubscribers());
                 nSubscribersTextView.setText(nSubscribers);
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewUserDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewUserDetailActivity.java
index fc3be116..e9ab3123 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewUserDetailActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewUserDetailActivity.java
@@ -216,6 +216,9 @@ public class ViewUserDetailActivity extends AppCompatActivity {
 
                 String userFullName = "u/" + userData.getName();
                 userNameTextView.setText(userFullName);
+                if(!title.equals(userFullName)) {
+                    getSupportActionBar().setTitle(userFullName);
+                }
                 String karma = getString(R.string.karma_info, userData.getKarma());
                 karmaTextView.setText(karma);
             }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 475ceb6c..6c9120c7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -24,6 +24,7 @@
     <string name="no_posts">No posts found.</string>
     <string name="no_subreddits">No subreddits found.</string>
     <string name="no_users">No users found.</string>
+    <string name="no_storage_permission">No storage permission to save this file</string>
 
     <string name="load_posts_failed">Error loading posts</string>
     <string name="load_comment_failed">Error loading comments</string>
@@ -77,4 +78,6 @@
     <string name="send_comment_failed">Could not send this comment</string>
     <string name="parse_sent_comment_failed">The comment is sent but unable to get the sent comment</string>
 
+    <string name="download_completed">Download completed</string>
+    <string name="download_failed">Download Failed</string>
 </resources>
-- 
cgit v1.2.3