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 5adf31b72eb56ae9b0a8f3051481acde2c8a5245..5144cb84aac1b91f8dda0997fd723cb26164cc50 100644 --- a/app/src/main/java/com/example/bondoman/activities/MainActivity.kt +++ b/app/src/main/java/com/example/bondoman/activities/MainActivity.kt @@ -3,7 +3,7 @@ package com.example.bondoman.activities import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import androidx.navigation.findNavController -import androidx.navigation.ui.setupWithNavController +import androidx.navigation.ui.onNavDestinationSelected import com.example.bondoman.R import com.google.android.material.bottomnavigation.BottomNavigationView @@ -15,13 +15,11 @@ class MainActivity : AppCompatActivity() { val bottomNavigationView = findViewById<BottomNavigationView >(R.id.bottom_navigation_view) val navController = findNavController(R.id.nav_fragment) - bottomNavigationView.setupWithNavController(navController) - bottomNavigationView.setOnItemSelectedListener { menuItem -> - supportActionBar?.setTitle(menuItem.title.toString()) + supportActionBar?.title = menuItem.title + menuItem.onNavDestinationSelected(navController) true } - } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_scan.xml b/app/src/main/res/layout/fragment_scan.xml index a615753e97f7d4080975b51b32029b80467d9eaa..4440e588d5b8e3b01e4b8165be5d504c1ce83c5f 100644 --- a/app/src/main/res/layout/fragment_scan.xml +++ b/app/src/main/res/layout/fragment_scan.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/green"/> </FrameLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index 91cc83f07ad2724df4e4abbcae410ec310da2409..7a51b15e37a8c031f60589f23ddc709b9a4af4ee 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -9,7 +9,7 @@ <TextView android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/design_default_color_on_primary" + android:background="@color/brown_1" android:text="@string/hello_blank_fragment" /> </FrameLayout> \ No newline at end of file