Skip to content

feat: Add date format for Favorite Event Fragment #2162

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
Jul 21, 2019
Merged

feat: Add date format for Favorite Event Fragment #2162

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
3 changes: 2 additions & 1 deletion app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteEventViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ class FavoriteEventViewHolder(
var eventClickListener: EventClickListener? = null
var favFabClickListener: FavoriteFabClickListener? = null

fun bind(event: Event, itemPosition: Int) {
fun bind(event: Event, itemPosition: Int, headerDate: String) {
val startsAt = EventUtils.getEventDateTime(event.startsAt, event.timezone)
val endsAt = EventUtils.getEventDateTime(event.endsAt, event.timezone)

with(binding) {
this.event = event
this.headerDate = headerDate
position = itemPosition
dateTime = EventUtils.getFormattedDateTimeRangeBulleted(startsAt, endsAt)
executePendingBindings()
Expand Down
16 changes: 15 additions & 1 deletion app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteEventsListAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import org.fossasia.openevent.general.common.EventClickListener
import org.fossasia.openevent.general.common.EventsDiffCallback
import org.fossasia.openevent.general.common.FavoriteFabClickListener
import org.fossasia.openevent.general.databinding.ItemCardFavoriteEventBinding
import org.fossasia.openevent.general.event.EventUtils.getEventDateTime
import org.fossasia.openevent.general.event.EventUtils.getFormattedDate

/**
* The RecyclerView adapter class for displaying favorite events list
Expand All @@ -30,9 +32,21 @@ class FavoriteEventsListAdapter : ListAdapter<Event, FavoriteEventViewHolder>(Ev
override fun onBindViewHolder(holder: FavoriteEventViewHolder, position: Int) {
val event = getItem(position)
holder.apply {
bind(event, position)
val eventDate = getDateFormat(event.startsAt, event.timezone)
var showEventDate = true
if (position != 0) {
val previousEvent = getItem(position - 1)
if (previousEvent != null && eventDate == getDateFormat(previousEvent.startsAt, previousEvent.timezone))
showEventDate = false
}
bind(event, position, if (showEventDate) eventDate else "")
eventClickListener = onEventClick
favFabClickListener = onFavFabClick
}
}

private fun getDateFormat(eventDate: String, timeZone: String): String {
val date = getEventDateTime(eventDate, timeZone)
return getFormattedDate(date)
}
}
3 changes: 2 additions & 1 deletion app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import org.fossasia.openevent.general.event.Event
import org.fossasia.openevent.general.common.EventClickListener
import org.fossasia.openevent.general.common.FavoriteFabClickListener
import org.fossasia.openevent.general.data.Preference
import org.fossasia.openevent.general.event.EventUtils.getEventDateTime
import org.fossasia.openevent.general.search.location.SAVED_LOCATION
import org.fossasia.openevent.general.utils.extensions.nonNull
import org.koin.androidx.viewmodel.ext.android.viewModel
Expand Down Expand Up @@ -89,7 +90,7 @@ class FavoriteFragment : Fragment(), BottomIconDoubleClick {
favoriteEventViewModel.events
.nonNull()
.observe(viewLifecycleOwner, Observer { list ->
favoriteEventsRecyclerAdapter.submitList(list)
favoriteEventsRecyclerAdapter.submitList(list.sortedBy { getEventDateTime(it.startsAt, it.timezone) })
rootView.likesNumber.text = "${list.size} likes"
showEmptyMessage(list.size)
Timber.d("Fetched events of size %s", list.size)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/fossasia/openevent/general/search/SearchPagedListAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class SearchPagedListAdapter : PagedListAdapter<Event, FavoriteEventViewHolder>(
val event = getItem(position)
if (event != null) {
holder.apply {
bind(event, position)
bind(event, position, "")
eventClickListener = onEventClick
favFabClickListener = onFavFabClick
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_favorite.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/layout_margin_large"
android:layout_marginTop="@dimen/layout_margin_large"
android:layout_marginTop="@dimen/layout_margin_extreme_large"
android:layout_marginStart="@dimen/layout_margin_medium"
android:layout_marginEnd="@dimen/layout_margin_medium"
app:layout_constraintTop_toBottomOf="@id/likesNumber"
Expand Down
36 changes: 35 additions & 1 deletion app/src/main/res/layout/item_card_favorite_event.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,41 @@
<variable
name="dateTime"
type="String" />
<variable
name="headerDate"
type="String" />
</data>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:id="@+id/headerLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginTop="@dimen/layout_margin_medium"
app:hideIfEmpty="@{headerDate}"
tools:visibility="visible">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/event_details_divider"
android:background="@color/grey" />
<TextView
android:id="@+id/dateHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_large"
android:paddingTop="@dimen/padding_small"
android:paddingStart="@dimen/padding_large"
android:paddingEnd="@dimen/padding_large"
android:textColor="@color/black"
android:text="@{headerDate}"
tools:text="Jan 11, 2019" />
</LinearLayout>
<androidx.cardview.widget.CardView
android:id="@+id/allEventsCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down Expand Up @@ -72,6 +103,8 @@
android:src="@drawable/header"
android:background="@drawable/round_image"
android:layout_marginBottom="@dimen/layout_margin_moderate"
android:paddingTop="@dimen/padding_medium"
android:paddingBottom="@dimen/padding_small"
android:layout_marginStart="@dimen/layout_margin_large"
android:layout_marginTop="@dimen/layout_margin_moderate"
app:eventImage="@{event.originalImageUrl}"
Expand Down Expand Up @@ -127,4 +160,5 @@
</LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
</layout>