Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use neutral Talk verbiage in saved messages. #4552

Merged
merged 9 commits into from
Mar 27, 2024
Merged

Use neutral Talk verbiage in saved messages. #4552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
eb32cdd
Remove unused parameter and logic.
dbrant Mar 26, 2024
490d44e
Update Talk icon and label.
dbrant Mar 26, 2024
a00dafa
Update empty verbiage.
dbrant Mar 26, 2024
d5dbfa8
Update correct title.
dbrant Mar 26, 2024
d408f77
Remove unnecessary tooltip call.
dbrant Mar 26, 2024
6938a40
Merge branch 'main' into warnText_design
dbrant Mar 26, 2024
621450d
Merge branch 'main' into warnText_design
dbrant Mar 27, 2024
a168bbc
Revert "Remove unused parameter and logic."
dbrant Mar 27, 2024
809ecc7
Also set title of TalkReplyActivity.
dbrant Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions app/src/main/java/org/wikipedia/talk/TalkReplyActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
30 changes: 27 additions & 3 deletions app/src/main/java/org/wikipedia/talk/template/TalkTemplatesFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
}
Expand Down Expand Up @@ -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))

Expand All @@ -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
}
Expand Down Expand Up @@ -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() {
Expand Down
7 changes: 0 additions & 7 deletions app/src/main/res/drawable/ic_warning_outline_24.xml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions app/src/main/res/layout/fragment_article_edit_details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down