From 41b58139845da0ff697ded6d1c824adf86801400 Mon Sep 17 00:00:00 2001
From: Rashad Sookram <rashad@signal.org>
Date: Tue, 1 Mar 2022 16:58:51 -0500
Subject: [PATCH] Open story viewer from MyStoriesFragment.

---
 .../settings/app/account/AccountSettingsFragment.kt          | 1 -
 .../thoughtcrime/securesms/stories/my/MyStoriesFragment.kt   | 5 +++++
 .../org/thoughtcrime/securesms/stories/my/MyStoriesItem.kt   | 2 ++
 app/src/main/res/layout/stories_my_stories_item.xml          | 3 ++-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt
index 7a67464f77..d76a2ee67a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt
@@ -31,7 +31,6 @@ import org.thoughtcrime.securesms.lock.v2.KbsConstants
 import org.thoughtcrime.securesms.lock.v2.PinKeyboardType
 import org.thoughtcrime.securesms.pin.RegistrationLockV2Dialog
 import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.ServiceUtil
 import org.thoughtcrime.securesms.util.ThemeUtil
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesFragment.kt
index 3946eef5e3..62acefc1f5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesFragment.kt
@@ -12,6 +12,7 @@ import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectFor
 import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.stories.dialogs.StoryContextMenu
+import org.thoughtcrime.securesms.stories.viewer.StoryViewerActivity
 import org.thoughtcrime.securesms.util.LifecycleDisposable
 
 class MyStoriesFragment : DSLSettingsFragment(
@@ -54,6 +55,10 @@ class MyStoriesFragment : DSLSettingsFragment(
             customPref(
               MyStoriesItem.Model(
                 distributionStory = conversationMessage,
+                onClick = {
+                  // TODO [stories] pass in something more specific to start with the correct progress
+                  startActivity(StoryViewerActivity.createIntent(requireContext(), Recipient.self().id))
+                },
                 onSaveClick = {
                   StoryContextMenu.save(requireContext(), it.distributionStory.messageRecord)
                 },
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesItem.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesItem.kt
index c4d66603ac..23c4b38cc1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesItem.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesItem.kt
@@ -25,6 +25,7 @@ object MyStoriesItem {
 
   class Model(
     val distributionStory: ConversationMessage,
+    val onClick: (Model) -> Unit,
     val onSaveClick: (Model) -> Unit,
     val onDeleteClick: (Model) -> Unit,
     val onForwardClick: (Model) -> Unit,
@@ -48,6 +49,7 @@ object MyStoriesItem {
     private val date: TextView = itemView.findViewById(R.id.date)
 
     override fun bind(model: Model) {
+      itemView.setOnClickListener { model.onClick(model) }
       downloadTarget.setOnClickListener { model.onSaveClick(model) }
       moreTarget.setOnClickListener { showContextMenu(model) }
       viewCount.text = context.resources.getQuantityString(R.plurals.MyStories__d_views, model.distributionStory.messageRecord.readReceiptCount, model.distributionStory.messageRecord.readReceiptCount)
diff --git a/app/src/main/res/layout/stories_my_stories_item.xml b/app/src/main/res/layout/stories_my_stories_item.xml
index c8ec493c88..a3a6136d9e 100644
--- a/app/src/main/res/layout/stories_my_stories_item.xml
+++ b/app/src/main/res/layout/stories_my_stories_item.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingStart="@dimen/dsl_settings_gutter"
-    android:paddingEnd="@dimen/dsl_settings_gutter">
+    android:paddingEnd="@dimen/dsl_settings_gutter"
+    android:background="?selectableItemBackground">
 
     <org.thoughtcrime.securesms.components.ThumbnailView
         android:id="@+id/story"