From c9f59aace4138263b0695a3f0ce11b84515d560a Mon Sep 17 00:00:00 2001 From: Lakoja Date: Fri, 14 Apr 2023 11:56:10 +0200 Subject: [PATCH 1/4] 3530: Provide a help text on the empty conversations view --- .../tusky/components/conversation/ConversationsFragment.kt | 1 + app/src/main/res/values/strings.xml | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt index 48d1e87b8..97a4d7583 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt @@ -134,6 +134,7 @@ class ConversationsFragment : if (loadState.append is LoadState.NotLoading && loadState.source.refresh is LoadState.NotLoading) { binding.statusView.show() binding.statusView.setup(R.drawable.elephant_friend_empty, R.string.message_empty, null) + binding.statusView.showHelp(R.string.help_empty_conversations) } } is LoadState.Error -> { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c00363661..8c4527de2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -814,6 +814,12 @@ you follow.\n\nTo explore accounts you can either discover them in one of the other timelines. For example the local timeline of your instance [iconics gmd_group]. Or you can search them by name [iconics gmd_search]; for example search for Tusky to find our Mastodon account. + Here are your private messages; sometimes called conversations or direct messages (DM). + \n\nPrivate messages are created by setting the visibility [iconics gmd_public] of a post to [iconics gmd_mail] \"Direct\" and + mentioning one or more users in the text. + \n\nFor example you can start on the profile view of an account and tap the create button [iconics gmd_edit] and change the visibility. + + Load newest notifications Copy version and device information Copied version and device information From 0d1340781b83fe2991167cd56369df36db216b6a Mon Sep 17 00:00:00 2001 From: Lakoja Date: Tue, 18 Apr 2023 11:24:35 +0200 Subject: [PATCH 2/4] 3530: Add help text for empty lists view. --- app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt | 1 + app/src/main/res/values/strings.xml | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt b/app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt index 89b442a3a..8467e8542 100644 --- a/app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt @@ -192,6 +192,7 @@ class ListsActivity : BaseActivity(), Injectable, HasAndroidInjector { R.string.message_empty, null ) + binding.messageView.showHelp(R.string.help_empty_lists) } else { binding.messageView.hide() } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8c4527de2..dd4c2aea2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -819,6 +819,12 @@ mentioning one or more users in the text. \n\nFor example you can start on the profile view of an account and tap the create button [iconics gmd_edit] and change the visibility. + This is your lists view. You can define a number of private lists and add accounts to that. + \n\n + NOTE that you can only add accounts you follow to your lists. + \n\n + These lists can be used as a tab in Account preferences [iconics gmd_account_circle] [iconics gmd_navigate_next] Tabs. + Load newest notifications Copy version and device information From 7347ab96ddb4b9df7878fcaae7e6fd114a2f01be Mon Sep 17 00:00:00 2001 From: Lakoja Date: Tue, 18 Apr 2023 11:25:17 +0200 Subject: [PATCH 3/4] 3530: Hide help text if the message view is reconfigured (ie an error occurred). --- .../java/com/keylesspalace/tusky/view/BackgroundMessageView.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/keylesspalace/tusky/view/BackgroundMessageView.kt b/app/src/main/java/com/keylesspalace/tusky/view/BackgroundMessageView.kt index e24d79413..c33533628 100644 --- a/app/src/main/java/com/keylesspalace/tusky/view/BackgroundMessageView.kt +++ b/app/src/main/java/com/keylesspalace/tusky/view/BackgroundMessageView.kt @@ -61,6 +61,7 @@ class BackgroundMessageView @JvmOverloads constructor( binding.imageView.setImageResource(imageRes) binding.button.setOnClickListener(clickListener) binding.button.visible(clickListener != null) + binding.helpText.visible(false) } fun showHelp(@StringRes helpRes: Int) { From 8de23d33b89ac87b228a01b68800bc25e97e43e4 Mon Sep 17 00:00:00 2001 From: Lakoja Date: Wed, 2 Aug 2023 10:23:26 +0200 Subject: [PATCH 4/4] 3530: Change (remove) quotes --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dd4c2aea2..ce9ea57b0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -815,7 +815,7 @@ For example the local timeline of your instance [iconics gmd_group]. Or you can search them by name [iconics gmd_search]; for example search for Tusky to find our Mastodon account. Here are your private messages; sometimes called conversations or direct messages (DM). - \n\nPrivate messages are created by setting the visibility [iconics gmd_public] of a post to [iconics gmd_mail] \"Direct\" and + \n\nPrivate messages are created by setting the visibility [iconics gmd_public] of a post to [iconics gmd_mail] Direct and mentioning one or more users in the text. \n\nFor example you can start on the profile view of an account and tap the create button [iconics gmd_edit] and change the visibility.