From ddc218f4cce7d1eff95ab022e1eb64766003bedf Mon Sep 17 00:00:00 2001 From: Christopher Date: Sat, 1 Jun 2024 19:22:11 +0200 Subject: [PATCH] added package 'shoppinglist' renamed 'ShoppinglistFragment' to 'ShoplistFragment' removed unused code inside 'ShoplistFragment' renamed 'fragment_shoppinglist' to 'fragment_shoppinglist_shoplist' --- .../adapter/DashboardFragmentPagerAdapter.kt | 6 +- .../tabfragment/ShoppinglistFragment.kt | 60 ------------------- .../shoppinglist/ShoplistFragment.kt | 22 +++++++ ...xml => fragment_shoppinglist_shoplist.xml} | 2 +- 4 files changed, 25 insertions(+), 65 deletions(-) delete mode 100644 app/src/main/java/de/chrissthecoder/store/ui/dashboard/tabfragment/ShoppinglistFragment.kt create mode 100644 app/src/main/java/de/chrissthecoder/store/ui/dashboard/tabfragment/shoppinglist/ShoplistFragment.kt rename app/src/main/res/layout/{fragment_shoppinglist.xml => fragment_shoppinglist_shoplist.xml} (90%) diff --git a/app/src/main/java/de/chrissthecoder/store/adapter/DashboardFragmentPagerAdapter.kt b/app/src/main/java/de/chrissthecoder/store/adapter/DashboardFragmentPagerAdapter.kt index bd48bf7..69fcfd7 100644 --- a/app/src/main/java/de/chrissthecoder/store/adapter/DashboardFragmentPagerAdapter.kt +++ b/app/src/main/java/de/chrissthecoder/store/adapter/DashboardFragmentPagerAdapter.kt @@ -1,10 +1,8 @@ package de.chrissthecoder.store.adapter import androidx.fragment.app.Fragment -import androidx.fragment.app.FragmentManager -import androidx.lifecycle.Lifecycle import androidx.viewpager2.adapter.FragmentStateAdapter -import de.chrissthecoder.store.ui.dashboard.tabfragment.ShoppinglistFragment +import de.chrissthecoder.store.ui.dashboard.tabfragment.shoppinglist.ShoplistFragment import de.chrissthecoder.store.ui.dashboard.tabfragment.UnderstockFragment class DashboardFragmentPagerAdapter(fragment: Fragment) : FragmentStateAdapter(fragment) { @@ -14,7 +12,7 @@ class DashboardFragmentPagerAdapter(fragment: Fragment) : FragmentStateAdapter(f } override fun createFragment(position: Int) : Fragment { - return if(position == 0) { ShoppinglistFragment() } + return if(position == 0) { ShoplistFragment() } else { UnderstockFragment() } } } \ No newline at end of file diff --git a/app/src/main/java/de/chrissthecoder/store/ui/dashboard/tabfragment/ShoppinglistFragment.kt b/app/src/main/java/de/chrissthecoder/store/ui/dashboard/tabfragment/ShoppinglistFragment.kt deleted file mode 100644 index b015a20..0000000 --- a/app/src/main/java/de/chrissthecoder/store/ui/dashboard/tabfragment/ShoppinglistFragment.kt +++ /dev/null @@ -1,60 +0,0 @@ -package de.chrissthecoder.store.ui.dashboard.tabfragment - -import android.os.Bundle -import androidx.fragment.app.Fragment -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import de.chrissthecoder.store.R - -// TODO: Rename parameter arguments, choose names that match -// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER -private const val ARG_PARAM1 = "param1" -private const val ARG_PARAM2 = "param2" - -/** - * A simple [Fragment] subclass. - * Use the [ShoppinglistFragment.newInstance] factory method to - * create an instance of this fragment. - */ -class ShoppinglistFragment : Fragment() { - // TODO: Rename and change types of parameters - private var param1: String? = null - private var param2: String? = null - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - arguments?.let { - param1 = it.getString(ARG_PARAM1) - param2 = it.getString(ARG_PARAM2) - } - } - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_shoppinglist, container, false) - } - - companion object { - /** - * Use this factory method to create a new instance of - * this fragment using the provided parameters. - * - * @param param1 Parameter 1. - * @param param2 Parameter 2. - * @return A new instance of fragment ShoppinglistFragment. - */ - // TODO: Rename and change types and number of parameters - @JvmStatic - fun newInstance(param1: String, param2: String) = - ShoppinglistFragment().apply { - arguments = Bundle().apply { - putString(ARG_PARAM1, param1) - putString(ARG_PARAM2, param2) - } - } - } -} \ No newline at end of file diff --git a/app/src/main/java/de/chrissthecoder/store/ui/dashboard/tabfragment/shoppinglist/ShoplistFragment.kt b/app/src/main/java/de/chrissthecoder/store/ui/dashboard/tabfragment/shoppinglist/ShoplistFragment.kt new file mode 100644 index 0000000..801126e --- /dev/null +++ b/app/src/main/java/de/chrissthecoder/store/ui/dashboard/tabfragment/shoppinglist/ShoplistFragment.kt @@ -0,0 +1,22 @@ +package de.chrissthecoder.store.ui.dashboard.tabfragment.shoppinglist + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import de.chrissthecoder.store.R + +/** + * A [Fragment] subclass to list all shops that contains assigned shoppinglists. + */ +class ShoplistFragment : Fragment() { + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_shoppinglist_shoplist, container, false) + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_shoppinglist.xml b/app/src/main/res/layout/fragment_shoppinglist_shoplist.xml similarity index 90% rename from app/src/main/res/layout/fragment_shoppinglist.xml rename to app/src/main/res/layout/fragment_shoppinglist_shoplist.xml index b45de0f..b06925c 100644 --- a/app/src/main/res/layout/fragment_shoppinglist.xml +++ b/app/src/main/res/layout/fragment_shoppinglist_shoplist.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.dashboard.tabfragment.ShoppinglistFragment"> + tools:context=".ui.dashboard.tabfragment.shoppinglist.ShoplistFragment">