Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Update bottom nav icons for selected/unselected state #57

Merged
merged 2 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 0 additions & 45 deletions app/src/main/res/drawable/app_ic_book.xml

This file was deleted.

9 changes: 9 additions & 0 deletions app/src/main/res/drawable/app_ic_discover_selected.xml
Original file line number Diff line number Diff line change
@@ -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:fillColor="#000000"
android:pathData="M16.6,18L10.3,11.7C9.8,12.1 9.225,12.417 8.575,12.65C7.925,12.883 7.233,13 6.5,13C4.683,13 3.146,12.371 1.888,11.113C0.629,9.854 0,8.317 0,6.5C0,4.683 0.629,3.146 1.888,1.888C3.146,0.629 4.683,0 6.5,0C8.317,0 9.854,0.629 11.113,1.888C12.371,3.146 13,4.683 13,6.5C13,7.233 12.883,7.925 12.65,8.575C12.417,9.225 12.1,9.8 11.7,10.3L18,16.6L16.6,18Z" />
</vector>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/app_ic_discover_selector.xml
Original file line number Diff line number Diff line change
@@ -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_discover_selected" android:state_selected="true" />
HamzaIsrar12 marked this conversation as resolved.
Show resolved Hide resolved
<item android:drawable="@drawable/app_ic_discover_unselected" android:state_selected="false" />
</selector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/app_ic_discover_unselected.xml
Original file line number Diff line number Diff line change
@@ -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:fillColor="#707070"
android:pathData="M16.6,18L10.3,11.7C9.8,12.1 9.225,12.417 8.575,12.65C7.925,12.883 7.233,13 6.5,13C4.683,13 3.146,12.371 1.888,11.113C0.629,9.854 0,8.317 0,6.5C0,4.683 0.629,3.146 1.888,1.888C3.146,0.629 4.683,0 6.5,0C8.317,0 9.854,0.629 11.113,1.888C12.371,3.146 13,4.683 13,6.5C13,7.233 12.883,7.925 12.65,8.575C12.417,9.225 12.1,9.8 11.7,10.3L18,16.6L16.6,18ZM6.5,11C7.75,11 8.813,10.563 9.688,9.688C10.563,8.813 11,7.75 11,6.5C11,5.25 10.563,4.188 9.688,3.313C8.813,2.438 7.75,2 6.5,2C5.25,2 4.188,2.438 3.313,3.313C2.438,4.188 2,5.25 2,6.5C2,7.75 2.438,8.813 3.313,9.688C4.188,10.563 5.25,11 6.5,11Z" />
</vector>
38 changes: 0 additions & 38 deletions app/src/main/res/drawable/app_ic_home.xml

This file was deleted.

9 changes: 9 additions & 0 deletions app/src/main/res/drawable/app_ic_learn_selected.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="22dp"
android:height="18dp"
android:viewportWidth="22"
android:viewportHeight="18">
<path
android:fillColor="#000000"
android:pathData="M20,1C18.89,0.65 17.67,0.5 16.5,0.5C14.55,0.5 12.45,0.9 11,2C9.55,0.9 7.45,0.5 5.5,0.5C3.55,0.5 1.45,0.9 0,2V17.5C1.45,16.4 3.55,16 5.5,16C7.45,16 9.55,16.4 11,17.5C12.45,16.4 14.55,16 16.5,16C17.67,16 18.89,16.15 20,16.5C20.75,16.75 21.4,17.05 22,17.5V2C21.4,1.55 20.75,1.25 20,1ZM20,14.5C18.9,14.15 17.7,14 16.5,14C14.8,14 12.35,14.65 11,15.5V4C12.35,3.15 14.8,2.5 16.5,2.5C17.7,2.5 18.9,2.65 20,3V14.5Z" />
</vector>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/app_ic_learn_selector.xml
Original file line number Diff line number Diff line change
@@ -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_learn_selected" android:state_selected="true" />
<item android:drawable="@drawable/app_ic_learn_unselected" android:state_selected="false" />
</selector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/app_ic_learn_unselected.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="22dp"
android:height="17dp"
android:viewportWidth="22"
android:viewportHeight="17">
<path
android:fillColor="#707070"
android:pathData="M5.5,12C6.283,12 7.046,12.087 7.787,12.262C8.529,12.438 9.267,12.7 10,13.05V3.2C9.317,2.8 8.592,2.5 7.825,2.3C7.058,2.1 6.283,2 5.5,2C4.9,2 4.304,2.058 3.713,2.175C3.121,2.292 2.55,2.467 2,2.7V12.6C2.583,12.4 3.162,12.25 3.737,12.15C4.313,12.05 4.9,12 5.5,12ZM12,13.05C12.733,12.7 13.471,12.438 14.212,12.262C14.954,12.087 15.717,12 16.5,12C17.1,12 17.688,12.05 18.263,12.15C18.837,12.25 19.417,12.4 20,12.6V2.7C19.45,2.467 18.879,2.292 18.288,2.175C17.696,2.058 17.1,2 16.5,2C15.717,2 14.942,2.1 14.175,2.3C13.408,2.5 12.683,2.8 12,3.2V13.05ZM11,16C10.2,15.367 9.333,14.875 8.4,14.525C7.467,14.175 6.5,14 5.5,14C4.617,14 3.692,14.167 2.725,14.5C1.758,14.833 0.85,15.35 0,16.05V1.55C0.733,1.05 1.596,0.667 2.588,0.4C3.579,0.133 4.55,0 5.5,0C6.467,0 7.412,0.125 8.337,0.375C9.262,0.625 10.15,1 11,1.5C11.85,1 12.738,0.625 13.663,0.375C14.587,0.125 15.533,0 16.5,0C17.45,0 18.421,0.133 19.413,0.4C20.404,0.667 21.267,1.05 22,1.55V16.05C21.167,15.35 20.263,14.833 19.288,14.5C18.313,14.167 17.383,14 16.5,14C15.5,14 14.533,14.175 13.6,14.525C12.667,14.875 11.8,15.367 11,16ZM13,5.9V4.2C13.55,3.967 14.113,3.792 14.688,3.675C15.262,3.558 15.867,3.5 16.5,3.5C16.933,3.5 17.358,3.533 17.775,3.6C18.192,3.667 18.6,3.75 19,3.85V5.45C18.6,5.3 18.196,5.188 17.788,5.113C17.379,5.037 16.95,5 16.5,5C15.867,5 15.258,5.079 14.675,5.238C14.092,5.396 13.533,5.617 13,5.9ZM13,11.4V9.7C13.55,9.467 14.113,9.292 14.688,9.175C15.262,9.058 15.867,9 16.5,9C16.933,9 17.358,9.033 17.775,9.1C18.192,9.167 18.6,9.25 19,9.35V10.95C18.6,10.8 18.196,10.688 17.788,10.613C17.379,10.538 16.95,10.5 16.5,10.5C15.867,10.5 15.258,10.575 14.675,10.725C14.092,10.875 13.533,11.1 13,11.4ZM13,8.65V6.95C13.55,6.717 14.113,6.542 14.688,6.425C15.262,6.308 15.867,6.25 16.5,6.25C16.933,6.25 17.358,6.283 17.775,6.35C18.192,6.417 18.6,6.5 19,6.6V8.2C18.6,8.05 18.196,7.938 17.788,7.863C17.379,7.787 16.95,7.75 16.5,7.75C15.867,7.75 15.258,7.829 14.675,7.988C14.092,8.146 13.533,8.367 13,8.65Z" />
</vector>
31 changes: 0 additions & 31 deletions app/src/main/res/drawable/app_ic_profile.xml

This file was deleted.

9 changes: 9 additions & 0 deletions app/src/main/res/drawable/app_ic_profile_selected.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:viewportWidth="16"
android:viewportHeight="16">
<path
android:fillColor="#000000"
android:pathData="M8,8C10.21,8 12,6.21 12,4C12,1.79 10.21,0 8,0C5.79,0 4,1.79 4,4C4,6.21 5.79,8 8,8ZM8,10C5.33,10 0,11.34 0,14V16H16V14C16,11.34 10.67,10 8,10Z" />
</vector>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/app_ic_profile_selector.xml
Original file line number Diff line number Diff line change
@@ -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_selected" android:state_selected="true" />
<item android:drawable="@drawable/app_ic_profile_unselected" android:state_selected="false" />
</selector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/app_ic_profile_unselected.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:viewportWidth="16"
android:viewportHeight="16">
<path
android:fillColor="#707070"
android:pathData="M8,8C6.9,8 5.958,7.608 5.175,6.825C4.392,6.042 4,5.1 4,4C4,2.9 4.392,1.958 5.175,1.175C5.958,0.392 6.9,0 8,0C9.1,0 10.042,0.392 10.825,1.175C11.608,1.958 12,2.9 12,4C12,5.1 11.608,6.042 10.825,6.825C10.042,7.608 9.1,8 8,8ZM0,16V13.2C0,12.633 0.146,12.113 0.438,11.637C0.729,11.163 1.117,10.8 1.6,10.55C2.633,10.033 3.683,9.646 4.75,9.387C5.817,9.129 6.9,9 8,9C9.1,9 10.183,9.129 11.25,9.387C12.317,9.646 13.367,10.033 14.4,10.55C14.883,10.8 15.271,11.163 15.563,11.637C15.854,12.113 16,12.633 16,13.2V16H0ZM2,14H14V13.2C14,13.017 13.954,12.85 13.863,12.7C13.771,12.55 13.65,12.433 13.5,12.35C12.6,11.9 11.692,11.563 10.775,11.337C9.858,11.113 8.933,11 8,11C7.067,11 6.142,11.113 5.225,11.337C4.308,11.563 3.4,11.9 2.5,12.35C2.35,12.433 2.229,12.55 2.138,12.7C2.046,12.85 2,13.017 2,13.2V14ZM8,6C8.55,6 9.021,5.804 9.413,5.412C9.804,5.021 10,4.55 10,4C10,3.45 9.804,2.979 9.413,2.588C9.021,2.196 8.55,2 8,2C7.45,2 6.979,2.196 6.588,2.588C6.196,2.979 6,3.45 6,4C6,4.55 6.196,5.021 6.588,5.412C6.979,5.804 7.45,6 8,6Z" />
</vector>
10 changes: 0 additions & 10 deletions app/src/main/res/drawable/app_ic_rows.xml

This file was deleted.

6 changes: 3 additions & 3 deletions app/src/main/res/menu/bottom_view_menu.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
<item
android:id="@+id/fragmentLearn"
android:enabled="true"
android:icon="@drawable/dashboard_ic_book"
android:icon="@drawable/app_ic_learn_selector"
android:title="@string/app_navigation_learn" />

<item
android:id="@+id/fragmentDiscover"
android:enabled="true"
android:icon="@drawable/app_ic_home"
android:icon="@drawable/app_ic_discover_selector"
android:title="@string/app_navigation_discovery" />

<item
android:id="@+id/fragmentProfile"
android:enabled="true"
android:icon="@drawable/app_ic_profile"
android:icon="@drawable/app_ic_profile_selector"
android:title="@string/app_navigation_profile" />

</menu>
Loading