Skip to content

Commit

Permalink
add feedback container
Browse files Browse the repository at this point in the history
  • Loading branch information
aggarwalpulkit596 committed Apr 13, 2019
1 parent f72f336 commit 2e7c888
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 0 deletions.
Expand Up @@ -107,6 +107,7 @@ class EventDetailsFragment : Fragment() {
showEventErrorScreen(false)
setHasOptionsMenu(true)
})
eventViewModel.loadEventFeedback(safeArgs.eventId)
}

override fun onCreateView(
Expand Down
Expand Up @@ -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() {
Expand All @@ -26,6 +27,20 @@ class EventDetailsViewModel(private val eventService: EventService, private val
val error: LiveData<String> = mutableError
private val mutableEvent = MutableLiveData<Event>()
val event: LiveData<Event> = mutableEvent
private val mutableEventFeedback = MutableLiveData<List<Feedback>>()
val eventFeedback: LiveData<List<Feedback>> = 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)) {
Expand Down
36 changes: 36 additions & 0 deletions app/src/main/res/layout/content_event.xml
Expand Up @@ -371,6 +371,42 @@
android:paddingRight="@dimen/padding_large"
android:paddingTop="@dimen/padding_small" />
</LinearLayout>
<LinearLayout
android:id="@+id/feedbackContainer"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_margin_large"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/locationContainer"
tools:visibility="visible">

<View
android:layout_width="match_parent"
android:layout_height="@dimen/event_details_divider"
android:layout_marginLeft="@dimen/layout_margin_large"
android:layout_marginRight="@dimen/layout_margin_large"
android:layout_marginBottom="@dimen/layout_margin_extra_large"
android:background="@color/grey" />

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/layout_margin_large"
android:layout_marginRight="@dimen/layout_margin_large"
android:layout_marginBottom="@dimen/layout_margin_large"
android:text="@string/feedback"
android:textColor="@color/dark_grey"
android:textSize="@dimen/event_details_headers" />

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/feedbackRv"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>


<LinearLayout
android:id="@+id/similarEventsContainer"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
Expand Up @@ -300,5 +300,6 @@
<string name="and_i_m_up_for">And I\'m up for</string>
<string name="savedType">savedType</string>
<string name="what_type">What Sounds good?</string>
<string name="feedback">Feedback</string>

</resources>

0 comments on commit 2e7c888

Please sign in to comment.