CA-1983 - Fix count review sometime it not correct and update text re…

…viewer
rfcx · Feb 9, 2020 · c2889dd · c2889dd
1 parent ed90d57
commit c2889dd
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 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
@@ -83,7 +83,6 @@ data class EventResponse(
 		}
 		if (review != null) {
 			event.reviewCreated = review.created
-//			event.reviewConfirmed = review.confirmed
 		}
 
 		reviewer?.let {

diff --git a/app/src/main/java/org/rfcx/ranger/view/alert/AlertBottomDialogFragment.kt b/app/src/main/java/org/rfcx/ranger/view/alert/AlertBottomDialogFragment.kt
@@ -126,11 +126,13 @@ class AlertBottomDialogFragment : BaseBottomSheetDialogFragment() {
 				timeTextView.text = "  ${context?.let { it1 -> it.beginsAt.toTimeSinceStringAlternativeTimeAgo(it1) }}"
 				reviewedTextView.text = context?.getString(if (it.firstNameReviewer.isNotBlank()) R.string.last_reviewed_by else R.string.not_have_review)
 						?: ""
+
 				nameReviewerTextView.text = if (it.firstNameReviewer.isNotBlank()) {
-					it.firstNameReviewer
+					it.firstNameReviewer.capitalize()
 				} else {
-					if (state != "NONE" && context != null) context.getNameEmail() else ""
+					if (state != "NONE" && context != null) context.getNameEmail().capitalize() else ""
 				}
+
 				nameReviewerTextView.visibility = if (it.firstNameReviewer.isNotBlank()) View.VISIBLE else View.INVISIBLE
 				linearLayout.visibility = View.INVISIBLE
 				agreeTextView.text = it.confirmedCount.toString()
@@ -291,6 +293,7 @@ class AlertBottomDialogFragment : BaseBottomSheetDialogFragment() {
 		})
 	}
 
+	@SuppressLint("DefaultLocale")
 	private fun showCountReviewer(event: Event, reviewConfirm: String) {
 		nameReviewerTextView.visibility = View.VISIBLE
 
@@ -299,7 +302,8 @@ class AlertBottomDialogFragment : BaseBottomSheetDialogFragment() {
 			event.firstNameReviewer
 		} else {
 			context.getNameEmail()
-		}
+		}.capitalize()
+
 		agreeTextView.text = event.confirmedCount.toString()
 		rejectTextView.text = event.rejectedCount.toString()
 

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
@@ -95,9 +95,9 @@ class AlertsAdapter(val listener: AlertClickListener) : ListAdapter<BaseItem, Re
 			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()
+				tvNameReviewer.text = context.getNameEmail().capitalize()
 			} else if (item.event.firstNameReviewer.isNotBlank()) {
-				tvNameReviewer.text = item.event.firstNameReviewer
+				tvNameReviewer.text = item.event.firstNameReviewer.capitalize()
 			}
 
 			when (item.state) {

diff --git a/...x/ranger/view/alerts/guardianListDetail/alertDetailByType/ItemAlertDetailByTypeAdapter.kt b/...x/ranger/view/alerts/guardianListDetail/alertDetailByType/ItemAlertDetailByTypeAdapter.kt
@@ -1,5 +1,6 @@
 package org.rfcx.ranger.view.alerts.guardianListDetail.alertDetailByType
 
+import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -52,6 +53,7 @@ class ItemAlertDetailByTypeAdapter(var items: MutableList<EventItem>, val listen
 		private val ivReject = itemView.rejectImageView
 		private val linearLayout = itemView.linearLayout
 
+		@SuppressLint("DefaultLocale")
 		fun bind(item: EventItem) {
 			eventsInEventsTextView.text = item.event.beginsAt.toTimeSinceStringAlternativeTimeAgo(itemView.context)
 			item.event.value.toEventIcon().let { iconAlert.setImageResource(it) }
@@ -62,9 +64,9 @@ class ItemAlertDetailByTypeAdapter(var items: MutableList<EventItem>, val listen
 			linearLayout.visibility = View.INVISIBLE
 
 			if (item.state !== EventItem.State.NONE) {
-				tvNameReviewer.text = context.getNameEmail()
+				tvNameReviewer.text = context.getNameEmail().capitalize()
 			} else if (item.event.firstNameReviewer.isNotBlank()) {
-				tvNameReviewer.text = item.event.firstNameReviewer
+				tvNameReviewer.text = item.event.firstNameReviewer.capitalize()
 			}
 
 			when (item.state) {

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
@@ -1,5 +1,6 @@
 package org.rfcx.ranger.view.status.adapter.viewholder
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.drawable.Drawable
 import android.view.View
@@ -13,6 +14,7 @@ import org.rfcx.ranger.view.status.StatusFragmentListener
 import org.rfcx.ranger.view.status.adapter.StatusAdapter
 
 class AlertView(private val binding: ItemStatusAlertBinding, private val listener: StatusFragmentListener?) : RecyclerView.ViewHolder(binding.root) {
+	@SuppressLint("DefaultLocale")
 	fun bind(item: StatusAdapter.AlertItem) {
 		binding.alertItem = item
 		binding.context = binding.root.context
@@ -26,9 +28,9 @@ class AlertView(private val binding: ItemStatusAlertBinding, private val listene
 		}
 
 		if (item.state !== StatusAdapter.AlertItem.State.NONE) {
-			binding.nameReviewerTextView.text = binding.root.context.getNameEmail()
+			binding.nameReviewerTextView.text = binding.root.context.getNameEmail().capitalize()
 		} else if (item.event.firstNameReviewer.isNotBlank()) {
-			binding.nameReviewerTextView.text = item.event.firstNameReviewer
+			binding.nameReviewerTextView.text = item.event.firstNameReviewer.capitalize()
 		}
 
 		when (item.state) {