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 @@
-
-
-
-
\ 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?
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)
Verification is already in progress
Captcha request is already in progress
- You are requesting captcha too fast
+ You are requesting captcha too fast