Updated the app to use navigation components instead of custom solution

Welcome to mid 2018.

app/src/main/java/com/topjohnwu/magisk/model/navigation/MagiskNavigationEvent.kt

@@ -1,94 +0,0 @@
-package com.topjohnwu.magisk.model.navigation
-
-import android.os.Bundle
-import androidx.annotation.AnimRes
-import androidx.annotation.AnimatorRes
-import androidx.fragment.app.Fragment
-import com.topjohnwu.magisk.core.base.BaseActivity
-import com.topjohnwu.magisk.model.events.ActivityExecutor
-import com.topjohnwu.magisk.model.events.ViewEvent
-import com.topjohnwu.magisk.ui.base.BaseUIActivity
-import kotlin.reflect.KClass
-
-@DslMarker
-annotation class NavigationDslMarker
-
-class MagiskNavigationEvent(
-    val navDirections: MagiskNavDirectionsBuilder,
-    val navOptions: MagiskNavOptions,
-    val animOptions: MagiskAnimBuilder
-) : ViewEvent(), ActivityExecutor {
-
-    companion object {
-        operator fun invoke(builder: Builder.() -> Unit) = Builder().apply(builder).build()
-    }
-
-    override fun invoke(activity: BaseActivity) {
-        if (activity !is BaseUIActivity<*, *>) return
-        activity.navigation?.navigateTo(this)
-    }
-
-    @NavigationDslMarker
-    class Builder {
-
-        private var animOptions: MagiskAnimBuilder = MagiskAnimBuilder()
-        private var navOptions: MagiskNavOptions = MagiskNavOptions()
-        private val directionsBuilder = MagiskNavDirectionsBuilder()
-
-        fun args(builder: Bundle.() -> Unit) = directionsBuilder.args(builder)
-
-        fun navAnim(builder: MagiskAnimBuilder.() -> Unit) {
-            animOptions = MagiskAnimBuilder().apply(builder)
-        }
-
-        fun navOptions(builder: MagiskNavOptions.() -> Unit) {
-            navOptions = MagiskNavOptions().apply(builder)
-        }
-
-        fun navDirections(builder: MagiskNavDirectionsBuilder.() -> Unit) {
-            directionsBuilder.apply(builder)
-        }
-
-        internal fun build() = MagiskNavigationEvent(directionsBuilder, navOptions, animOptions)
-    }
-}
-
-@NavigationDslMarker
-class MagiskNavDirectionsBuilder {
-
-    var destination: KClass<out Fragment>? = null
-    var isActivity: Boolean = false
-    val args: Bundle = Bundle()
-
-    fun args(builder: Bundle.() -> Unit) = args.apply(builder)
-
-}
-
-@NavigationDslMarker
-class MagiskNavOptions {
-    var popUpTo: KClass<*>? = null
-    var inclusive: Boolean = false
-    var clearTask: Boolean = false
-    var singleTop: Boolean = false
-}
-
-@NavigationDslMarker
-class MagiskAnimBuilder {
-    @AnimRes
-    @AnimatorRes
-    var enter = 0
-
-    @AnimRes
-    @AnimatorRes
-    var exit = 0
-
-    @AnimRes
-    @AnimatorRes
-    var popEnter = 0
-
-    @AnimRes
-    @AnimatorRes
-    var popExit = 0
-
-    val anySet: Boolean get() = enter != 0 || exit != 0 || popEnter != 0 || popExit != 0
-}

app/src/main/java/com/topjohnwu/magisk/model/navigation/Navigation.kt

@@ -6,80 +6,9 @@ import android.os.Build
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.intent
 import com.topjohnwu.magisk.ui.MainActivity
-import com.topjohnwu.magisk.ui.hide.HideFragment
-import com.topjohnwu.magisk.ui.home.HomeFragment
-import com.topjohnwu.magisk.ui.install.InstallFragment
-import com.topjohnwu.magisk.ui.log.LogFragment
-import com.topjohnwu.magisk.ui.module.ModuleFragment
-import com.topjohnwu.magisk.ui.safetynet.SafetynetFragment
-import com.topjohnwu.magisk.ui.settings.SettingsFragment
-import com.topjohnwu.magisk.ui.superuser.SuperuserFragment
-import com.topjohnwu.magisk.ui.theme.ThemeFragment
 
 object Navigation {
 
-    fun home() = MagiskNavigationEvent {
-        navDirections {
-            destination = HomeFragment::class
-        }
-        navOptions {
-            popUpTo = HomeFragment::class
-        }
-    }
-
-    fun superuser() = MagiskNavigationEvent {
-        navDirections {
-            destination = SuperuserFragment::class
-        }
-    }
-
-    fun modules() = MagiskNavigationEvent {
-        navDirections {
-            destination = ModuleFragment::class
-        }
-    }
-
-    fun hide() = MagiskNavigationEvent {
-        navDirections {
-            destination = HideFragment::class
-        }
-    }
-
-    fun safetynet() = MagiskNavigationEvent {
-        navDirections { destination = SafetynetFragment::class }
-    }
-
-    fun log() = MagiskNavigationEvent {
-        navDirections {
-            destination = LogFragment::class
-        }
-    }
-
-    fun settings() = MagiskNavigationEvent {
-        navDirections {
-            destination = SettingsFragment::class
-        }
-    }
-
-    fun install() = MagiskNavigationEvent {
-        navDirections { destination = InstallFragment::class }
-    }
-
-    fun theme() = MagiskNavigationEvent {
-        navDirections { destination = ThemeFragment::class }
-    }
-
-    fun fromSection(section: String) = when (section) {
-        "superuser" -> superuser()
-        "modules" -> modules()
-        "magiskhide" -> hide()
-        "log" -> log()
-        "settings" -> settings()
-        else -> home()
-    }
-
-    // redesign starts here
-
     fun start(launchIntent: Intent, context: Context) {
         context.intent<MainActivity>()
             .putExtra(
@@ -92,10 +21,6 @@ object Navigation {
             .also { context.startActivity(it) }
     }
 
-    object Main {
-        const val OPEN_NAV = 1
-    }
-
     private val ACTION_APPLICATION_PREFERENCES
         get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             Intent.ACTION_APPLICATION_PREFERENCES

app/src/main/java/com/topjohnwu/magisk/model/navigation/NavigationWrapper.kt

@@ -0,0 +1,18 @@
+package com.topjohnwu.magisk.model.navigation
+
+import androidx.navigation.NavDirections
+import com.topjohnwu.magisk.core.base.BaseActivity
+import com.topjohnwu.magisk.model.events.ActivityExecutor
+import com.topjohnwu.magisk.model.events.ViewEvent
+import com.topjohnwu.magisk.ui.base.BaseUIActivity
+
+class NavigationWrapper(
+    private val directions: NavDirections
+) : ViewEvent(), ActivityExecutor {
+    override fun invoke(activity: BaseActivity) {
+        if (activity !is BaseUIActivity<*, *>) return
+        activity.apply {
+            directions.navigate()
+        }
+    }
+}