From f3598c96996762af2e7f2dafd411e78f866a7408 Mon Sep 17 00:00:00 2001 From: Mariya Date: Tue, 26 Sep 2023 14:27:49 +0530 Subject: [PATCH 1/4] set the card color into green if the incubation time equals to 15. and it turns red if the incubation time equals 25, --- .../presentation/adapter/UserListAdapter.kt | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt b/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt index 77e285c..3ee0492 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt @@ -1,6 +1,7 @@ package com.example.hpostesting.presentation.adapter import android.annotation.SuppressLint +import android.graphics.Color import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -45,6 +46,14 @@ class UserListAdapter( userId.text = "User ID:${model._id} \n Time: ${isBetween15And30Minutes(model.incubationTime)}" btnStartIncubation.visibility = View.GONE } + + if (isTimeEqualTo(model.incubationTime, 15)) { + userCard.setCardBackgroundColor(Color.GREEN) + } else if (isTimeEqualTo(model.incubationTime, 25)) { + userCard.setCardBackgroundColor(Color.RED) + } + + Glide.with(view).load(model.userImageURL).into(userImage) if (model.testStatus!!) { teststatus.text = "Test concluded" @@ -123,4 +132,23 @@ class UserListAdapter( return diffMillis / (60 * 1000) } + + + + private fun isTimeEqualTo(createdAt: String, targetMinutes: Int): Boolean { + val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()) + val createdAtDate: Date = formatter.parse(createdAt) ?: return false // Return false if parsing fails + + val currentTime = Calendar.getInstance().time + + val diffMillis = currentTime.time - createdAtDate.time + val diffMinutes = diffMillis / (60 * 1000) + + // Check if the difference in minutes is equal to the targetMinutes + return diffMinutes.toInt() == targetMinutes + } + + + + } \ No newline at end of file From 9cd0ee21b6cdd5fece6d6db5ede1a84d1f47fcc6 Mon Sep 17 00:00:00 2001 From: Mariya Date: Tue, 26 Sep 2023 14:27:49 +0530 Subject: [PATCH 2/4] set the card color into green if the incubation time equals to 15. and it turns red if the incubation time equals 25, --- app/build.gradle | 2 +- .../presentation/adapter/UserListAdapter.kt | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index b207d3c..f7a375f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,7 +15,7 @@ android { namespace 'in.sminnovations.hpostesting' defaultConfig { - applicationId "in.sminnovations.hpostesting.prod" + applicationId "in.sminnovations.hpostesting" minSdk 21 targetSdk 34 versionCode 14 diff --git a/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt b/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt index 77e285c..4680ba4 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt @@ -1,6 +1,7 @@ package com.example.hpostesting.presentation.adapter import android.annotation.SuppressLint +import android.graphics.Color import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -45,6 +46,14 @@ class UserListAdapter( userId.text = "User ID:${model._id} \n Time: ${isBetween15And30Minutes(model.incubationTime)}" btnStartIncubation.visibility = View.GONE } + + if (isTimeEqualTotime(model.incubationTime, 15)) { + userCard.setCardBackgroundColor(Color.GREEN) + } else if (isTimeEqualTotime(model.incubationTime, 25)) { + userCard.setCardBackgroundColor(Color.RED) + } + + Glide.with(view).load(model.userImageURL).into(userImage) if (model.testStatus!!) { teststatus.text = "Test concluded" @@ -123,4 +132,23 @@ class UserListAdapter( return diffMillis / (60 * 1000) } + + + + private fun isTimeEqualTotime(createdAt: String, targetMinutes: Int): Boolean { + val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()) + val createdAtDate: Date = formatter.parse(createdAt) ?: return false // Return false if parsing fails + + val currentTime = Calendar.getInstance().time + + val diffMillis = currentTime.time - createdAtDate.time + val diffMinutes = diffMillis / (60 * 1000) + + // Check if the difference in minutes is equal to the targetMinutes + return diffMinutes.toInt() == targetMinutes + } + + + + } \ No newline at end of file From 1d017f0578f6eb4ac48cfc39878991e85da25a32 Mon Sep 17 00:00:00 2001 From: Mariya Date: Tue, 26 Sep 2023 14:44:26 +0530 Subject: [PATCH 3/4] set the card color into green if the incubation time equals to 15. and it turns red if the incubation time equals 25, new push --- .../hpostesting/presentation/adapter/UserListAdapter.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt b/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt index 4680ba4..4151f67 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt @@ -47,9 +47,9 @@ class UserListAdapter( btnStartIncubation.visibility = View.GONE } - if (isTimeEqualTotime(model.incubationTime, 15)) { + if (isTimeEqual(model.incubationTime, 15)) { userCard.setCardBackgroundColor(Color.GREEN) - } else if (isTimeEqualTotime(model.incubationTime, 25)) { + } else if (isTimeEqual(model.incubationTime, 25)) { userCard.setCardBackgroundColor(Color.RED) } @@ -135,7 +135,7 @@ class UserListAdapter( - private fun isTimeEqualTotime(createdAt: String, targetMinutes: Int): Boolean { + private fun isTimeEqual(createdAt: String, targetMinutes: Int): Boolean { val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()) val createdAtDate: Date = formatter.parse(createdAt) ?: return false // Return false if parsing fails From 3671dc9db811240fd1b26cbf6cb0026579d7c947 Mon Sep 17 00:00:00 2001 From: mohamedkaif356 Date: Tue, 26 Sep 2023 16:45:32 +0530 Subject: [PATCH 4/4] Removed card color logic --- .../presentation/adapter/UserListAdapter.kt | 37 ++++--------------- 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt b/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt index 4151f67..dd0f288 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt @@ -1,7 +1,6 @@ package com.example.hpostesting.presentation.adapter import android.annotation.SuppressLint -import android.graphics.Color import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -43,16 +42,11 @@ class UserListAdapter( if (model.incubationTime == "") { btnStartIncubation.visibility = View.VISIBLE } else { - userId.text = "User ID:${model._id} \n Time: ${isBetween15And30Minutes(model.incubationTime)}" + userId.text = + "User ID:${model._id} \n Time: ${isBetween15And30Minutes(model.incubationTime)}" btnStartIncubation.visibility = View.GONE } - if (isTimeEqual(model.incubationTime, 15)) { - userCard.setCardBackgroundColor(Color.GREEN) - } else if (isTimeEqual(model.incubationTime, 25)) { - userCard.setCardBackgroundColor(Color.RED) - } - Glide.with(view).load(model.userImageURL).into(userImage) if (model.testStatus!!) { @@ -73,11 +67,11 @@ class UserListAdapter( "yyyy-MM-dd HH:mm:ss", Locale.getDefault() ).format(Calendar.getInstance().time).toString() ).addOnSuccessListener { - Toast.makeText( - view.context, "Incubation started", Toast.LENGTH_SHORT - ).show() - startListening() - } + Toast.makeText( + view.context, "Incubation started", Toast.LENGTH_SHORT + ).show() + startListening() + } } } } @@ -134,21 +128,4 @@ class UserListAdapter( } - - private fun isTimeEqual(createdAt: String, targetMinutes: Int): Boolean { - val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()) - val createdAtDate: Date = formatter.parse(createdAt) ?: return false // Return false if parsing fails - - val currentTime = Calendar.getInstance().time - - val diffMillis = currentTime.time - createdAtDate.time - val diffMinutes = diffMillis / (60 * 1000) - - // Check if the difference in minutes is equal to the targetMinutes - return diffMinutes.toInt() == targetMinutes - } - - - - } \ No newline at end of file