Move `Refresh` to the bottom of the main options menu. https://redmine.stoutner...

diff --git a/app/src/main/assets/de/about_licenses.html b/app/src/main/assets/de/about_licenses.html
index ddd730db96cd482b6ced8114f8b2dab999b1fe06..6b479aeac61198d448b3d6ec42c3fbe2a251e8a8 100644 (file)
--- a/app/src/main/assets/de/about_licenses.html
+++ b/app/src/main/assets/de/about_licenses.html
@@ -48,7 +48,8 @@
         <p>Privacy Browser ist copyright © 2015-2017 von <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.</p>
 
         <h3>Lizenz</h3>
-        <p>Privacy Browser ist veröffentlicht unter der <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ Lizenz</a>. The full text of the license is below.</p>
+        <p>Privacy Browser ist veröffentlicht unter der <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ Lizenz</a>. The full text of the license is below.
+            The source code is available from <a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=summary">git.stoutner.com</a>.</p>
 
         <h3>Attribute</h3>
         <p>The list of ad servers used by the ad blocker comes from <a href="https://pgl.yoyo.org/adservers/">pgl.yoyo.org</a>.
@@ -77,7 +78,7 @@
         <p><img class="icon" src="../en/images/ic_close.png"> ic_close.</p>
         <p><img class="icon" src="../en/images/ic_create_new_folder.png"> ic_create_new_folder.</p>
         <p><img class="icon" src="../en/images/ic_devices_other.png"> ic_devices_other.</p>
-        <p><img class="icon" src="../en/images/ic_delete.png"> ic_download.</p>
+        <p><img class="icon" src="../en/images/ic_delete.png"> ic_delete.</p>
         <p><img class="icon" src="../en/images/ic_dns.png"> ic_dns.</p>
         <p><img class="icon" src="../en/images/ic_edit.png"> ic_edit.</p>
         <p><img class="icon" src="../en/images/ic_exit_to_app.png"> ic_exit_to_app.</p>

diff --git a/app/src/main/assets/en/about_licenses.html b/app/src/main/assets/en/about_licenses.html
index c433ce37508429c86ef235fb2f7532680ae85728..4e9f8f660b74a6c0dbd1037578983b06717d3186 100644 (file)
--- a/app/src/main/assets/en/about_licenses.html
+++ b/app/src/main/assets/en/about_licenses.html
@@ -43,7 +43,8 @@
         <p>Privacy Browser copyright © 2015-2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.</p>
 
         <h3>License</h3>
-        <p>Privacy Browser is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>. The full text of the license is below.</p>
+        <p>Privacy Browser is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>. The full text of the license is below.
+            The source code is available from <a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=summary">git.stoutner.com</a>.</p>
 
         <h3>Attributions</h3>
         <p>The list of ad servers used by the ad blocker comes from <a href="https://pgl.yoyo.org/adservers/">pgl.yoyo.org</a>.
@@ -71,7 +72,7 @@
         <p><img class="icon" src="images/ic_close.png"> ic_close.</p>
         <p><img class="icon" src="images/ic_create_new_folder.png"> ic_create_new_folder.</p>
         <p><img class="icon" src="images/ic_devices_other.png"> ic_devices_other.</p>
-        <p><img class="icon" src="images/ic_delete.png"> ic_download.</p>
+        <p><img class="icon" src="images/ic_delete.png"> ic_delete.</p>
         <p><img class="icon" src="images/ic_dns.png"> ic_dns.</p>
         <p><img class="icon" src="images/ic_edit.png"> ic_edit.</p>
         <p><img class="icon" src="images/ic_exit_to_app.png"> ic_exit_to_app.</p>

diff --git a/app/src/main/assets/es/about_licenses.html b/app/src/main/assets/es/about_licenses.html
index 15727c8d5ab9366e60b90556bbc1f965932730f2..b34a68f3a4c390f41c489dc9ead86ed0137e239a 100644 (file)
--- a/app/src/main/assets/es/about_licenses.html
+++ b/app/src/main/assets/es/about_licenses.html
@@ -45,7 +45,8 @@
         <p>Navegador Privado tiene derechos de autor © 2015-2017 por <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.</p>
 
         <h3>Licencia</h3>
-        <p>Navegador Privado está liberado bajo la licencia <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+</a>. El texto completo de la licencia se encuentra en la parte inferior de este documento (se deja en el idioma original).</p>
+        <p>Navegador Privado está liberado bajo la licencia <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+</a>. El texto completo de la licencia se encuentra en la parte inferior de este documento (se deja en el idioma original).
+            The source code is available from <a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=summary">git.stoutner.com</a>.</p>
 
         <h3>Atribuciones</h3>
         <p>La lista de servidores publicitarios usados por el bloqueador de anuncios procede de <a href="https://pgl.yoyo.org/adservers/">pgl.yoyo.org</a>.
@@ -75,7 +76,7 @@
         <p><img class="icon" src="../en/images/ic_close.png"> ic_close.</p>
         <p><img class="icon" src="../en/images/ic_create_new_folder.png"> ic_create_new_folder.</p>
         <p><img class="icon" src="../en/images/ic_devices_other.png"> ic_devices_other.</p>
-        <p><img class="icon" src="../en/images/ic_delete.png"> ic_download.</p>
+        <p><img class="icon" src="../en/images/ic_delete.png"> ic_delete.</p>
         <p><img class="icon" src="../en/images/ic_dns.png"> ic_dns.</p>
         <p><img class="icon" src="../en/images/ic_edit.png"> ic_edit.</p>
         <p><img class="icon" src="../en/images/ic_exit_to_app.png"> ic_exit_to_app.</p>

diff --git a/app/src/main/assets/it/about_licenses.html b/app/src/main/assets/it/about_licenses.html
index e960817c2e14dc8579348995e8765d11b795452d..eeae2d53316435a90fc33de39edc1394a8357dec 100644 (file)
--- a/app/src/main/assets/it/about_licenses.html
+++ b/app/src/main/assets/it/about_licenses.html
@@ -49,7 +49,8 @@
             che usa la GNU GPL. Soltanto la <a href="https://www.gnu.org/licenses/gpl-3.0.html">versione originale in inglese della GNU GPL</a> fa ciò.
             Lo scopo di questa traduzione è unicamente quello di aiutare gli utenti di lingua italiana a comprendere la GNU GPL, e pertanto in caso di eventuali discrepanze tra
             traduzione e versione originale in inglese, prevarrà e sarà unicamente la versione originale ad avere valore legale.
-            E' inoltre ammessa la modifica e la pubblicazione di questa traduzione, ma solamente in accordo ai termini <a href="https://www.gnu.org/licenses/translations.html">qui</a> riportati.</p>
+            E' inoltre ammessa la modifica e la pubblicazione di questa traduzione, ma solamente in accordo ai termini <a href="https://www.gnu.org/licenses/translations.html">qui</a> riportati.
+            The source code is available from <a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=summary">git.stoutner.com</a>.</p>
 
         <h3>Attribuzioni</h3>
         <p>La lista dei server utilizzata dalla funzionalità di blocco degli annunci è tratta da <a href="https://pgl.yoyo.org/adservers/">pgl.yoyo.org</a>.
@@ -77,7 +78,7 @@
         <p><img class="icon" src="../en/images/ic_close.png"> ic_close.</p>
         <p><img class="icon" src="../en/images/ic_create_new_folder.png"> ic_create_new_folder.</p>
         <p><img class="icon" src="../en/images/ic_devices_other.png"> ic_devices_other.</p>
-        <p><img class="icon" src="../en/images/ic_delete.png"> ic_download.</p>
+        <p><img class="icon" src="../en/images/ic_delete.png"> ic_delete.</p>
         <p><img class="icon" src="../en/images/ic_dns.png"> ic_dns.</p>
         <p><img class="icon" src="../en/images/ic_edit.png"> ic_edit.</p>
         <p><img class="icon" src="../en/images/ic_exit_to_app.png"> ic_exit_to_app.</p>

diff --git a/app/src/main/assets/zh-rTW/about_licenses.html b/app/src/main/assets/zh-rTW/about_licenses.html
index c206459dfc4fb4a9b157a7b9398c0df03dd84f7e..0af91d73ec03b4a52b3395ec57e04f00037f7dc4 100644 (file)
--- a/app/src/main/assets/zh-rTW/about_licenses.html
+++ b/app/src/main/assets/zh-rTW/about_licenses.html
@@ -43,7 +43,8 @@
         <p>Privacy Browser copyright © 2015-2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.</p>
 
         <h3>License</h3>
-        <p>Privacy Browser is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>. The full text of the license is below.</p>
+        <p>Privacy Browser is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>. The full text of the license is below.
+            The source code is available from <a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=summary">git.stoutner.com</a>.</p>
 
         <h3>Attributions</h3>
         <p>The list of ad servers used by the ad blocker comes from <a href="https://pgl.yoyo.org/adservers/">pgl.yoyo.org</a>.
@@ -71,7 +72,7 @@
         <p><img class="icon" src="../en/images/ic_close.png"> ic_close.</p>
         <p><img class="icon" src="../en/images/ic_create_new_folder.png"> ic_create_new_folder.</p>
         <p><img class="icon" src="../en/images/ic_devices_other.png"> ic_devices_other.</p>
-        <p><img class="icon" src="../en/images/ic_delete.png"> ic_download.</p>
+        <p><img class="icon" src="../en/images/ic_delete.png"> ic_delete.</p>
         <p><img class="icon" src="../en/images/ic_dns.png"> ic_dns.</p>
         <p><img class="icon" src="../en/images/ic_edit.png"> ic_edit.</p>
         <p><img class="icon" src="../en/images/ic_exit_to_app.png"> ic_exit_to_app.</p>

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 05625983417be7983b39ef89b3f39244c618d588..01978f46869684e9111240c737353deffa8f65c1 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
@@ -1277,10 +1277,6 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
                 }, 200);
                 return true;
 
-            case R.id.refresh:
-                mainWebView.reload();
-                return true;
-
             case R.id.print:
                 // Get a `PrintManager` instance.
                 PrintManager printManager = (PrintManager) getSystemService(Context.PRINT_SERVICE);
@@ -1300,6 +1296,10 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
                 //Everything else will be handled by `CreateHomeScreenShortcutDialog` and the associated listener below.
                 return true;
 
+            case R.id.refresh:
+                mainWebView.reload();
+                return true;
+
             default:
                 // Don't consume the event.
                 return super.onOptionsItemSelected(menuItem);

diff --git a/app/src/main/res/menu/webview_options_menu.xml b/app/src/main/res/menu/webview_options_menu.xml
index c1fc680a118ecc8ae51d9fde6725d4ebbaf9ac1d..d2d5743201942a6403698630b2a40a2663e3258a 100644 (file)
--- a/app/src/main/res/menu/webview_options_menu.xml
+++ b/app/src/main/res/menu/webview_options_menu.xml
@@ -146,22 +146,22 @@
         android:title="@string/find_on_page"
         android:orderInCategory="110"
         app:showAsAction="never|collapseActionView" />
-
     <item
-        android:id="@+id/refresh"
-        android:title="@string/refresh"
+        android:id="@+id/print"
+        android:title="@string/print"
         android:orderInCategory="120"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/print"
-        android:title="@string/print"
+        android:id="@+id/addToHomescreen"
+        android:title="@string/add_to_home_screen"
         android:orderInCategory="130"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/addToHomescreen"
-        android:title="@string/add_to_home_screen"
+        android:id="@+id/refresh"
+        android:title="@string/refresh"
         android:orderInCategory="140"
         app:showAsAction="never" />
+
 </menu>