From 6b865c246e111156a9fe3d54f93f27aa094b4e40 Mon Sep 17 00:00:00 2001
From: k1rakishou <kez1911@protonmail.com>
Date: Sun, 28 Apr 2019 20:34:45 +0300
Subject: [PATCH] Post review fixes

---
 .../java/org/floens/chan/core/presenter/ReplyPresenter.java   | 2 ++
 .../org/floens/chan/ui/captcha/v2/CaptchaNoJsV2Adapter.java   | 4 +++-
 .../app/src/main/java/org/floens/chan/utils/AndroidUtils.java | 4 ++--
 Clover/app/src/main/res/drawable/background_rectangle.xml     | 4 ----
 .../src/main/res/layout/layout_captcha_challenge_image.xml    | 2 --
 Clover/app/src/main/res/values/strings.xml                    | 2 +-
 6 files changed, 8 insertions(+), 10 deletions(-)
 delete mode 100644 Clover/app/src/main/res/drawable/background_rectangle.xml

diff --git a/Clover/app/src/main/java/org/floens/chan/core/presenter/ReplyPresenter.java b/Clover/app/src/main/java/org/floens/chan/core/presenter/ReplyPresenter.java
index 1d32dc20..06a053a0 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/presenter/ReplyPresenter.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/presenter/ReplyPresenter.java
@@ -279,6 +279,8 @@ public class ReplyPresenter implements AuthenticationLayoutCallback, ImagePickDe
     public void onAuthenticationComplete(AuthenticationLayoutInterface authenticationLayout, String challenge, String response) {
         draft.captchaChallenge = challenge;
         draft.captchaResponse = response;
+
+        // should this be called here?
         authenticationLayout.reset();
         makeSubmitCall();
     }
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/captcha/v2/CaptchaNoJsV2Adapter.java b/Clover/app/src/main/java/org/floens/chan/ui/captcha/v2/CaptchaNoJsV2Adapter.java
index 7bade2e6..72f7c46e 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/captcha/v2/CaptchaNoJsV2Adapter.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/captcha/v2/CaptchaNoJsV2Adapter.java
@@ -16,6 +16,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class CaptchaNoJsV2Adapter extends BaseAdapter {
+    private static final int ANIMATION_DURATION = 50;
+
     private LayoutInflater inflater;
     private int imageSize = 0;
 
@@ -65,7 +67,7 @@ public class CaptchaNoJsV2Adapter extends BaseAdapter {
                 imageList.get(position).toggleChecked();
                 boolean isChecked = imageList.get(position).isChecked;
 
-                AndroidUtils.animateViewScale(imageView, isChecked);
+                AndroidUtils.animateViewScale(imageView, isChecked, ANIMATION_DURATION);
                 blueCheckmark.setVisibility(isChecked ? View.VISIBLE : View.GONE);
             });
 
diff --git a/Clover/app/src/main/java/org/floens/chan/utils/AndroidUtils.java b/Clover/app/src/main/java/org/floens/chan/utils/AndroidUtils.java
index 07b8bb06..8cd83a67 100644
--- a/Clover/app/src/main/java/org/floens/chan/utils/AndroidUtils.java
+++ b/Clover/app/src/main/java/org/floens/chan/utils/AndroidUtils.java
@@ -455,7 +455,7 @@ public class AndroidUtils {
         return networkInfo != null && networkInfo.isConnected();
     }
 
-    public static void animateViewScale(View view, boolean zoomOut) {
+    public static void animateViewScale(View view, boolean zoomOut, int duration) {
         ScaleAnimation scaleAnimation;
         final float normalScale = 1.0f;
         final float zoomOutScale = 0.8f;
@@ -482,7 +482,7 @@ public class AndroidUtils {
                     0.5f);
         }
 
-        scaleAnimation.setDuration(50);
+        scaleAnimation.setDuration(duration);
         scaleAnimation.setFillAfter(true);
         scaleAnimation.setInterpolator(new AccelerateDecelerateInterpolator());
 
diff --git a/Clover/app/src/main/res/drawable/background_rectangle.xml b/Clover/app/src/main/res/drawable/background_rectangle.xml
deleted file mode 100644
index 89e226bc..00000000
--- a/Clover/app/src/main/res/drawable/background_rectangle.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <solid android:color="@android:color/white" />
-    <stroke android:width="1dip" android:color="@color/accent"/>
-</shape>
\ No newline at end of file
diff --git a/Clover/app/src/main/res/layout/layout_captcha_challenge_image.xml b/Clover/app/src/main/res/layout/layout_captcha_challenge_image.xml
index cb54eaa3..855b01bd 100644
--- a/Clover/app/src/main/res/layout/layout_captcha_challenge_image.xml
+++ b/Clover/app/src/main/res/layout/layout_captcha_challenge_image.xml
@@ -9,8 +9,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="fitXY"
-        android:layout_margin="2dp"
-        android:background="@drawable/background_rectangle"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/Clover/app/src/main/res/values/strings.xml b/Clover/app/src/main/res/values/strings.xml
index 18685f89..95d6505c 100644
--- a/Clover/app/src/main/res/values/strings.xml
+++ b/Clover/app/src/main/res/values/strings.xml
@@ -583,5 +583,5 @@ Don't have a 4chan Pass?<br>
     <string name="captcha_layout_v2_you_have_to_select_at_least_one_image" tools:ignore="MissingTranslation">You have to selected at least one image (if you see a captcha that does not have any matching images then it is probably a bug fill an issue and use old captcha for a while)</string>
     <string name="captcha_layout_v2_verification_already_in_progress" tools:ignore="MissingTranslation">Verification is already in progress</string>
     <string name="captcha_layout_v2_captcha_request_is_already_in_progress" tools:ignore="MissingTranslation">Captcha request is already in progress</string>
-    <string name="captcha_layout_v2_you_are_requesting_captcha_too_fast" translatable="false">You are requesting captcha too fast</string>
+    <string name="captcha_layout_v2_you_are_requesting_captcha_too_fast" tools:ignore="MissingTranslation">You are requesting captcha too fast</string>
 </resources>