Remove OnboardingActivity (7b189afa) · Commits · e / os / Mail

app/k9mail/src/main/AndroidManifest.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -60,10 +60,6 @@
		<meta-data android:name="android.webkit.WebView.MetricsOptOut"
		android:value="true" />

		<activity
		android:name=".ui.onboarding.OnboardingActivity"
		android:label="@string/welcome_message_title" />

		<activity
		android:name=".ui.settings.account.OpenPgpAppSelectDialog"
		android:configChanges="locale"

deleted100644 → 0

+0 −44

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

		import android.app.Activity
		import android.content.Intent
		import android.os.Bundle
		import androidx.navigation.NavController
		import androidx.navigation.ui.AppBarConfiguration
		import androidx.navigation.ui.setupActionBarWithNavController
		import com.fsck.k9.ui.R
		import com.fsck.k9.ui.base.K9Activity
		import com.fsck.k9.ui.base.extensions.findNavController

		class OnboardingActivity : K9Activity() {
		private lateinit var navController: NavController

		override fun onCreate(savedInstanceState: Bundle?) {
		super.onCreate(savedInstanceState)
		setLayout(R.layout.activity_onboarding)
		setTitle(R.string.account_setup_basics_title)

		initializeActionBar()
		}

		private fun initializeActionBar() {
		val appBarConfiguration = AppBarConfiguration(topLevelDestinationIds = setOf(R.id.welcomeScreen))

		navController = findNavController(R.id.nav_host_fragment)
		setupActionBarWithNavController(navController, appBarConfiguration)
		}

		override fun onSupportNavigateUp(): Boolean {
		return navController.navigateUp() \|\| super.onSupportNavigateUp()
		}

		companion object {
		@JvmStatic
		fun launch(activity: Activity) {
		val intent = Intent(activity, OnboardingActivity::class.java).apply {
		flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
		}
		activity.startActivity(intent)
		}
		}
		}

deleted100644 → 0

+0 −22

Original line number	Diff line number	Diff line
		<?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"
		xmlns:tools="http://schemas.android.com/tools"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical"
		tools:context=".onboarding.OnboardingActivity">

		<include layout="@layout/toolbar" />

		<androidx.fragment.app.FragmentContainerView
		android:id="@+id/nav_host_fragment"
		android:name="androidx.navigation.fragment.NavHostFragment"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"
		app:defaultNavHost="true"
		app:navGraph="@navigation/navigation_onboarding" />

		</LinearLayout>

deleted100644 → 0

+0 −45

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<navigation xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		xmlns:tools="http://schemas.android.com/tools"
		android:id="@+id/navigation_onboarding"
		app:startDestination="@id/welcomeScreen">

		<fragment
		android:id="@+id/welcomeScreen"
		android:name="com.fsck.k9.ui.onboarding.WelcomeFragment"
		android:label="@string/welcome_message_title"
		tools:layout="@layout/fragment_welcome_message">

		<action
		android:id="@+id/action_welcomeScreen_to_settingsImportScreen"
		app:destination="@id/settingsImportScreen" />

		<action
		android:id="@+id/action_welcomeScreen_to_addAccountScreen"
		app:destination="@id/addAccountScreen" />

		<action
		android:id="@+id/action_welcomeScreen_to_messageListScreen"
		app:destination="@id/messageListScreen" />

		</fragment>

		<fragment
		android:id="@+id/settingsImportScreen"
		android:name="com.fsck.k9.ui.settings.import.SettingsImportFragment"
		android:label="@string/settings_import_title"
		tools:layout="@layout/fragment_settings_import"/>

		<activity
		android:id="@+id/addAccountScreen"
		android:name="com.fsck.k9.activity.setup.AccountSetupBasics"
		android:label="@string/account_setup_basics_title"
		tools:layout="@layout/account_setup_basics"/>

		<activity
		android:id="@+id/messageListScreen"
		android:name="com.fsck.k9.activity.MessageList"
		tools:layout="@layout/message_list"/>

		</navigation>

+0 −10

Original line number	Diff line number	Diff line
		@@ -11,10 +11,6 @@
		android:label="@string/prefs_title"
		tools:layout="@layout/fragment_settings_list">

		<action
		android:id="@+id/action_settingsListScreen_to_onboardingScreen"
		app:destination="@id/onboardingScreen" />

		<action
		android:id="@+id/action_settingsListScreen_to_aboutScreen"
		app:destination="@id/aboutScreen" />
		@@ -36,12 +32,6 @@
		app:destination="@id/settingsImportScreen" />
		</fragment>

		<activity
		android:id="@+id/onboardingScreen"
		android:name="com.fsck.k9.ui.onboarding.OnboardingActivity"
		android:label="@string/welcome_message_title"
		tools:layout="@layout/activity_onboarding"/>

		<fragment
		android:id="@+id/aboutScreen"
		android:name="com.fsck.k9.ui.settings.AboutFragment"