Open View Entry screen if there's only one entry on Throwback date

Otherwise will open the Throwback Entries screen Also bumps version number
MarcDonald · Jun 30, 2019 · a37af2a · a37af2a
1 parent f6614ba
commit a37af2a
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -14,8 +14,8 @@ android {
         applicationId "com.marcdonald.hibi"
         minSdkVersion 23
         targetSdkVersion 28
-        versionCode 29
-        versionName "1.2.0"
+        versionCode 30
+        versionName "1.2.1"
         setProperty("archivesBaseName", "Hibi-v$versionName")
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/.../com/marcdonald/hibi/mainscreens/throwbackscreen/mainthrowbackscreen/ThrowbackFragment.kt b/.../com/marcdonald/hibi/mainscreens/throwbackscreen/mainthrowbackscreen/ThrowbackFragment.kt
@@ -10,6 +10,7 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
+import androidx.navigation.NavDirections
 import androidx.navigation.Navigation
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -87,8 +88,14 @@ class ThrowbackFragment : Fragment(), KodeinAware {
     })
   }
 
-  private fun onItemClick(day: Int, month: Int, year: Int) {
-    val action = ThrowbackFragmentDirections.throwbackEntriesAction(day, month, year)
+  private fun onItemClick(amountOfOtherEntries: Int, entryId: Int, day: Int, month: Int, year: Int) {
+    val action: NavDirections
+    if(amountOfOtherEntries == 0) {
+      action = ThrowbackFragmentDirections.viewEntryAction()
+      action.entryId = entryId
+    } else {
+      action = ThrowbackFragmentDirections.throwbackEntriesAction(day, month, year)
+    }
     Navigation.findNavController(requireParentFragment().requireView()).navigate(action)
   }
 }
diff --git a/...rcdonald/hibi/mainscreens/throwbackscreen/mainthrowbackscreen/ThrowbackRecyclerAdapter.kt b/...rcdonald/hibi/mainscreens/throwbackscreen/mainthrowbackscreen/ThrowbackRecyclerAdapter.kt
@@ -9,7 +9,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.marcdonald.hibi.R
 
 class ThrowbackRecyclerAdapter(private val context: Context,
-                               private val onClick: (day: Int, month: Int, year: Int) -> Unit)
+                               private val onClick: (amountOfEntriesOnDay: Int, entryId: Int, day: Int, month: Int, year: Int) -> Unit)
   : RecyclerView.Adapter<ThrowbackRecyclerViewHolder>() {
 
   private val inflater: LayoutInflater = LayoutInflater.from(context)
@@ -18,7 +18,13 @@ class ThrowbackRecyclerAdapter(private val context: Context,
 
   override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ThrowbackRecyclerViewHolder {
     val view = inflater.inflate(R.layout.item_throwback, parent, false)
-    return ThrowbackRecyclerViewHolder(view, onClick)
+    return ThrowbackRecyclerViewHolder(view, ::onViewHolderClick)
+  }
+
+  private fun onViewHolderClick(adapterPosition: Int) {
+    val item = items[adapterPosition]
+    val itemEntry = item.entryDisplayItem.entry
+    onClick(item.amountOfOtherEntries, itemEntry.id, itemEntry.day, itemEntry.month, itemEntry.year)
   }
 
   override fun getItemCount(): Int {

diff --git a/...onald/hibi/mainscreens/throwbackscreen/mainthrowbackscreen/ThrowbackRecyclerViewHolder.kt b/...onald/hibi/mainscreens/throwbackscreen/mainthrowbackscreen/ThrowbackRecyclerViewHolder.kt
@@ -17,7 +17,7 @@ import com.marcdonald.hibi.internal.utils.formatTimeForDisplay
 import java.util.*
 
 class ThrowbackRecyclerViewHolder(itemView: View,
-                                  onClick: (day: Int, month: Int, year: Int) -> Unit)
+                                  onClick: (adapterPosition: Int) -> Unit)
   : RecyclerView.ViewHolder(itemView) {
 
   // <editor-fold desc="UI Components">
@@ -38,9 +38,7 @@ class ThrowbackRecyclerViewHolder(itemView: View,
 
   init {
     itemView.findViewById<LinearLayout>(R.id.lin_throwback).setOnClickListener {
-      displayedItem?.let { item ->
-        onClick(item.entryDisplayItem.entry.day, item.entryDisplayItem.entry.month, item.entryDisplayItem.entry.year)
-      }
+      onClick(adapterPosition)
     }
   }
 

diff --git a/app/src/main/res/navigation/main_navigation.xml b/app/src/main/res/navigation/main_navigation.xml
@@ -213,6 +213,18 @@
         android:name="year"
         app:argType="integer" />
     </action>
+    <action
+      android:id="@+id/view_entry_action"
+      app:destination="@id/destination_view_entry"
+      app:enterAnim="@anim/nav_default_enter_anim"
+      app:exitAnim="@anim/nav_default_exit_anim"
+      app:popEnterAnim="@anim/nav_default_pop_enter_anim"
+      app:popExitAnim="@anim/nav_default_pop_exit_anim">
+      <argument
+        android:name="entryId"
+        app:argType="integer"
+        android:defaultValue="0" />
+    </action>
   </fragment>
   <!--endregion-->