Big refactor

.gitignore

@@ -14,3 +14,5 @@ Test Results*
 Morpho/.kotlin
 .kotlin
 /.kotlin/
+Butterfly
+**.log

Morpho/.gitignore

@@ -19,3 +19,4 @@ captures
 !*.xcodeproj/project.xcworkspace/
 !*.xcworkspace/contents.xcworkspacedata
 **/xcshareddata/WorkspaceSettings.xcsettings
+**.log

Morpho/build.gradle.kts

@@ -14,6 +14,7 @@ plugins {
     alias(libs.plugins.kotlinParcelize).apply(false)
     alias(libs.plugins.androidApplication).apply(false)
     alias(libs.plugins.androidLibrary).apply(false)
+    id("com.codingfeline.buildkonfig") version "0.15.2" apply false
 
 }
 

Morpho/composeApp/build.gradle.kts

@@ -1,4 +1,6 @@
+import com.codingfeline.buildkonfig.compiler.FieldSpec.Type.STRING
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
@@ -9,13 +11,69 @@ plugins {
     alias(libs.plugins.compose.compiler)
 
     alias(libs.plugins.androidApplication)
+    id("com.codingfeline.buildkonfig")
     id("kotlin-parcelize")
+    //id("kotlin-kapt")
 
     //id("com.rickclephas.kmp.nativecoroutines") version "1.0.0-ALPHA-27"
 }
 
+val versionString = "1.0.0-alpha_1"
+val packageString = "com.morpho.app"
+
+buildkonfig {
+    packageName = packageString
+    // objectName = "YourAwesomeConfig"
+    // exposeObjectWithName = "YourAwesomePublicConfig"
+
+    defaultConfigs {
+        buildConfigField(STRING, "versionString", versionString)
+        buildConfigField(STRING, "packageName", packageString)
+        buildConfigField(STRING, "appName", "Morpho")
+        buildConfigField(STRING, "versionNumber", "0.1.0")
+    }
+    defaultConfigs("dev") {
+        buildConfigField(STRING, "versionString", "${versionString}-dev")
+        buildConfigField(STRING, "packageName", packageString)
+        buildConfigField(STRING, "appName", "Morpho")
+        buildConfigField(STRING, "versionNumber", "0.1.0")
+    }
+
+    targetConfigs {
+        create("android") {
+            buildConfigField(STRING, "versionString", "android-${versionString}")
+        }
+        create("desktop") {
+            buildConfigField(STRING, "versionString", "desktop-${versionString}")
+        }
+        create("ios") {
+            buildConfigField(STRING, "versionString", "ios-${versionString}")
+        }
+
+    }
+    targetConfigs("dev") {
+        create("android") {
+            buildConfigField(STRING, "versionString", "android-${versionString}-dev")
+        }
+        create("desktop") {
+            buildConfigField(STRING, "versionString", "desktop-${versionString}-dev")
+        }
+        create("ios") {
+            buildConfigField(STRING, "versionString", "ios-${versionString}-dev")
+        }
+
+    }
+}
+
 kotlin {
     androidTarget {
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            freeCompilerArgs.addAll(
+                "-P",
+                "plugin:org.jetbrains.kotlin.parcelize:additionalAnnotation=com.morpho.app.CommonParcelize",
+            )
+        }
         compilations.all {
             kotlinOptions {
                 jvmTarget = "11"
@@ -74,11 +132,27 @@ kotlin {
             implementation(libs.ktor.client.android)
 
             implementation(libs.kotlin.jwt)
+
+            implementation(libs.androidx.paging.runtime)
+            implementation(libs.androidx.paging.compose)
+
+
+            //implementation(libs.logkmpanion)
         }
 
         commonMain.dependencies {
             implementation("com.morpho:shared")
 
+            implementation("com.russhwolf:multiplatform-settings:1.2.0")
+            implementation("com.russhwolf:multiplatform-settings-serialization:1.2.0")
+            implementation("com.russhwolf:multiplatform-settings-coroutines:1.2.0")
+            implementation("com.russhwolf:multiplatform-settings-datastore:1.2.0")
+            implementation("com.russhwolf:multiplatform-settings-no-arg:1.2.0")
+            implementation("androidx.datastore:datastore-preferences-core:1.1.1")
+            implementation("androidx.datastore:datastore-core:1.1.1")
+
+            implementation(libs.paging.common)
+            implementation(libs.paging.compose.common)
 
             implementation(compose.runtime)
             implementation(compose.foundation)
@@ -116,9 +190,6 @@ kotlin {
             implementation(libs.kotlinx.serialization.cbor)
             implementation(libs.kotlinx.serialization.json)
 
-
-
-
             implementation(kotlin("reflect"))
 
             api(libs.logging)
@@ -133,6 +204,7 @@ kotlin {
             implementation(libs.koin.core.coroutines)
             implementation(libs.koin.annotations)
             implementation(libs.koin.compose)
+            implementation("io.insert-koin:koin-logger-slf4j:3.5.3")
 
 
             // Enables FileKit without Compose dependencies
@@ -147,6 +219,7 @@ kotlin {
             implementation(libs.ktor.contentnegotiation)
             implementation(libs.ktor.serialization.json)
             implementation(libs.ktor.websockets)
+            implementation(libs.ktor.client.encoding)
             implementation(libs.ktor.client.resources)
             implementation(libs.ktor.client.auth)
 
@@ -155,6 +228,7 @@ kotlin {
             implementation(libs.voyager.navigator)
             // Screen Model
             implementation(libs.voyager.screenmodel)
+            implementation(libs.voyager.lifecycle.kmp)
             // BottomSheetNavigator
             implementation(libs.voyager.bottom.sheet.navigator)
             // TabNavigator
@@ -169,9 +243,12 @@ kotlin {
             implementation(libs.slf4j.api)
             //implementation(libs.slf4j.simple)
 
+            implementation(libs.toolargetool)
+            api(libs.parcelize)
+
         }
         nativeMain.dependencies {
-
+            implementation(libs.paging.runtime.uikit)
         }
         desktopMain.dependencies {
             implementation(compose.desktop.currentOs)
@@ -182,19 +259,30 @@ kotlin {
             implementation(libs.logback.classic)
             implementation(libs.nativeparameterstoreaccess)
             implementation(libs.kotlin.jwt)
+
+
+            //implementation(libs.logkmpanion)
         }
 
         commonTest.dependencies {
             implementation(libs.kotlin.test)
             @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
             implementation(compose.uiTest)
+            implementation(libs.paging.testing)
+
+
         }
         val desktopTest by getting {
             dependencies {
                 implementation(compose.desktop.uiTestJUnit4)
                 implementation(compose.desktop.currentOs)
             }
         }
+        getByName("commonMain") {
+            dependencies {
+                implementation(libs.kotlinx.coroutines)
+            }
+        }
     }
 }
 
@@ -207,11 +295,11 @@ android {
     sourceSets["main"].resources.srcDirs("src/commonMain/resources")
 
     defaultConfig {
-        applicationId = "com.morpho.app"
+        applicationId = packageString
         minSdk = libs.versions.android.minSdk.get().toInt()
         targetSdk = libs.versions.android.targetSdk.get().toInt()
         versionCode = 1
-        versionName = "1.0"
+        versionName = versionString
     }
     packaging {
         resources {
@@ -231,7 +319,9 @@ android {
             applicationIdSuffix = ".debug"
         }
     }
+
     compileOptions {
+
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
@@ -265,8 +355,9 @@ compose.desktop {
                 TargetFormat.AppImage,
                 TargetFormat.Pkg
             )
-            packageName = "com.morpho.app"
-            packageVersion = "1.0.0"
+            packageName = packageString
+
+            packageVersion = versionString.split("-")[0]
         }
     }
 }

Morpho/composeApp/src/androidMain/kotlin/Platform.android.kt

@@ -1,7 +0,0 @@
-import android.os.Build
-
-class AndroidPlatform : Platform {
-    override val name: String = "Android ${Build.VERSION.SDK_INT}"
-}
-
-actual fun getPlatform(): Platform = AndroidPlatform()

Morpho/composeApp/src/androidMain/kotlin/com/morpho/app/MorphoApplication.kt

@@ -3,12 +3,11 @@ package com.morpho.app
 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.DefaultLifecycleObserver
+import com.gu.toolargetool.TooLargeTool
+import com.morpho.app.data.MorphoAgent
 import com.morpho.app.data.PreferencesRepository
 import com.morpho.app.di.appModule
-import com.morpho.app.di.dataModule
-import com.morpho.app.di.storageModule
-import com.morpho.butterfly.AtIdentifier
-import com.morpho.butterfly.Butterfly
+
 import com.morpho.butterfly.auth.SessionRepository
 import com.morpho.butterfly.auth.UserRepository
 import org.koin.android.annotation.KoinViewModel
@@ -27,29 +26,24 @@ class AndroidMainViewModel(app: Application): AndroidViewModel(app), DefaultLife
     val sessionRepository = app.getKoin().get<SessionRepository>()
     val userRepository = app.getKoin().get<UserRepository>()
 
-    val api = app.getKoin().get<Butterfly>()
+    val agent = app.getKoin().get<MorphoAgent>()
 }
 
 class MorphoApplication : Application() {
     override fun onCreate() {
-
+        TooLargeTool.startLogging(this);
 
         val koin = startKoin {
             androidContext(this@MorphoApplication)
             androidLogger()
-            modules(androidModule, appModule, storageModule, dataModule)
+            modules(androidModule, appModule)//, storageModule, dataModule)
         }.koin
-        val sessionRepository = koin.get<SessionRepository> { parametersOf(cacheDir.path.toString()) }
-        val userRepository = koin.get<UserRepository> { parametersOf(cacheDir.path.toString()) }
-        val prefs = koin.get<PreferencesRepository> { parametersOf(cacheDir.path.toString()) }
-        val id: AtIdentifier? = if(sessionRepository.auth?.did != null) {
-            sessionRepository.auth?.did
-        } else if (sessionRepository.auth?.handle != null) {
-            sessionRepository.auth?.handle
-        } else {
-            userRepository.firstUser()?.id
-        }
-        val api = koin.get<Butterfly> { parametersOf(id) }
+
+        val storageDir = getPlatformStorageDir(filesDir.path.toString())
+        koin.get<SessionRepository> { parametersOf(storageDir) }
+        koin.get<UserRepository> { parametersOf(storageDir) }
+        koin.get<PreferencesRepository> { parametersOf(storageDir) }
+        koin.get<MorphoAgent>()
         super.onCreate()
     }
 }

Morpho/composeApp/src/androidMain/kotlin/com/morpho/app/Platform.android.kt

@@ -0,0 +1,48 @@
+@file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
+package com.morpho.app
+
+import android.os.Build
+import android.os.Parcel
+import android.os.Parcelable
+import kotlinx.datetime.LocalDateTime
+import kotlinx.parcelize.Parceler
+import kotlinx.parcelize.Parcelize
+import kotlinx.parcelize.RawValue
+import kotlinx.parcelize.TypeParceler
+import java.util.Locale
+
+actual typealias CommonParcelize = Parcelize
+actual typealias CommonParcelable = Parcelable
+
+actual typealias CommonRawValue = RawValue
+actual typealias CommonParceler<T> = Parceler<T>
+actual typealias CommonTypeParceler<T,P> = TypeParceler<T, P>
+actual object LocalDateTimeParceler : Parceler<LocalDateTime> {
+    override fun create(parcel: Parcel): LocalDateTime {
+        val date = parcel.readString()
+        return date?.let { LocalDateTime.parse(it) }
+            ?: LocalDateTime(0, 0, 0, 0, 0)
+    }
+
+    override fun LocalDateTime.write(parcel: Parcel, flags: Int) {
+        parcel.writeString(this.toString())
+    }
+}
+
+class AndroidPlatform : Platform {
+    override val name: String = "Android ${Build.VERSION.SDK_INT}"
+}
+
+actual fun getPlatform(): Platform = AndroidPlatform()
+
+
+
+actual val myLang:String?
+    get() = Locale.getDefault().language
+
+actual val myCountry:String?
+    get() = Locale.getDefault().country
+
+actual fun getPlatformStorageDir(baseDir: String): String {
+    return baseDir
+}

Morpho/composeApp/src/androidMain/kotlin/com/morpho/app/Previews.kt

@@ -0,0 +1,26 @@
+package com.morpho.app.com.morpho.app
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.tooling.preview.Preview
+import com.morpho.app.ui.post.PlaceholderSkylineItem
+import com.morpho.app.ui.post.PostFragmentRole
+
+@Preview
+@Composable
+fun PreviewPlaceholderSkylineItem() {
+    //MorphoTheme {
+        Column {
+            Column {
+                PlaceholderSkylineItem()
+                PlaceholderSkylineItem(role = PostFragmentRole.PrimaryThreadRoot)
+                PlaceholderSkylineItem(role = PostFragmentRole.ThreadBranchStart)
+                PlaceholderSkylineItem(role = PostFragmentRole.ThreadBranchMiddle)
+                PlaceholderSkylineItem(role = PostFragmentRole.ThreadBranchEnd)
+                PlaceholderSkylineItem(role = PostFragmentRole.ThreadRootUnfocused)
+                PlaceholderSkylineItem(role = PostFragmentRole.ThreadEnd)
+                PlaceholderSkylineItem(elevate = true)
+            }
+        }
+    //}
+}

Morpho/composeApp/src/androidMain/kotlin/com/morpho/app/ui/common/BackHandler.kt

@@ -4,7 +4,5 @@ import androidx.compose.runtime.Composable
 
 @Composable
 actual fun BackHandler(content: () -> Unit) {
-    BackHandler {
-        content()
-    }
+
 }