From aa1a98439b3e55a61420c24e253c52ad921c8f6e Mon Sep 17 00:00:00 2001
From: cketti <cketti@thunderbird.net>
Date: Fri, 10 Mar 2023 13:33:42 +0100
Subject: [PATCH 1/3] Use `colorSecondary` for the snackbar button text

---
 app/ui/legacy/src/main/res/values/styles.xml | 4 ++++
 app/ui/legacy/src/main/res/values/themes.xml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/app/ui/legacy/src/main/res/values/styles.xml b/app/ui/legacy/src/main/res/values/styles.xml
index 22dec7c34..993262b19 100644
--- a/app/ui/legacy/src/main/res/values/styles.xml
+++ b/app/ui/legacy/src/main/res/values/styles.xml
@@ -115,5 +115,9 @@
         <item name="actionMenuTextColor">?android:attr/textColorSecondary</item>
     </style>
 
+    <style name="Widget.K9.Button.Snackbar" parent="Widget.MaterialComponents.Button.TextButton.Snackbar">
+        <item name="android:textColor">?attr/colorSecondary</item>
+    </style>
+
 </resources>
 
diff --git a/app/ui/legacy/src/main/res/values/themes.xml b/app/ui/legacy/src/main/res/values/themes.xml
index 03611b649..a15ab543a 100644
--- a/app/ui/legacy/src/main/res/values/themes.xml
+++ b/app/ui/legacy/src/main/res/values/themes.xml
@@ -164,6 +164,8 @@
         <item name="materialDrawerStyle">@style/Widget.MaterialDrawerStyle.K9.Light</item>
         <item name="materialDrawerHeaderStyle">@style/Widget.MaterialDrawerHeaderStyle.K9.Light</item>
         <item name="behindRecyclerView">#F0F0F0</item>
+
+        <item name="snackbarButtonStyle">@style/Widget.K9.Button.Snackbar</item>
     </style>
 
     <style name="Theme.K9.Light" parent="Theme.K9.Light.Common">
@@ -330,6 +332,8 @@
         <item name="materialDrawerHeaderStyle">@style/Widget.MaterialDrawerHeaderStyle.K9.Dark</item>
 
         <item name="behindRecyclerView">#202020</item>
+
+        <item name="snackbarButtonStyle">@style/Widget.K9.Button.Snackbar</item>
     </style>
 
     <style name="Theme.K9.Dialog.Light" parent="Theme.K9.Light">

From 1e7d5bf4ee75e4f28a42a0b02387237c3f25e1e5 Mon Sep 17 00:00:00 2001
From: cketti <cketti@thunderbird.net>
Date: Fri, 10 Mar 2023 13:49:13 +0100
Subject: [PATCH 2/3] Change button text of "recent changes" snackbar

---
 .../java/com/fsck/k9/ui/messagelist/MessageListFragment.kt     | 2 +-
 app/ui/legacy/src/main/res/values/strings.xml                  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt
index f318dd33f..998f5236a 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt
@@ -364,7 +364,7 @@ class MessageListFragment :
 
         recentChangesSnackbar = Snackbar
             .make(coordinatorLayout, R.string.changelog_snackbar_text, Snackbar.LENGTH_INDEFINITE)
-            .setAction(R.string.okay_action) { launchRecentChangesActivity() }
+            .setAction(R.string.changelog_snackbar_button_text) { launchRecentChangesActivity() }
             .addCallback(
                 object : BaseCallback<Snackbar>() {
                     override fun onDismissed(transientBottomBar: Snackbar?, event: Int) {
diff --git a/app/ui/legacy/src/main/res/values/strings.xml b/app/ui/legacy/src/main/res/values/strings.xml
index 745c9707a..f7b727f4d 100644
--- a/app/ui/legacy/src/main/res/values/strings.xml
+++ b/app/ui/legacy/src/main/res/values/strings.xml
@@ -29,7 +29,10 @@
     <string name="changelog_version_title">Version %s</string>
     <string name="changelog_recent_changes_title">What\'s new</string>
     <string name="changelog_show_recent_changes">Show recent changes when app was updated</string>
+    <!-- Displayed in a "snack bar" at the bottom of the screen when the app was updated. -->
     <string name="changelog_snackbar_text">Find out what\'s new in this release</string>
+    <!-- Button text of the "snack bar" that is displayed when the app was updated. -->
+    <string name="changelog_snackbar_button_text">View</string>
 
 
     <!-- Welcome message -->

From 3060e111db2957842892b5df9e625d6e239dfa81 Mon Sep 17 00:00:00 2001
From: cketti <cketti@thunderbird.net>
Date: Fri, 10 Mar 2023 13:59:42 +0100
Subject: [PATCH 3/3] Only show "recent changes" snackbar for 10 seconds

---
 .../java/com/fsck/k9/ui/messagelist/MessageListFragment.kt   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt
index 998f5236a..b9052436f 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt
@@ -66,6 +66,7 @@ import timber.log.Timber
 
 private const val MAXIMUM_MESSAGE_SORT_OVERRIDES = 3
 private const val MINIMUM_CLICK_INTERVAL = 200L
+private const val RECENT_CHANGES_SNACKBAR_DURATION = 10 * 1000
 
 class MessageListFragment :
     Fragment(),
@@ -363,12 +364,12 @@ class MessageListFragment :
         val coordinatorLayout = requireView().findViewById<View>(R.id.message_list_coordinator)
 
         recentChangesSnackbar = Snackbar
-            .make(coordinatorLayout, R.string.changelog_snackbar_text, Snackbar.LENGTH_INDEFINITE)
+            .make(coordinatorLayout, R.string.changelog_snackbar_text, RECENT_CHANGES_SNACKBAR_DURATION)
             .setAction(R.string.changelog_snackbar_button_text) { launchRecentChangesActivity() }
             .addCallback(
                 object : BaseCallback<Snackbar>() {
                     override fun onDismissed(transientBottomBar: Snackbar?, event: Int) {
-                        if (event == DISMISS_EVENT_SWIPE) {
+                        if (event == DISMISS_EVENT_SWIPE || event == DISMISS_EVENT_TIMEOUT) {
                             recentChangesViewModel.onRecentChangesHintDismissed()
                         }
                     }