Added icons with string to navigation views

JMApps · Mar 11, 2020 · 801ac2d · 801ac2d
1 parent 5b0af8e
commit 801ac2d
Show file tree

Hide file tree

Showing 18 changed files with 306 additions and 50 deletions.
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
diff --git a/app/src/main/kotlin/jmapps/arabicinyourhands/ui/activities/MainActivity.kt b/app/src/main/kotlin/jmapps/arabicinyourhands/ui/activities/MainActivity.kt
@@ -59,8 +59,15 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
 
     override fun onNavigationItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            R.id.nav_home -> {
-            }
+            R.id.nav_tools -> {}
+
+            R.id.nav_night_mode -> {}
+
+            R.id.nav_about_us -> {}
+
+            R.id.nav_rate -> {}
+
+            R.id.nav_share -> {}
 
             R.id.bottom_nav_first_volume -> otherPresenterImpl.replaceFragment(FirstVolumeFragment())
 

diff --git a/app/src/main/res/drawable/ic_about_us.xml b/app/src/main/res/drawable/ic_about_us.xml
@@ -0,0 +1,44 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:pathData="M304,487H87c-35.8,0 -65,-29.3 -65,-65V88c0,-35.8 29.3,-65 65,-65h217c35.8,0 65,29.3 65,65v334C369,457.7 339.7,487 304,487z"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:pathData="M437,23L439,487"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:pathData="M453,50L453,143"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:pathData="M88.5,96.5L232.5,96.5"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M83,206L305,206"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M83,257L305,257"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M83,308L305,308"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_first_volume.xml b/app/src/main/res/drawable/ic_first_volume.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:pathData="M19,140v261.3c0,52.1 42.6,94.7 94.7,94.7H375"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:pathData="M434.1,20H138.9C104.3,20 76,48.3 76,82.9v295.2c0,34.6 28.3,62.9 62.9,62.9h295.2c34.6,0 62.9,-28.3 62.9,-62.9V82.9C497,48.3 468.7,20 434.1,20z"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#626262"
+        android:pathData="M251.4,91.4l4.5,0.6c12.1,19.8 31.9,40.5 46.2,57.4l-15.6,16.6c21.7,45.3 45,130.8 45,175.4c0,15.3 -12.8,39.2 -25.5,56.8l-5.1,-2.9c1.6,-7.7 2.2,-15.9 2.2,-24.9c0,-66 -39.2,-168.4 -76.2,-242.1C234.8,115.7 243.1,102.6 251.4,91.4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_night_mode.xml b/app/src/main/res/drawable/ic_night_mode.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:pathData="M25.2,130.3c-7.6,-11.6 1.5,-26.9 15.4,-25.8l52.7,4.1c5.5,0.4 10.9,-1.9 14.3,-6.1L141,61.4c8.7,-10.8 26,-6.8 29.3,6.6l12.3,51.4c1.3,5.4 5.1,9.7 10.3,11.7l49.4,19c12.9,5 14.6,22.7 2.7,29.9l-45.1,27.6c-4.7,2.9 -7.7,7.9 -8,13.4l-2.8,52.8c-0.7,13.9 -17.1,20.9 -27.6,11.8l-40.2,-34.4c-4.2,-3.6 -9.9,-4.9 -15.2,-3.4L55,261.7c-13.4,3.6 -25.1,-9.8 -19.8,-22.6l20.2,-48.9c2.1,-5.1 1.6,-10.9 -1.4,-15.5L25.2,130.3z"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:pathData="M492,256c0,130.3 -105.7,236 -236,236c-66.5,0 -126.5,-27.5 -169.4,-71.7C223.7,410.6 332,294.6 332,153c0,-46.8 -11.8,-90.7 -32.5,-129C409,44.4 492,140.5 492,256z"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_one.xml b/app/src/main/res/drawable/ic_one.xml
diff --git a/app/src/main/res/drawable/ic_rate.xml b/app/src/main/res/drawable/ic_rate.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:pathData="M380.6,477.4l-115.4,-60.5c-5.7,-3 -12.4,-3 -18,0l-115.3,60.8c-14.2,7.5 -30.8,-4.6 -28.1,-20.4l21.9,-128.5c1.1,-6.3 -1,-12.7 -5.6,-17.2l-93.4,-90.9C15,209.5 21.4,190 37.3,187.6l129,-18.9c6.3,-0.9 11.8,-4.9 14.6,-10.6l57.6,-116.9c7.1,-14.4 27.6,-14.4 34.8,0L330.9,158c2.8,5.7 8.3,9.7 14.6,10.6l129,18.6c15.9,2.3 22.3,21.8 10.8,33.1l-93.2,91.1c-4.6,4.5 -6.6,10.9 -5.6,17.2l22.2,128.4C411.4,472.7 394.8,484.8 380.6,477.4z"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_second_volume.xml b/app/src/main/res/drawable/ic_second_volume.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="569"
+    android:viewportHeight="512">
+    <path
+        android:pathData="M198,496h261.3c52.1,0 94.7,-42.6 94.7,-94.7V140"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:pathData="M16,140v261.3c0,52.1 42.6,94.7 94.7,94.7H372"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:pathData="M138.9,20h295.2c34.6,0 62.9,28.3 62.9,62.9v295.2c0,34.6 -28.3,62.9 -62.9,62.9H138.9c-34.6,0 -62.9,-28.3 -62.9,-62.9V82.9C76,48.3 104.3,20 138.9,20z"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#626262"
+        android:pathData="M264.8,187.3c14.9,42.7 27.2,84.9 27.2,135.8c0,16.1 -1.3,26.9 -26.9,65.9l-5.4,-3.2c2.9,-12.3 4.1,-25.3 4.1,-38.9c0,-67.1 -32,-148.5 -65.2,-228.9c7.3,-12.7 13.6,-23.4 20.6,-32.9h5.4c4.4,13.3 14.2,33.2 21.5,42.4c14.6,18.4 44,22.5 60.5,22.5c21.5,0 51,-11.4 56.4,-65.2c5.4,1.3 9.5,2.8 13.3,4.4c0.3,4.8 0.6,9.5 0.6,13.9c0,53.8 -24.7,89 -74.1,89c-11.1,0 -23.7,-1.9 -37.4,-5.7L264.8,187.3z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
@@ -0,0 +1,36 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:pathData="M397.5,405.1m-88.5,0a88.5,88.5 0,1 1,177 0a88.5,88.5 0,1 1,-177 0"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:pathData="M107.5,256m-88.5,0a88.5,88.5 0,1 1,177 0a88.5,88.5 0,1 1,-177 0"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:pathData="M397.5,106.9m-88.5,0a88.5,88.5 0,1 1,177 0a88.5,88.5 0,1 1,-177 0"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:pathData="M318.8,147.4L186.2,215.5"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:pathData="M318.8,364.6L186.2,296.5"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_third_volume.xml b/app/src/main/res/drawable/ic_third_volume.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:pathData="M141,496h261.3c52.1,0 94.7,-42.6 94.7,-94.7V140"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:pathData="M81.9,20h295.2c34.6,0 62.9,28.3 62.9,62.9v295.2c0,34.6 -28.3,62.9 -62.9,62.9H81.9C47.3,441 19,412.7 19,378.1V82.9C19,48.3 47.3,20 81.9,20z"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#626262"
+        android:pathData="M190.7,186.1c15.3,43.9 28.6,89.8 28.6,142.2c0,18.9 0,27 -29,65.7l-5.5,-3.3c4.9,-13.7 5.5,-24.1 5.5,-38.1c0,-65.1 -31.9,-152.6 -66.1,-235.3c7.5,-13 14,-24.1 21.2,-33.8h5.5c4.6,13.7 14.6,34.2 22.1,43.6c11.1,14 34.2,19.5 44.9,19.5c18.6,0 29.9,-8.8 29.9,-39.4c0,-5.9 -0.3,-12.4 -1.3,-19.9c4.6,-2 9.1,-3.6 13.7,-4.9c8.1,36.5 18.6,48.8 33.8,48.8c12.7,0 25.7,-10.1 25.7,-34.8c0,-3.9 -0.3,-8.5 -1,-13c5.2,0 10.4,1 15.6,2.6c1.6,9.4 2.6,17.9 2.6,26c0,39.4 -19.2,62.8 -43.6,62.8c-10.1,0 -20.8,-3.9 -31.9,-12.4l-1.3,0.3c-7.2,18.9 -25.1,28.3 -44.3,28.3c-8.1,0 -16.9,-2 -25.1,-5.9L190.7,186.1z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_three.xml b/app/src/main/res/drawable/ic_three.xml
diff --git a/app/src/main/res/drawable/ic_tools.xml b/app/src/main/res/drawable/ic_tools.xml
@@ -0,0 +1,86 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:pathData="M331.7,289.1L331.7,224.9"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M181.3,287.1L181.3,226.9"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M331.7,437.5v33.1c0,14 -11.4,25.4 -25.4,25.4h-99.5c-14,0 -25.4,-11.4 -25.4,-25.4v-31.1"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M181.3,74.5V41.4c0,-14 11.4,-25.4 25.4,-25.4h99.5c14,0 25.4,11.4 25.4,25.4v35.1"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M440.5,180.3h31.1c14,0 25.4,11.4 25.4,25.4v99.5c0,14 -11.4,25.4 -25.4,25.4h-34.1"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M74.5,180.3H42.4c-14,0 -25.4,11.4 -25.4,25.4v99.5c0,14 11.4,25.4 25.4,25.4h35.1"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M290.1,330.7L224.9,330.7"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M287.1,180.3L227.9,180.3"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M331.7,224.9L287.1,180.3"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M437.5,330.7l23.9,23.9c9.9,9.9 9.9,26.1 0,35.9L391,460.9c-9.9,9.9 -26.1,9.9 -35.9,0l-23.4,-23.4"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M224.9,330.7L181.3,287.1"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M74.5,180.3l-22.9,-22.9c-9.9,-9.9 -9.9,-26.1 0,-35.9L122,51.1c9.9,-9.9 26.1,-9.9 35.9,0l23.4,23.4"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M331.7,76.5l23.4,-23.4c9.9,-9.9 26.1,-9.9 35.9,0l70.4,70.4c9.9,9.9 9.9,26.1 0,35.9l-20.9,20.9"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M227.9,180.3L181.3,226.9"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M331.7,289.1L290.1,330.7"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M77.5,330.7l-25.9,25.9c-9.9,9.9 -9.9,26.1 0,35.9l70.4,70.4c9.9,9.9 26.1,9.9 35.9,0l23.4,-23.4"
+        android:strokeWidth="30"
+        android:strokeColor="#626262"
+        android:strokeLineCap="round" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_two.xml b/app/src/main/res/drawable/ic_two.xml
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
@@ -5,16 +5,30 @@
 
     <group android:checkableBehavior="single">
         <item
-            android:id="@+id/nav_home"
-            android:title="Домой" />
-
+            android:id="@+id/nav_tools"
+            android:icon="@drawable/ic_tools"
+            android:title="@string/action_nav_tools" />
+        <item
+            android:id="@+id/nav_night_mode"
+            android:checkable="true"
+            android:icon="@drawable/ic_night_mode"
+            android:title="@string/action_nav_night_mode" />
     </group>
 
-    <item android:title="Дополнительно">
+    <item android:title="@string/action_nav_additionally">
         <menu>
+            <item
+                android:id="@+id/nav_about_us"
+                android:icon="@drawable/ic_about_us"
+                android:title="@string/action_nav_about_us" />
+            <item
+                android:id="@+id/nav_rate"
+                android:icon="@drawable/ic_rate"
+                android:title="@string/action_nav_rate" />
             <item
                 android:id="@+id/nav_share"
-                android:title="Поделиться" />
+                android:icon="@drawable/ic_share"
+                android:title="@string/action_nav_share" />
         </menu>
     </item>
 

diff --git a/app/src/main/res/menu/bottom_navigation_main.xml b/app/src/main/res/menu/bottom_navigation_main.xml
@@ -2,14 +2,14 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/bottom_nav_first_volume"
-        android:icon="@drawable/ic_one"
+        android:icon="@drawable/ic_first_volume"
         android:title="" />
     <item
         android:id="@+id/bottom_nav_second_volume"
-        android:icon="@drawable/ic_two"
+        android:icon="@drawable/ic_second_volume"
         android:title="" />
     <item
         android:id="@+id/bottom_nav_third_volume"
-        android:icon="@drawable/ic_three"
+        android:icon="@drawable/ic_third_volume"
         android:title="" />
 </menu>