diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 0c0c3383890637b4721df1f49d0b229e55c0f361..85a54b7f898de23c11fddaec81b84b899db01c12 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -3,7 +3,20 @@ <component name="deploymentTargetDropDown"> <value> <entry key="app"> - <State /> + <State> + <runningDeviceTargetSelectedWithDropDown> + <Target> + <type value="RUNNING_DEVICE_TARGET" /> + <deviceKey> + <Key> + <type value="SERIAL_NUMBER" /> + <value value="SDEDU20221000821" /> + </Key> + </deviceKey> + </Target> + </runningDeviceTargetSelectedWithDropDown> + <timeTargetWasSelectedWithDropDown value="2024-03-16T15:01:52.841022900Z" /> + </State> </entry> </value> </component> diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000000000000000000000000000000000000..35eb1ddfbbc029bcab630581847471d7f238ec53 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="VcsDirectoryMappings"> + <mapping directory="" vcs="Git" /> + </component> +</project> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index a23c81babe3ec1ff66661989d95620c2e0282a7d..132fca03ec0427fb8c2a9be47842e24bffaa2102 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -5,7 +5,7 @@ android:id="@+id/container" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingTop="?attr/actionBarSize" + android:paddingTop="10dp" > @@ -28,6 +28,8 @@ app:menu="@menu/bottom_nav_menu" android:layout_marginEnd="20dp" android:background="@android:color/transparent" + app:itemTextAppearanceActive="@style/BottomNavigationView.Active" + app:itemTextAppearanceInactive="@style/BottomNavigationView" /> </com.google.android.material.bottomappbar.BottomAppBar> diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml index 5a00f1aadc859c6fad5d4c35054f63f3a4a0e61f..115578b9e561cfdb0a1da6bb416d206b9aeeec3d 100644 --- a/app/src/main/res/menu/bottom_nav_menu.xml +++ b/app/src/main/res/menu/bottom_nav_menu.xml @@ -9,7 +9,8 @@ <item android:id="@+id/navigation_dashboard" android:icon="@drawable/ic_dashboard_black_24dp" - android:title="@string/title_dashboard" /> + android:title="@string/title_dashboard" + /> <item android:id="@+id/floatingNav" diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 03e58d3bfaec25246ad9ef68f92bee65326d3695..a274a3fea9e180b6c8ed126aa95e30c31c094f2b 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -16,4 +16,13 @@ <item name="android:navigationBarColor">#000000</item> </style> + <style name="BottomNavigationView" parent="@style/TextAppearance.AppCompat.Caption"> + <item name="android:textSize">10sp</item> + </style> + + <style name="BottomNavigationView.Active" parent="@style/TextAppearance.AppCompat.Caption"> + <item name="android:textSize">10sp</item> + </style> + + </resources> \ No newline at end of file