bug fixes

baristpl · Jul 13, 2022 · db34355 · db34355
1 parent 2a28c1b
commit db34355
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 28 deletions.
diff --git a/app/src/main/java/com/example/retrofitgetdata/HomeFragment.kt b/app/src/main/java/com/example/retrofitgetdata/HomeFragment.kt
@@ -10,6 +10,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.example.retrofitgetdata.databinding.FragmentHomeBinding
+import com.example.retrofitgetdata.models.CardModel
 import com.example.retrofitgetdata.recycler.CardAdapter
 import com.example.retrofitgetdata.recycler.GridAdapter
 
@@ -35,40 +36,61 @@ class HomeFragment : Fragment() {
         val blogRecycler = binding.blogRecycler
         val departmentRecycler = binding.departmentRecycler
 
+        val dummyCardModel = arrayListOf<CardModel>()
+        dummyCardModel.add(CardModel("Title", "SubTitle","https://dummyimage.com/560x265"))
 
-        viewModel.universityContent.observe(viewLifecycleOwner){
-            universityRecycler.apply {
-                layoutManager = LinearLayoutManager(
-                    requireContext(),
-                    RecyclerView.VERTICAL,
-                    false
-                )
-                adapter = CardAdapter(it, requireContext())
+        universityRecycler.apply {
+            layoutManager = LinearLayoutManager(
+                requireContext(),
+                RecyclerView.HORIZONTAL,
+                false
+            )
+            adapter = CardAdapter(requireContext()).apply {
+                setData(dummyCardModel)
             }
         }
 
-        viewModel.countryContent.observe(viewLifecycleOwner){
-            countryRecycler.apply {
-                layoutManager = LinearLayoutManager(
-                    requireContext(),
-                    RecyclerView.VERTICAL,
-                    false
-                )
-                adapter = CardAdapter(it, requireContext())
+        countryRecycler.apply {
+            layoutManager = LinearLayoutManager(
+                requireContext(),
+                RecyclerView.HORIZONTAL,
+                false
+            )
+            adapter = CardAdapter(requireContext()).apply {
+                setData(dummyCardModel)
             }
         }
 
-        viewModel.blogContent.observe(viewLifecycleOwner){
-            blogRecycler.apply {
-                layoutManager = LinearLayoutManager(
-                    requireContext(),
-                    RecyclerView.VERTICAL,
-                    false
-                )
-                adapter = CardAdapter(it, requireContext())
+        blogRecycler.apply {
+            layoutManager = LinearLayoutManager(
+                requireContext(),
+                RecyclerView.HORIZONTAL,
+                false
+            )
+            adapter = CardAdapter(requireContext()).apply {
+                setData(dummyCardModel)
             }
         }
 
+        viewModel.universityContent.observe(viewLifecycleOwner) {
+            val universityAdapter = universityRecycler.adapter as CardAdapter
+            universityAdapter.setData(it)
+            universityAdapter.notifyDataSetChanged()
+        }
+
+        viewModel.countryContent.observe(viewLifecycleOwner){
+            val countryAdapter = countryRecycler.adapter as CardAdapter
+            countryAdapter.setData(it)
+            countryAdapter.notifyDataSetChanged()
+
+        }
+
+        viewModel.blogContent.observe(viewLifecycleOwner){
+            val blogAdapter = blogRecycler.adapter as CardAdapter
+            blogAdapter.setData(it)
+            blogAdapter.notifyDataSetChanged()
+        }
+
         viewModel.departmentContent.observe(viewLifecycleOwner) {
             departmentRecycler.apply {
                 layoutManager =

diff --git a/app/src/main/java/com/example/retrofitgetdata/recycler/CardAdapter.kt b/app/src/main/java/com/example/retrofitgetdata/recycler/CardAdapter.kt
@@ -10,8 +10,9 @@ import com.example.retrofitgetdata.models.CardModel
 import com.squareup.picasso.Picasso
 
 
-class CardAdapter(private val data: ArrayList<CardModel>, private val context: Context) :
+class CardAdapter( private val context: Context) :
     RecyclerView.Adapter<CardHolder>() {
+    private val data: ArrayList<CardModel> = arrayListOf()
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CardHolder {
 
 
@@ -23,13 +24,15 @@ class CardAdapter(private val data: ArrayList<CardModel>, private val context: C
     override fun onBindViewHolder(holder: CardHolder, position: Int) {
         holder.title.text = data[position].title
 
-        if (data[position].subTitle != "")
-            holder.subTitle.text = data[position].subTitle
+        holder.subTitle.text = data[position].subTitle
 
         Picasso.with(context).load(data[position].thumbnail).into(holder.thumbnail)
 
     }
-
+    fun setData(newData: ArrayList<CardModel>) {
+        this.data.clear()
+        this.data.addAll(newData)
+    }
     override fun getItemCount(): Int {
         return data.size
     }