diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/MyStoriesItem.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/MyStoriesItem.kt index d99d74f55e..d721d94edc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/MyStoriesItem.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/MyStoriesItem.kt @@ -19,22 +19,17 @@ object MyStoriesItem { } class Model( - val onClick: () -> Unit, - val onClickThumbnail: () -> Unit + val onClick: () -> Unit ) : PreferenceModel() { override fun areItemsTheSame(newItem: Model): Boolean = true } private class ViewHolder(itemView: View) : MappingViewHolder(itemView) { - private val thumbnail: View = itemView.findViewById(R.id.story) private val avatarView: AvatarView = itemView.findViewById(R.id.avatar) override fun bind(model: Model) { itemView.setOnClickListener { model.onClick() } - thumbnail.setOnClickListener { model.onClickThumbnail() } - avatarView.setOnClickListener { model.onClickThumbnail() } - avatarView.displayProfileAvatar(Recipient.self()) } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt index 639c09fd6d..f69952dd49 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt @@ -172,9 +172,6 @@ class StoriesLandingFragment : DSLSettingsFragment(layoutId = R.layout.stories_l customPref( MyStoriesItem.Model( onClick = { - startActivityIfAble(Intent(requireContext(), MyStoriesActivity::class.java)) - }, - onClickThumbnail = { cameraFab.performClick() } ) diff --git a/app/src/main/res/layout/stories_landing_item_my_stories.xml b/app/src/main/res/layout/stories_landing_item_my_stories.xml index f4b55385f6..af6e02923c 100644 --- a/app/src/main/res/layout/stories_landing_item_my_stories.xml +++ b/app/src/main/res/layout/stories_landing_item_my_stories.xml @@ -1,12 +1,13 @@ + android:background="@drawable/conversation_list_item_background" + android:paddingStart="@dimen/dsl_settings_gutter" + android:paddingEnd="@dimen/dsl_settings_gutter" + tools:viewBindingIgnore="true"> @@ -49,28 +50,12 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:text="@string/StoriesLandingFragment__add_a_story" + android:text="@string/StoriesLandingFragment__tap_to_add_a_story" android:textAppearance="@style/Signal.Text.BodyMedium" android:textColor="@color/signal_colorOnSurfaceVariant" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@id/story" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/avatar" app:layout_constraintTop_toBottomOf="@id/sender" /> - - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f69aece970..ad4ba12a6c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4578,7 +4578,7 @@ My Stories - Add a story + Tap to add a story No recent updates to show right now. Tap + to add to your story.