Merge branch 'development' into 1491_no_internet_tickets

Author: anhanh11001

.github/release-drafter.yml

@@ -0,0 +1,19 @@
+name-template: v$NEXT_PATCH_VERSION 🌈
+tag-template: v$NEXT_PATCH_VERSION
+categories:
+  - title: 🚀 Features
+    label: feature
+  - title: 🐛 Bug Fixes
+    label: fix
+  - title: 🧰 Maintenance
+    label: chore
+change-template: '- $TITLE (#$NUMBER) - @$AUTHOR'
+template: |
+  ## Changes
+
+  $CHANGES
+  
+  ## Contributors
+  
+  Thanks a lot to our contributors for making this release possible:
+  $CONTRIBUTORS

app/src/main/java/org/fossasia/openevent/general/event/EventViewHolder.kt

@@ -43,6 +43,7 @@ class EventViewHolder(override val containerView: View) : RecyclerView.ViewHolde
         event: Event,
         dateFormat: String
     ) {
+        containerView.eventImage.setImageResource(R.drawable.header)
         containerView.eventName.text = event.name
         containerView.locationName.text = event.locationName
 

app/src/main/java/org/fossasia/openevent/general/event/EventsFragment.kt

@@ -10,7 +10,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
-import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.GridLayoutManager
 import androidx.navigation.Navigation.findNavController
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.content_no_internet.view.noInternetCard
@@ -96,7 +96,8 @@ class EventsFragment : Fragment(), ScrollToTop {
 
         rootView.progressBar.isIndeterminate = true
 
-        rootView.eventsRecycler.layoutManager = LinearLayoutManager(activity)
+        rootView.eventsRecycler.layoutManager =
+            GridLayoutManager(activity, resources.getInteger(R.integer.events_column_count))
 
         rootView.eventsRecycler.adapter = eventsListAdapter
         rootView.eventsRecycler.isNestedScrollingEnabled = false

app/src/main/java/org/fossasia/openevent/general/event/topic/SimilarEventsFragment.kt

@@ -171,6 +171,7 @@ class SimilarEventsFragment : Fragment() {
 
         handleVisibility(similarEvents)
         Timber.d("Fetched Similar events of size %s", similarEvents.size)
+        if (similarEventsListAdapter.currentList.size != similarEvents.size) similarEvents.shuffle()
         similarEventsListAdapter.submitList(similarEvents)
         similarEventsListAdapter.notifyDataSetChanged()
     }

app/src/main/java/org/fossasia/openevent/general/ticket/TicketViewHolder.kt

@@ -11,7 +11,7 @@ import kotlinx.android.synthetic.main.item_ticket.view.ticketName
 
 class TicketViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
-    fun bind(ticket: Ticket, selectedListener: TicketSelectedListener?, eventCurrency: String?) {
+    fun bind(ticket: Ticket, selectedListener: TicketSelectedListener?, eventCurrency: String?, ticketQuantity: Int) {
         itemView.ticketName.text = ticket.name
 
         if (ticket.minOrder > 0 && ticket.maxOrder > 0) {
@@ -31,6 +31,11 @@ class TicketViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
             }
             itemView.orderRange.adapter = ArrayAdapter(itemView.context, android.R.layout.select_dialog_singlechoice,
                 spinnerList)
+            val currentQuantityPosition = spinnerList.indexOf(ticketQuantity.toString())
+            if (currentQuantityPosition != -1) {
+                itemView.orderRange.setSelection(currentQuantityPosition)
+                itemView.order.text = ticketQuantity.toString()
+            }
         }
 
         itemView.order.setOnClickListener {

app/src/main/java/org/fossasia/openevent/general/ticket/TicketsFragment.kt

@@ -54,6 +54,7 @@ class TicketsFragment : Fragment() {
         val ticketSelectedListener = object : TicketSelectedListener {
             override fun onSelected(ticketId: Int, quantity: Int) {
                 handleTicketSelect(ticketId, quantity)
+                ticketsViewModel.ticketIdAndQty.value = ticketIdAndQty
             }
         }
         ticketsRecyclerAdapter.setSelectListener(ticketSelectedListener)
@@ -208,6 +209,15 @@ class TicketsFragment : Fragment() {
             showNoInternetScreen(false)
             ticketsViewModel.loadEvent(safeArgs.eventId)
             ticketsViewModel.loadTickets(safeArgs.eventId)
+
+            val retainedTicketIdAndQty: List<Pair<Int, Int>>? = ticketsViewModel.ticketIdAndQty.value
+            if (retainedTicketIdAndQty != null) {
+                for (idAndQty in retainedTicketIdAndQty) {
+                    handleTicketSelect(idAndQty.first, idAndQty.second)
+                }
+                ticketsRecyclerAdapter.setTicketAndQty(retainedTicketIdAndQty)
+                ticketsRecyclerAdapter.notifyDataSetChanged()
+            }
         }
     }
 

app/src/main/java/org/fossasia/openevent/general/ticket/TicketsRecyclerAdapter.kt

@@ -10,6 +10,7 @@ class TicketsRecyclerAdapter : RecyclerView.Adapter<TicketViewHolder>() {
     private val tickets = ArrayList<Ticket>()
     private var eventCurrency: String? = null
     private var selectedListener: TicketSelectedListener? = null
+    private lateinit var ticketAndQuantity: List<Pair<Int, Int>>
 
     fun addAll(ticketList: List<Ticket>) {
         if (tickets.isNotEmpty())
@@ -32,12 +33,17 @@ class TicketsRecyclerAdapter : RecyclerView.Adapter<TicketViewHolder>() {
 
     override fun onBindViewHolder(holder: TicketViewHolder, position: Int) {
         val event = tickets[position]
-        holder.bind(event, selectedListener, eventCurrency)
+        holder.bind(event, selectedListener, eventCurrency,
+            if ((this::ticketAndQuantity.isInitialized)) ticketAndQuantity.get(position).second else 0)
     }
 
     override fun getItemCount(): Int {
         return tickets.size
     }
+
+    fun setTicketAndQty(ticketAndQty: List<Pair<Int, Int>>) {
+        ticketAndQuantity = ticketAndQty
+    }
 }
 
 interface TicketSelectedListener {

app/src/main/java/org/fossasia/openevent/general/ticket/TicketsViewModel.kt

@@ -29,6 +29,7 @@ class TicketsViewModel(
     val event: LiveData<Event> = mutableEvent
     private val mutableTicketTableVisibility = MutableLiveData<Boolean>()
     val ticketTableVisibility: LiveData<Boolean> = mutableTicketTableVisibility
+    val ticketIdAndQty = MutableLiveData<List<Pair<Int, Int>>>()
 
     fun isLoggedIn() = authHolder.isLoggedIn()
 

app/src/main/res/values-land/integers.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="events_column_count">2</integer>
+</resources>

app/src/main/res/values-sw600dp-land/integers.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="events_column_count">4</integer>
+</resources>

app/src/main/res/values-sw600dp/dimens.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="layout_margin_medium">16dp</dimen>
+</resources>

app/src/main/res/values-sw600dp/integers.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="events_column_count">3</integer>
+</resources>

app/src/main/res/values/integers.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="events_column_count">1</integer>
+</resources>