Use vector icon

ruby-china · Aug 25, 2016 · 953b2ad · 953b2ad
1 parent 836688c
commit 953b2ad
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 2 deletions.
diff --git a/app/src/main/java/org/ruby_china/rubychina/MainActivity.java b/app/src/main/java/org/ruby_china/rubychina/MainActivity.java
@@ -42,6 +42,7 @@ protected void onCreate(Bundle savedInstanceState) {
         NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
         navigationView.setNavigationItemSelectedListener(this);
 
+        navigationView.setItemIconTintList(null);
         turbolinksView = (TurbolinksView) findViewById(R.id.turbolinks_view);
 
         TurbolinksSession.getDefault(this).setDebugLoggingEnabled(true);

diff --git a/app/src/main/res/drawable/ic_add_white_24dp.xml b/app/src/main/res/drawable/ic_add_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_add_white_48dp.png b/app/src/main/res/drawable/ic_add_white_48dp.png
diff --git a/app/src/main/res/drawable/ic_share_white_24dp.xml b/app/src/main/res/drawable/ic_share_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_share_white_48dp.png b/app/src/main/res/drawable/ic_share_white_48dp.png
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -39,7 +39,7 @@
             android:layout_gravity="bottom|end"
             android:layout_margin="16dp"
             android:onClick="newTopic"
-            android:src="@drawable/ic_add_white_48dp" />
+            android:src="@drawable/ic_add_white_24dp" />
 
     </android.support.design.widget.CoordinatorLayout>
 

diff --git a/app/src/main/res/menu/topic_menu.xml b/app/src/main/res/menu/topic_menu.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/action_topic_share"
-        android:icon="@drawable/ic_share_white_48dp"
+        android:icon="@drawable/ic_share_white_24dp"
         android:title="分享"
         app:showAsAction="ifRoom"/>
 </menu>