diff --git a/app/k9mail/src/main/AndroidManifest.xml b/app/k9mail/src/main/AndroidManifest.xml
index ff83a773874d8343233125af215a00ba24538bb0..6c889e67bdb962eb133a65fb224563f8e3369881 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"/>
-
-
.
- */
-
-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 startActivityClearTop(clazz: Class) {
- 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/java/com/fsck/k9/ui/onboarding/OnboardingActivity.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/OnboardingActivity.kt
index ae0ef86780f56b1aa8ea020a731c8a3d803fe03a..6ec83f7b6a370439b898a4649db18362675b0509 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/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/WelcomeFragment.kt
index 5848703a7d39afe6984da48817cf4ec07408b9de..5b2eecb227ae6a6b0b62295a1ac85d1841ab9781 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
@@ -29,7 +31,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(R.id.next).setOnClickListener { launchAccountSetup() }
@@ -42,6 +44,24 @@ class WelcomeFragment : Fragment() {
}
}
+ override fun onResume() {
+ super.onResume()
+ getActionBar()?.hide()
+ }
+
+ override fun onStop() {
+ getActionBar()?.show()
+ 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)
@@ -59,4 +79,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/layout/account_setup_import_settings.xml b/app/ui/legacy/src/main/res/color/btn_color_bg_state.xml
similarity index 53%
rename from app/ui/legacy/src/main/res/layout/account_setup_import_settings.xml
rename to app/ui/legacy/src/main/res/color/btn_color_bg_state.xml
index 74eeb9a10f654e81bc484467503e1a9d4fbf5c78..b95f55832d9d2805632b0098990303302e781950 100644
--- a/app/ui/legacy/src/main/res/layout/account_setup_import_settings.xml
+++ b/app/ui/legacy/src/main/res/color/btn_color_bg_state.xml
@@ -15,19 +15,9 @@
~ along with this program. If not, see .
-->
-
-
-
+
+