From 15c1fc8ee4090af334c3d228ef271814d5e39969 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 7 Nov 2019 12:55:57 +0100
Subject: [PATCH] change guild overview view binding

---
 .../res/layout/fragment_guilds_overview.xml   |  7 +--
 .../social/GuildsOverviewFragment.kt          | 51 +++++++------------
 2 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/Habitica/res/layout/fragment_guilds_overview.xml b/Habitica/res/layout/fragment_guilds_overview.xml
index caf6e3316..e16c5052f 100644
--- a/Habitica/res/layout/fragment_guilds_overview.xml
+++ b/Habitica/res/layout/fragment_guilds_overview.xml
@@ -2,7 +2,7 @@
 <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/chat_refresh_layout"
+    android:id="@+id/refresh_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior">
@@ -12,16 +12,13 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            >
-
+            android:orientation="vertical">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/SectionTitle"
                 android:text="@string/my_guilds"
                 android:textAppearance="?android:attr/textAppearanceMedium" />
-
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.kt
index e5a0ad939..a54bfe30d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.kt
@@ -5,36 +5,30 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
-import android.widget.LinearLayout
 import android.widget.TextView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ChallengeRepository
 import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.databinding.FragmentGuildsOverviewBinding
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.helpers.resetViews
 import io.reactivex.functions.Consumer
 import io.realm.RealmResults
 import java.util.*
 import javax.inject.Inject
 
-class GuildsOverviewFragment : BaseMainFragment(), View.OnClickListener, androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
+class GuildsOverviewFragment : BaseMainFragment(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
 
+    private var binding: FragmentGuildsOverviewBinding? = null
     @Inject
     lateinit var socialRepository: SocialRepository
     @Inject
     lateinit var challengeRepository: ChallengeRepository
 
-    private val guildsListView: LinearLayout? by bindView(R.id.my_guilds_listview)
-    private val publicGuildsButton: Button? by bindView(R.id.publicGuildsButton)
-    private val swipeRefreshLayout: androidx.swiperefreshlayout.widget.SwipeRefreshLayout? by bindView(R.id.chat_refresh_layout)
-
     private var guilds: List<Group>? = null
     private var guildIDs: ArrayList<String>? = null
 
@@ -46,7 +40,8 @@ class GuildsOverviewFragment : BaseMainFragment(), View.OnClickListener, android
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         super.onCreateView(inflater, container, savedInstanceState)
-        return container?.inflate(R.layout.fragment_guilds_overview)
+        binding = FragmentGuildsOverviewBinding.inflate(inflater, container, false)
+        return binding?.root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -54,8 +49,10 @@ class GuildsOverviewFragment : BaseMainFragment(), View.OnClickListener, android
 
         resetViews()
 
-        swipeRefreshLayout?.setOnRefreshListener(this)
-        this.publicGuildsButton?.setOnClickListener(this)
+        binding?.refreshLayout?.setOnRefreshListener(this)
+        binding?.publicGuildsButton?.setOnClickListener {
+            MainNavigationController.navigate(GuildsOverviewFragmentDirections.openPublicGuilds())
+        }
         compositeSubscription.add(socialRepository.getUserGroups().subscribe(Consumer { this.setGuilds(it) }, RxErrorHandler.handleEmptyError()))
     }
     override fun onDestroy() {
@@ -69,45 +66,33 @@ class GuildsOverviewFragment : BaseMainFragment(), View.OnClickListener, android
     }
 
     override fun onRefresh() {
-        if (swipeRefreshLayout != null) {
-            swipeRefreshLayout?.isRefreshing = true
-        }
+        binding?.refreshLayout?.isRefreshing = true
         fetchGuilds()
     }
 
     private fun fetchGuilds() {
         compositeSubscription.add(this.socialRepository.retrieveGroups("guilds")
                 .subscribe(Consumer {
-                    swipeRefreshLayout?.isRefreshing = false
+                    binding?.refreshLayout?.isRefreshing = false
                 }, RxErrorHandler.handleEmptyError()))
     }
 
     private fun setGuilds(guilds: RealmResults<Group>) {
         this.guilds = guilds
-        if (this.guildsListView == null) {
+        if (binding?.myGuildsListview == null) {
             return
         }
         this.guildIDs = ArrayList()
-        this.guildsListView?.removeAllViewsInLayout()
+        binding?.myGuildsListview?.removeAllViewsInLayout()
         val inflater = context?.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as? LayoutInflater
         for (guild in guilds) {
-            val entry = inflater?.inflate(R.layout.plain_list_item, this.guildsListView, false) as? TextView
+            val entry = inflater?.inflate(R.layout.plain_list_item, binding?.myGuildsListview, false) as? TextView
             entry?.text = guild.name
-            entry?.setOnClickListener(this)
-            this.guildsListView?.addView(entry)
+            entry?.setOnClickListener {
+                MainNavigationController.navigate(GuildsOverviewFragmentDirections.openGuildDetail(guild.id))
+            }
+            binding?.myGuildsListview?.addView(entry)
             this.guildIDs?.add(guild.id)
         }
     }
-
-    override fun onClick(v: View) {
-        if (v === this.publicGuildsButton) {
-            MainNavigationController.navigate(GuildsOverviewFragmentDirections.openPublicGuilds())
-        } else {
-            val guildIndex = (v.parent as? ViewGroup)?.indexOfChild(v)
-            val guildId = this.guilds?.get(guildIndex ?: 0)?.id ?: return
-            MainNavigationController.navigate(GuildsOverviewFragmentDirections.openGuildDetail(guildId))
-        }
-    }
-
-
 }