LastRefresh now displays nicely

szczys · szczys · commit f5be5a82dd7b · 2020-07-17T01:37:49.000-05:00
diff --git a/app/src/main/java/com/jumptuck/recipebrowser2/recipelist/RecipeListFragment.kt b/app/src/main/java/com/jumptuck/recipebrowser2/recipelist/RecipeListFragment.kt
@@ -20,6 +20,9 @@ import com.jumptuck.recipebrowser2.settings.RecipeDeleteAllDialogBuilder
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.custom_action_bar_layout.view.*
 import timber.log.Timber
+import java.text.SimpleDateFormat
+import java.util.*
+import kotlin.collections.ArrayList
 
 class RecipeListFragment : Fragment() {
     lateinit var recipeListViewModel: RecipeListViewModel
@@ -122,9 +125,17 @@ class RecipeListFragment : Fragment() {
         /** Set last_refresh date in nav drawer header **/
         RecipeRepository.lastRefresh.observe(viewLifecycleOwner, Observer {
             it?.let {
+                val timestamp = RecipeRepository.lastRefresh.value
+                val stringTime: String
+                if (timestamp == 0L) { stringTime = getString(R.string.last_refresh_never) }
+                else {
+                    stringTime =
+                        SimpleDateFormat("MM/dd/yy hh:mma")
+                            .format(timestamp)
+                }
                 val navigationView = requireActivity().findViewById<NavigationView>(R.id.navView)
                 navigationView
-                    .findViewById<TextView>(R.id.last_refresh).text = RecipeRepository.lastRefresh.value.toString()
+                    .findViewById<TextView>(R.id.last_refresh_value).text = stringTime
             }
         })
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -45,15 +45,21 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
-                android:clickable="true"
+                android:paddingStart="16dp"
+                android:paddingBottom="16dp"
                 android:orientation="vertical">
 
                 <TextView
-                    android:id="@+id/last_refresh"
+                    android:id="@+id/last_refresh_title"
                     android:layout_width="match_parent"
-                    android:layout_height="48dp"
-                    android:gravity="center"
-                    android:text="Last Refresh" />
+                    android:layout_height="22dp"
+                    android:gravity="start"
+                    android:text="@string/nav_drawer_footer_last_refresh" />
+                <TextView
+                    android:id="@+id/last_refresh_value"
+                    android:layout_width="match_parent"
+                    android:layout_height="22dp"
+                    android:gravity="start" />
             </LinearLayout>
         </com.google.android.material.navigation.NavigationView>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -50,6 +50,8 @@
     <string name="nav_header_icon_description">Pie slice icon</string>
     <string name="nav_header_title">Recipe\nBrowser</string>
     <string name="refresh_action_force">Force Refresh</string>
+    <string name="nav_drawer_footer_last_refresh">Last Refresh:</string>
+    <string name="last_refresh_never">Never</string>
 
     <plurals name="numberOfRecipes">
         <item quantity="one">%d Recipe</item>
