From c6307f50615ffdaad2db0572e95bc7dd0c837be9 Mon Sep 17 00:00:00 2001
From: Aidan Follestad <afollestad@squareup.com>
Date: Sat, 1 Dec 2018 12:33:57 -0800
Subject: [PATCH] Main list shows 'Now' as the next check time if the status is
 pending

---
 .../nocknock/adapter/ServerAdapter.kt         | 30 +++++++++++--------
 app/src/main/res/values/strings.xml           |  1 +
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/afollestad/nocknock/adapter/ServerAdapter.kt b/app/src/main/java/com/afollestad/nocknock/adapter/ServerAdapter.kt
index c3bc156..3bf58cc 100644
--- a/app/src/main/java/com/afollestad/nocknock/adapter/ServerAdapter.kt
+++ b/app/src/main/java/com/afollestad/nocknock/adapter/ServerAdapter.kt
@@ -11,6 +11,7 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.afollestad.nocknock.R
 import com.afollestad.nocknock.data.ServerModel
+import com.afollestad.nocknock.data.isPending
 import com.afollestad.nocknock.data.textRes
 import com.afollestad.nocknock.utilities.ui.onDebouncedClick
 import kotlinx.android.synthetic.main.list_item_server.view.iconStatus
@@ -46,13 +47,23 @@ class ServerVH constructor(
       itemView.textStatus.setText(statusText)
     }
 
-    if (model.disabled) {
-      itemView.textInterval.setText(R.string.checks_disabled)
-    } else {
-      itemView.textInterval.text = itemView.resources.getString(
-          R.string.next_check_x,
-          model.intervalText()
-      )
+    val res = itemView.resources
+    when {
+      model.disabled -> {
+        itemView.textInterval.setText(R.string.checks_disabled)
+      }
+      model.status.isPending() -> {
+        itemView.textInterval.text = res.getString(
+            R.string.next_check_x,
+            res.getString(R.string.now)
+        )
+      }
+      else -> {
+        itemView.textInterval.text = res.getString(
+            R.string.next_check_x,
+            model.intervalText()
+        )
+      }
     }
   }
 
@@ -116,11 +127,6 @@ class ServerAdapter(private val listener: Listener) : RecyclerView.Adapter<Serve
     notifyDataSetChanged()
   }
 
-  fun clear() {
-    models.clear()
-    notifyDataSetChanged()
-  }
-
   override fun onCreateViewHolder(
     parent: ViewGroup,
     viewType: Int
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6a4e99d..62b0a69 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -37,6 +37,7 @@
   <string name="last_check_result">Last Check Result</string>
   <string name="next_check">Next Check</string>
   <string name="next_check_x">Next Check: %1$s</string>
+  <string name="now">Now</string>
   <string name="none_turned_off">None (turned off)</string>
   <string name="none">None</string>