CA-1983 - Updated displaying reviewer name

rfcx · Feb 10, 2020 · f025cc4 · f025cc4
1 parent c2889dd
commit f025cc4
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 36 deletions.
diff --git a/app/src/main/java/org/rfcx/ranger/entity/event/EventResponse.kt b/app/src/main/java/org/rfcx/ranger/entity/event/EventResponse.kt
@@ -86,7 +86,7 @@ data class EventResponse(
 		}
 
 		reviewer?.let {
-			event.firstNameReviewer = it.firstName ?: it.email.split("@")[0]
+			event.firstNameReviewer = it.email.split("@")[0] //TODO: UPDATE LATER - WAITING API SUPPORT FIRST NAME
 			event.reviewConfirmed = it.confirmed
 		}
 

diff --git a/app/src/main/java/org/rfcx/ranger/entity/event/Review.kt b/app/src/main/java/org/rfcx/ranger/entity/event/Review.kt
@@ -15,11 +15,8 @@ open class Review {
 open class Reviewer {
 	@SerializedName("firstname")
 	var firstName: String? = ""
-
 	@SerializedName("lastname")
 	var lastName: String? = ""
-
 	var email: String = ""
-
 	var confirmed: Boolean? = null
 }
diff --git a/app/src/main/java/org/rfcx/ranger/util/EventExt.kt b/app/src/main/java/org/rfcx/ranger/util/EventExt.kt
@@ -1,5 +1,6 @@
 package org.rfcx.ranger.util
 
+import android.annotation.SuppressLint
 import android.content.Context
 import org.rfcx.ranger.R
 import org.rfcx.ranger.adapter.entity.BaseItem
@@ -64,6 +65,21 @@ fun Event.toEventItem(eventDb: EventDb): EventItem {
 
 data class EventItem(var event: Event, var state: State = State.NONE) : BaseItem {
 
+	@SuppressLint("DefaultLocale")
+	fun getReviewerName(context: Context):String {
+		return if (state != State.NONE) {
+			if (event.firstNameReviewer.isNotBlank()) {
+				event.firstNameReviewer
+			} else {
+				context.getNameEmail()
+			}.capitalize()
+		} else {
+			event.firstNameReviewer.capitalize()
+		}
+	}
+
+
+
 	enum class State {
 		CONFIRM, REJECT, NONE
 	}

diff --git a/app/src/main/java/org/rfcx/ranger/view/alert/AlertBottomDialogViewModel.kt b/app/src/main/java/org/rfcx/ranger/view/alert/AlertBottomDialogViewModel.kt
@@ -27,6 +27,7 @@ import org.rfcx.ranger.entity.event.EventReview
 import org.rfcx.ranger.entity.event.ReviewEventFactory
 import org.rfcx.ranger.service.ReviewEventSyncWorker
 import org.rfcx.ranger.util.NetworkNotConnection
+import org.rfcx.ranger.util.getNameEmail
 import org.rfcx.ranger.util.isNetworkAvailable
 import java.io.File
 
@@ -231,7 +232,11 @@ class AlertBottomDialogViewModel(private val context: Context,
 					// save to review unsent
 					eventDb.save(EventReview(requests.eventGuID, requests.reviewConfirm,
 							EventReview.UNSENT))
-					_reviewEvent.value = Result.Success(Pair(eventResult!!, requests))
+					val event = eventResult!!.apply {
+						it.firstNameReviewer = context.getNameEmail() // update reviewer on offline
+					}
+					eventDb.saveEvent(event)
+					_reviewEvent.value = Result.Success(Pair(event, requests))
 					_eventState.value = EventState.REVIEWED	// invoke state to review
 				}
 

diff --git a/app/src/main/java/org/rfcx/ranger/view/alerts/adapter/AlertsAdapter.kt b/app/src/main/java/org/rfcx/ranger/view/alerts/adapter/AlertsAdapter.kt
@@ -1,13 +1,9 @@
 package org.rfcx.ranger.view.alerts.adapter
 
 import android.annotation.SuppressLint
-import android.content.Context
-import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.widget.AppCompatImageView
-import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
@@ -92,13 +88,8 @@ class AlertsAdapter(val listener: AlertClickListener) : ListAdapter<BaseItem, Re
 			tvAgreeValue.text = item.event.confirmedCount.toString()
 			tvRejectValue.text = item.event.rejectedCount.toString()
 			tvReviewed.text = context.getString(if (item.event.firstNameReviewer.isNotBlank() || item.state !== EventItem.State.NONE) R.string.last_reviewed_by else R.string.not_have_review)
-			tvNameReviewer.visibility = if (item.event.firstNameReviewer.isNotBlank() || item.state !== EventItem.State.NONE) View.VISIBLE else View.INVISIBLE
-
-			if (item.state !== EventItem.State.NONE) {
-				tvNameReviewer.text = context.getNameEmail().capitalize()
-			} else if (item.event.firstNameReviewer.isNotBlank()) {
-				tvNameReviewer.text = item.event.firstNameReviewer.capitalize()
-			}
+			tvNameReviewer.text = item.getReviewerName(context)
+			tvNameReviewer.visibility = if (item.event.firstNameReviewer.isNotBlank() || item.state != EventItem.State.NONE) View.VISIBLE else View.INVISIBLE
 
 			when (item.state) {
 				EventItem.State.CONFIRM -> {
@@ -111,7 +102,7 @@ class AlertsAdapter(val listener: AlertClickListener) : ListAdapter<BaseItem, Re
 					ivReject.setImageDrawable(context.getImage(R.drawable.ic_reject_event_gray))
 					ivReject.setBackgroundColor(context.getBackgroundColor(R.color.transparent))
 
-					val confirmCount = if (item.event.confirmedCount > 0) item.event.confirmedCount  else 1
+					val confirmCount = if (item.event.confirmedCount > 0) item.event.confirmedCount else 1
 					tvAgreeValue.text = confirmCount.toString()
 				}
 				EventItem.State.REJECT -> {
@@ -124,7 +115,7 @@ class AlertsAdapter(val listener: AlertClickListener) : ListAdapter<BaseItem, Re
 					ivAgree.setImageDrawable(context.getImage(R.drawable.ic_confirm_event_gray))
 					ivAgree.setBackgroundColor(context.getBackgroundColor(R.color.transparent))
 
-					val rejectedCount = if (item.event.rejectedCount > 0) item.event.rejectedCount  else 1
+					val rejectedCount = if (item.event.rejectedCount > 0) item.event.rejectedCount else 1
 					tvRejectValue.text = rejectedCount.toString()
 				}
 				EventItem.State.NONE -> {

diff --git a/...x/ranger/view/alerts/guardianListDetail/alertDetailByType/ItemAlertDetailByTypeAdapter.kt b/...x/ranger/view/alerts/guardianListDetail/alertDetailByType/ItemAlertDetailByTypeAdapter.kt
@@ -60,15 +60,10 @@ class ItemAlertDetailByTypeAdapter(var items: MutableList<EventItem>, val listen
 			tvAgreeValue.text = item.event.confirmedCount.toString()
 			tvRejectValue.text = item.event.rejectedCount.toString()
 			tvReviewed.text = context.getString(if (item.event.firstNameReviewer.isNotBlank() || item.state !== EventItem.State.NONE) R.string.last_reviewed_by else R.string.not_have_review)
+			tvNameReviewer.text = item.getReviewerName(context)
 			tvNameReviewer.visibility = if (item.event.firstNameReviewer.isNotBlank() || item.state !== EventItem.State.NONE) View.VISIBLE else View.INVISIBLE
 			linearLayout.visibility = View.INVISIBLE
 
-			if (item.state !== EventItem.State.NONE) {
-				tvNameReviewer.text = context.getNameEmail().capitalize()
-			} else if (item.event.firstNameReviewer.isNotBlank()) {
-				tvNameReviewer.text = item.event.firstNameReviewer.capitalize()
-			}
-
 			when (item.state) {
 				EventItem.State.CONFIRM -> {
 					circleImageView.visibility = View.INVISIBLE

diff --git a/app/src/main/java/org/rfcx/ranger/view/status/adapter/StatusAdapter.kt b/app/src/main/java/org/rfcx/ranger/view/status/adapter/StatusAdapter.kt
@@ -396,6 +396,16 @@ class StatusAdapter(private val statusTitle: String?, private val alertTitle: St
 		override fun getId(): Int = -3
 
 		fun getGuardianShortname(): String = event.guardianName
+		@SuppressLint("DefaultLocale")
+		fun getReviewerName(context: Context): String = if (state != State.NONE) {
+			if (event.firstNameReviewer.isNotBlank()) {
+				event.firstNameReviewer
+			} else {
+				context.getNameEmail()
+			}.capitalize()
+		} else {
+			event.firstNameReviewer.capitalize()
+		}
 		fun getImage(): Int = event.value.toEventIcon()
 		fun getTime(context: Context): String = "  ${event.beginsAt.toTimeSinceStringAlternativeTimeAgo(context)}"
 		fun getReviewed(context: Context): String = context.getString(if (event.firstNameReviewer.isNotBlank() || state !== State.NONE) R.string.last_reviewed_by else R.string.not_have_review)

diff --git a/app/src/main/java/org/rfcx/ranger/view/status/adapter/viewholder/AlertView.kt b/app/src/main/java/org/rfcx/ranger/view/status/adapter/viewholder/AlertView.kt
@@ -9,7 +9,6 @@ import androidx.recyclerview.widget.RecyclerView
 import org.rfcx.ranger.R
 import org.rfcx.ranger.databinding.ItemStatusAlertBinding
 import org.rfcx.ranger.util.EventItem
-import org.rfcx.ranger.util.getNameEmail
 import org.rfcx.ranger.view.status.StatusFragmentListener
 import org.rfcx.ranger.view.status.adapter.StatusAdapter
 
@@ -21,17 +20,6 @@ class AlertView(private val binding: ItemStatusAlertBinding, private val listene
 		binding.reviewedTextView.visibility = View.VISIBLE
 		binding.confirmCount = item.event.confirmedCount.toString()
 		binding.rejectCount = item.event.rejectedCount.toString()
-		if (item.event.firstNameReviewer.isNotBlank() || item.state !== StatusAdapter.AlertItem.State.NONE) {
-			binding.nameReviewerTextView.visibility = View.VISIBLE
-		} else {
-			binding.nameReviewerTextView.visibility = View.INVISIBLE
-		}
-
-		if (item.state !== StatusAdapter.AlertItem.State.NONE) {
-			binding.nameReviewerTextView.text = binding.root.context.getNameEmail().capitalize()
-		} else if (item.event.firstNameReviewer.isNotBlank()) {
-			binding.nameReviewerTextView.text = item.event.firstNameReviewer.capitalize()
-		}
 
 		when (item.state) {
 			StatusAdapter.AlertItem.State.CONFIRM -> {

diff --git a/app/src/main/res/layout/item_status_alert.xml b/app/src/main/res/layout/item_status_alert.xml
@@ -124,6 +124,8 @@
 				android:gravity="center_vertical"
 				android:maxLines="1"
 				android:textStyle="bold"
+				android:text="@{alertItem.getReviewerName(context)}"
+				android:visibility="@{alertItem.event.firstNameReviewer.length() > 0 ? View.VISIBLE : View.INVISIBLE}"
 				app:layout_constraintEnd_toStartOf="@+id/linearLayout"
 				app:layout_constraintStart_toEndOf="@+id/reviewedTextView"
 				app:layout_constraintTop_toBottomOf="@+id/alertTitleLayout"