Skip to content

fix: Improve AttendeesFragment #1810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 25, 2019
Merged

fix: Improve AttendeesFragment #1810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
667 changes: 394 additions & 273 deletions app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeFragment.kt
View file
Open in desktop

Large diffs are not rendered by default.

59 changes: 40 additions & 19 deletions app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeRecyclerAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,45 @@ import android.view.LayoutInflater
import android.view.ViewGroup
import org.fossasia.openevent.general.R
import org.fossasia.openevent.general.attendees.forms.CustomForm
import org.fossasia.openevent.general.event.EventId
import org.fossasia.openevent.general.ticket.Ticket

class AttendeeRecyclerAdapter : RecyclerView.Adapter<AttendeeViewHolder>() {
val attendeeList = ArrayList<Attendee>()
val ticketList = ArrayList<Ticket>()
var eventId = EventId(-1)
val customForm = ArrayList<CustomForm>()
private val attendeeList = ArrayList<Attendee>()
private val ticketList = ArrayList<Ticket>()
private var qty = ArrayList<Int>()
private val customForm = ArrayList<CustomForm>()
private var eventId: Long = -1
var attendeeChangeListener: AttendeeDetailChangeListener? = null

fun addAll(attendeeList: List<Attendee>, ticketList: List<Ticket>) {
if (attendeeList.isNotEmpty())
this.attendeeList.clear()
this.attendeeList.addAll(attendeeList)
if (ticketList.isNotEmpty())
this.ticketList.clear()
this.ticketList.addAll(ticketList)
fun setEventId(newId: Long) {
eventId = newId
}

fun setCustomForm(customForm: List<CustomForm>) {
this.customForm.clear()
this.customForm.addAll(customForm)
fun setQuantity(ticketQuantities: List<Int>) {
if (qty.isNotEmpty())qty.clear()
qty.addAll(ticketQuantities)
}

fun addAllTickets(tickets: List<Ticket>) {
if (ticketList.isNotEmpty()) ticketList.clear()
tickets.forEachIndexed { index, ticket ->
repeat(qty[index]) {
ticketList.add(ticket)
}
}
notifyDataSetChanged()
}

fun addAllAttendees(attendees: List<Attendee>) {
if (attendeeList.isNotEmpty()) attendeeList.clear()
attendeeList.addAll(attendees)
notifyDataSetChanged()
}

fun add(attendeeList: Attendee, ticket: Ticket) {
this.attendeeList.add(attendeeList)
this.ticketList.add(ticket)
fun setCustomForm(customForm: List<CustomForm>) {
if (customForm.isNotEmpty()) this.customForm.clear()
this.customForm.addAll(customForm)
notifyDataSetChanged()
}

override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AttendeeViewHolder {
Expand All @@ -39,10 +52,18 @@ class AttendeeRecyclerAdapter : RecyclerView.Adapter<AttendeeViewHolder>() {
}

override fun onBindViewHolder(holder: AttendeeViewHolder, position: Int) {
holder.bind(this, position)
holder.apply {
if (attendeeList.size == ticketList.size)
bind(attendeeList[position], ticketList[position], customForm, position, eventId)
onAttendeeDetailChanged = attendeeChangeListener
}
}

override fun getItemCount(): Int {
return attendeeList.size
}
}

interface AttendeeDetailChangeListener {
fun onAttendeeDetailChanged(attendee: Attendee, position: Int)
}
66 changes: 30 additions & 36 deletions app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,62 +8,56 @@ import android.view.View
import android.widget.EditText
import kotlinx.android.synthetic.main.item_attendee.view.*
import org.fossasia.openevent.general.attendees.forms.CustomForm
import org.fossasia.openevent.general.event.EventId
import org.fossasia.openevent.general.ticket.Ticket
import org.fossasia.openevent.general.ticket.TicketId

class AttendeeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
private var identifierList = ArrayList<String>()
private var editTextList = ArrayList<EditText>()
lateinit var textWatcher: TextWatcher
var onAttendeeDetailChanged: AttendeeDetailChangeListener? = null

fun bind(attendeeRecyclerAdapter: AttendeeRecyclerAdapter, position: Int) {
fun bind(attendee: Attendee, ticket: Ticket, customForm: List<CustomForm>, position: Int, eventId: Long) {

setText(itemView.attendeeItemCountry, attendeeRecyclerAdapter.attendeeList[position].country)
setText(itemView.attendeeItemLastName, attendeeRecyclerAdapter.attendeeList[position].lastname)
setText(itemView.attendeeItemEmail, attendeeRecyclerAdapter.attendeeList[position].email)
setText(itemView.attendeeItemFirstName, attendeeRecyclerAdapter.attendeeList[position].firstname)
itemView.attendeeItemTicketName.text = "Ticket Name - ${attendeeRecyclerAdapter.ticketList[position].name}"
itemView.attendeeItemCountry.setText(attendee.country)
itemView.attendeeItemLastName.setText(attendee.lastname)
itemView.attendeeItemEmail.setText(attendee.email)
itemView.attendeeItemFirstName.setText(attendee.firstname)
itemView.attendeeItemTicketName.text = "Ticket Name - ${ticket.name}"

textWatcher = object : TextWatcher {
override fun afterTextChanged(p0: Editable?) {
val id = attendeeRecyclerAdapter.attendeeList[position].id
attendeeRecyclerAdapter.attendeeList.removeAt(position)
val attendee = Attendee(id, firstname = itemView.attendeeItemFirstName.text.toString(),
lastname = itemView.attendeeItemLastName.text.toString(),
email = itemView.attendeeItemEmail.text.toString(),
city = getAttendeeField("city"),
address = getAttendeeField("address"),
state = getAttendeeField("state"),
country = itemView.attendeeItemCountry.text.toString(),
ticket = TicketId(attendeeRecyclerAdapter.ticketList[position].id.toLong()),
event = attendeeRecyclerAdapter.eventId)
attendeeRecyclerAdapter.attendeeList.add(position, attendee)
val textWatcher = object : TextWatcher {
override fun afterTextChanged(s: Editable?) {
val newAttendee = Attendee(
id = attendee.id,
firstname = itemView.attendeeItemFirstName.text.toString(),
lastname = itemView.attendeeItemLastName.text.toString(),
email = itemView.attendeeItemEmail.text.toString(),
city = getAttendeeField("city"),
address = getAttendeeField("address"),
state = getAttendeeField("state"),
country = itemView.attendeeItemCountry.text.toString(),
ticket = TicketId(ticket.id.toLong()),
event = EventId(eventId))
onAttendeeDetailChanged?.onAttendeeDetailChanged(newAttendee, position)
}

override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
}

override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
}
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { /*Do nothing*/ }
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { /*Do nothing*/ }
}
itemView.attendeeItemFirstName.addTextChangedListener(textWatcher)
itemView.attendeeItemLastName.addTextChangedListener(textWatcher)
itemView.attendeeItemEmail.addTextChangedListener(textWatcher)
itemView.attendeeItemCountry.addTextChangedListener(textWatcher)
fillInformationSection(customForm, textWatcher)

fillInformationSection(attendeeRecyclerAdapter.customForm)
if (attendeeRecyclerAdapter.customForm.isEmpty()) itemView.moreAttendeeInformation.visibility = View.GONE
val price = attendeeRecyclerAdapter.ticketList[position].price
if (customForm.isEmpty()) itemView.moreAttendeeInformation.visibility = View.GONE
val price = ticket.price
if ((price != null && price.equals(0.toFloat())) || price == null) {
itemView.countryArea.visibility = View.GONE
}
}

fun setText(editText: EditText, string: String?) {
if (!string.isNullOrEmpty())
editText.setText(string)
}

private fun fillInformationSection(forms: List<CustomForm>) {
private fun fillInformationSection(forms: List<CustomForm>, textWatcher: TextWatcher) {
val layout = itemView.attendeeInformation
for (form in forms) {
if (form.type == "text") {
Expand All @@ -80,7 +74,7 @@ class AttendeeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
}
}

fun getAttendeeField(identifier: String): String {
private fun getAttendeeField(identifier: String): String {
val index = identifierList.indexOf(identifier)
return if (index == -1) "" else index.let { editTextList[it] }.text.toString()
}
Expand Down
Loading