feat: navigation icons update

PavloNetrebchuk · PavloNetrebchuk · commit 6dd621f7ae77 · 2025-03-28T12:23:16.000+02:00
diff --git a/app/src/main/java/org/openedx/app/MainFragment.kt b/app/src/main/java/org/openedx/app/MainFragment.kt
@@ -104,16 +104,16 @@ class MainFragment : Fragment(R.layout.fragment_main) {
             R.id.fragmentDownloads to resources.getString(R.string.app_navigation_downloads),
             R.id.fragmentProfile to resources.getString(R.string.app_navigation_profile),
         )
-        val tabIcons = mapOf(
-            R.id.fragmentLearn to R.drawable.app_ic_rows,
-            R.id.fragmentDiscover to R.drawable.app_ic_home,
-            R.id.fragmentDownloads to R.drawable.app_ic_download_cloud,
-            R.id.fragmentProfile to R.drawable.app_ic_profile
+        val tabIconSelectors = mapOf(
+            R.id.fragmentLearn to R.drawable.app_ic_learn_selector,
+            R.id.fragmentDiscover to R.drawable.app_ic_discover_selector,
+            R.id.fragmentDownloads to R.drawable.app_ic_downloads_selector,
+            R.id.fragmentProfile to R.drawable.app_ic_profile_selector
         )
 
         for ((id, _) in tabList) {
             val menuItem = menu.add(Menu.NONE, id, Menu.NONE, tabTitles[id] ?: "")
-            tabIcons[id]?.let { menuItem.setIcon(it) }
+            tabIconSelectors[id]?.let { menuItem.setIcon(it) }
         }
     }
 
diff --git a/app/src/main/res/drawable/app_ic_book.xml b/app/src/main/res/drawable/app_ic_book.xml
diff --git a/app/src/main/res/drawable/app_ic_book_fill.xml b/app/src/main/res/drawable/app_ic_book_fill.xml
diff --git a/app/src/main/res/drawable/app_ic_book_outline.xml b/app/src/main/res/drawable/app_ic_book_outline.xml
@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="17dp"
+    android:viewportWidth="20"
+    android:viewportHeight="17">
+  <path
+      android:pathData="M5.5,15.669C4.074,15.669 2.673,16.045 1.438,16.758C1.019,16.999 0.484,16.856 0.242,16.438C0.001,16.019 0.144,15.484 0.563,15.242C2.064,14.375 3.767,13.919 5.5,13.919C7.067,13.919 8.609,14.292 10,15.004C11.391,14.292 12.933,13.919 14.5,13.919C16.233,13.919 17.936,14.375 19.438,15.242C19.856,15.484 19.999,16.019 19.758,16.438C19.516,16.856 18.981,16.999 18.563,16.758C17.327,16.045 15.926,15.669 14.5,15.669C13.074,15.669 11.673,16.045 10.438,16.758C10.167,16.914 9.833,16.914 9.563,16.758C8.327,16.045 6.926,15.669 5.5,15.669Z"
+      android:fillColor="#97A5BB"
+      android:fillType="evenOdd" />
+  <path
+      android:pathData="M5.5,2.669C4.074,2.669 2.673,3.045 1.438,3.758C1.019,3.999 0.484,3.856 0.242,3.438C0.001,3.019 0.144,2.484 0.563,2.242C2.064,1.376 3.767,0.919 5.5,0.919C7.067,0.919 8.609,1.292 10,2.004C11.391,1.292 12.933,0.919 14.5,0.919C16.233,0.919 17.936,1.376 19.438,2.242C19.856,2.484 19.999,3.019 19.758,3.438C19.516,3.856 18.981,3.999 18.563,3.758C17.327,3.045 15.926,2.669 14.5,2.669C13.074,2.669 11.673,3.045 10.438,3.758C10.167,3.914 9.833,3.914 9.563,3.758C8.327,3.045 6.926,2.669 5.5,2.669Z"
+      android:fillColor="#97A5BB"
+      android:fillType="evenOdd" />
+  <path
+      android:pathData="M1,2.125C1.483,2.125 1.875,2.517 1.875,3V16C1.875,16.483 1.483,16.875 1,16.875C0.517,16.875 0.125,16.483 0.125,16V3C0.125,2.517 0.517,2.125 1,2.125Z"
+      android:fillColor="#97A5BB"
+      android:fillType="evenOdd" />
+  <path
+      android:pathData="M10,2.125C10.483,2.125 10.875,2.517 10.875,3V16C10.875,16.483 10.483,16.875 10,16.875C9.517,16.875 9.125,16.483 9.125,16V3C9.125,2.517 9.517,2.125 10,2.125Z"
+      android:fillColor="#97A5BB"
+      android:fillType="evenOdd" />
+  <path
+      android:pathData="M19,2.125C19.483,2.125 19.875,2.517 19.875,3V16C19.875,16.483 19.483,16.875 19,16.875C18.517,16.875 18.125,16.483 18.125,16V3C18.125,2.517 18.517,2.125 19,2.125Z"
+      android:fillColor="#97A5BB"
+      android:fillType="evenOdd" />
+</vector>
diff --git a/app/src/main/res/drawable/app_ic_discover_selector.xml b/app/src/main/res/drawable/app_ic_discover_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/app_ic_search_fill" android:state_checked="true" />
+    <item android:drawable="@drawable/app_ic_search_outline" />
+</selector>
diff --git a/app/src/main/res/drawable/app_ic_download_cloud_fill.xml b/app/src/main/res/drawable/app_ic_download_cloud_fill.xml
diff --git a/app/src/main/res/drawable/app_ic_download_cloud_outline.xml b/app/src/main/res/drawable/app_ic_download_cloud_outline.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="16dp"
+    android:viewportWidth="24"
+    android:viewportHeight="16">
+    <path
+        android:pathData="M19.35,6.04C18.67,2.59 15.64,0 12,0C9.11,0 6.6,1.64 5.35,4.04C2.34,4.36 0,6.91 0,10C0,13.31 2.69,16 6,16H19C21.76,16 24,13.76 24,11C24,8.36 21.95,6.22 19.35,6.04ZM19,14H6C3.79,14 2,12.21 2,10C2,7.95 3.53,6.24 5.56,6.03L6.63,5.92L7.13,4.97C8.08,3.14 9.94,2 12,2C14.62,2 16.88,3.86 17.39,6.43L17.69,7.93L19.22,8.04C20.78,8.14 22,9.45 22,11C22,12.65 20.65,14 19,14ZM13.45,6H10.55V9H8L12,13L16,9H13.45V6Z"
+        android:fillColor="#97A5BB" />
+</vector>
diff --git a/app/src/main/res/drawable/app_ic_downloads_selector.xml b/app/src/main/res/drawable/app_ic_downloads_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/app_ic_download_cloud_fill" android:state_checked="true" />
+    <item android:drawable="@drawable/app_ic_download_cloud_outline" />
+</selector>
diff --git a/app/src/main/res/drawable/app_ic_home.xml b/app/src/main/res/drawable/app_ic_home.xml
diff --git a/app/src/main/res/drawable/app_ic_learn_selector.xml b/app/src/main/res/drawable/app_ic_learn_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/app_ic_book_fill" android:state_checked="true" />
+    <item android:drawable="@drawable/app_ic_book_outline" />
+</selector>
diff --git a/app/src/main/res/drawable/app_ic_profile.xml b/app/src/main/res/drawable/app_ic_profile.xml
diff --git a/app/src/main/res/drawable/app_ic_profile_fill.xml b/app/src/main/res/drawable/app_ic_profile_fill.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+    <path
+        android:pathData="M10,0C4.48,0 0,4.48 0,10C0,15.52 4.48,20 10,20C15.52,20 20,15.52 20,10C20,4.48 15.52,0 10,0ZM10,4C11.93,4 13.5,5.57 13.5,7.5C13.5,9.43 11.93,11 10,11C8.07,11 6.5,9.43 6.5,7.5C6.5,5.57 8.07,4 10,4ZM10,18C7.97,18 5.57,17.18 3.86,15.12C5.55,13.8 7.68,13 10,13C12.32,13 14.45,13.8 16.14,15.12C14.43,17.18 12.03,18 10,18Z"
+        android:fillColor="#3C68FF" />
+</vector>
diff --git a/app/src/main/res/drawable/app_ic_profile_outline.xml b/app/src/main/res/drawable/app_ic_profile_outline.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M10,0C4.48,0 0,4.48 0,10C0,15.52 4.48,20 10,20C15.52,20 20,15.52 20,10C20,4.48 15.52,0 10,0ZM5.35,16.5C6.66,15.56 8.26,15 10,15C11.74,15 13.34,15.56 14.65,16.5C13.34,17.44 11.74,18 10,18C8.26,18 6.66,17.44 5.35,16.5ZM16.14,15.12C14.45,13.8 12.32,13 10,13C7.68,13 5.55,13.8 3.86,15.12C2.7,13.73 2,11.95 2,10C2,5.58 5.58,2 10,2C14.42,2 18,5.58 18,10C18,11.95 17.3,13.73 16.14,15.12Z"
+      android:fillColor="#97A5BB" />
+  <path
+      android:pathData="M10,4C8.07,4 6.5,5.57 6.5,7.5C6.5,9.43 8.07,11 10,11C11.93,11 13.5,9.43 13.5,7.5C13.5,5.57 11.93,4 10,4ZM10,9C9.17,9 8.5,8.33 8.5,7.5C8.5,6.67 9.17,6 10,6C10.83,6 11.5,6.67 11.5,7.5C11.5,8.33 10.83,9 10,9Z"
+      android:fillColor="#97A5BB" />
+</vector>
diff --git a/app/src/main/res/drawable/app_ic_profile_selector.xml b/app/src/main/res/drawable/app_ic_profile_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/app_ic_profile_fill" android:state_checked="true" />
+    <item android:drawable="@drawable/app_ic_profile_outline" />
+</selector>
diff --git a/app/src/main/res/drawable/app_ic_search_fill.xml b/app/src/main/res/drawable/app_ic_search_fill.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="18"
+    android:viewportHeight="18">
+    <path
+        android:pathData="M12.75,11.26H11.96L11.68,10.99C12.66,9.85 13.25,8.37 13.25,6.76C13.25,3.17 10.34,0.26 6.75,0.26C3.16,0.26 0.25,3.17 0.25,6.76C0.25,10.35 3.16,13.26 6.75,13.26C8.36,13.26 9.84,12.67 10.98,11.69L11.25,11.97V12.76L16.25,17.75L17.74,16.26L12.75,11.26Z"
+        android:fillColor="#3C68FF" />
+</vector>
diff --git a/app/src/main/res/drawable/app_ic_search_outline.xml b/app/src/main/res/drawable/app_ic_search_outline.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="18"
+    android:viewportHeight="18">
+    <path
+        android:pathData="M12.755,11.255H11.965L11.685,10.985C12.665,9.845 13.255,8.365 13.255,6.755C13.255,3.165 10.345,0.255 6.755,0.255C3.165,0.255 0.255,3.165 0.255,6.755C0.255,10.345 3.165,13.255 6.755,13.255C8.365,13.255 9.845,12.665 10.985,11.685L11.255,11.965V12.755L16.255,17.745L17.745,16.255L12.755,11.255ZM6.755,11.255C4.265,11.255 2.255,9.245 2.255,6.755C2.255,4.265 4.265,2.255 6.755,2.255C9.245,2.255 11.255,4.265 11.255,6.755C11.255,9.245 9.245,11.255 6.755,11.255Z"
+        android:fillColor="#97A5BB" />
+</vector>

Original file line number	Diff line number	Diff line change
`@@ -104,16 +104,16 @@ class MainFragment : Fragment(R.layout.fragment_main) {`
`104`	`104`	`R.id.fragmentDownloads to resources.getString(R.string.app_navigation_downloads),`
`105`	`105`	`R.id.fragmentProfile to resources.getString(R.string.app_navigation_profile),`
`106`	`106`	`)`
`107`		`- val tabIcons = mapOf(`
`108`		`- R.id.fragmentLearn to R.drawable.app_ic_rows,`
`109`		`- R.id.fragmentDiscover to R.drawable.app_ic_home,`
`110`		`- R.id.fragmentDownloads to R.drawable.app_ic_download_cloud,`
`111`		`- R.id.fragmentProfile to R.drawable.app_ic_profile`
	`107`	`+ val tabIconSelectors = mapOf(`
	`108`	`+ R.id.fragmentLearn to R.drawable.app_ic_learn_selector,`
	`109`	`+ R.id.fragmentDiscover to R.drawable.app_ic_discover_selector,`
	`110`	`+ R.id.fragmentDownloads to R.drawable.app_ic_downloads_selector,`
	`111`	`+ R.id.fragmentProfile to R.drawable.app_ic_profile_selector`
`112`	`112`	`)`
`113`	`113`
`114`	`114`	`for ((id, _) in tabList) {`
`115`	`115`	`val menuItem = menu.add(Menu.NONE, id, Menu.NONE, tabTitles[id] ?: "")`
`116`		`- tabIcons[id]?.let { menuItem.setIcon(it) }`
	`116`	`+ tabIconSelectors[id]?.let { menuItem.setIcon(it) }`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`