]> gitweb.stoutner.com Git - PrivacyBrowserAndroid.git/commitdiff
Add icons to the menu items.
authorSoren Stoutner <soren@stoutner.com>
Thu, 22 Oct 2015 22:27:37 +0000 (15:27 -0700)
committerSoren Stoutner <soren@stoutner.com>
Thu, 22 Oct 2015 22:27:37 +0000 (15:27 -0700)
15 files changed:
app/src/main/java/com/stoutner/privacybrowser/Webview.java
app/src/main/res/drawable-hdpi/ic_back.png [new file with mode: 0644]
app/src/main/res/drawable-hdpi/ic_forward.png [new file with mode: 0644]
app/src/main/res/drawable-hdpi/ic_home_black_24dp.png [new file with mode: 0644]
app/src/main/res/drawable-mdpi/ic_back.png [new file with mode: 0644]
app/src/main/res/drawable-mdpi/ic_forward.png [new file with mode: 0644]
app/src/main/res/drawable-mdpi/ic_home_black_24dp.png [new file with mode: 0644]
app/src/main/res/drawable-xhdpi/ic_back.png [new file with mode: 0644]
app/src/main/res/drawable-xhdpi/ic_forward.png [new file with mode: 0644]
app/src/main/res/drawable-xhdpi/ic_home_black_24dp.png [new file with mode: 0644]
app/src/main/res/drawable-xxhdpi/ic_back.png [new file with mode: 0644]
app/src/main/res/drawable-xxhdpi/ic_forward.png [new file with mode: 0644]
app/src/main/res/drawable-xxhdpi/ic_home_black_24dp.png [new file with mode: 0644]
app/src/main/res/menu/menu_webview.xml
build.gradle

index ce6fdb88ebb998db6a8f6cd30c59a328e6a802b6..a783262c336d41e7383432081dc6d58256f931ba 100644 (file)
@@ -198,8 +198,6 @@ public class Webview extends AppCompatActivity {
 
     public void loadUrlFromTextBox(View view) throws UnsupportedEncodingException {
         // Get the text from urlTextInput and convert it to a string.
-        final EditText urlTextBox = (EditText) findViewById(R.id.urlTextBox);
-        final WebView mainWebView = (WebView) findViewById(R.id.mainWebView);
         String unformattedUrlString = urlTextBox.getText().toString();
         URL unformattedUrl = null;
         Uri.Builder formattedUri = new Uri.Builder();
diff --git a/app/src/main/res/drawable-hdpi/ic_back.png b/app/src/main/res/drawable-hdpi/ic_back.png
new file mode 100644 (file)
index 0000000..2e13b17
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_back.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_forward.png b/app/src/main/res/drawable-hdpi/ic_forward.png
new file mode 100644 (file)
index 0000000..0258cbe
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_forward.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_home_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_home_black_24dp.png
new file mode 100644 (file)
index 0000000..a1ba11a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_home_black_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_back.png b/app/src/main/res/drawable-mdpi/ic_back.png
new file mode 100644 (file)
index 0000000..6f6cd20
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_back.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_forward.png b/app/src/main/res/drawable-mdpi/ic_forward.png
new file mode 100644 (file)
index 0000000..1c249ef
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_forward.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_home_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_home_black_24dp.png
new file mode 100644 (file)
index 0000000..3995d50
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_home_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_back.png b/app/src/main/res/drawable-xhdpi/ic_back.png
new file mode 100644 (file)
index 0000000..b9096a7
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_back.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_forward.png b/app/src/main/res/drawable-xhdpi/ic_forward.png
new file mode 100644 (file)
index 0000000..6e81f73
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_forward.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_home_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_home_black_24dp.png
new file mode 100644 (file)
index 0000000..2fb1e5d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_home_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_back.png b/app/src/main/res/drawable-xxhdpi/ic_back.png
new file mode 100644 (file)
index 0000000..99615cc
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_back.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_forward.png b/app/src/main/res/drawable-xxhdpi/ic_forward.png
new file mode 100644 (file)
index 0000000..fc68e95
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_forward.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_home_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_home_black_24dp.png
new file mode 100644 (file)
index 0000000..fc2bd7e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_home_black_24dp.png differ
index 8dcf42d42ab1db4f532c145473870dec3638177b..2a8923dcdfc3e3326f40300912d4fd2842ad96d1 100644 (file)
@@ -8,17 +8,20 @@
         android:id="@+id/home"
         android:title="@string/home"
         android:orderInCategory="100"
+        android:icon="@drawable/ic_home_black_24dp"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/back"
         android:title="@string/back"
         android:orderInCategory="200"
+        android:icon="@drawable/ic_back"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/forward"
         android:title="@string/forward"
         android:orderInCategory="300"
+        android:icon="@drawable/ic_forward"
         app:showAsAction="ifRoom" />
 </menu>
index 1b7886d148cb5729f5b4829af050c3d49efce033..c6371d6cdcc0203ee574baa951d0ccccfd5f5e6c 100644 (file)
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:1.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files