Added placeholder footer items for future pages [#1]

* Removed unused classes from the codebase. * Removed the desktop and shared IOS directories.
comixed · Dec 9, 2023 · 0ecf66a · 0ecf66a
1 parent ea86a70
commit 0ecf66a
Show file tree

Hide file tree

Showing 27 changed files with 52 additions and 524 deletions.
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -4,7 +4,6 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.androidApplication)
-    alias(libs.plugins.jetbrainsCompose)
     id("app.cash.sqldelight")
 }
 
@@ -24,45 +23,34 @@ kotlin {
         }
     }
 
-    jvm("desktop")
-
     listOf(
         iosX64(),
         iosArm64(),
         iosSimulatorArm64()
     ).forEach { iosTarget ->
         iosTarget.binaries.framework {
-            baseName = "ComposeApp"
+            baseName = "Shared"
             isStatic = true
         }
     }
 
     sourceSets {
-        val desktopMain by getting
-
         androidMain.dependencies {
             implementation(libs.compose.ui)
             implementation(libs.compose.ui.tooling.preview)
-            implementation(libs.androidx.activity.compose)
+            implementation(libs.compose.material)
+            implementation(libs.androidx.compose.material3)
+            implementation(libs.compose.icons.extended)
             implementation(libs.koin.android)
             implementation(libs.koin.androidx.compose)
             implementation(libs.sqldelight.driver.android)
             implementation(libs.navigation.compose)
             implementation(libs.koin.androidx.compose)
         }
-        desktopMain.dependencies {
-            implementation(compose.desktop.currentOs)
-            implementation(libs.koin.core)
-            implementation(libs.sqldelight.driver.sqlite)
+        iosMain.dependencies {
+            implementation(libs.sqldelight.driver.native)
         }
         commonMain.dependencies {
-            implementation(compose.runtime)
-            implementation(compose.foundation)
-            implementation(compose.material)
-            implementation(compose.material3)
-            implementation(compose.materialIconsExtended)
-            @OptIn(ExperimentalComposeLibrary::class)
-            implementation(compose.components.resources)
             implementation(libs.napier)
             implementation(libs.datetime)
             implementation(libs.koin.core)
@@ -115,18 +103,6 @@ android {
     }
 }
 
-compose.desktop {
-    application {
-        mainClass = "MainKt"
-
-        nativeDistributions {
-            targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
-            packageName = "org.comixedproject.variant"
-            packageVersion = "1.0.0"
-        }
-    }
-}
-
 sqldelight {
     databases {
         create("VariantDb") {

diff --git a/...org/comixedproject/variant/KoinAndroid.kt → ...ixedproject/variant/KoinCommon.android.kt b/...org/comixedproject/variant/KoinAndroid.kt → ...ixedproject/variant/KoinCommon.android.kt
diff --git a/composeApp/src/androidMain/kotlin/org/comixedproject/variant/MainActivity.kt b/composeApp/src/androidMain/kotlin/org/comixedproject/variant/MainActivity.kt
@@ -22,19 +22,9 @@ import android.annotation.SuppressLint
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.material.Scaffold
-import androidx.compose.material.ScaffoldState
-import androidx.compose.material.rememberScaffoldState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.navigation.NavGraph.Companion.findStartDestination
-import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import io.github.aakira.napier.DebugAntilog
 import io.github.aakira.napier.Napier
-import kotlinx.coroutines.launch
-import org.comixedproject.variant.ui.Screen
-import org.comixedproject.variant.ui.main.AppDrawer
 
 /**
  * <code>MainActivity</code> is the main entry point into the application on Android.
@@ -49,39 +39,12 @@ class MainActivity : ComponentActivity() {
         Napier.base(DebugAntilog())
         setContent {
             VariantTheme {
-                val coroutineScope = rememberCoroutineScope()
-                val scaffoldState: ScaffoldState = rememberScaffoldState()
                 val navController = rememberNavController()
-                val navBackStackEntry by navController.currentBackStackEntryAsState()
 
-                Scaffold(
-                    scaffoldState = scaffoldState,
-                    drawerContent = {
-                        AppDrawer(
-                            currentScreen = Screen.fromRoute(
-                                navBackStackEntry?.destination?.route
-                            ),
-                            onScreenSelected = { screen ->
-                                navController.navigate(screen.route) {
-                                    popUpTo(navController.graph.findStartDestination().id) {
-                                        saveState = true
-                                    }
-                                    launchSingleTop = true
-                                    restoreState = true
-                                }
-                                coroutineScope.launch {
-                                    scaffoldState.drawerState.close()
-                                }
-                            }
-                        )
-                    },
-                    content = {
-                        MainActivityScreen(
-                            navController = navController
-                        )
-                    }
+                MainActivityScreen(
+                    navController = navController
                 )
             }
         }
     }
-}
+}
diff --git a/composeApp/src/androidMain/kotlin/org/comixedproject/variant/MainActivityScreen.kt b/composeApp/src/androidMain/kotlin/org/comixedproject/variant/MainActivityScreen.kt
@@ -20,16 +20,23 @@ package org.comixedproject.variant
 
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
 import org.comixedproject.variant.model.serverTemplate
 import org.comixedproject.variant.ui.Screen
 import org.comixedproject.variant.ui.server.EditServer
 import org.comixedproject.variant.ui.server.ServerList
 import org.comixedproject.variant.viewmodel.MainViewModel
 import org.koin.androidx.compose.getViewModel
 
+/**
+ * The main activity screen for the application.
+ *
+ * @author Darryl L. Pierce
+ */
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MainActivityScreen(
@@ -72,4 +79,12 @@ fun MainActivityScreen(
                 }, onCancel = { navController.navigate(Screen.ServerList.route) })
         }
     }
+}
+
+@Preview
+@Composable
+fun MainActivityScreenPreview() {
+    VariantTheme {
+        MainActivityScreen(rememberNavController())
+    }
 }
diff --git a/composeApp/src/androidMain/kotlin/org/comixedproject/variant/ui/AnimatedSwipeDismiss.kt b/composeApp/src/androidMain/kotlin/org/comixedproject/variant/ui/AnimatedSwipeDismiss.kt
diff --git a/composeApp/src/androidMain/kotlin/org/comixedproject/variant/ui/BottomItem.kt b/composeApp/src/androidMain/kotlin/org/comixedproject/variant/ui/BottomItem.kt
@@ -25,6 +25,11 @@ import androidx.compose.material.icons.filled.Settings
 import androidx.compose.ui.graphics.vector.ImageVector
 import org.comixedproject.variant.R
 
+/**
+ * <code>BottomItem</code> represents a single item displayed at the bottom of the application screen.
+ *
+ * @author Darryl L. Pierce
+ */
 data class BottomItem(
     val route: String,
     val icon: ImageVector,

diff --git a/composeApp/src/androidMain/kotlin/org/comixedproject/variant/ui/main/AppDrawer.kt b/composeApp/src/androidMain/kotlin/org/comixedproject/variant/ui/main/AppDrawer.kt
diff --git a/composeApp/src/androidMain/kotlin/org/comixedproject/variant/ui/main/AppDrawerHeader.kt b/composeApp/src/androidMain/kotlin/org/comixedproject/variant/ui/main/AppDrawerHeader.kt