diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 123512ba303400ab0c65a394ec9b19dcdc078d37..82f13d652db784779022d1d750aec18c5bc1516a 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -15,7 +15,7 @@ </deviceKey> </Target> </targetSelectedWithDropDown> - <timeTargetWasSelectedWithDropDown value="2024-03-12T14:57:15.412212Z" /> + <timeTargetWasSelectedWithDropDown value="2024-03-12T16:51:54.989040Z" /> </State> </entry> </value> diff --git a/app/src/main/java/com/example/bondoman/activities/MainActivity.kt b/app/src/main/java/com/example/bondoman/activities/MainActivity.kt index a8a5a2a805f6f841701ef377226743065c48b380..5adf31b72eb56ae9b0a8f3051481acde2c8a5245 100644 --- a/app/src/main/java/com/example/bondoman/activities/MainActivity.kt +++ b/app/src/main/java/com/example/bondoman/activities/MainActivity.kt @@ -16,5 +16,12 @@ class MainActivity : AppCompatActivity() { >(R.id.bottom_navigation_view) val navController = findNavController(R.id.nav_fragment) bottomNavigationView.setupWithNavController(navController) + + + bottomNavigationView.setOnItemSelectedListener { menuItem -> + supportActionBar?.setTitle(menuItem.title.toString()) + true + } + } } \ 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 ea709b6971c3e3ef5f8c5fd5ed4ba01f39dfb8a9..80569005c6ed4a36f8597b13702383783737800a 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,12 +6,6 @@ android:layout_height="match_parent" tools:context=".activities.MainActivity"> - <Toolbar - android:id="@+id/current_page" - android:layout_width="match_parent" - android:layout_height="wrap_content" - app:layout_constraintTop_toTopOf="parent"/> - <fragment android:id="@+id/nav_fragment" android:name="androidx.navigation.fragment.NavHostFragment" @@ -21,7 +15,7 @@ app:layout_constraintBottom_toTopOf="@+id/bottom_navigation_view" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" - app:layout_constraintTop_toBottomOf="@+id/current_page" + app:layout_constraintTop_toBottomOf="parent" app:navGraph="@navigation/nav_graph"/> <com.google.android.material.bottomnavigation.BottomNavigationView @@ -31,6 +25,7 @@ android:layout_marginStart="0dp" android:layout_marginEnd="0dp" app:itemIconTint="@color/menu_color" + app:itemTextColor="@color/green" app:itemBackground="@color/brown_1" android:background="?android:attr/windowBackground" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/fragment_graf.xml b/app/src/main/res/layout/fragment_graf.xml index f803bad664a2530216f2e1f271caf02e9ade01c9..953ea7f8bddeeb4401f89cf4e084042d9ec4f453 100644 --- a/app/src/main/res/layout/fragment_graf.xml +++ b/app/src/main/res/layout/fragment_graf.xml @@ -9,6 +9,7 @@ <TextView android:layout_width="match_parent" android:layout_height="match_parent" - android:text="@string/hello_blank_fragment" /> + android:text="@string/hello_blank_fragment" + android:background="@color/black"/> </FrameLayout> \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index fd4aac389296e92fcaee8b7523616c1219788a5c..5e4c951883171ae5126754304c648e772587ed15 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -4,4 +4,6 @@ <item name="colorPrimary">@color/green</item> <item name="android:textColorSecondary">@color/brown_2</item> </style> + + </resources> \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index ac296b340ea6c059b9a92d900c23ce529465d653..9a0a1e2a86cc95014697a09e3885076416953c4e 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,8 +1,8 @@ <resources xmlns:tools="http://schemas.android.com/tools"> <!-- Base application theme. --> - <style name="Theme.BondoMan" parent="Theme.MaterialComponents.Light.NoActionBar"> + <style name="Theme.BondoMan" parent="Theme.MaterialComponents.Light.DarkActionBar"> <!-- Primary brand color. --> - <item name="colorPrimary">@color/green</item> + <item name="colorPrimary">@color/white</item> <item name="colorPrimaryVariant">@color/black</item> <item name="colorOnPrimary">@color/black</item> <!-- Secondary brand color. --> @@ -10,6 +10,8 @@ <item name="colorSecondaryVariant">@color/teal_700</item> <item name="colorOnSecondary">@color/black</item> <item name="android:statusBarColor">?attr/colorPrimaryVariant</item> + <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Light</item> + <!-- Customize your theme here. --> </style> </resources> \ No newline at end of file