Add a button to the captcha layouts to hard reset them

Clover/app/src/main/java/org/floens/chan/ui/controller/ThemeSettingsController.java

@@ -65,7 +65,7 @@ import static org.floens.chan.utils.AndroidUtils.getAttrColor;
 import static org.floens.chan.utils.AndroidUtils.getString;
 
 public class ThemeSettingsController extends Controller implements View.OnClickListener {
-    private static PostCell.PostCellCallback DUMMY_POST_CALLBACK = new PostCell.PostCellCallback() {
+    private PostCell.PostCellCallback DUMMY_POST_CALLBACK = new PostCell.PostCellCallback() {
         private Loadable loadable = new Loadable("g", 1234);
 
         @Override

Clover/app/src/main/java/org/floens/chan/ui/layout/CaptchaLayout.java

@@ -64,6 +64,8 @@ public class CaptchaLayout extends WebView implements CaptchaLayoutInterface {
         this.siteKey = siteKey;
         this.lightTheme = lightTheme;
 
+        AndroidUtils.hideKeyboard(this);
+
         WebSettings settings = getSettings();
         settings.setJavaScriptEnabled(true);
 
@@ -100,14 +102,19 @@ public class CaptchaLayout extends WebView implements CaptchaLayoutInterface {
         if (loaded) {
             loadUrl("javascript:grecaptcha.reset()");
         } else {
-            loaded = true;
+            hardReset();
+        }
+    }
 
-            String html = IOUtils.assetAsString(getContext(), "captcha/captcha.html");
+    @Override
-            html = html.replace("__site_key__", siteKey);
+    public void hardReset() {
-            html = html.replace("__theme__", lightTheme ? "light" : "dark");
+        loaded = true;
 
-            loadDataWithBaseURL(baseUrl, html, "text/html", "UTF-8", null);
+        String html = IOUtils.assetAsString(getContext(), "captcha/captcha.html");
-        }
+        html = html.replace("__site_key__", siteKey);
+        html = html.replace("__theme__", lightTheme ? "light" : "dark");
+
+        loadDataWithBaseURL(baseUrl, html, "text/html", "UTF-8", null);
     }
 
     private void onCaptchaLoaded() {

Clover/app/src/main/java/org/floens/chan/ui/layout/CaptchaLayoutInterface.java

@@ -21,4 +21,6 @@ public interface CaptchaLayoutInterface {
     void initCaptcha(String baseUrl, String siteKey, boolean lightTheme, CaptchaCallback callback);
 
     void reset();
+
+    void hardReset();
 }

Clover/app/src/main/java/org/floens/chan/ui/layout/LegacyCaptchaLayout.java

@@ -130,6 +130,11 @@ public class LegacyCaptchaLayout extends LinearLayout implements CaptchaLayoutIn
         this.callback = callback;
     }
 
+    @Override
+    public void hardReset() {
+        reset();
+    }
+
     @Override
     public void reset() {
         input.setText("");
@@ -141,6 +146,7 @@ public class LegacyCaptchaLayout extends LinearLayout implements CaptchaLayoutIn
     }
 
     private void submitCaptcha() {
+        AndroidUtils.hideKeyboard(this);
         callback.captchaEntered(this, challenge, input.getText().toString());
     }
 

Clover/app/src/main/java/org/floens/chan/ui/layout/ReplyLayout.java

@@ -28,6 +28,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.EditText;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -61,8 +62,11 @@ import static org.floens.chan.utils.AndroidUtils.setRoundItemBackground;
 public class ReplyLayout extends LoadView implements View.OnClickListener, AnimationUtils.LayoutAnimationProgress, ReplyPresenter.ReplyPresenterCallback, TextWatcher, ImageDecoder.ImageDecoderCallback, SelectionListeningEditText.SelectionChangedListener {
     private ReplyPresenter presenter;
     private ReplyLayoutCallback callback;
+    private boolean newCaptcha = ChanSettings.postNewCaptcha.get();
 
     private View replyInputLayout;
+    private FrameLayout captchaContainer;
+    private ImageView captchaHardReset;
     private CaptchaLayoutInterface captchaLayout;
 
     private boolean openingName;
@@ -141,6 +145,12 @@ public class ReplyLayout extends LoadView implements View.OnClickListener, Anima
         setRoundItemBackground(submit);
         submit.setOnClickListener(this);
 
+        captchaContainer = (FrameLayout) LayoutInflater.from(getContext()).inflate(R.layout.layout_reply_captcha, this, false);
+        captchaHardReset = (ImageView) captchaContainer.findViewById(R.id.reset);
+        theme().refreshDrawable.apply(captchaHardReset);
+        setRoundItemBackground(captchaHardReset);
+        captchaHardReset.setOnClickListener(this);
+
         setView(replyInputLayout);
     }
 
@@ -167,9 +177,9 @@ public class ReplyLayout extends LoadView implements View.OnClickListener, Anima
 
     @Override
     public LayoutParams getLayoutParamsForView(View view) {
-        if (view == replyInputLayout || (view == captchaLayout && captchaLayout instanceof LegacyCaptchaLayout)) {
+        if (view == replyInputLayout || (view == captchaContainer && !newCaptcha)) {
             return new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
-        } else if (view == captchaLayout && captchaLayout instanceof CaptchaLayout) {
+        } else if (view == captchaContainer && newCaptcha) {
             return new LayoutParams(LayoutParams.MATCH_PARENT, dp(300));
         } else {
             // Loadbar
@@ -198,7 +208,9 @@ public class ReplyLayout extends LoadView implements View.OnClickListener, Anima
             presenter.onSubmitClicked();
         }/* else if (v == preview) {
             // TODO
-        }*/
+        }*/ else if (v == captchaHardReset) {
+            captchaLayout.hardReset();
+        }
     }
 
     @Override
@@ -218,16 +230,20 @@ public class ReplyLayout extends LoadView implements View.OnClickListener, Anima
                 break;
             case CAPTCHA:
                 if (captchaLayout == null) {
-                    if (ChanSettings.postNewCaptcha.get()) {
+                    if (newCaptcha) {
                         captchaLayout = new CaptchaLayout(getContext());
                     } else {
-                        captchaLayout = (CaptchaLayoutInterface) LayoutInflater.from(getContext()).inflate(R.layout.layout_captcha_legacy, this, false);
+                        captchaLayout = (CaptchaLayoutInterface) LayoutInflater.from(getContext()).inflate(R.layout.layout_captcha_legacy, captchaContainer, false);
                     }
+                    captchaContainer.addView((View) captchaLayout, 0);
+                }
+
+                if (newCaptcha) {
+                    AndroidUtils.hideKeyboard(this);
                 }
 
-                setView((View) captchaLayout);
+                setView(captchaContainer);
 
-                AndroidUtils.hideKeyboard(this);
                 break;
         }
     }
@@ -321,6 +337,7 @@ public class ReplyLayout extends LoadView implements View.OnClickListener, Anima
     @Override
     public void updateCommentCount(int count, int maxCount, boolean over) {
         commentCounter.setText(count + "/" + maxCount);
+        //noinspection ResourceAsColor
         commentCounter.setTextColor(over ? 0xffff0000 : getAttrColor(getContext(), R.attr.text_color_secondary));
     }
 

Clover/app/src/main/java/org/floens/chan/ui/theme/DarkTheme.java

@@ -36,5 +36,6 @@ public class DarkTheme extends Theme {
         historyDrawable = new ThemeDrawable(R.drawable.ic_history_white_24dp, 1f);
         listAddDrawable = new ThemeDrawable(R.drawable.ic_playlist_add_white_24dp, 1f);
         helpDrawable = new ThemeDrawable(R.drawable.ic_help_outline_white_24dp, 1f);
+        refreshDrawable = new ThemeDrawable(R.drawable.ic_refresh_white_24dp, 1f);
     }
 }

Clover/app/src/main/java/org/floens/chan/ui/theme/Theme.java

@@ -68,6 +68,7 @@ public class Theme {
     public ThemeDrawable historyDrawable;
     public ThemeDrawable listAddDrawable;
     public ThemeDrawable helpDrawable;
+    public ThemeDrawable refreshDrawable;
 
     public Theme(String displayName, String name, int resValue, ThemeHelper.PrimaryColor primaryColor) {
         this.displayName = displayName;
@@ -90,6 +91,7 @@ public class Theme {
         historyDrawable = new ThemeDrawable(R.drawable.ic_history_black_24dp, 0.54f);
         listAddDrawable = new ThemeDrawable(R.drawable.ic_playlist_add_black_24dp, 0.54f);
         helpDrawable = new ThemeDrawable(R.drawable.ic_help_outline_black_24dp, 0.54f);
+        refreshDrawable = new ThemeDrawable(R.drawable.ic_refresh_black_24dp, 0.54f);
     }
 
     public void applyFabColor(FloatingActionButton fab) {

Clover/app/src/main/res/layout/layout_reply_captcha.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Clover - 4chan browser https://github.com/Floens/Clover/
+Copyright (C) 2014  Floens
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/reset"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_gravity="top|right"
+        android:padding="6dp"
+        tools:ignore="ContentDescription" />
+
+</FrameLayout>