Update icons. Release 1.0.

diff --git a/app/app.iml b/app/app.iml
index 3fa1af5aaa9dcdef977c1aa2db79c117f1c2467f..877c12aa2aa49a519768c9ab0fe0a8fcac344b64 100644 (file)
--- a/app/app.iml
+++ b/app/app.iml
@@ -8,39 +8,48 @@
     </facet>
     <facet type="android" name="Android">
       <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="freeRelease" />
+        <option name="SELECTED_BUILD_VARIANT" value="freeDebug" />
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleFreeRelease" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileFreeReleaseSources" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleFreeDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileFreeDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleFreeDebugAndroidTest" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileFreeDebugAndroidTestSources" />
         <afterSyncTasks>
-          <task>generateFreeReleaseSources</task>
+          <task>generateFreeDebugAndroidTestSources</task>
+          <task>generateFreeDebugSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/free/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/standard/res" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/free/release" />
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/free/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/free/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/free/release" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/free/release" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/free/release" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/free/release" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/free/release" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/free/release" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/freeRelease/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/freeRelease/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/freeRelease/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/freeRelease/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/freeRelease/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/freeRelease/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/freeRelease/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/free/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/free/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/free/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/free/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/free/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/free/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/freeDebug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/freeDebug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/freeDebug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/freeDebug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/freeDebug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/freeDebug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/freeDebug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/free/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/free/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/free/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/free/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/free/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/free/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/free/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/free/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/free/assets" type="java-resource" />
@@ -55,13 +64,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />

diff --git a/app/src/free/privacy_browser-web.png b/app/src/free/privacy_browser-web.png
new file mode 100644 (file)
index 0000000..d399c6a
Binary files /dev/null and b/app/src/free/privacy_browser-web.png differ

diff --git a/app/src/free/res/mipmap-hdpi/privacy_browser.png b/app/src/free/res/mipmap-hdpi/privacy_browser.png
new file mode 100644 (file)
index 0000000..549612a
Binary files /dev/null and b/app/src/free/res/mipmap-hdpi/privacy_browser.png differ

diff --git a/app/src/free/res/mipmap-mdpi/privacy_browser.png b/app/src/free/res/mipmap-mdpi/privacy_browser.png
new file mode 100644 (file)
index 0000000..25f6e1d
Binary files /dev/null and b/app/src/free/res/mipmap-mdpi/privacy_browser.png differ

diff --git a/app/src/free/res/mipmap-xhdpi/privacy_browser.png b/app/src/free/res/mipmap-xhdpi/privacy_browser.png
new file mode 100644 (file)
index 0000000..7292bc8
Binary files /dev/null and b/app/src/free/res/mipmap-xhdpi/privacy_browser.png differ

diff --git a/app/src/free/res/mipmap-xxhdpi/privacy_browser.png b/app/src/free/res/mipmap-xxhdpi/privacy_browser.png
new file mode 100644 (file)
index 0000000..47480e8
Binary files /dev/null and b/app/src/free/res/mipmap-xxhdpi/privacy_browser.png differ

diff --git a/app/src/free/res/mipmap-xxxhdpi/privacy_browser.png b/app/src/free/res/mipmap-xxxhdpi/privacy_browser.png
new file mode 100644 (file)
index 0000000..fb45fe7
Binary files /dev/null and b/app/src/free/res/mipmap-xxxhdpi/privacy_browser.png differ

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 773f0a88a1c8ad151d6f63c790d66b0082735dc5..379bc3c86807f9d0aa41cd6dae3df32477a2cee5 100644 (file)
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -33,7 +33,7 @@
     <!-- on API >= 23, app data is automatically backed up to Google cloud servers unless android:allowBackup="false" and android:fullBackupContent="false" is set. -->
     <application
         android:label="@string/privacy_browser"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/privacy_browser"
         android:theme="@style/AppTheme"
         android:allowBackup="false"
         android:fullBackupContent="false" >

diff --git a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java
index 757b2c87895b21b935d5c9f4b2e786b3881b01bb..78138237289cf308b1588c84d539fa25512985de 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java
@@ -288,7 +288,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome
                 }
 
                 downloadManager.enqueue(requestUri);
-                Toast.makeText(mainWebViewActivity, "Download started", Toast.LENGTH_SHORT).show();
+                Toast.makeText(mainWebViewActivity, R.string.download_started, Toast.LENGTH_SHORT).show();
             }
         });
 

diff --git a/app/src/main/privacy_browser-web.png b/app/src/main/privacy_browser-web.png
new file mode 100644 (file)
index 0000000..72d585a
Binary files /dev/null and b/app/src/main/privacy_browser-web.png differ

diff --git a/app/src/main/res/drawable-hdpi/ic_language_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_language_black_24dp.png
deleted file mode 100644 (file)
index 3f12777..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_language_black_24dp.png and /dev/null differ

diff --git a/app/src/main/res/drawable-mdpi/ic_language_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_language_black_24dp.png
deleted file mode 100644 (file)
index 424701c..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_language_black_24dp.png and /dev/null differ

diff --git a/app/src/main/res/drawable-xhdpi/ic_language_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_language_black_24dp.png
deleted file mode 100644 (file)
index 33017e1..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_language_black_24dp.png and /dev/null differ

diff --git a/app/src/main/res/drawable-xxhdpi/ic_language_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_language_black_24dp.png
deleted file mode 100644 (file)
index a376c13..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_language_black_24dp.png and /dev/null differ

diff --git a/app/src/main/res/drawable/javascript_enabled.xml b/app/src/main/res/drawable/javascript_enabled.xml
index b58a56140a40e48d740b92eabe5752ee5ef121c6..633f17eef1cbdcfb0d2b58940811f086d0e8bb27 100644 (file)
--- a/app/src/main/res/drawable/javascript_enabled.xml
+++ b/app/src/main/res/drawable/javascript_enabled.xml
@@ -4,10 +4,10 @@
   Changes to fill color were made by Soren Stoutner in 2016. -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:width="26dp"
+        android:height="26dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="26.0">
 
     <!-- The fillColor must be hardcoded in this file unitl the minimum API is >= 22.  Then the resources in colors.xml may be used instead. -->
     <path

diff --git a/app/src/main/res/drawable/privacy_mode.xml b/app/src/main/res/drawable/privacy_mode.xml
index 5b25cc9d04c159be5d4b53eb03e475f74263a385..453b210a1b295675c6f2b7945671cb158f487837 100644 (file)
--- a/app/src/main/res/drawable/privacy_mode.xml
+++ b/app/src/main/res/drawable/privacy_mode.xml
@@ -1,13 +1,13 @@
 <!--
   privacy_mode.xml is part of the Android Material icon set, where it is named ic_visibility_off.
   It is released under the CC-BY license <https://creativecommons.org/licenses/by/4.0/>.
-  Changes to fill color were made by Soren Stoutner in 2016. -->
+  Changes to fill color and size were made by Soren Stoutner in 2016. -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:width="26dp"
+        android:height="26dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="26.0">
 
     <!-- The fillColor must be hardcoded in this file unitl the minimum API is >= 22.  Then the resources in colors.xml may be used instead. -->
     <path

diff --git a/app/src/main/res/drawable/warning.xml b/app/src/main/res/drawable/warning.xml
index dbd18296ad5c8214e12c95641722d557a9920ed1..16e16ce83a34fd274263457055cce59b36dd4701 100644 (file)
--- a/app/src/main/res/drawable/warning.xml
+++ b/app/src/main/res/drawable/warning.xml
@@ -1,13 +1,13 @@
 <!--
   warning.xml is part of the Android Material icon set, where it is named ic_visibility.
   It is released under the CC-BY license <https://creativecommons.org/licenses/by/4.0/>.
-  Changes to fill color were made by Soren Stoutner in 2016. -->
+  Changes to fill color and size were made by Soren Stoutner in 2016. -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:width="26dp"
+        android:height="26dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="26.0">
 
     <!-- The fillColor must be hardcoded in this file unitl the minimum API is >= 22.  Then the resources in colors.xml may be used instead. -->
     <path

diff --git a/app/src/main/res/drawable/world.xml b/app/src/main/res/drawable/world.xml
new file mode 100644 (file)
index 0000000..c923d9a
--- /dev/null
+++ b/app/src/main/res/drawable/world.xml
@@ -0,0 +1,14 @@
+<!--
+  world.xml is part of the Android Material icon set, where it is named ic_language.
+  It is released under the CC-BY license <https://creativecommons.org/licenses/by/4.0/>.
+  Changes to fill color and size were made by Soren Stoutner in 2016. -->
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="26dp"
+    android:width="26dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <path android:fillColor="#FF9E9E9E" android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zm6.93,6h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2H4.26zm0.82,2h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zm2.95,-8H5.08c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14H9.66c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zm0.25,5.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
+</vector>

diff --git a/app/src/main/res/layout/url_bar.xml b/app/src/main/res/layout/url_bar.xml
index b5fd028f427be4118fa433742d925809dd639221..b9ac404f31e5323aadd24c4a71b9f9843821aeeb 100644 (file)
--- a/app/src/main/res/layout/url_bar.xml
+++ b/app/src/main/res/layout/url_bar.xml
@@ -35,7 +35,7 @@
         <!-- layout_width and layout_height of 26dp matches the AppBar icons. -->
         <ImageView
             android:id="@+id/favoriteIcon"
-            android:src="@drawable/ic_language_black_24dp"
+            android:src="@drawable/world"
             android:layout_width="26dp"
             android:layout_height="26dp"
             android:layout_centerVertical="true"

diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644 (file)
index e51dab7..0000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ

diff --git a/app/src/main/res/mipmap-hdpi/privacy_browser.png b/app/src/main/res/mipmap-hdpi/privacy_browser.png
new file mode 100644 (file)
index 0000000..4205bfa
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/privacy_browser.png differ

diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644 (file)
index ea26271..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ

diff --git a/app/src/main/res/mipmap-mdpi/privacy_browser.png b/app/src/main/res/mipmap-mdpi/privacy_browser.png
new file mode 100644 (file)
index 0000000..d49a5f7
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/privacy_browser.png differ

diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644 (file)
index ef473ed..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ

diff --git a/app/src/main/res/mipmap-xhdpi/privacy_browser.png b/app/src/main/res/mipmap-xhdpi/privacy_browser.png
new file mode 100644 (file)
index 0000000..413dbb1
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/privacy_browser.png differ

diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644 (file)
index 3a72e5e..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ

diff --git a/app/src/main/res/mipmap-xxhdpi/privacy_browser.png b/app/src/main/res/mipmap-xxhdpi/privacy_browser.png
new file mode 100644 (file)
index 0000000..1bae9aa
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/privacy_browser.png differ

diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644 (file)
index e72c83d..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ

diff --git a/app/src/main/res/mipmap-xxxhdpi/privacy_browser.png b/app/src/main/res/mipmap-xxxhdpi/privacy_browser.png
new file mode 100644 (file)
index 0000000..8c957b0
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/privacy_browser.png differ

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 720731f06e3c5ffafa64671fcb6ed6a66e660f36..4a8f23650db08bbf82a4dffb89087ec5a5a07384 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,6 +28,7 @@
 
     <!-- MainWebViewActivity. -->
     <string name="privacy_mode">Privacy Mode</string>
+    <string name="download_started">Download started</string>
 
     <!-- Custom App Bar. -->
     <string name="favorite_icon">Favorite Icon</string>