code cleanup

app/src/main/kotlin/org/mjdev/tvapp/base/activity/ComposableActivity.kt

@@ -31,9 +31,9 @@ import org.mjdev.tvapp.base.annotations.TvPreview
 import org.mjdev.tvapp.base.extensions.ContextExt.isATv
 import org.mjdev.tvapp.base.extensions.NavExt.rememberNavControllerEx
 import org.mjdev.tvapp.base.ui.components.complex.ScreenView
-import org.mjdev.tvapp.base.ui.components.navigation.EmptyScreen
+import org.mjdev.tvapp.base.ui.components.complex.EmptyScreen
 import org.mjdev.tvapp.base.ui.components.navigation.NavGraphBuilderEx
-import org.mjdev.tvapp.base.ui.components.navigation.NavHostEx
+import org.mjdev.tvapp.base.ui.components.complex.NavHostEx
 import org.mjdev.tvapp.base.ui.components.navigation.Screen.Companion.screen
 import org.mjdev.tvapp.ui.theme.TVAppTheme
 import timber.log.Timber

app/src/main/kotlin/org/mjdev/tvapp/base/ui/components/navigation/EmptyScreen.kt → app/src/main/kotlin/org/mjdev/tvapp/base/ui/components/complex/EmptyScreen.kt

@@ -6,10 +6,11 @@
  *  w: https://mjdev.org
  */
 
-package org.mjdev.tvapp.base.ui.components.navigation
+package org.mjdev.tvapp.base.ui.components.complex
 
 import androidx.compose.runtime.Composable
 import org.mjdev.tvapp.base.annotations.TvPreview
+import org.mjdev.tvapp.base.ui.components.navigation.Screen
 
 internal class EmptyScreen : Screen() {
 

app/src/main/kotlin/org/mjdev/tvapp/base/ui/components/navigation/NavDrawerContent.kt → app/src/main/kotlin/org/mjdev/tvapp/base/ui/components/complex/NavDrawerContent.kt

@@ -6,7 +6,7 @@
  *  w: https://mjdev.org
  */
 
-package org.mjdev.tvapp.base.ui.components.navigation
+package org.mjdev.tvapp.base.ui.components.complex
 
 import android.annotation.SuppressLint
 import androidx.compose.foundation.background
@@ -24,7 +24,11 @@ import androidx.tv.material3.DrawerState
 import androidx.tv.material3.DrawerValue
 import androidx.tv.material3.ExperimentalTvMaterial3Api
 import org.mjdev.tvapp.base.extensions.NavExt.rememberNavControllerEx
+import org.mjdev.tvapp.base.ui.components.navigation.MenuItem
+import org.mjdev.tvapp.base.ui.components.navigation.NavHostControllerEx
+import org.mjdev.tvapp.base.ui.components.navigation.NavigationState
 import org.mjdev.tvapp.base.ui.components.navigation.Screen.Companion.open
+import org.mjdev.tvapp.base.ui.components.navigation.rememberNavigationState
 
 @SuppressLint("AutoboxingStateValueProperty")
 @OptIn(ExperimentalTvMaterial3Api::class)

app/src/main/kotlin/org/mjdev/tvapp/base/ui/components/navigation/NavHostEx.kt → app/src/main/kotlin/org/mjdev/tvapp/base/ui/components/complex/NavHostEx.kt

@@ -6,7 +6,7 @@
  *  w: https://mjdev.org
  */
 
-package org.mjdev.tvapp.base.ui.components.navigation
+package org.mjdev.tvapp.base.ui.components.complex
 
 import androidx.compose.animation.AnimatedContentTransitionScope
 import androidx.compose.animation.EnterTransition
@@ -23,6 +23,8 @@ import androidx.navigation.compose.NavHost
 import org.mjdev.tvapp.base.annotations.TvPreview
 import org.mjdev.tvapp.base.extensions.NavExt.createGraph
 import org.mjdev.tvapp.base.extensions.NavExt.rememberNavControllerEx
+import org.mjdev.tvapp.base.ui.components.navigation.NavGraphBuilderEx
+import org.mjdev.tvapp.base.ui.components.navigation.NavHostControllerEx
 import org.mjdev.tvapp.base.ui.components.navigation.Screen.Companion.screen
 
 @TvPreview

app/src/main/kotlin/org/mjdev/tvapp/base/ui/components/navigation/Navigation.kt → app/src/main/kotlin/org/mjdev/tvapp/base/ui/components/complex/Navigation.kt

@@ -1,12 +1,12 @@
 /*
  * Copyright (c) Milan Jurkulák 2023. 
- * Contact:
- * e: mimoccc@gmail.com
- * e: mj@mjdev.org
- * w: https://mjdev.org
+ *  Contact:
+ *  e: mimoccc@gmail.com
+ *  e: mj@mjdev.org
+ *  w: https://mjdev.org
  */
 
-package org.mjdev.tvapp.base.ui.components.navigation
+package org.mjdev.tvapp.base.ui.components.complex
 
 import android.annotation.SuppressLint
 import androidx.compose.foundation.background
@@ -26,6 +26,10 @@ import androidx.tv.material3.rememberDrawerState
 import org.mjdev.tvapp.base.annotations.TvPreview
 import org.mjdev.tvapp.base.extensions.ComposeExt.isEditMode
 import org.mjdev.tvapp.base.extensions.NavExt.rememberNavControllerEx
+import org.mjdev.tvapp.base.ui.components.navigation.MenuItem
+import org.mjdev.tvapp.base.ui.components.navigation.NavHostControllerEx
+import org.mjdev.tvapp.base.ui.components.navigation.NavigationState
+import org.mjdev.tvapp.base.ui.components.navigation.rememberNavigationState
 
 @SuppressLint("AutoboxingStateValueProperty")
 @OptIn(ExperimentalTvMaterial3Api::class)

app/src/main/kotlin/org/mjdev/tvapp/base/ui/components/navigation/NavigationRow.kt → app/src/main/kotlin/org/mjdev/tvapp/base/ui/components/complex/NavigationRow.kt

@@ -6,7 +6,7 @@
  * w: https://mjdev.org
  */
 
-package org.mjdev.tvapp.base.ui.components.navigation
+package org.mjdev.tvapp.base.ui.components.complex
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.background

app/src/main/kotlin/org/mjdev/tvapp/base/ui/components/complex/ScreenView.kt

@@ -21,9 +21,7 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import org.mjdev.tvapp.base.annotations.TvPreview
 import org.mjdev.tvapp.base.extensions.NavExt.rememberNavControllerEx
-import org.mjdev.tvapp.base.ui.components.navigation.EmptyScreen
 import org.mjdev.tvapp.base.ui.components.navigation.NavHostControllerEx
-import org.mjdev.tvapp.base.ui.components.navigation.Navigation
 
 @Suppress("TrailingComma", "unused")
 @TvPreview

app/src/main/kotlin/org/mjdev/tvapp/base/ui/components/navigation/NavGraphBuilderEx.kt

@@ -11,7 +11,7 @@ package org.mjdev.tvapp.base.ui.components.navigation
 import androidx.navigation.NavGraph
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavigatorProvider
-import org.mjdev.tvapp.base.ui.components.navigation.EmptyScreen.Companion.ROUTE_NONE
+import org.mjdev.tvapp.base.ui.components.complex.EmptyScreen.Companion.ROUTE_NONE
 
 class NavGraphBuilderEx(
     provider: NavigatorProvider,