Fixed issue (danascape#5) - Unnecessary use of Custom AppBar

rajitdeb · Oct 14, 2023 · 297b032 · 297b032
1 parent f7d6eb6
commit 297b032
Show file tree

Hide file tree

Showing 14 changed files with 142 additions and 131 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,7 +11,7 @@ android {
 
     defaultConfig {
         applicationId "dev.dsi.robust"
-        minSdk 26
+        minSdk 21
         targetSdk 33
         versionCode 1
         versionName "1.0"

diff --git a/app/src/main/java/dev/dsi/robust/MainActivity.kt b/app/src/main/java/dev/dsi/robust/MainActivity.kt
@@ -1,15 +1,19 @@
 package dev.dsi.robust
 
+import android.graphics.Color
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.NavController
+import androidx.navigation.findNavController
 import androidx.navigation.fragment.NavHostFragment
+import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupWithNavController
 import dev.dsi.robust.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityMainBinding
+    private lateinit var navController: NavController
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -19,9 +23,27 @@ class MainActivity : AppCompatActivity() {
         val navHost = supportFragmentManager
             .findFragmentById(binding.navHostFragment.id) as NavHostFragment
 
-        val navController: NavController = navHost.navController
+        navController = navHost.navController
+
+        val appBarConfiguration = AppBarConfiguration(
+            setOf(
+                R.id.fridgeFragment,
+                R.id.tipsFragment,
+                R.id.aboutFragment
+            )
+        )
+
+        binding.toolbar.apply {
+            setTitleTextColor(Color.WHITE)
+            setupWithNavController(navController, appBarConfiguration)
+        }
 
         binding.bottomNav.setupWithNavController(navController)
 
     }
+
+    override fun onSupportNavigateUp(): Boolean {
+        return navController.navigateUp() || super.onSupportNavigateUp()
+    }
+
 }
diff --git a/app/src/main/java/dev/dsi/robust/ui/AboutFragment.kt b/app/src/main/java/dev/dsi/robust/ui/AboutFragment.kt
@@ -11,26 +11,17 @@ import android.widget.Toast
 import dev.dsi.robust.R
 import dev.dsi.robust.databinding.FragmentAboutBinding
 
-
 class AboutFragment : Fragment() {
-    private var _binding: FragmentAboutBinding? = null
-    private val binding
-    get() = _binding!!
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-    }
+    private var _binding: FragmentAboutBinding? = null
+    private val binding get() = _binding!!
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
         _binding = FragmentAboutBinding.inflate(inflater, container, false)
 
-        binding.toolbarDashboardFridge.setNavigationOnClickListener {
-            activity?.onBackPressed()
-        }
         //Madhur
         binding.textGithubOne.setOnClickListener {
             val openURL = Intent(android.content.Intent.ACTION_VIEW)
@@ -102,4 +93,9 @@ class AboutFragment : Fragment() {
         return binding.root
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
 }
diff --git a/app/src/main/java/dev/dsi/robust/ui/AddItemFragment.kt b/app/src/main/java/dev/dsi/robust/ui/AddItemFragment.kt
@@ -18,12 +18,11 @@ import dev.dsi.robust.utils.Snacker
 import java.text.SimpleDateFormat
 import java.util.*
 
-@Suppress("DEPRECATION")
 class AddItemFragment : Fragment() {
+
     private lateinit var fridgeViewmodel: FridgeViewModel
     private var _binding: FragmentAddItemBinding? = null
-    private val binding
-        get() = _binding!!
+    private val binding get() = _binding!!
 
     var cal = Calendar.getInstance()
 
@@ -34,13 +33,6 @@ class AddItemFragment : Fragment() {
     ): View? {
         _binding = FragmentAddItemBinding.inflate(inflater, container, false)
 
-        binding.toolbarDashboardFridge.setNavigationOnClickListener {
-            activity?.onBackPressed()
-        }
-
-
-
-
             fun updateDateInView() {
                 val myFormat = "MM/dd/yyyy"
                 val sdf = SimpleDateFormat(myFormat, Locale.US)
@@ -111,5 +103,9 @@ class AddItemFragment : Fragment() {
         return binding.root
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
 
 }
diff --git a/app/src/main/java/dev/dsi/robust/ui/FridgeFragment.kt b/app/src/main/java/dev/dsi/robust/ui/FridgeFragment.kt
@@ -22,11 +22,12 @@ import dev.dsi.robust.utils.SwipeToDeleteCallback
 
 
 class FridgeFragment : Fragment() {
+
     private lateinit var fridgeViewModel: FridgeViewModel
     lateinit var fridgeAdapter: FridgeAdapter
+
     private var _binding: FragmentFridgeBinding? = null
-    private val binding
-        get() = _binding!!
+    private val binding get() = _binding!!
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -85,4 +86,10 @@ class FridgeFragment : Fragment() {
         val itemTouchhelper = ItemTouchHelper(swipeToDeleteCallback)
         itemTouchhelper.attachToRecyclerView(binding.rv)
     }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
 }
diff --git a/app/src/main/java/dev/dsi/robust/ui/TipsFragment.kt b/app/src/main/java/dev/dsi/robust/ui/TipsFragment.kt
@@ -9,27 +9,22 @@ import dev.dsi.robust.R
 import dev.dsi.robust.databinding.FragmentAboutBinding
 import dev.dsi.robust.databinding.FragmentTipsBinding
 
-
 class TipsFragment : Fragment() {
-    private var _binding: FragmentTipsBinding? = null
-    private val binding
-        get() = _binding!!
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
 
-    }
+    private var _binding: FragmentTipsBinding? = null
+    private val binding get() = _binding!!
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
         _binding = FragmentTipsBinding.inflate(inflater, container, false)
-        binding.toolbarDashboardFridge.setNavigationOnClickListener {
-            activity?.onBackPressed()
-        }
         return binding.root
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
 
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -6,6 +6,23 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayoutAbout"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:background="@color/material_blue"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:theme="@style/MyToolbar"/>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/navHostFragment"
         android:name="androidx.navigation.fragment.NavHostFragment"
@@ -15,18 +32,15 @@
         app:layout_constraintBottom_toTopOf="@+id/bottomNav"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/appBarLayoutAbout"
         app:navGraph="@navigation/nav_graph" />
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/bottomNav"
         style="@style/Widget.Design.BottomNavigationView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:backgroundTint="@color/white"
-        app:itemIconTint="@color/black"
-        app:itemRippleColor="@color/material_blue"
-        app:itemTextColor="@color/black"
+        android:background="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
@@ -10,32 +10,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/appBarLayoutAbout"
-            android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:background="@color/material_blue"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <com.google.android.material.appbar.MaterialToolbar
-                android:id="@+id/toolbarDashboardFridge"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-                app:navigationIcon="?attr/homeAsUpIndicator"
-                app:title="Know Your Developers"
-                app:titleTextAppearance="@style/TextAppearance.AppCompat.Medium"
-                app:titleTextColor="@color/white" />
-
-        </com.google.android.material.appbar.AppBarLayout>
-
         <TextView
             android:id="@+id/robustText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/appBarLayoutAbout"
             android:layout_marginStart="16dp"
             android:layout_marginTop="8dp"
             android:fontFamily="@font/sofiaprosoftmedium"

diff --git a/app/src/main/res/layout/fragment_add_item.xml b/app/src/main/res/layout/fragment_add_item.xml
@@ -7,26 +7,26 @@
     android:orientation="vertical"
     tools:context=".ui.AddItemFragment">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayoutFridge"
-        android:layout_width="match_parent"
-        android:layout_height="56dp"
-        android:background="@color/material_blue"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbarDashboardFridge"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-            app:navigationIcon="?attr/homeAsUpIndicator"
-            app:title="Add your item"
-            app:titleTextAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:titleTextColor="@color/white" />
-
-    </com.google.android.material.appbar.AppBarLayout>
+<!--    <com.google.android.material.appbar.AppBarLayout-->
+<!--        android:id="@+id/appBarLayoutFridge"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="56dp"-->
+<!--        android:background="@color/material_blue"-->
+<!--        app:layout_constraintEnd_toEndOf="parent"-->
+<!--        app:layout_constraintStart_toStartOf="parent"-->
+<!--        app:layout_constraintTop_toTopOf="parent">-->
+
+<!--        <com.google.android.material.appbar.MaterialToolbar-->
+<!--            android:id="@+id/toolbarDashboardFridge"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="match_parent"-->
+<!--            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"-->
+<!--            app:navigationIcon="?attr/homeAsUpIndicator"-->
+<!--            app:title="Add your item"-->
+<!--            app:titleTextAppearance="@style/TextAppearance.AppCompat.Medium"-->
+<!--            app:titleTextColor="@color/white" />-->
+
+<!--    </com.google.android.material.appbar.AppBarLayout>-->
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/itemNameTextInput"

diff --git a/app/src/main/res/layout/fragment_fridge.xml b/app/src/main/res/layout/fragment_fridge.xml
@@ -7,25 +7,25 @@
     android:layout_height="match_parent"
     tools:context=".ui.FridgeFragment">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayoutFridge"
-        android:layout_width="match_parent"
-        android:layout_height="56dp"
-        android:background="@color/material_blue"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+<!--    <com.google.android.material.appbar.AppBarLayout-->
+<!--        android:id="@+id/appBarLayoutFridge"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="56dp"-->
+<!--        android:background="@color/material_blue"-->
+<!--        app:layout_constraintEnd_toEndOf="parent"-->
+<!--        app:layout_constraintStart_toStartOf="parent"-->
+<!--        app:layout_constraintTop_toTopOf="parent">-->
 
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbarDashboardFridge"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-            app:title="Fridge"
-            app:titleTextAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:titleTextColor="@color/white" />
+<!--        <com.google.android.material.appbar.MaterialToolbar-->
+<!--            android:id="@+id/toolbarDashboardFridge"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="match_parent"-->
+<!--            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"-->
+<!--            app:title="Fridge"-->
+<!--            app:titleTextAppearance="@style/TextAppearance.AppCompat.Medium"-->
+<!--            app:titleTextColor="@color/white" />-->
 
-    </com.google.android.material.appbar.AppBarLayout>
+<!--    </com.google.android.material.appbar.AppBarLayout>-->
 
     <RelativeLayout
         android:id="@+id/anim"
@@ -56,7 +56,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="56dp"
+
         android:orientation="vertical">
 
         <androidx.recyclerview.widget.RecyclerView