From 2e7c88843c66589d61bd0d0101890d05e06a6b38 Mon Sep 17 00:00:00 2001 From: pulkit-mac Date: Sun, 14 Apr 2019 00:34:39 +0530 Subject: [PATCH] add feedback container --- .../general/event/EventDetailsFragment.kt | 1 + .../general/event/EventDetailsViewModel.kt | 15 ++++++++ app/src/main/res/layout/content_event.xml | 36 +++++++++++++++++++ app/src/main/res/values/strings.xml | 1 + 4 files changed, 53 insertions(+) diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt index 27c026a358..50280ec3af 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt @@ -107,6 +107,7 @@ class EventDetailsFragment : Fragment() { showEventErrorScreen(false) setHasOptionsMenu(true) }) + eventViewModel.loadEventFeedback(safeArgs.eventId) } override fun onCreateView( diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsViewModel.kt index fbd88c75f2..e01e8b7401 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsViewModel.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsViewModel.kt @@ -12,6 +12,7 @@ import org.fossasia.openevent.general.R import org.fossasia.openevent.general.auth.User import org.fossasia.openevent.general.common.SingleLiveEvent import org.fossasia.openevent.general.data.Resource +import org.fossasia.openevent.general.event.feedback.Feedback import timber.log.Timber class EventDetailsViewModel(private val eventService: EventService, private val resource: Resource) : ViewModel() { @@ -26,6 +27,20 @@ class EventDetailsViewModel(private val eventService: EventService, private val val error: LiveData = mutableError private val mutableEvent = MutableLiveData() val event: LiveData = mutableEvent + private val mutableEventFeedback = MutableLiveData>() + val eventFeedback: LiveData> = mutableEventFeedback + + fun loadEventFeedback(id:Long) { + compositeDisposable.add(eventService.getEventFeedback(id) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe({ + mutableEventFeedback.value = it + }, { + Timber.e(it, "Error fetching events feedback") + }) + ) + } fun loadEvent(id: Long) { if (id.equals(-1)) { diff --git a/app/src/main/res/layout/content_event.xml b/app/src/main/res/layout/content_event.xml index af97c8bc18..02b1fddfc5 100644 --- a/app/src/main/res/layout/content_event.xml +++ b/app/src/main/res/layout/content_event.xml @@ -371,6 +371,42 @@ android:paddingRight="@dimen/padding_large" android:paddingTop="@dimen/padding_small" /> + + + + + + + + + And I\'m up for savedType What Sounds good? + Feedback