Skip to content

Commit

Permalink
Merge pull request #22 from ElchinGasymov/career_hub_add_bottom_navig…
Browse files Browse the repository at this point in the history
…ation_view

Добавил панель навигации, выпилил ненужный второй синий цвет
  • Loading branch information
AndreyRyabitckiy authored Aug 4, 2024
2 parents b7d25bb + 6e36cbd commit 508aaa6
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 4 deletions.
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/nav_color.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:color="@color/blue" android:state_checked="true" />
<item android:color="@color/gray" android:state_checked="false" />
</selector>
22 changes: 22 additions & 0 deletions app/src/main/res/layout/activity_root.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,28 @@
app:layout_constraintTop_toTopOf="parent"
app:navGraph="@navigation/main_navigation_graph" />

<com.google.android.material.divider.MaterialDivider
android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:dividerColor="@color/light_gray"
app:dividerThickness="@dimen/dividerThickness"
app:layout_constraintBottom_toTopOf="@+id/bottomNavigationView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottomNavigationView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
app:itemIconTint="@drawable/nav_color"
app:itemTextColor="@drawable/nav_color"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:menu="@menu/bottom_navigation_menu" />

</androidx.constraintlayout.widget.ConstraintLayout>


17 changes: 17 additions & 0 deletions app/src/main/res/menu/bottom_navigation_menu.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/mainFragment"
android:icon="@drawable/ic_bottom_navigation_main_20px"
android:title="@string/main_screen_title" />

<item
android:id="@+id/favoriteFragment"
android:icon="@drawable/ic_bottom_navigation_favorites_20px"
android:title="@string/favorite_screen_title" />

<item
android:id="@+id/teamFragment"
android:icon="@drawable/ic_bottom_navigation_team_20px"
android:title="@string/team_screen_title" />
</menu>
1 change: 0 additions & 1 deletion app/src/main/res/values-night/themes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<item name="colorOnSecondaryFixed">@color/white</item>

<!-- кнопки -->
<item name="colorSurface">@color/light_blue</item>
<item name="colorOnSurface">@color/white</item>

<!-- кнопки сброса и добавления в избранное -->
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<resources>
<color name="black">#1A1B22</color>
<color name="white">#FDFDFD</color>
<color name="blue">#3722E7</color>
<color name="light_blue">#3772E7</color>
<color name="blue">#3772E7</color>
<color name="gray">#AEAFB4</color>
<color name="light_gray">#E6E8EB</color>
<color name="red">#F56B6C</color>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,6 @@
<dimen name="margin_size_19">19dp</dimen>
<dimen name="margin_size_24">24dp</dimen>
<dimen name="margin_size_35">35dp</dimen>

<dimen name="dividerThickness">1dp</dimen>
</resources>
1 change: 0 additions & 1 deletion app/src/main/res/values/themes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<item name="colorOnSecondaryFixed">@color/gray</item>

<!-- кнопки -->
<item name="colorSurface">@color/light_blue</item>
<item name="colorOnSurface">@color/white</item>

<!-- кнопки сброса и добавления в избранное -->
Expand Down

0 comments on commit 508aaa6

Please sign in to comment.