From 0cc890a1d1384266916a9382309fcaa3cdbb0115 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Sat, 1 Feb 2020 17:53:43 +0100
Subject: [PATCH] Move "Done" button and make it theme conpliant in ReCaptcha

---
 .../java/org/schabi/newpipe/ReCaptchaActivity.java   | 12 +++++++-----
 app/src/main/res/drawable/ic_done_black_24dp.xml     |  9 +++++++++
 app/src/main/res/layout/activity_recaptcha.xml       |  3 +--
 app/src/main/res/menu/menu_recaptcha.xml             | 10 ++++++++++
 app/src/main/res/values/attrs.xml                    |  1 +
 app/src/main/res/values/strings.xml                  |  1 +
 app/src/main/res/values/styles.xml                   |  2 ++
 7 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_done_black_24dp.xml
 create mode 100644 app/src/main/res/menu/menu_recaptcha.xml

diff --git a/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java b/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
index 7bd632f39..f2970345f 100644
--- a/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
@@ -17,6 +17,8 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
+import org.schabi.newpipe.util.ThemeHelper;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -49,6 +51,7 @@ public class ReCaptchaActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        ThemeHelper.setTheme(this);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_recaptcha);
         Toolbar toolbar = findViewById(R.id.toolbar);
@@ -92,17 +95,16 @@ public class ReCaptchaActivity extends AppCompatActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        boolean ret = super.onCreateOptionsMenu(menu);
+        getMenuInflater().inflate(R.menu.menu_recaptcha, menu);
 
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setHomeAsUpIndicator(getResources().getDrawable(R.drawable.ic_done_white_24dp));
+            actionBar.setDisplayHomeAsUpEnabled(false);
             actionBar.setTitle(R.string.title_activity_recaptcha);
             actionBar.setSubtitle(R.string.subtitle_activity_recaptcha);
         }
 
-        return ret;
+        return true;
     }
 
     @Override
@@ -114,7 +116,7 @@ public class ReCaptchaActivity extends AppCompatActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
         switch (id) {
-            case android.R.id.home:
+            case R.id.menu_item_done:
                 saveCookiesAndFinish();
                 return true;
             default:
diff --git a/app/src/main/res/drawable/ic_done_black_24dp.xml b/app/src/main/res/drawable/ic_done_black_24dp.xml
new file mode 100644
index 000000000..7affe9ba9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_done_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_recaptcha.xml b/app/src/main/res/layout/activity_recaptcha.xml
index 8e277d0c5..759e1f296 100644
--- a/app/src/main/res/layout/activity_recaptcha.xml
+++ b/app/src/main/res/layout/activity_recaptcha.xml
@@ -14,8 +14,7 @@
         android:minHeight="?attr/actionBarSize"
         android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
         app:popupTheme="@style/ThemeOverlay.AppCompat.ActionBar"
-        app:titleTextAppearance="@style/Toolbar.Title"
-        app:contentInsetStartWithNavigation="0dp" />
+        app:titleTextAppearance="@style/Toolbar.Title"/>
 
     <WebView
         android:id="@+id/reCaptchaWebView"
diff --git a/app/src/main/res/menu/menu_recaptcha.xml b/app/src/main/res/menu/menu_recaptcha.xml
new file mode 100644
index 000000000..07ad07b38
--- /dev/null
+++ b/app/src/main/res/menu/menu_recaptcha.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_item_done"
+        android:title="@string/recaptcha_done_button"
+        android:icon="?attr/ic_done"
+        app:showAsAction="always"/>
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index c64ed1256..88925a598 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -45,6 +45,7 @@
     <attr name="ic_grid" format="reference"/>
     <attr name="ic_delete" format="reference"/>
     <attr name="ic_settings_update" format="reference"/>
+    <attr name="ic_done" format="reference"/>
 
     <attr name="progress_horizontal_drawable" format="reference"/>
     <!-- Can't refer to colors directly in drawable's xml-->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 56ecc3356..b16713172 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -331,6 +331,7 @@
     <string name="title_activity_recaptcha">reCAPTCHA challenge</string>
     <string name="subtitle_activity_recaptcha">Press \"Done\" when solved</string>
     <string name="recaptcha_request_toast">reCAPTCHA challenge requested</string>
+    <string name="recaptcha_done_button">Done</string>
     <!-- Downloads -->
     <string name="settings_category_downloads_title">Download</string>
     <string name="settings_file_charset_title">Allowed characters in filenames</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 679d4d1cd..8047ef7f4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -60,6 +60,7 @@
         <item name="ic_grid">@drawable/ic_grid_black_24dp</item>
         <item name="ic_delete">@drawable/ic_delete_black_24dp</item>
         <item name="ic_settings_update">@drawable/ic_settings_update_black</item>
+        <item name="ic_done">@drawable/ic_done_black_24dp</item>
 
         <item name="separator_color">@color/light_separator_color</item>
         <item name="contrast_background_color">@color/light_contrast_background_color</item>
@@ -129,6 +130,7 @@
         <item name="ic_delete">@drawable/ic_delete_white_24dp</item>
         <item name="pause">@drawable/ic_pause_white_24dp</item>
         <item name="ic_settings_update">@drawable/ic_settings_update_white</item>
+        <item name="ic_done">@drawable/ic_done_white_24dp</item>
 
         <item name="separator_color">@color/dark_separator_color</item>
         <item name="contrast_background_color">@color/dark_contrast_background_color</item>