From 47fc7d8e15061658856bf821ca682713bd6f6177 Mon Sep 17 00:00:00 2001 From: Emre KARTAL Date: Fri, 31 Mar 2023 17:31:01 +0200 Subject: [PATCH] Realization of the masterdetail :sparkles: --- .../uca/iut/clermont/view/DetailFragment.kt | 7 + .../uca/iut/clermont/view/FavoriteFragment.kt | 26 +-- .../uca/iut/clermont/view/StartFragment.kt | 2 +- .../clermont/view/adapter/FavoritesAdapter.kt | 37 +++- .../view/viewHolder/FavoriteHolder.kt | 17 -- .../src/main/res/drawable-v24/round_icon.png | Bin 0 -> 22368 bytes src/app/src/main/res/drawable/exit_button.png | Bin 0 -> 1201 bytes src/app/src/main/res/drawable/round_icon.png | Bin 26944 -> 0 bytes src/app/src/main/res/layout/cellule_match.xml | 2 +- .../src/main/res/layout/fragment_detail.xml | 180 +++++++++++++++++- src/app/src/main/res/layout/fragment_home.xml | 2 +- src/app/src/main/res/navigation/my_nav.xml | 11 +- 12 files changed, 246 insertions(+), 38 deletions(-) delete mode 100644 src/app/src/main/java/uca/iut/clermont/view/viewHolder/FavoriteHolder.kt create mode 100644 src/app/src/main/res/drawable-v24/round_icon.png create mode 100644 src/app/src/main/res/drawable/exit_button.png delete mode 100644 src/app/src/main/res/drawable/round_icon.png diff --git a/src/app/src/main/java/uca/iut/clermont/view/DetailFragment.kt b/src/app/src/main/java/uca/iut/clermont/view/DetailFragment.kt index 9f2a411..faf446a 100644 --- a/src/app/src/main/java/uca/iut/clermont/view/DetailFragment.kt +++ b/src/app/src/main/java/uca/iut/clermont/view/DetailFragment.kt @@ -6,6 +6,7 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageButton import androidx.fragment.app.Fragment +import androidx.navigation.fragment.findNavController import uca.iut.clermont.R class DetailFragment : Fragment() { @@ -17,9 +18,15 @@ class DetailFragment : Fragment() { container: ViewGroup?, savedInstanceState: Bundle? ): View? { + val view = inflater.inflate(R.layout.fragment_detail, container, false) val button = view.findViewById(R.id.buttonLike) + val buttonExit = view.findViewById(R.id.buttonExit) + + buttonExit.setOnClickListener { + findNavController().navigate(R.id.favoriteFragment) + } button.setOnClickListener { isLiked = !isLiked diff --git a/src/app/src/main/java/uca/iut/clermont/view/FavoriteFragment.kt b/src/app/src/main/java/uca/iut/clermont/view/FavoriteFragment.kt index e205008..ca8c75e 100644 --- a/src/app/src/main/java/uca/iut/clermont/view/FavoriteFragment.kt +++ b/src/app/src/main/java/uca/iut/clermont/view/FavoriteFragment.kt @@ -6,38 +6,34 @@ import android.view.View import android.view.ViewGroup import android.widget.Button import android.widget.ImageButton +import androidx.core.os.bundleOf import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import uca.iut.clermont.R import uca.iut.clermont.model.Competition -import uca.iut.clermont.model.Match import uca.iut.clermont.view.adapter.FavoritesAdapter -import uca.iut.clermont.view.adapter.MatchesAdapter -class FavoriteFragment : Fragment() { +class FavoriteFragment : Fragment(), FavoritesAdapter.OnItemClickListener { + override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { val view = inflater.inflate(R.layout.fragment_favorite, container, false) - - val competitions = (activity as MainActivity).manager.competitionsMgr.getItems() + var competitions = (activity as MainActivity).manager.competitionsMgr.getItems() var buttonHome = view.findViewById(R.id.buttonHome) val buttonTextFavorite = view.findViewById