Merge pull request #6793 from thundernest/remove_unused_setup_module (3988d5cc) · Commits · e / os / Mail

app/ui/legacy/build.gradle.kts

+0 −10

Original line number	Diff line number	Diff line
		@@ -6,7 +6,6 @@ plugins {

		dependencies {
		api(projects.app.ui.base)
		debugImplementation(projects.app.ui.setup)
		implementation(projects.app.core)
		implementation(projects.app.autodiscovery.api)
		implementation(projects.app.autodiscovery.providersxml)
		@@ -75,18 +74,9 @@ android {

		buildTypes {
		debug {
		val useNewSetupUi = if (project.hasProperty("k9mail.useNewSetupUi")) {
		project.property("k9mail.useNewSetupUi").toString()
		} else {
		"false"
		}
		buildConfigField("boolean", "USE_NEW_SETUP_UI_FOR_ONBOARDING", useNewSetupUi)

		manifestPlaceholders["appAuthRedirectScheme"] = "FIXME: override this in your app project"
		}
		release {
		buildConfigField("boolean", "USE_NEW_SETUP_UI_FOR_ONBOARDING", "false")

		manifestPlaceholders["appAuthRedirectScheme"] = "FIXME: override this in your app project"
		}
		}

deleted100644 → 0

+0 −15

Original line number	Diff line number	Diff line
		package com.fsck.k9.ui.settings

		import com.fsck.k9.ui.R
		import com.fsck.k9.ui.settings.SettingsListFragment.SettingsListBuilder

		@Deprecated("Remove this once we switch over to the new setup UI")
		internal object NewSetupUiHack {
		fun addAction(builder: SettingsListBuilder) {
		builder.addAction(
		"Add account (NEW)",
		R.id.action_settingsListScreen_to_newAddAccountScreen,
		R.attr.iconSettingsAccountAdd,
		)
		}
		}

deleted100644 → 0

+0 −4

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<resources>
		<color name="icon_background">#E4D9FF</color>
		</resources>

+2 −7

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@ import android.view.ViewGroup
		import android.widget.TextView
		import androidx.fragment.app.Fragment
		import androidx.navigation.fragment.findNavController
		import com.fsck.k9.ui.BuildConfig
		import com.fsck.k9.ui.R
		import com.fsck.k9.ui.helper.HtmlToSpanned
		import com.fsck.k9.ui.observeNotNull
		@@ -43,13 +42,9 @@ class WelcomeFragment : Fragment() {
		}

		private fun launchAccountSetup() {
		if (BuildConfig.USE_NEW_SETUP_UI_FOR_ONBOARDING) {
		findNavController().navigate(R.id.action_welcomeScreen_to_newAddAccountScreen)
		} else {
		findNavController().navigate(R.id.action_welcomeScreen_to_addAccountScreen)
		requireActivity().finish()
		}
		}

		private fun launchImportSettings() {
		findNavController().navigate(R.id.action_welcomeScreen_to_settingsImportScreen)

+0 −2

Original line number	Diff line number	Diff line
		@@ -104,8 +104,6 @@ class SettingsListFragment : Fragment(), ItemTouchCallback {
		navigationAction = R.id.action_settingsListScreen_to_addAccountScreen,
		icon = R.attr.iconSettingsAccountAdd,
		)

		NewSetupUiHack.addAction(this)
		}

		addSection(title = getString(R.string.settings_list_backup_category)) {