From 1e1bce79b4d891c71f43447c78a1f59bcbdec7c2 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Tue, 21 Feb 2023 08:59:34 +0100
Subject: [PATCH 1/9] remove import settings button from wizard_setup.xml and
 activity

---
 .../com/fsck/k9/activity/setup/AccountSetupBasics.kt   | 10 ----------
 app/ui/legacy/src/main/res/layout/wizard_setup.xml     |  9 ---------
 2 files changed, 19 deletions(-)

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt
index 3e31c8ed4a..4219a7fb8b 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt
@@ -67,7 +67,6 @@ class AccountSetupBasics : K9Activity() {
     private lateinit var advancedOptionsContainer: View
     private lateinit var nextButton: Button
     private lateinit var manualSetupButton: Button
-    private lateinit var importSettingsButton: Button
     private lateinit var allowClientCertificateView: ViewGroup
 
     private var uiState = UiState.EMAIL_ADDRESS_ONLY
@@ -88,10 +87,7 @@ class AccountSetupBasics : K9Activity() {
         advancedOptionsContainer = findViewById(R.id.foldable_advanced_options)
         nextButton = findViewById(R.id.next)
         manualSetupButton = findViewById(R.id.manual_setup)
-        importSettingsButton = findViewById(R.id.import_settings)
-
         manualSetupButton.setOnClickListener { onManualSetup() }
-        importSettingsButton.setOnClickListener { onImportSettings() }
     }
 
     override fun onPostCreate(savedInstanceState: Bundle?) {
@@ -339,12 +335,6 @@ class AccountSetupBasics : K9Activity() {
         AccountSetupAccountType.actionSelectAccountType(this, account, makeDefault = false, initialAccountSettings)
     }
 
-    private fun onImportSettings() {
-        val intent = Intent(this, AccountSetupImportSettings::class.java)
-        startActivity(intent)
-        finish()
-    }
-
     private fun initAccount(email: String): Account {
         val account = this.account ?: createAccount().also { this.account = it }
 
diff --git a/app/ui/legacy/src/main/res/layout/wizard_setup.xml b/app/ui/legacy/src/main/res/layout/wizard_setup.xml
index 570c56ad41..199c3d55df 100644
--- a/app/ui/legacy/src/main/res/layout/wizard_setup.xml
+++ b/app/ui/legacy/src/main/res/layout/wizard_setup.xml
@@ -22,15 +22,6 @@
             android:background="?selectableItemBackground"
             android:text="@string/account_setup_basics_manual_setup_action" />
 
-        <Button
-            android:id="@+id/import_settings"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:background="?selectableItemBackground"
-            android:text="@string/settings_import" />
-
         <Button
             android:id="@+id/next"
             style="?android:attr/buttonBarButtonStyle"
-- 
GitLab


From 17f07ee3961a39999d92a3bbf5da73e849ddc325 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Tue, 21 Feb 2023 09:45:35 +0100
Subject: [PATCH 2/9] Call OnBoardingActivity from MessageList if no account
 instead of AccoutnSetupBasics

---
 .../src/main/java/com/fsck/k9/activity/MessageList.kt     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
index fbaddd1ef9..e630a84a91 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright ECORP SAS 2022
+ * Copyright ECORP SAS 2022-2023
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -52,7 +52,6 @@ import com.fsck.k9.Preferences
 import com.fsck.k9.account.AccountCreator
 import com.fsck.k9.account.BackgroundAccountRemover
 import com.fsck.k9.activity.compose.MessageActions
-import com.fsck.k9.activity.setup.AccountSetupBasics
 import com.fsck.k9.activity.setup.accountmanager.EeloAccountCreator
 import com.fsck.k9.controller.MessageReference
 import com.fsck.k9.controller.MessagingController
@@ -81,6 +80,7 @@ import com.fsck.k9.ui.messageview.MessageViewContainerFragment
 import com.fsck.k9.ui.messageview.MessageViewContainerFragment.MessageViewContainerListener
 import com.fsck.k9.ui.messageview.MessageViewFragment.MessageViewFragmentListener
 import com.fsck.k9.ui.messageview.PlaceholderFragment
+import com.fsck.k9.ui.onboarding.OnboardingActivity
 import com.fsck.k9.ui.permissions.K9PermissionUiHelper
 import com.fsck.k9.ui.permissions.Permission
 import com.fsck.k9.ui.permissions.PermissionUiHelper
@@ -181,7 +181,9 @@ open class MessageList :
         if (!hasAccountSetup) {
             generalSettingsManager.setReloadAccountChipsColors(false)
 
-            AccountSetupBasics.actionNewAccount(this)
+
+            val intent = Intent(this, OnboardingActivity::class.java)
+            startActivity(intent)
             finish()
             return
         }
-- 
GitLab


From 04e750ee16477f3d4a476f10feb0b6148e184048 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Tue, 21 Feb 2023 12:43:15 +0100
Subject: [PATCH 3/9] import new icon & new text form welcome fragment

---
 .../fsck/k9/ui/onboarding/WelcomeFragment.kt  |  4 +-
 .../src/main/res/drawable/ic_welcome_mail.xml | 83 +++++++++++++++++++
 .../res/layout/fragment_welcome_message.xml   |  7 ++
 app/ui/legacy/src/main/res/values/strings.xml |  1 +
 4 files changed, 93 insertions(+), 2 deletions(-)
 create mode 100644 app/ui/legacy/src/main/res/drawable/ic_welcome_mail.xml

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt
index 5848703a7d..9d6c18f59d 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt
@@ -29,7 +29,7 @@ class WelcomeFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         val welcome: TextView = view.findViewById(R.id.welcome_message)
-        welcome.text = htmlToSpanned.convert(getString(R.string.accounts_welcome))
+        welcome.text = htmlToSpanned.convert(getString(R.string.welcome_message_text))
         welcome.movementMethod = LinkMovementMethod.getInstance()
 
         view.findViewById<View>(R.id.next).setOnClickListener { launchAccountSetup() }
@@ -59,4 +59,4 @@ class WelcomeFragment : Fragment() {
         findNavController().navigate(R.id.action_welcomeScreen_to_messageListScreen)
         requireActivity().finish()
     }
-}
\ No newline at end of file
+}
diff --git a/app/ui/legacy/src/main/res/drawable/ic_welcome_mail.xml b/app/ui/legacy/src/main/res/drawable/ic_welcome_mail.xml
new file mode 100644
index 0000000000..65ed11d0d0
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_welcome_mail.xml
@@ -0,0 +1,83 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="114dp"
+    android:height="114dp"
+    android:viewportWidth="114"
+    android:viewportHeight="114">
+  <group>
+    <clip-path
+        android:pathData="M0,0h114v114h-114z"/>
+    <path
+        android:pathData="M89.93,0H24.07C10.77,0 0,10.77 0,24.07V89.93C0,103.22 10.77,114 24.07,114H89.93C103.22,114 114,103.22 114,89.93V24.07C114,10.77 103.22,0 89.93,0Z">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="57"
+            android:startY="10.43"
+            android:endX="57"
+            android:endY="111.77"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFFF7300"/>
+          <item android:offset="0.37" android:color="#FFFB6C09"/>
+          <item android:offset="0.97" android:color="#FFF15B23"/>
+          <item android:offset="1" android:color="#FFF15A24"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M68.5,59.59L93.79,84.87C94.58,83.8 95,82.51 95,81.18V33.09L68.5,59.59Z">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="81.75"
+            android:startY="50.32"
+            android:endX="81.75"
+            android:endY="112.4"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFFFFFFF"/>
+          <item android:offset="1" android:color="#FFCBD6EA"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M19.67,31.08L50.07,61.48C50.98,62.39 52.05,63.11 53.24,63.6C54.43,64.1 55.7,64.35 56.99,64.35C58.27,64.35 59.55,64.1 60.74,63.61C61.92,63.11 63,62.39 63.91,61.48L94.31,31.08C94.42,30.97 94.55,30.89 94.7,30.85C94.31,29.58 93.52,28.46 92.44,27.67C91.37,26.88 90.07,26.45 88.74,26.45H25.23C23.9,26.45 22.6,26.88 21.52,27.67C20.45,28.46 19.65,29.57 19.26,30.85C19.41,30.89 19.56,30.97 19.67,31.08V31.08Z">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="56.98"
+            android:startY="39.06"
+            android:endX="56.98"
+            android:endY="139.63"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFFFFFFF"/>
+          <item android:offset="1" android:color="#FFCBD6EA"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M19,33.09V81.18C19,82.51 19.43,83.8 20.22,84.87L45.5,59.59L19,33.09Z">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="32.25"
+            android:startY="50.32"
+            android:endX="32.25"
+            android:endY="112.4"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFFFFFFF"/>
+          <item android:offset="1" android:color="#FFCBD6EA"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M67.16,60.93L65.26,62.83C64.18,63.92 62.9,64.78 61.48,65.37C60.07,65.96 58.56,66.26 57.03,66.26C55.49,66.26 53.98,65.96 52.57,65.37C51.15,64.78 49.87,63.92 48.79,62.83L46.89,60.93L21.6,86.22C22.67,87 23.97,87.43 25.3,87.43H88.8C90.13,87.43 91.42,87 92.49,86.22L67.16,60.93Z">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="57.04"
+            android:startY="69.75"
+            android:endX="57.04"
+            android:endY="101.52"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFFFFFFF"/>
+          <item android:offset="1" android:color="#FFCBD6EA"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+  </group>
+</vector>
diff --git a/app/ui/legacy/src/main/res/layout/fragment_welcome_message.xml b/app/ui/legacy/src/main/res/layout/fragment_welcome_message.xml
index 1b11746c1f..bf747178e2 100644
--- a/app/ui/legacy/src/main/res/layout/fragment_welcome_message.xml
+++ b/app/ui/legacy/src/main/res/layout/fragment_welcome_message.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
@@ -15,6 +16,12 @@
             android:layout_height="wrap_content"
             android:orientation="vertical" >
 
+            <ImageView
+                android:id="@+id/welcome_icon"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:srcCompat="@drawable/ic_welcome_mail" />
+
             <TextView
                 android:id="@+id/welcome_message"
                 android:layout_width="match_parent"
diff --git a/app/ui/legacy/src/main/res/values/strings.xml b/app/ui/legacy/src/main/res/values/strings.xml
index 8fbe4fbf5f..3eebd6c995 100644
--- a/app/ui/legacy/src/main/res/values/strings.xml
+++ b/app/ui/legacy/src/main/res/values/strings.xml
@@ -27,6 +27,7 @@
     <string name="changelog_snackbar_text">Find out what\'s new in this release</string>
     <!-- Welcome message -->
     <string name="welcome_message_title">Welcome to Mail</string>
+    <string name="welcome_message_text">Set up a new account or import yours email accounts from a previous settings file.</string>
     <string name="accounts_welcome">Mail is the default mail client for /e/OS</string>
     <!-- Default signature -->
     <string name="default_signature">-- Sent from /e/OS Mail.</string>
-- 
GitLab


From 37b7db6159a20019dc37f5944679c3752bb783bb Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Tue, 21 Feb 2023 16:00:23 +0100
Subject: [PATCH 4/9] update welcome UI

---
 .../fsck/k9/ui/onboarding/OnboardingActivity.kt    |  3 +--
 .../main/res/layout/fragment_welcome_message.xml   | 14 +++++++++++++-
 .../main/res/navigation/navigation_onboarding.xml  |  2 +-
 app/ui/legacy/src/main/res/values/strings.xml      |  2 +-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/OnboardingActivity.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/OnboardingActivity.kt
index ae0ef86780..6ec83f7b6a 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/OnboardingActivity.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/OnboardingActivity.kt
@@ -20,7 +20,6 @@ class OnboardingActivity : K9Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setLayout(R.layout.activity_onboarding)
-        setTitle(R.string.account_setup_basics_title)
 
         initializeActionBar()
     }
@@ -46,4 +45,4 @@ class OnboardingActivity : K9Activity() {
             activity.startActivity(intent)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/ui/legacy/src/main/res/layout/fragment_welcome_message.xml b/app/ui/legacy/src/main/res/layout/fragment_welcome_message.xml
index bf747178e2..14ed1bd7e4 100644
--- a/app/ui/legacy/src/main/res/layout/fragment_welcome_message.xml
+++ b/app/ui/legacy/src/main/res/layout/fragment_welcome_message.xml
@@ -12,6 +12,7 @@
         android:fadingEdge="none" >
 
         <LinearLayout
+            android:layout_gravity="center"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical" >
@@ -22,11 +23,22 @@
                 android:layout_height="wrap_content"
                 app:srcCompat="@drawable/ic_welcome_mail" />
 
+            <TextView
+                android:id="@+id/welcome_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/welcome_message_title"
+                android:textAlignment="center"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textSize="24sp" />
+
             <TextView
                 android:id="@+id/welcome_message"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
+                android:layout_marginLeft="71sp"
+                android:layout_marginRight="71sp"
+                android:textAlignment="center"
                 android:textColor="?android:attr/textColorPrimary"
                 android:textSize="14sp" />
 
diff --git a/app/ui/legacy/src/main/res/navigation/navigation_onboarding.xml b/app/ui/legacy/src/main/res/navigation/navigation_onboarding.xml
index 03d12ab54b..0e4d692d5d 100644
--- a/app/ui/legacy/src/main/res/navigation/navigation_onboarding.xml
+++ b/app/ui/legacy/src/main/res/navigation/navigation_onboarding.xml
@@ -48,4 +48,4 @@
         android:name="com.fsck.k9.activity.MessageList"
         tools:layout="@layout/message_list"/>
 
-</navigation>
\ No newline at end of file
+</navigation>
diff --git a/app/ui/legacy/src/main/res/values/strings.xml b/app/ui/legacy/src/main/res/values/strings.xml
index 3eebd6c995..a40e2c5e6d 100644
--- a/app/ui/legacy/src/main/res/values/strings.xml
+++ b/app/ui/legacy/src/main/res/values/strings.xml
@@ -27,7 +27,7 @@
     <string name="changelog_snackbar_text">Find out what\'s new in this release</string>
     <!-- Welcome message -->
     <string name="welcome_message_title">Welcome to Mail</string>
-    <string name="welcome_message_text">Set up a new account or import yours email accounts from a previous settings file.</string>
+    <string name="welcome_message_text">Set up a new account or import your email accounts from a previous settings file.</string>
     <string name="accounts_welcome">Mail is the default mail client for /e/OS</string>
     <!-- Default signature -->
     <string name="default_signature">-- Sent from /e/OS Mail.</string>
-- 
GitLab


From a8373b9dc8571e48615bf57c6b5cdc9e95227e3e Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Wed, 22 Feb 2023 10:24:12 +0100
Subject: [PATCH 5/9] Replace LinearLayout from welcome fragment by a
 ConstraintLayout

---
 .../res/layout/fragment_welcome_message.xml   | 95 +++++++++----------
 .../src/main/res/layout/wizard_setup.xml      |  2 +-
 .../src/main/res/layout/wizard_welcome.xml    | 11 +--
 .../res/navigation/navigation_onboarding.xml  |  2 +-
 4 files changed, 52 insertions(+), 58 deletions(-)

diff --git a/app/ui/legacy/src/main/res/layout/fragment_welcome_message.xml b/app/ui/legacy/src/main/res/layout/fragment_welcome_message.xml
index 14ed1bd7e4..8b3510ee71 100644
--- a/app/ui/legacy/src/main/res/layout/fragment_welcome_message.xml
+++ b/app/ui/legacy/src/main/res/layout/fragment_welcome_message.xml
@@ -1,54 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:layout_height="match_parent">
 
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:fadingEdge="none" >
-
-        <LinearLayout
-            android:layout_gravity="center"
+        <ImageView
+            android:id="@+id/welcome_icon"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <ImageView
-                android:id="@+id/welcome_icon"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:srcCompat="@drawable/ic_welcome_mail" />
-
-            <TextView
-                android:id="@+id/welcome_title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/welcome_message_title"
-                android:textAlignment="center"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textSize="24sp" />
-
-            <TextView
-                android:id="@+id/welcome_message"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="71sp"
-                android:layout_marginRight="71sp"
-                android:textAlignment="center"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textSize="14sp" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
-        </LinearLayout>
-    </ScrollView>
-
-    <include layout="@layout/wizard_welcome" />
-
-</LinearLayout>
+            app:srcCompat="@drawable/ic_welcome_mail"
+            app:layout_constraintBottom_toTopOf="@+id/bottomBar"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"/>
+
+        <TextView
+            android:id="@+id/welcome_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/welcome_message_title"
+            android:textAlignment="center"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="24sp"
+            android:layout_marginLeft="71dp"
+            android:layout_marginRight="71dp"
+            android:layout_marginTop="64dp"
+            app:layout_constraintTop_toBottomOf="@id/welcome_icon"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"/>
+
+        <TextView
+            android:id="@+id/welcome_message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAlignment="center"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="14sp"
+            android:layout_marginLeft="71dp"
+            android:layout_marginRight="71dp"
+            android:layout_marginTop="106dp"
+            app:layout_constraintTop_toBottomOf="@id/welcome_icon"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"/>
+
+        <include layout="@layout/wizard_welcome"
+            android:id="@+id/bottomBar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/ui/legacy/src/main/res/layout/wizard_setup.xml b/app/ui/legacy/src/main/res/layout/wizard_setup.xml
index 199c3d55df..4ad7277f22 100644
--- a/app/ui/legacy/src/main/res/layout/wizard_setup.xml
+++ b/app/ui/legacy/src/main/res/layout/wizard_setup.xml
@@ -24,7 +24,7 @@
 
         <Button
             android:id="@+id/next"
-            style="?android:attr/buttonBarButtonStyle"
+            style="@style/Widget.AppCompat.Button.Colored"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
diff --git a/app/ui/legacy/src/main/res/layout/wizard_welcome.xml b/app/ui/legacy/src/main/res/layout/wizard_welcome.xml
index 9aa27d17a3..0d3e0084d3 100644
--- a/app/ui/legacy/src/main/res/layout/wizard_welcome.xml
+++ b/app/ui/legacy/src/main/res/layout/wizard_welcome.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <View
-        android:id="@+id/divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/dividerHorizontal" />
-
     <LinearLayout
         style="?android:attr/buttonBarStyle"
         android:layout_width="match_parent"
@@ -24,12 +18,13 @@
 
         <Button
             android:id="@+id/next"
-            style="?android:attr/buttonBarButtonStyle"
+            style="@style/Widget.AppCompat.Button.Colored"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
+            android:textColor="@android:color/white"
             android:background="?selectableItemBackground"
             android:text="@string/next_action" />
     </LinearLayout>
 
-</merge>
\ No newline at end of file
+</merge>
diff --git a/app/ui/legacy/src/main/res/navigation/navigation_onboarding.xml b/app/ui/legacy/src/main/res/navigation/navigation_onboarding.xml
index 0e4d692d5d..39371a5513 100644
--- a/app/ui/legacy/src/main/res/navigation/navigation_onboarding.xml
+++ b/app/ui/legacy/src/main/res/navigation/navigation_onboarding.xml
@@ -10,7 +10,7 @@
     <fragment
         android:id="@+id/welcomeScreen"
         android:name="com.fsck.k9.ui.onboarding.WelcomeFragment"
-        android:label="@string/welcome_message_title"
+        android:label=""
         tools:layout="@layout/fragment_welcome_message">
 
         <action
-- 
GitLab


From 36cea0155ada95b252455ae93e1bd428377bcdec Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Wed, 22 Feb 2023 17:29:33 +0600
Subject: [PATCH 6/9] Fix some ui issues

---
 .../fsck/k9/ui/onboarding/WelcomeFragment.kt  | 20 ++++++++++
 .../src/main/res/color/btn_color_bg_state.xml | 23 +++++++++++
 .../res/drawable/btn_bg_rounded_corner.xml    | 25 ++++++++++++
 .../res/layout/fragment_welcome_message.xml   | 38 ++++++++++++-------
 .../src/main/res/layout/wizard_cancel.xml     |  8 +---
 .../src/main/res/layout/wizard_done.xml       |  8 +---
 .../src/main/res/layout/wizard_next.xml       |  8 +---
 .../src/main/res/layout/wizard_setup.xml      | 32 ++++++++--------
 .../src/main/res/layout/wizard_welcome.xml    | 27 ++++++++-----
 .../res/navigation/navigation_onboarding.xml  |  2 +-
 .../src/main/res/values-night/colors.xml      |  4 +-
 app/ui/legacy/src/main/res/values/colors.xml  |  2 +
 12 files changed, 136 insertions(+), 61 deletions(-)
 create mode 100644 app/ui/legacy/src/main/res/color/btn_color_bg_state.xml
 create mode 100644 app/ui/legacy/src/main/res/drawable/btn_bg_rounded_corner.xml

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt
index 9d6c18f59d..a9faea36cd 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt
@@ -6,6 +6,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.appcompat.app.ActionBar
+import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import com.fsck.k9.ui.BuildConfig
@@ -42,6 +44,24 @@ class WelcomeFragment : Fragment() {
         }
     }
 
+    fun getActionBar(): ActionBar? {
+        if (activity is AppCompatActivity) {
+            return (activity as AppCompatActivity).supportActionBar
+        }
+
+        return null
+    }
+
+    override fun onResume() {
+        super.onResume()
+        getActionBar()?.hide()
+    }
+
+    override fun onStop() {
+        super.onStop()
+        getActionBar()?.show()
+    }
+
     private fun launchAccountSetup() {
         if (BuildConfig.USE_NEW_SETUP_UI_FOR_ONBOARDING) {
             findNavController().navigate(R.id.action_welcomeScreen_to_newAddAccountScreen)
diff --git a/app/ui/legacy/src/main/res/color/btn_color_bg_state.xml b/app/ui/legacy/src/main/res/color/btn_color_bg_state.xml
new file mode 100644
index 0000000000..b95f55832d
--- /dev/null
+++ b/app/ui/legacy/src/main/res/color/btn_color_bg_state.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright MURENA SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/color_btn_bg_disabled"
+        android:state_enabled="false" />
+
+    <item android:color="@color/color_default_accent" />
+</selector>
diff --git a/app/ui/legacy/src/main/res/drawable/btn_bg_rounded_corner.xml b/app/ui/legacy/src/main/res/drawable/btn_bg_rounded_corner.xml
new file mode 100644
index 0000000000..0e0e0ad38c
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/btn_bg_rounded_corner.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright MURENA SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#FFFFFF"/>
+    <corners android:radius="7dp"/>
+
+</shape>
diff --git a/app/ui/legacy/src/main/res/layout/fragment_welcome_message.xml b/app/ui/legacy/src/main/res/layout/fragment_welcome_message.xml
index 8b3510ee71..a7f962a44e 100644
--- a/app/ui/legacy/src/main/res/layout/fragment_welcome_message.xml
+++ b/app/ui/legacy/src/main/res/layout/fragment_welcome_message.xml
@@ -4,15 +4,20 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/bottomBarHolder">
+
         <ImageView
             android:id="@+id/welcome_icon"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/ic_welcome_mail"
-            app:layout_constraintBottom_toTopOf="@+id/bottomBar"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"/>
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
 
         <TextView
             android:id="@+id/welcome_title"
@@ -38,16 +43,23 @@
             android:textSize="14sp"
             android:layout_marginLeft="71dp"
             android:layout_marginRight="71dp"
-            android:layout_marginTop="106dp"
-            app:layout_constraintTop_toBottomOf="@id/welcome_icon"
+            android:layout_marginTop="16dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/welcome_title"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+    <LinearLayout
+        android:id="@+id/bottomBarHolder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <include layout="@layout/wizard_welcome" />
+    </LinearLayout>
 
-        <include layout="@layout/wizard_welcome"
-            android:id="@+id/bottomBar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/ui/legacy/src/main/res/layout/wizard_cancel.xml b/app/ui/legacy/src/main/res/layout/wizard_cancel.xml
index 15bc04d23e..25ec43d8ae 100644
--- a/app/ui/legacy/src/main/res/layout/wizard_cancel.xml
+++ b/app/ui/legacy/src/main/res/layout/wizard_cancel.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <View
-        android:id="@+id/divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/dividerHorizontal" />
-
     <LinearLayout
         style="?android:attr/buttonBarStyle"
         android:layout_width="match_parent"
@@ -28,4 +22,4 @@
             android:layout_weight="1" />
     </LinearLayout>
 
-</merge>
\ No newline at end of file
+</merge>
diff --git a/app/ui/legacy/src/main/res/layout/wizard_done.xml b/app/ui/legacy/src/main/res/layout/wizard_done.xml
index 89c69b6901..85be2e4d28 100644
--- a/app/ui/legacy/src/main/res/layout/wizard_done.xml
+++ b/app/ui/legacy/src/main/res/layout/wizard_done.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <View
-        android:id="@+id/divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/dividerHorizontal" />
-
     <LinearLayout
         style="?android:attr/buttonBarStyle"
         android:layout_width="match_parent"
@@ -28,4 +22,4 @@
             android:text="@string/done_action" />
     </LinearLayout>
 
-</merge>
\ No newline at end of file
+</merge>
diff --git a/app/ui/legacy/src/main/res/layout/wizard_next.xml b/app/ui/legacy/src/main/res/layout/wizard_next.xml
index 9d44e367ba..32b1e7cbb9 100644
--- a/app/ui/legacy/src/main/res/layout/wizard_next.xml
+++ b/app/ui/legacy/src/main/res/layout/wizard_next.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <View
-        android:id="@+id/divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/dividerHorizontal" />
-
     <LinearLayout
         style="?android:attr/buttonBarStyle"
         android:layout_width="match_parent"
@@ -28,4 +22,4 @@
             android:text="@string/next_action" />
     </LinearLayout>
 
-</merge>
\ No newline at end of file
+</merge>
diff --git a/app/ui/legacy/src/main/res/layout/wizard_setup.xml b/app/ui/legacy/src/main/res/layout/wizard_setup.xml
index 4ad7277f22..1d0237069d 100644
--- a/app/ui/legacy/src/main/res/layout/wizard_setup.xml
+++ b/app/ui/legacy/src/main/res/layout/wizard_setup.xml
@@ -1,35 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <View
-        android:id="@+id/divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/dividerHorizontal" />
-
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         style="?android:attr/buttonBarStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal" >
+        android:layout_marginEnd="16dp" >
 
         <Button
             android:id="@+id/manual_setup"
             style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_weight="1"
+            app:layout_constraintStart_toStartOf="parent"
+            android:textSize="14sp"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
             android:background="?selectableItemBackground"
             android:text="@string/account_setup_basics_manual_setup_action" />
 
         <Button
             android:id="@+id/next"
             style="@style/Widget.AppCompat.Button.Colored"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:background="?selectableItemBackground"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:foreground="?selectableItemBackground"
+            android:background="@drawable/btn_bg_rounded_corner"
+            android:backgroundTint="@color/btn_color_bg_state"
+            android:textColor="@color/color_default_background"
+            android:textSize="14sp"
             android:text="@string/next_action" />
-    </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </merge>
diff --git a/app/ui/legacy/src/main/res/layout/wizard_welcome.xml b/app/ui/legacy/src/main/res/layout/wizard_welcome.xml
index 0d3e0084d3..0f4ed4373b 100644
--- a/app/ui/legacy/src/main/res/layout/wizard_welcome.xml
+++ b/app/ui/legacy/src/main/res/layout/wizard_welcome.xml
@@ -1,30 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         style="?android:attr/buttonBarStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal" >
+        android:layout_marginEnd="16dp" >
 
         <Button
             android:id="@+id/import_settings"
             style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_weight="1"
+            app:layout_constraintStart_toStartOf="parent"
             android:background="?selectableItemBackground"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:textSize="14sp"
             android:text="@string/settings_import" />
 
         <Button
             android:id="@+id/next"
             style="@style/Widget.AppCompat.Button.Colored"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:textColor="@android:color/white"
-            android:background="?selectableItemBackground"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:textColor="@color/color_default_background"
+            android:foreground="?selectableItemBackground"
+            android:background="@drawable/btn_bg_rounded_corner"
+            android:backgroundTint="@color/color_default_accent"
+            android:textSize="14sp"
             android:text="@string/next_action" />
-    </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </merge>
diff --git a/app/ui/legacy/src/main/res/navigation/navigation_onboarding.xml b/app/ui/legacy/src/main/res/navigation/navigation_onboarding.xml
index 39371a5513..0e4d692d5d 100644
--- a/app/ui/legacy/src/main/res/navigation/navigation_onboarding.xml
+++ b/app/ui/legacy/src/main/res/navigation/navigation_onboarding.xml
@@ -10,7 +10,7 @@
     <fragment
         android:id="@+id/welcomeScreen"
         android:name="com.fsck.k9.ui.onboarding.WelcomeFragment"
-        android:label=""
+        android:label="@string/welcome_message_title"
         tools:layout="@layout/fragment_welcome_message">
 
         <action
diff --git a/app/ui/legacy/src/main/res/values-night/colors.xml b/app/ui/legacy/src/main/res/values-night/colors.xml
index dbdfd3d526..df719f1a2b 100644
--- a/app/ui/legacy/src/main/res/values-night/colors.xml
+++ b/app/ui/legacy/src/main/res/values-night/colors.xml
@@ -25,4 +25,6 @@
     <color name="color_contact_token_background">#4b4b4b</color>
     <color name="color_avatar_background">#474747</color>
     <color name="color_avatar_foreground">#cfcfcf</color>
-</resources>
\ No newline at end of file
+
+    <color name="color_btn_bg_disabled">#664c4c4c</color>
+</resources>
diff --git a/app/ui/legacy/src/main/res/values/colors.xml b/app/ui/legacy/src/main/res/values/colors.xml
index a2af1f2962..fb3193bb4f 100644
--- a/app/ui/legacy/src/main/res/values/colors.xml
+++ b/app/ui/legacy/src/main/res/values/colors.xml
@@ -61,4 +61,6 @@
     <color name="color_star_fill">#FFC300</color>
 
     <color name="white">#FFFFFF</color>
+
+    <color name="color_btn_bg_disabled">#26000000</color>
 </resources>
-- 
GitLab


From d6661e671a6f6c8dfd1d5916765b21f4f626523d Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Wed, 22 Feb 2023 16:52:27 +0100
Subject: [PATCH 7/9] - remove useless stuff from previous MR

- remove elevation of bottom bar in import settings fragment
---
 app/k9mail/src/main/AndroidManifest.xml       |  5 --
 .../setup/AccountSetupImportSettings.kt       | 78 -------------------
 .../layout/account_setup_import_settings.xml  | 33 --------
 .../res/layout/fragment_settings_import.xml   |  1 -
 4 files changed, 117 deletions(-)
 delete mode 100644 app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupImportSettings.kt
 delete mode 100644 app/ui/legacy/src/main/res/layout/account_setup_import_settings.xml

diff --git a/app/k9mail/src/main/AndroidManifest.xml b/app/k9mail/src/main/AndroidManifest.xml
index ff83a77387..6c889e67bd 100644
--- a/app/k9mail/src/main/AndroidManifest.xml
+++ b/app/k9mail/src/main/AndroidManifest.xml
@@ -75,11 +75,6 @@
             android:configChanges="locale"
             android:label="@string/account_setup_basics_title"/>
 
-        <activity
-            android:name=".activity.setup.AccountSetupImportSettings"
-            android:configChanges="locale"
-            android:label="@string/settings_import_title"/>
-
         <activity
             android:name=".activity.setup.AccountSetupAccountType"
             android:configChanges="locale"
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupImportSettings.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupImportSettings.kt
deleted file mode 100644
index aa0b846104..0000000000
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupImportSettings.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright MURENA SAS 2023
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.fsck.k9.activity.setup
-
-import android.app.Activity
-import android.content.Intent
-import android.os.Bundle
-import android.view.MenuItem
-import com.fsck.k9.activity.MessageList
-import com.fsck.k9.ui.R
-import com.fsck.k9.ui.base.K9Activity
-import com.fsck.k9.ui.settings.import.SettingsImportResultViewModel
-import com.fsck.k9.ui.settings.import.SettingsImportSuccess
-import org.koin.androidx.viewmodel.ext.android.viewModel
-
-/**
- * Prompts the user to select a exported settings file
- *
- */
-class AccountSetupImportSettings : K9Activity() {
-
-    private val resultViewModel: SettingsImportResultViewModel by viewModel()
-
-    public override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setLayout(R.layout.account_setup_import_settings)
-        setUpActionBar()
-
-        handleOnSuccessCallback()
-    }
-
-    private fun handleOnSuccessCallback() {
-        resultViewModel.settingsImportResult.observe(this) {
-            if (it == SettingsImportSuccess) {
-                startActivityClearTop(MessageList::class.java)
-            }
-        }
-    }
-
-    private fun <T : Activity> startActivityClearTop(clazz: Class<T>) {
-        val intent = Intent(this@AccountSetupImportSettings, clazz)
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
-        startActivity(intent)
-        finish()
-    }
-
-    private fun setUpActionBar() {
-        setTitle(R.string.settings_import_title)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == android.R.id.home) {
-            onBackPressed()
-            return true
-        }
-
-        return super.onOptionsItemSelected(item)
-    }
-
-    override fun onBackPressed() {
-        startActivityClearTop(AccountSetupBasics::class.java)
-    }
-}
diff --git a/app/ui/legacy/src/main/res/layout/account_setup_import_settings.xml b/app/ui/legacy/src/main/res/layout/account_setup_import_settings.xml
deleted file mode 100644
index 74eeb9a10f..0000000000
--- a/app/ui/legacy/src/main/res/layout/account_setup_import_settings.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright MURENA SAS 2023
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent"
-    tools:context="com.fsck.k9.activity.setup.AccountSetupImportSettings">
-    
-    <include layout="@layout/toolbar" />
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/fragment_container_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:name="com.fsck.k9.ui.settings.import.SettingsImportFragment" />
-
-</LinearLayout>
diff --git a/app/ui/legacy/src/main/res/layout/fragment_settings_import.xml b/app/ui/legacy/src/main/res/layout/fragment_settings_import.xml
index d0b61cbd6d..e340107ef8 100644
--- a/app/ui/legacy/src/main/res/layout/fragment_settings_import.xml
+++ b/app/ui/legacy/src/main/res/layout/fragment_settings_import.xml
@@ -51,7 +51,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?attr/bottomBarBackground"
-        android:elevation="8dp"
         android:minHeight="56dp"
         app:layout_constraintBottom_toBottomOf="parent"
         tools:ignore="UnusedAttribute">
-- 
GitLab


From 34a8c977378365161223779e977fc98c1ca17b8e Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Thu, 23 Feb 2023 08:20:45 +0000
Subject: [PATCH 8/9] Apply 2 suggestion(s) to 1 file(s)

---
 .../main/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt
index a9faea36cd..3feca82bbb 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt
@@ -44,7 +44,7 @@ class WelcomeFragment : Fragment() {
         }
     }
 
-    fun getActionBar(): ActionBar? {
+    private fun getActionBar(): ActionBar? {
         if (activity is AppCompatActivity) {
             return (activity as AppCompatActivity).supportActionBar
         }
@@ -58,8 +58,8 @@ class WelcomeFragment : Fragment() {
     }
 
     override fun onStop() {
-        super.onStop()
         getActionBar()?.show()
+        super.onStop()
     }
 
     private fun launchAccountSetup() {
-- 
GitLab


From 72aff67323a28ffb06ad41fb30221403316fe6bd Mon Sep 17 00:00:00 2001
From: Jonathan Klee <jonathan.klee@e.email>
Date: Thu, 23 Feb 2023 09:38:43 +0000
Subject: [PATCH 9/9] Apply Jonathan's suggestion

---
 .../com/fsck/k9/ui/onboarding/WelcomeFragment.kt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt
index 3feca82bbb..5b2eecb227 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt
@@ -44,14 +44,6 @@ class WelcomeFragment : Fragment() {
         }
     }
 
-    private fun getActionBar(): ActionBar? {
-        if (activity is AppCompatActivity) {
-            return (activity as AppCompatActivity).supportActionBar
-        }
-
-        return null
-    }
-
     override fun onResume() {
         super.onResume()
         getActionBar()?.hide()
@@ -62,6 +54,14 @@ class WelcomeFragment : Fragment() {
         super.onStop()
     }
 
+    private fun getActionBar(): ActionBar? {
+        if (activity is AppCompatActivity) {
+            return (activity as AppCompatActivity).supportActionBar
+        }
+
+        return null
+    }
+
     private fun launchAccountSetup() {
         if (BuildConfig.USE_NEW_SETUP_UI_FOR_ONBOARDING) {
             findNavController().navigate(R.id.action_welcomeScreen_to_newAddAccountScreen)
-- 
GitLab