Merge branch 'Homocube' of https://gitlab.com/sminnovations/hpos into Homocube
This commit is contained in:
@@ -15,7 +15,7 @@ android {
|
|||||||
namespace 'in.sminnovations.hpostesting'
|
namespace 'in.sminnovations.hpostesting'
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "in.sminnovations.hpostesting.prod"
|
applicationId "in.sminnovations.hpostesting"
|
||||||
minSdk 21
|
minSdk 21
|
||||||
targetSdk 34
|
targetSdk 34
|
||||||
versionCode 14
|
versionCode 14
|
||||||
|
|||||||
@@ -42,9 +42,12 @@ class UserListAdapter(
|
|||||||
if (model.incubationTime == "") {
|
if (model.incubationTime == "") {
|
||||||
btnStartIncubation.visibility = View.VISIBLE
|
btnStartIncubation.visibility = View.VISIBLE
|
||||||
} else {
|
} 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
|
btnStartIncubation.visibility = View.GONE
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Glide.with(view).load(model.userImageURL).into(userImage)
|
Glide.with(view).load(model.userImageURL).into(userImage)
|
||||||
if (model.testStatus!!) {
|
if (model.testStatus!!) {
|
||||||
teststatus.text = "Test concluded"
|
teststatus.text = "Test concluded"
|
||||||
@@ -64,11 +67,11 @@ class UserListAdapter(
|
|||||||
"yyyy-MM-dd HH:mm:ss", Locale.getDefault()
|
"yyyy-MM-dd HH:mm:ss", Locale.getDefault()
|
||||||
).format(Calendar.getInstance().time).toString()
|
).format(Calendar.getInstance().time).toString()
|
||||||
).addOnSuccessListener {
|
).addOnSuccessListener {
|
||||||
Toast.makeText(
|
Toast.makeText(
|
||||||
view.context, "Incubation started", Toast.LENGTH_SHORT
|
view.context, "Incubation started", Toast.LENGTH_SHORT
|
||||||
).show()
|
).show()
|
||||||
startListening()
|
startListening()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -123,4 +126,6 @@ class UserListAdapter(
|
|||||||
|
|
||||||
return diffMillis / (60 * 1000)
|
return diffMillis / (60 * 1000)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user