diff --git a/app/app/src/main/java/tech/mercantec/easyeat/MainActivity.kt b/app/app/src/main/java/tech/mercantec/easyeat/MainActivity.kt index f3835dd..4c1d13e 100644 --- a/app/app/src/main/java/tech/mercantec/easyeat/MainActivity.kt +++ b/app/app/src/main/java/tech/mercantec/easyeat/MainActivity.kt @@ -24,7 +24,7 @@ class MainActivity : AppCompatActivity() { val navController = findNavController(R.id.nav_host_fragment_activity_main) val appBarConfiguration = AppBarConfiguration( setOf( - R.id.navigation_dishes, R.id.navigation_dashboard, R.id.navigation_notifications + R.id.navigation_dishes, R.id.navigation_shopping_list, R.id.navigation_notifications ) ) setupActionBarWithNavController(navController, appBarConfiguration) diff --git a/app/app/src/main/java/tech/mercantec/easyeat/ui/dashboard/DashboardFragment.kt b/app/app/src/main/java/tech/mercantec/easyeat/ui/dashboard/DashboardFragment.kt deleted file mode 100644 index 5a994a7..0000000 --- a/app/app/src/main/java/tech/mercantec/easyeat/ui/dashboard/DashboardFragment.kt +++ /dev/null @@ -1,42 +0,0 @@ -package tech.mercantec.easyeat.ui.dashboard - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.fragment.app.Fragment -import androidx.lifecycle.ViewModelProvider -import tech.mercantec.easyeat.databinding.FragmentDashboardBinding - -class DashboardFragment : Fragment() { - - private var _binding: FragmentDashboardBinding? = null - - // This property is only valid between onCreateView and - // onDestroyView. - private val binding get() = _binding!! - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View { - val dashboardViewModel = - ViewModelProvider(this).get(DashboardViewModel::class.java) - - _binding = FragmentDashboardBinding.inflate(inflater, container, false) - val root: View = binding.root - - val textView: TextView = binding.textDashboard - dashboardViewModel.text.observe(viewLifecycleOwner) { - textView.text = it - } - return root - } - - override fun onDestroyView() { - super.onDestroyView() - _binding = null - } -} \ No newline at end of file diff --git a/app/app/src/main/java/tech/mercantec/easyeat/ui/dashboard/DashboardViewModel.kt b/app/app/src/main/java/tech/mercantec/easyeat/ui/dashboard/DashboardViewModel.kt deleted file mode 100644 index 6bda48b..0000000 --- a/app/app/src/main/java/tech/mercantec/easyeat/ui/dashboard/DashboardViewModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package tech.mercantec.easyeat.ui.dashboard - -import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.ViewModel - -class DashboardViewModel : ViewModel() { - - private val _text = MutableLiveData().apply { - value = "This is dashboard Fragment" - } - val text: LiveData = _text -} \ No newline at end of file diff --git a/app/app/src/main/java/tech/mercantec/easyeat/ui/shopping_list/ShoppingListFragment.kt b/app/app/src/main/java/tech/mercantec/easyeat/ui/shopping_list/ShoppingListFragment.kt new file mode 100644 index 0000000..81b5d99 --- /dev/null +++ b/app/app/src/main/java/tech/mercantec/easyeat/ui/shopping_list/ShoppingListFragment.kt @@ -0,0 +1,33 @@ +package tech.mercantec.easyeat.ui.shopping_list + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import tech.mercantec.easyeat.databinding.FragmentShoppingListBinding + +class ShoppingListFragment : Fragment() { + + private var _binding: FragmentShoppingListBinding? = null + + // This property is only valid between onCreateView and + // onDestroyView. + private val binding get() = _binding!! + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + _binding = FragmentShoppingListBinding.inflate(inflater, container, false) + val root: View = binding.root + + return root + } + + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } +} \ No newline at end of file diff --git a/app/app/src/main/res/drawable/ic_dashboard_black_24dp.xml b/app/app/src/main/res/drawable/ic_dashboard_black_24dp.xml deleted file mode 100644 index 46fc8de..0000000 --- a/app/app/src/main/res/drawable/ic_dashboard_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/app/src/main/res/drawable/ic_list_alt_black_24px.xml b/app/app/src/main/res/drawable/ic_list_alt_black_24px.xml new file mode 100644 index 0000000..ef5d22e --- /dev/null +++ b/app/app/src/main/res/drawable/ic_list_alt_black_24px.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/app/src/main/res/layout/fragment_dashboard.xml b/app/app/src/main/res/layout/fragment_dashboard.xml deleted file mode 100644 index 166ab0e..0000000 --- a/app/app/src/main/res/layout/fragment_dashboard.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/app/src/main/res/layout/fragment_shopping_list.xml b/app/app/src/main/res/layout/fragment_shopping_list.xml new file mode 100644 index 0000000..33133f0 --- /dev/null +++ b/app/app/src/main/res/layout/fragment_shopping_list.xml @@ -0,0 +1,9 @@ + + + + diff --git a/app/app/src/main/res/menu/bottom_nav_menu.xml b/app/app/src/main/res/menu/bottom_nav_menu.xml index fddba85..40d55c4 100644 --- a/app/app/src/main/res/menu/bottom_nav_menu.xml +++ b/app/app/src/main/res/menu/bottom_nav_menu.xml @@ -7,9 +7,9 @@ android:title="@string/title_your_dishes" /> + android:id="@+id/navigation_shopping_list" + android:icon="@drawable/ic_list_alt_black_24px" + android:title="@string/title_shopping_list" /> + android:id="@+id/navigation_shopping_list" + android:name="tech.mercantec.easyeat.ui.shopping_list.ShoppingListFragment" + android:label="@string/title_shopping_list" + tools:layout="@layout/fragment_shopping_list" /> EasyEat MainActivity Your Dishes - Dashboard + Shopping list Notifications Welcome to EasyEat Login