Use neutral Talk verbiage in saved messages. (#4552)

* Remove unused parameter and logic. * Update Talk icon and label. * Update empty verbiage. * Update correct title. * Remove unnecessary tooltip call. * Revert "Remove unused parameter and logic." This reverts commit eb32cdd. * Also set title of TalkReplyActivity.
wikimedia · Mar 27, 2024 · 6a32f12 · 6a32f12
1 parent 1c0f33c
commit 6a32f12
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 16 deletions.
diff --git a/app/src/main/java/org/wikipedia/talk/TalkReplyActivity.kt b/app/src/main/java/org/wikipedia/talk/TalkReplyActivity.kt
@@ -255,16 +255,15 @@ class TalkReplyActivity : BaseActivity(), UserMentionInputView.Listener, EditPre
     }
 
     private fun setToolbarTitle(pageTitle: PageTitle) {
-        val title = StringUtil.fromHtml(
-            if (viewModel.isNewTopic || viewModel.isFromDiff) pageTitle.namespace.ifEmpty { TalkAliasData.valueFor(pageTitle.wikiSite.languageCode) } + ": " + "<a href='#'>${StringUtil.removeNamespace(pageTitle.displayText)}</a>"
+        val title = if (viewModel.templateManagementMode) getString(R.string.talk_warn_saved_messages) else
+        StringUtil.fromHtml(if (viewModel.isNewTopic || viewModel.isFromDiff) pageTitle.namespace.ifEmpty { TalkAliasData.valueFor(pageTitle.wikiSite.languageCode) } + ": " + "<a href='#'>${StringUtil.removeNamespace(pageTitle.displayText)}</a>"
             else intent.getStringExtra(EXTRA_PARENT_SUBJECT).orEmpty()
         ).trim().ifEmpty { getString(R.string.talk_no_subject) }
         ViewUtil.getTitleViewFromToolbar(binding.replyToolbar)?.let {
             it.movementMethod = LinkMovementMethodExt { _ ->
                 val entry = HistoryEntry(TalkTopicsActivity.getNonTalkPageTitle(pageTitle), HistoryEntry.SOURCE_TALK_TOPIC)
                 startActivity(PageActivity.newIntentForNewTab(this, entry, entry.title))
             }
-            FeedbackUtil.setButtonTooltip(it)
         }
         supportActionBar?.title = title
     }

diff --git a/app/src/main/java/org/wikipedia/talk/template/TalkTemplatesFragment.kt b/app/src/main/java/org/wikipedia/talk/template/TalkTemplatesFragment.kt
@@ -29,8 +29,11 @@ import org.wikipedia.Constants
 import org.wikipedia.R
 import org.wikipedia.analytics.eventplatform.PatrollerExperienceEvent
 import org.wikipedia.databinding.FragmentTalkTemplatesBinding
+import org.wikipedia.history.HistoryEntry
 import org.wikipedia.page.LinkMovementMethodExt
+import org.wikipedia.page.PageActivity
 import org.wikipedia.page.PageTitle
+import org.wikipedia.staticdata.TalkAliasData
 import org.wikipedia.talk.TalkReplyActivity
 import org.wikipedia.talk.TalkReplyActivity.Companion.EXTRA_TEMPLATE_MANAGEMENT
 import org.wikipedia.talk.TalkReplyActivity.Companion.RESULT_BACK_FROM_TOPIC
@@ -41,6 +44,7 @@ import org.wikipedia.util.StringUtil
 import org.wikipedia.views.DrawableItemDecoration
 import org.wikipedia.views.MultiSelectActionModeCallback
 import org.wikipedia.views.SwipeableItemTouchHelperCallback
+import org.wikipedia.views.ViewUtil
 
 class TalkTemplatesFragment : Fragment() {
     private var _binding: FragmentTalkTemplatesBinding? = null
@@ -63,8 +67,14 @@ class TalkTemplatesFragment : Fragment() {
 
         (requireActivity() as AppCompatActivity).setSupportActionBar(binding.toolbar)
         (requireActivity() as AppCompatActivity).supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        (requireActivity() as AppCompatActivity).supportActionBar?.title =
-            getString(if (viewModel.templateManagementMode) R.string.talk_warn_saved_messages else R.string.talk_warn)
+
+        setToolbarTitle()
+
+        binding.talkTemplatesRecyclerView.setHasFixedSize(true)
+        adapter = RecyclerAdapter()
+        binding.talkTemplatesRecyclerView.adapter = adapter
+        binding.talkTemplatesRecyclerView.layoutManager = LinearLayoutManager(requireContext())
+        binding.talkTemplatesRecyclerView.addItemDecoration(DrawableItemDecoration(requireContext(), R.attr.list_divider, drawStart = true, drawEnd = false))
 
         return binding.root
     }
@@ -186,6 +196,7 @@ class TalkTemplatesFragment : Fragment() {
 
             override fun onTabReselected(tab: TabLayout.Tab) {}
         })
+        setUpTouchListeners()
 
         binding.talkTemplatesEmptyStateTextView.text = StringUtil.fromHtml(getString(R.string.talk_templates_empty_message))
 
@@ -195,6 +206,20 @@ class TalkTemplatesFragment : Fragment() {
         }
     }
 
+    private fun setToolbarTitle() {
+        val title = if (viewModel.templateManagementMode) getString(R.string.talk_warn_saved_messages) else
+            StringUtil.fromHtml(viewModel.pageTitle.namespace.ifEmpty { TalkAliasData.valueFor(viewModel.pageTitle.wikiSite.languageCode) } +
+                ": " + "<a href='#'>${StringUtil.removeNamespace(viewModel.pageTitle.displayText)}</a>"
+        ).trim().ifEmpty { getString(R.string.talk_no_subject) }
+        ViewUtil.getTitleViewFromToolbar(binding.toolbar)?.let {
+            it.movementMethod = LinkMovementMethodExt { _ ->
+                val entry = HistoryEntry(TalkTopicsActivity.getNonTalkPageTitle(viewModel.pageTitle), HistoryEntry.SOURCE_TALK_TOPIC)
+                startActivity(PageActivity.newIntentForNewTab(requireActivity(), entry, entry.title))
+            }
+        }
+        (requireActivity() as AppCompatActivity).supportActionBar?.title = title
+    }
+
     private fun showToolbarEditView(visible: Boolean) {
         binding.toolBarEditView.isVisible = visible
     }
@@ -233,7 +258,6 @@ class TalkTemplatesFragment : Fragment() {
         binding.talkTemplatesRecyclerView.layoutManager = LinearLayoutManager(requireContext())
         binding.talkTemplatesRecyclerView.addItemDecoration(DrawableItemDecoration(requireContext(), R.attr.list_divider, drawStart = true, drawEnd = false))
         updateAndNotifyAdapter()
-        setUpTouchListeners()
     }
 
     private fun onLoading() {

diff --git a/app/src/main/res/drawable/ic_warning_outline_24.xml b/app/src/main/res/drawable/ic_warning_outline_24.xml
diff --git a/app/src/main/res/layout/fragment_article_edit_details.xml b/app/src/main/res/layout/fragment_article_edit_details.xml
@@ -557,7 +557,7 @@
                 android:layout_marginTop="12dp"
                 android:layout_gravity="center_horizontal"
                 app:tint="?attr/placeholder_color"
-                app:srcCompat="@drawable/ic_warning_outline_24" />
+                app:srcCompat="@drawable/ic_notification_user_talk" />
 
             <TextView
                 style="@style/BottomNavigationTextAppearance"
@@ -566,7 +566,7 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="44dp"
                 android:textAlignment="center"
-                android:text="@string/talk_warn"
+                android:text="@string/talk_title"
                 android:textColor="?attr/placeholder_color"/>
 
         </FrameLayout>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1557,7 +1557,7 @@
     <!-- /Shareable reading lists -->
 
     <!-- Patroller task -->
-    <string name="talk_templates_empty_message"><![CDATA[Create your own warning messages or use <a href="#">example messages</a> to get started.]]>  </string>
+    <string name="talk_templates_empty_message"><![CDATA[Create your own messages or use <a href="#">example messages</a> to get started.]]>  </string>
     <string name="talk_templates_new_message_title">New message</string>
     <string name="talk_templates_new_message_subject_hint">Subject</string>
     <string name="talk_templates_new_message_compose_hint">Compose message</string>