Update the Clear and Exit icon. Implements https://redmine.stoutner.com/issues/146.
authorSoren Stoutner <soren@stoutner.com>
Thu, 6 Jul 2017 00:05:38 +0000 (17:05 -0700)
committerSoren Stoutner <soren@stoutner.com>
Thu, 6 Jul 2017 00:05:38 +0000 (17:05 -0700)
app/src/main/assets/de/about_licenses.html
app/src/main/assets/en/about_licenses.html
app/src/main/assets/en/images/clear_and_exit.png [new file with mode: 0644]
app/src/main/assets/en/images/ic_exit_to_app.png [deleted file]
app/src/main/assets/es/about_licenses.html
app/src/main/assets/it/about_licenses.html
app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
app/src/main/res/drawable/clear_and_exit.xml [new file with mode: 0644]
app/src/main/res/drawable/exit.xml [deleted file]
app/src/main/res/menu/webview_navigation_menu.xml

index 3a742ca2f6f3f227afdd08433292b34f59a7ae68..32692288bfb43a6d3860a0dfcf1217c7bc982361 100644 (file)
@@ -60,6 +60,9 @@
             <img class="left" src="../en/images/javascript_enabled.png">
             are derived from ic_security and ic_language, which are part of the <a href="https://material.io/icons/">Android Material icon set</a> and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
             The full text of the license is below. Modifications copyright © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p><img class="left" src="../en/images/clear_and_exit.png">
+            is derived from ic_exit_to_app, which is part of the <a href="https://material.io/icons/">Android Material icon set</a> and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
+            The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="../en/images/orbot.png"> orbot is a modified version of <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">the status icon from the Orbot project</a>, which is copyright
             2009-2010 Nathan Freitas, The Guardian Project. It is released under the <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">3-clause BSD license</a>.
             The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
@@ -83,7 +86,6 @@
         <p><img class="icon" src="../en/images/ic_dns.png"> ic_dns.</p>
         <p><img class="icon" src="../en/images/ic_donut_small.png"> ic_donut_small.</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>
         <p><img class="icon" src="../en/images/ic_expand_less.png"> ic_expand_less.</p>
         <p><img class="icon" src="../en/images/ic_expand_more.png"> ic_expand_more.</p>
         <p><img class="icon" src="../en/images/ic_file_download.png"> ic_file_download.</p>
index 4d742f155c668a49132cabee9454b9af609301c8..18a7edb06cd8aad7e2c4e6ba8b1e45e1cb636ba4 100644 (file)
@@ -55,6 +55,9 @@
             <img class="left" src="images/javascript_enabled.png">
             are derived from ic_security and ic_language, which are part of the <a href="https://material.io/icons/">Android Material icon set</a> and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
             The full text of the license is below. Modifications copyright © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p><img class="left" src="images/clear_and_exit.png">
+            is derived from ic_exit_to_app, which is part of the <a href="https://material.io/icons/">Android Material icon set</a> and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
+            The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="images/orbot.png"> orbot is a modified version of <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">the status icon from the Orbot project</a>, which is copyright
             2009-2010 Nathan Freitas, The Guardian Project. It is released under the <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">3-clause BSD license</a>.
             The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
@@ -77,7 +80,6 @@
         <p><img class="icon" src="images/ic_dns.png"> ic_dns.</p>
         <p><img class="icon" src="images/ic_donut_small.png"> ic_donut_small.</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>
         <p><img class="icon" src="images/ic_expand_less.png"> ic_expand_less.</p>
         <p><img class="icon" src="images/ic_expand_more.png"> ic_expand_more.</p>
         <p><img class="icon" src="images/ic_file_download.png"> ic_file_download.</p>
diff --git a/app/src/main/assets/en/images/clear_and_exit.png b/app/src/main/assets/en/images/clear_and_exit.png
new file mode 100644 (file)
index 0000000..b9fdd99
Binary files /dev/null and b/app/src/main/assets/en/images/clear_and_exit.png differ
diff --git a/app/src/main/assets/en/images/ic_exit_to_app.png b/app/src/main/assets/en/images/ic_exit_to_app.png
deleted file mode 100644 (file)
index fae891f..0000000
Binary files a/app/src/main/assets/en/images/ic_exit_to_app.png and /dev/null differ
index 47836aa38379ecb341d1157f697759157e5db1c3..9460f56402427a07e16d33a19747540a2e2db496 100644 (file)
             derivan de ic_security y de ic_language, que son parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a> y son liberados bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>.
             El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. Las imágenes resultantes se liberan bajo la
             <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
+        <p><img class="left" src="../en/images/clear_and_exit.png">
+            deriva de ic_exit_to_app, que es parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a> y es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>.
+            El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. El imagen resultante se libera bajo la
+            <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
         <p><img class="left" src="../en/images/orbot.png"> orbot es una versión modificada del <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">icono de estado del proyecto Orbot</a>,
             que tiene copyright 2009-2010 por Nathan Freitas, The Guardian Project. Es liberado bajo la <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">licencia BSD modificada (de 3 cláusulas)</a>.
             El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             La imagen resultante se libera bajo la <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
         <p><img class="left" src="../en/images/cookie.png"> cookie fue creado por Google. Es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">licencia Apache 2.0</a> y puede ser descargado desde
             <a href="https://materialdesignicons.com/icon/cookie">Material Design Icons</a>. Está sin cambios, excepto por la información de diseño como el color y el tamaño.</p>
-        <p>Los siguientes iconos proceden de <a href="https://material.io/icons/">Android Material icon set</a>, el cual es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">licencia Apache 2.0</a>.
+        <p>Los siguientes iconos proceden de <a href="https://material.io/icons/">conjunto de iconos Android Material</a>, el cual es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">licencia Apache 2.0</a>.
             Están sin cambios, excepto por la información de diseño como el color y el tamaño. Algunos de ellos se han renombrado para que coincida con su uso en el código. Los iconos y los nombres originales se muestran a continuación.</p>
         <p><img class="icon" src="../en/images/ic_add.png"> ic_add.</p>
         <p><img class="icon" src="../en/images/ic_arrow_back.png"> ic_arrow_back.</p>
@@ -81,7 +85,6 @@
         <p><img class="icon" src="../en/images/ic_dns.png"> ic_dns.</p>
         <p><img class="icon" src="../en/images/ic_donut_small.png"> ic_donut_small.</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>
         <p><img class="icon" src="../en/images/ic_expand_less.png"> ic_expand_less.</p>
         <p><img class="icon" src="../en/images/ic_expand_more.png"> ic_expand_more.</p>
         <p><img class="icon" src="../en/images/ic_file_download.png"> ic_file_download.</p>
index 44374ba5c68b7e140817f974259d22f269d47c03..899cd65e8499351916ef9e5c639e64c32d555861 100644 (file)
@@ -62,6 +62,9 @@
             sono state derivate da ic_security e ic_language, che fanno parte dell'<a href="https://material.io/icons/">Android Material icon set</a> e sono state rilasciate sotto <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>.
             Il testo completo della Licenza è riportato di seguito. Copyright delle modifiche © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. Le immagini risultanti sono rilasciate sotto
             <a href="https://www.gnu.org/licenses/gpl-3.0.html">Licenza GPLv3+</a>.</p>
+        <p><img class="left" src="../en/images/clear_and_exit.png">
+            is derived from ic_exit_to_app, which is part of the <a href="https://material.io/icons/">Android Material icon set</a> and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
+            The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="../en/images/orbot.png"> orbot è una versione modificata della <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">icona di stato del progetto Orbot</a>, il cui copyright
             è 2009-2010 Nathan Freitas, The Guardian Project. E' rilasciata sotto <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">3-clause BSD license</a>. Il testo completo della Licenza è riportato di seguito.
             Copyright delle modifiche © 2017<a href="mailto:soren@stoutner.com">Soren Stoutner</a>. L'immagine risultante è rilasciata sotto <a href="https://www.gnu.org/licenses/gpl-3.0.html">Licenza GPLv3+</a>.</p>
@@ -84,7 +87,6 @@
         <p><img class="icon" src="../en/images/ic_dns.png"> ic_dns.</p>
         <p><img class="icon" src="../en/images/ic_donut_small.png"> ic_donut_small.</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>
         <p><img class="icon" src="../en/images/ic_expand_less.png"> ic_expand_less.</p>
         <p><img class="icon" src="../en/images/ic_expand_more.png"> ic_expand_more.</p>
         <p><img class="icon" src="../en/images/ic_file_download.png"> ic_file_download.</p>
index f826f6d130ab63e969ac5c6ae31e723ea0af2441..36650cd7848df99fc5fec2b27ebba51fdf166399 100644 (file)
@@ -362,9 +362,6 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
                 } else {  // The user has stopped editing `urlTextBox`.
                     // Reapply the highlighting.
                     highlightUrlText();
-
-                    // Scroll to the beginning of the text.
-                    urlTextBox.setScrollX(0);
                 }
             }
         });
diff --git a/app/src/main/res/drawable/clear_and_exit.xml b/app/src/main/res/drawable/clear_and_exit.xml
new file mode 100644 (file)
index 0000000..24a6a54
--- /dev/null
@@ -0,0 +1,26 @@
+<!-- `clear_and_exit.xml` is derived from ic_exit_to_app, which is part of the Android Material icon set.  It is released under the Apache License 2.0.
+    Modifications copyright © 2017 Soren Stoutner <soren@stoutner.com>.  The resulting image is released under the GPLv3+ license. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:width="24dp"
+    android:autoMirrored="true"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M2.096,3.377H15.51c1.064,0 1.916,0.862 1.916,1.916V9.126H15.51V5.293H2.096V18.707H15.51v-3.833h1.916v3.833c0,1.054 -0.853,1.916 -1.916,1.916H2.096c-1.054,0 -1.916,-0.862 -1.916,-1.916V5.293c0,-1.054 0.862,-1.916 1.916,-1.916z"
+        android:strokeWidth="0.95815897" />
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="m17.845,15.44 l1.351,1.351 4.791,-4.791 -4.791,-4.791 -1.351,1.351 2.472,2.482H8.096v1.916H20.317Z"
+        android:strokeWidth="0.95815897" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/exit.xml b/app/src/main/res/drawable/exit.xml
deleted file mode 100644 (file)
index 49b5841..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `exit.xml` comes from the Android Material icon set, where it is called `ic_exit_to_app`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:autoMirrored="true"
-    tools:ignore="VectorRaster" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z" />
-</vector>
\ No newline at end of file
index 59d086ddf3ebd0feb24d6644b2d3de5492c3ebb8..16bdf8f69ad3af80bbbd2c19dd25eda9758c1802 100644 (file)
@@ -98,7 +98,7 @@
         <item
             android:id="@+id/clearAndExit"
             android:title="@string/clear_and_exit"
-            android:icon="@drawable/exit"
+            android:icon="@drawable/clear_and_exit"
             android:orderInCategory="110" />
     </group>
 </menu>
\ No newline at end of file