fix: Improve Search Type Layout (#1648)

Detail:
Make font smaller + Add checked drawable on checked type

Fixes: #1581

Author: anhanh11001

app/src/main/java/org/fossasia/openevent/general/search/SearchFragment.kt

@@ -86,8 +86,8 @@ class SearchFragment : Fragment() {
         }
 
         rootView.eventTypeTextView.setOnClickListener {
-            SearchLocationFragmentArgs.Builder()
-                .setFromSearchFragment(true)
+            SearchTypeFragmentArgs.Builder()
+                .setType(rootView.eventTypeTextView.text.toString())
                 .build()
                 .toBundle()
                 .also { bundle ->

app/src/main/java/org/fossasia/openevent/general/search/SearchTypeAdapter.kt

@@ -0,0 +1,68 @@
+package org.fossasia.openevent.general.search
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.CheckedTextView
+import androidx.recyclerview.widget.RecyclerView
+import kotlinx.android.synthetic.main.event_type_list.view.typeTextView
+import org.fossasia.openevent.general.R
+import timber.log.Timber
+
+class SearchTypeAdapter : RecyclerView.Adapter<SearchTypeViewHolder>() {
+    private val types = ArrayList<String>()
+    private var checkedTypePosition = -1
+    private var listener: TypeClickListener? = null
+
+    fun addAll(typeList: List<String>) {
+        if (types.isNotEmpty()) types.clear()
+        types.addAll(typeList)
+    }
+
+    fun setListener(typeListener: TypeClickListener) {
+        listener = typeListener
+    }
+
+    fun setCheckTypePosition(pos: Int) {
+        checkedTypePosition = pos
+    }
+
+    override fun onBindViewHolder(holder: SearchTypeViewHolder, position: Int) {
+        holder.bind(types[position], checkedTypePosition == position, listener)
+    }
+
+    override fun getItemCount(): Int {
+        return types.size
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SearchTypeViewHolder {
+        val view = LayoutInflater.from(parent.context).inflate(R.layout.event_type_list, parent, false)
+        return SearchTypeViewHolder(view)
+    }
+}
+
+interface TypeClickListener {
+    fun onClick(chosenType: String)
+}
+
+class SearchTypeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    fun bind(typeValue: String, isChecked: Boolean, listener: TypeClickListener?) {
+        val typeView = itemView.typeTextView
+        if (typeView is CheckedTextView) {
+            typeView.text = typeValue
+            if (isChecked) {
+                Timber.d("DEBUGGING CHECKED CALLED: $typeValue")
+                typeView.setCheckMarkDrawable(R.drawable.ic_checked)
+                typeView.isChecked = true
+            } else {
+                typeView.checkMarkDrawable = null
+                typeView.isChecked = false
+            }
+            if (listener != null) {
+                typeView.setOnClickListener {
+                    listener.onClick(typeView.text.toString())
+                }
+            }
+        }
+    }
+}

app/src/main/java/org/fossasia/openevent/general/search/SearchTypeFragment.kt

@@ -5,19 +5,22 @@ import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ArrayAdapter
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.navigation.NavOptions
 import androidx.navigation.Navigation
-import kotlinx.android.synthetic.main.fragment_search_type.view.eventTypesLv
+import androidx.navigation.fragment.navArgs
+import androidx.recyclerview.widget.LinearLayoutManager
+import kotlinx.android.synthetic.main.fragment_search_type.view.eventTypesRecyclerView
 import org.fossasia.openevent.general.R
 import org.fossasia.openevent.general.utils.Utils.setToolbar
 import org.fossasia.openevent.general.utils.extensions.nonNull
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class SearchTypeFragment : Fragment() {
+    private val typesAdapter: SearchTypeAdapter = SearchTypeAdapter()
     private val searchTypeViewModel by viewModel<SearchTypeViewModel>()
+    private val safeArgs: SearchTypeFragmentArgs by navArgs()
     private lateinit var rootView: View
     private val eventTypesList: MutableList<String> = arrayListOf("Anything")
 
@@ -30,21 +33,27 @@ class SearchTypeFragment : Fragment() {
         rootView = inflater.inflate(R.layout.fragment_search_type, container, false)
         setToolbar(activity, "", hasUpEnabled = true)
         setHasOptionsMenu(true)
+        rootView.eventTypesRecyclerView.layoutManager = LinearLayoutManager(activity)
+        rootView.eventTypesRecyclerView.adapter = typesAdapter
         searchTypeViewModel.loadEventTypes()
-        val adapter = ArrayAdapter(context, R.layout.event_type_list, eventTypesList)
-        rootView.eventTypesLv.adapter = adapter
 
         searchTypeViewModel.eventTypes
             .nonNull()
             .observe(this, Observer { list ->
                 list.forEach {
                     eventTypesList.add(it.name)
                 }
-                adapter.notifyDataSetChanged()
+                setCurrentChoice(safeArgs.type)
+                typesAdapter.addAll(eventTypesList)
+                typesAdapter.notifyDataSetChanged()
             })
-        rootView.eventTypesLv.setOnItemClickListener { parent, view, position, id ->
-            redirectToSearch(eventTypesList[position])
+
+        val listener: TypeClickListener = object : TypeClickListener {
+            override fun onClick(chosenType: String) {
+                redirectToSearch(chosenType)
+            }
         }
+        typesAdapter.setListener(listener)
         return rootView
     }
 
@@ -63,4 +72,13 @@ class SearchTypeFragment : Fragment() {
         val navOptions = NavOptions.Builder().setPopUpTo(R.id.eventsFragment, false).build()
         Navigation.findNavController(rootView).navigate(R.id.searchFragment, null, navOptions)
     }
+
+    private fun setCurrentChoice(value: String?) {
+        for (pos in 0 until eventTypesList.size) {
+            if (eventTypesList[pos] == value) {
+                typesAdapter.setCheckTypePosition(pos)
+                return
+            }
+        }
+    }
 }

app/src/main/res/layout/event_type_list.xml

@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <CheckedTextView
-    android:id="@+id/text1"
+    android:id="@+id/typeTextView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="@dimen/layout_margin_large"
     android:paddingTop="@dimen/layout_margin_large"
     android:paddingBottom="@dimen/layout_margin_large"
     android:gravity="center_vertical"
     android:text="@string/anytime"
     android:background="?attr/selectableItemBackground"
     android:textColor="@color/black"
-    android:textSize="@dimen/text_size_expanded_title"
-    android:paddingLeft="@dimen/layout_margin_large"
+    android:textSize="@dimen/text_size_large"
     xmlns:android="http://schemas.android.com/apk/res/android" />

app/src/main/res/layout/fragment_search_type.xml

@@ -20,9 +20,11 @@
         android:textSize="@dimen/text_size_extra_large"
         android:textStyle="bold" />
 
-    <ListView
-        android:id="@+id/eventTypesLv"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/eventTypesRecyclerView"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:divider="@null"
+        android:scrollbars="none"/>
 </LinearLayout>