Reorder the options menu. Implements https://redmine.stoutner.com/issues/105.

diff --git a/app/src/main/assets/en/about_changelog.html b/app/src/main/assets/en/about_changelog.html
index 108a9076a2c0d2679853666290c2a1ac82d0d963..96da1683b3c58c4fe7b05b1df56ae82dea10fef4 100644 (file)
--- a/app/src/main/assets/en/about_changelog.html
+++ b/app/src/main/assets/en/about_changelog.html
@@ -32,9 +32,9 @@
             <li><a href="https://redmine.stoutner.com/issues/101">Only load domain settings when the domain changes</a>.</li>
             <li>Only apply domain settings to subdomains if <a href="https://redmine.stoutner.com/issues/99">*. is specified at the beginning of the domain name</a>.</li>
             <li>Reload domain settings when <a href="https://redmine.stoutner.com/issues/100">navigating with the back button</a>.</li>
-            <li><a href="https://redmine.stoutner.com/issues/98">Autopopulate the bookmark and create shorcut dialogues</a>.</li>
+            <li><a href="https://redmine.stoutner.com/issues/98">Autopopulate the create bookmark and create shortcut dialogs</a>.</li>
             <li>Updated Italian translation provided by Francesco Buratti.</li>
-            <li>Updated Spanish translation provided by <a href="mailto:emails@joseleon.me">Jose A. León Becerra</a>.</li>
+            <li>Updated Spanish translation provided by <a href="mailto:emails@joseleon.me">Jose A. Le&oacute;n Becerra</a>.</li>
         </ul>
 
         <h3>2.0 (version code 19)</h3>
@@ -44,7 +44,7 @@
             <li>When proxying through Tor, <a href="https://redmine.stoutner.com/issues/90">wait until Orbot is ready</a> before attempting to load a page.</li>
             <li><a href="https://redmine.stoutner.com/issues/87">Use .onion search engines</a> when proxying through Tor.</li>
             <li>Updated Italian translation provided by Francesco Buratti.</li>
-            <li>Updated Spanish translation provided by <a href="mailto:emails@joseleon.me">Jose A. León Becerra</a>.</li>
+            <li>Updated Spanish translation provided by <a href="mailto:emails@joseleon.me">Jose A. Le&oacute;n Becerra</a>.</li>
         </ul>
 
         <h3>1.15 (version code 18)</h3>

diff --git a/app/src/main/assets/es/about_changelog.html b/app/src/main/assets/es/about_changelog.html
index 7a6481722d7457425f9be0744330bc410f1c14d1..ef3b4663a1e2f042f5d7717024f54f2d19372a60 100644 (file)
--- a/app/src/main/assets/es/about_changelog.html
+++ b/app/src/main/assets/es/about_changelog.html
@@ -34,9 +34,9 @@
             <li><a href="https://redmine.stoutner.com/issues/101">S&oacute;lo cargar la configuraci&oacute;n del dominio cuando el dominio cambie</a>.</li>
             <li>S&oacute;lo aplicar la configuraci&oacute;n de dominio a subdominios si <a href="https://redmine.stoutner.com/issues/99">*. se especifica al principio del nombre de dominio</a>.</li>
             <li>Recargar la configuraci&oacute;n de dominio cuando <a href="https://redmine.stoutner.com/issues/100">se navega con el bot&oacute;n de retroceso</a>.</li>
-            <li><a href="https://redmine.stoutner.com/issues/98">Autocompletar los di&aacute;logos del marcador y crear acceso directo</a>.</li>
+            <li><a href="https://redmine.stoutner.com/issues/98">Autorellenar las ventanas de crear marcador y de crear acceso directo</a>.</li>
+            <li>Traducci&oacute;n al espa&ntilde;ol actualizada proporcionada por <a href="mailto:emails@joseleon.me">Jose A. Le&oacute;n Becerra</a>.</li>
             <li>Traducci&oacute;n al italiano actualizada proporcionada por Francesco Buratti.</li>
-            <li>Traducci&oacute;n al espa&ntilde;ol actualizada proporcionada por<a href="mailto:emails@joseleon.me">Jose A. Le&oacute;n Becerra</a>.</li>
         </ul>
 
         <h3>2.0 (c&oacute;digo de versi&oacute;n 19)</h3>
@@ -45,8 +45,8 @@
             <li>Implementar <a href="https://redmine.stoutner.com/issues/7">configuraci&oacute;n de dominio personalizado</a>.</li>
             <li>Cuando se usa proxy a trav&eacute;s de Tor, <a href="https://redmine.stoutner.com/issues/90">esperar hasta que Orbot est&eacute; listo</a> antes de intentar cargar una p&aacute;gina.</li>
             <li><a href="https://redmine.stoutner.com/issues/87">Usar motores de b&uacute;squeda .onion</a> cuando se usa proxy a trav&eacute;s de Tor.</li>
+            <li>Traducci&oacute;n al espa&ntilde;ol actualizada proporcionada por <a href="mailto:emails@joseleon.me">Jose A. Le&oacute;n Becerra</a>.</li>
             <li>Traducci&oacute;n al italiano actualizada proporcionada por Francesco Buratti.</li>
-            <li>Traducci&oacute;n al espa&ntilde;ol actualizada proporcionada por<a href="mailto:emails@joseleon.me">Jose A. Le&oacute;n Becerra</a>.</li>
         </ul>
 
         <h3>1.15 (c&oacute;digo de versi&oacute;n 18)</h3>
@@ -57,8 +57,8 @@
             <li><a href="https://redmine.stoutner.com/issues/82">Localizar las fechas</a> en los cuadros de di&aacute;logo del certificado SSL.</li>
             <li>Habilitar la descarga de archivos de <a href="https://redmine.stoutner.com/issues/73">p&aacute;ginas web que requieren un inicio de sesi&oacute;n</a>. C&oacute;digo aportado por Hendrik Knackstedt.</li>
             <li>Solucionar un error al intentar <a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commit;h=da8974edd917b868957fa78bb3843fefb93b8cb7">descargar un archivo que no tiene un URI HTTP o HTTPS</a>.</li>
+            <li>Traducci&oacute;n al español actualizada proporcionada por <a href="mailto:emails@joseleon.me">Jose A. Le&oacute;n Becerra</a>.</li>
             <li>Traducci&oacute;n al italiano inicial proporcionada por Francesco Buratti.</li>
-            <li>Traducci&oacute;n al español actualizada proporcionada por <<a href="mailto:emails@joseleon.me">Jose A. Le&oacute;n Becerra</a>.</li>
         </ul>
 
         <h3>1.14.1 (c&oacute;digo de versi&oacute;n 17)</h3>

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
index e06531c6174780d655f9aad96a06996d612c72c1..2b8009f0d4d7b706d1dcfa5f28055fb965845416 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
@@ -1152,6 +1152,14 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
                 mainWebView.getSettings().setTextZoom(200);
                 return true;
 
+            case R.id.share:
+                Intent shareIntent = new Intent();
+                shareIntent.setAction(Intent.ACTION_SEND);
+                shareIntent.putExtra(Intent.EXTRA_TEXT, urlTextBox.getText().toString());
+                shareIntent.setType("text/plain");
+                startActivity(Intent.createChooser(shareIntent, "Share URL"));
+                return true;
+
             case R.id.find_on_page:
                 // Hide the URL app bar.
                 supportAppBar.setVisibility(View.GONE);
@@ -1175,20 +1183,8 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
                 }, 200);
                 return true;
 
-            case R.id.share:
-                Intent shareIntent = new Intent();
-                shareIntent.setAction(Intent.ACTION_SEND);
-                shareIntent.putExtra(Intent.EXTRA_TEXT, urlTextBox.getText().toString());
-                shareIntent.setType("text/plain");
-                startActivity(Intent.createChooser(shareIntent, "Share URL"));
-                return true;
-
-            case R.id.addToHomescreen:
-                // Show the `CreateHomeScreenShortcutDialog` `AlertDialog` and name this instance `R.string.create_shortcut`.
-                AppCompatDialogFragment createHomeScreenShortcutDialogFragment = new CreateHomeScreenShortcutDialog();
-                createHomeScreenShortcutDialogFragment.show(getSupportFragmentManager(), getResources().getString(R.string.create_shortcut));
-
-                //Everything else will be handled by `CreateHomeScreenShortcutDialog` and the associated listener below.
+            case R.id.refresh:
+                mainWebView.reload();
                 return true;
 
             case R.id.print:
@@ -1202,8 +1198,12 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
                 printManager.print(getResources().getString(R.string.privacy_browser_web_page), printDocumentAdapter, null);
                 return true;
 
-            case R.id.refresh:
-                mainWebView.reload();
+            case R.id.addToHomescreen:
+                // Show the `CreateHomeScreenShortcutDialog` `AlertDialog` and name this instance `R.string.create_shortcut`.
+                AppCompatDialogFragment createHomeScreenShortcutDialogFragment = new CreateHomeScreenShortcutDialog();
+                createHomeScreenShortcutDialogFragment.show(getSupportFragmentManager(), getResources().getString(R.string.create_shortcut));
+
+                //Everything else will be handled by `CreateHomeScreenShortcutDialog` and the associated listener below.
                 return true;
 
             default:

diff --git a/app/src/main/res/menu/webview_options_menu.xml b/app/src/main/res/menu/webview_options_menu.xml
index 8f0df746a42ab37f827a0a91b6525e307a8619d6..fbdca4d2564a3faa60c1ce175086a2f551a4c9da 100644 (file)
--- a/app/src/main/res/menu/webview_options_menu.xml
+++ b/app/src/main/res/menu/webview_options_menu.xml
@@ -130,20 +130,20 @@
     </item>
 
     <item
-        android:id="@+id/find_on_page"
-        android:title="@string/find_on_page"
+        android:id="@+id/share"
+        android:title="@string/share"
         android:orderInCategory="100"
-        app:showAsAction="never|collapseActionView" />
+        app:showAsAction="never" />
 
     <item
-        android:id="@+id/share"
-        android:title="@string/share"
+        android:id="@+id/find_on_page"
+        android:title="@string/find_on_page"
         android:orderInCategory="110"
-        app:showAsAction="never" />
+        app:showAsAction="never|collapseActionView" />
 
     <item
-        android:id="@+id/addToHomescreen"
-        android:title="@string/add_to_home_screen"
+        android:id="@+id/refresh"
+        android:title="@string/refresh"
         android:orderInCategory="120"
         app:showAsAction="never" />
 
@@ -154,8 +154,8 @@
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/refresh"
-        android:title="@string/refresh"
+        android:id="@+id/addToHomescreen"
+        android:title="@string/add_to_home_screen"
         android:orderInCategory="140"
         app:showAsAction="never" />
 </menu>