From 8c0b5a4464b0970126ae941d3c46c448a804abb0 Mon Sep 17 00:00:00 2001 From: Emre KARTAL Date: Sat, 1 Apr 2023 11:15:24 +0200 Subject: [PATCH] Update UI detail :white_check_mark: --- .../uca/iut/clermont/view/DetailFragment.kt | 25 +++++++++++++-- .../uca/iut/clermont/view/FavoriteFragment.kt | 29 ++++++++++++------ .../src/main/res/drawable-v24/empty_like.png | Bin 0 -> 971 bytes .../src/main/res/drawable-v24/full_like.png | Bin 0 -> 602 bytes .../src/main/res/drawable-v24/icon_like.png | Bin 2885 -> 2795 bytes src/app/src/main/res/drawable/empty_like.png | Bin 565 -> 0 bytes src/app/src/main/res/drawable/full_like.png | Bin 421 -> 0 bytes .../src/main/res/layout/fragment_detail.xml | 21 +++++++------ 8 files changed, 54 insertions(+), 21 deletions(-) create mode 100644 src/app/src/main/res/drawable-v24/empty_like.png create mode 100644 src/app/src/main/res/drawable-v24/full_like.png delete mode 100644 src/app/src/main/res/drawable/empty_like.png delete mode 100644 src/app/src/main/res/drawable/full_like.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 faf446a..1207f2b 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 @@ -4,14 +4,20 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.Button import android.widget.ImageButton +import android.widget.ImageView +import android.widget.TextView import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController +import com.bumptech.glide.Glide import uca.iut.clermont.R +import uca.iut.clermont.model.Competition class DetailFragment : Fragment() { private var isLiked = false + private lateinit var competition: Competition override fun onCreateView( inflater: LayoutInflater, @@ -21,8 +27,19 @@ class DetailFragment : Fragment() { val view = inflater.inflate(R.layout.fragment_detail, container, false) + val id = arguments?.getInt("idItem")!! + + competition = (activity as MainActivity).manager.competitionsMgr.getItemById(id)!! + + initializeView(view) + return view; + } + + private fun initializeView(view: View) { val button = view.findViewById(R.id.buttonLike) val buttonExit = view.findViewById(R.id.buttonExit) + var ImageHeader = view.findViewById(R.id.imageDetail) + var titleHeader = view.findViewById(R.id.title) buttonExit.setOnClickListener { findNavController().navigate(R.id.favoriteFragment) @@ -30,11 +47,15 @@ class DetailFragment : Fragment() { button.setOnClickListener { isLiked = !isLiked - button.setImageResource(if (isLiked) R.drawable.full_like else R.drawable.empty_like) } - return view; + Glide.with(view.context) + .load(competition.emblem) + .error(R.drawable.imagenotfound) + .into(ImageHeader) + + titleHeader.text = competition.name } } \ No newline at end of file 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 ca8c75e..aa09da1 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,11 +6,13 @@ import android.view.View import android.view.ViewGroup import android.widget.Button import android.widget.ImageButton +import android.widget.ImageView 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 com.bumptech.glide.Glide import uca.iut.clermont.R import uca.iut.clermont.model.Competition import uca.iut.clermont.view.adapter.FavoritesAdapter @@ -24,8 +26,20 @@ class FavoriteFragment : Fragment(), FavoritesAdapter.OnItemClickListener { ): View? { val view = inflater.inflate(R.layout.fragment_favorite, container, false) var competitions = (activity as MainActivity).manager.competitionsMgr.getItems() + + initRecyclerView(view, competitions, this) + initializeView(view) + + return view + } + + private fun navigate() { + findNavController().navigate(R.id.homeFragment) + } + + private fun initializeView(view: View) { var buttonHome = view.findViewById(R.id.buttonHome) - val buttonTextFavorite = view.findViewById