Merge pull request #3 from GetStream/feature/core-state

Implement core-uistate module to generate restartable and skippable UI states based on KSP

build.gradle.kts

@@ -25,6 +25,16 @@ subprojects {
       "-Xopt-in=androidx.compose.material3.ExperimentalMaterial3Api",
       "-Xopt-in=androidx.lifecycle.compose.ExperimentalLifecycleComposeApi"
     )
+    kotlinOptions.freeCompilerArgs += listOf(
+      "-P",
+      "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=" +
+        project.buildDir.absolutePath + "/compose_metrics"
+    )
+    kotlinOptions.freeCompilerArgs += listOf(
+      "-P",
+      "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=" +
+        project.buildDir.absolutePath + "/compose_metrics"
+    )
     kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
   }
 }

core-data/build.gradle.kts

@@ -3,7 +3,6 @@ plugins {
   id("org.jetbrains.kotlin.android")
   id("org.jetbrains.kotlin.plugin.serialization")
   id("kotlin-kapt")
-  id("com.google.devtools.ksp")
   id("dagger.hilt.android.plugin")
 }
 
@@ -21,24 +20,13 @@ android {
   }
 }
 
-kotlin {
-  sourceSets.configureEach {
-    kotlin.srcDir("$buildDir/generated/ksp/$name/kotlin/")
-  }
-}
-
 dependencies {
   api(project(":core-model"))
   api(project(":core-network"))
   api(project(":core-database"))
 
-  api(Dependencies.streamClient)
-
   api(Dependencies.coroutines)
 
   api(Dependencies.hiltAndroid)
   kapt(Dependencies.hiltCompiler)
-
-  implementation(Dependencies.sealedXCore)
-  ksp(Dependencies.sealedXProcessor)
 }

core-designsystem/build.gradle.kts

@@ -24,13 +24,6 @@ android {
   composeOptions {
     kotlinCompilerExtensionVersion = Versions.COMPOSE_COMPILER
   }
-
-  packagingOptions {
-    resources.excludes.add("META-INF/LICENSE.txt")
-    resources.excludes.add("META-INF/NOTICE.txt")
-    resources.excludes.add("LICENSE.txt")
-    resources.excludes.add("/META-INF/{AL2.0,LGPL2.1}")
-  }
 }
 
 dependencies {

core-model/build.gradle.kts

@@ -20,5 +20,6 @@ android {
 }
 
 dependencies {
+  api(Dependencies.streamClient)
   api(Dependencies.kotlinSerializationJson)
 }

core-uistate/.gitignore

@@ -0,0 +1 @@
+/build

core-uistate/build.gradle.kts

@@ -0,0 +1,42 @@
+plugins {
+  id("com.android.library")
+  id("org.jetbrains.kotlin.android")
+  id("com.google.devtools.ksp")
+}
+
+android {
+  compileSdk = Configurations.compileSdk
+
+  defaultConfig {
+    minSdk = Configurations.minSdk
+    targetSdk = Configurations.targetSdk
+  }
+
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
+
+  buildFeatures {
+    compose = true
+  }
+
+  composeOptions {
+    kotlinCompilerExtensionVersion = Versions.COMPOSE_COMPILER
+  }
+}
+
+kotlin {
+  sourceSets.configureEach {
+    kotlin.srcDir("$buildDir/generated/ksp/$name/kotlin/")
+  }
+}
+
+dependencies {
+  implementation(project(":core-model"))
+
+  implementation(Dependencies.composeRuntime)
+
+  implementation(Dependencies.sealedXCore)
+  ksp(Dependencies.sealedXProcessor)
+}

core-uistate/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="io.getstream.whatsappclone.uistate" />

core-data/src/main/kotlin/io/getstream/whatsappclone/data/model/UiState.kt → core-uistate/src/main/kotlin/io/getstream/whatsappclone/uistate/UiState.kt

@@ -14,20 +14,25 @@
  * limitations under the License.
  */
 
-package io.getstream.whatsappclone.data.model
+package io.getstream.whatsappclone.uistate
 
+import androidx.compose.runtime.Immutable
 import com.skydoves.sealedx.core.Extensive
 import com.skydoves.sealedx.core.annotations.ExtensiveModel
 import com.skydoves.sealedx.core.annotations.ExtensiveSealed
 import io.getstream.chat.android.client.models.Channel
-import io.getstream.whatsappclone.model.WhatsAppUserExtensive
 
+/**
+ * Generates restartable and skippable UI states based on KSP and extensive models.
+ * @see (SealedX)[https://github.com/skydoves/sealedx]
+ */
 @ExtensiveSealed(
   models = [
     ExtensiveModel(type = Channel::class, name = "WhatsAppMessage"),
     ExtensiveModel(type = WhatsAppUserExtensive::class, name = "WhatsAppUser")
   ]
 )
+@Immutable
 sealed interface UiState {
   data class Success(val data: Extensive) : UiState
   object Loading : UiState

core-model/src/main/kotlin/io/getstream/whatsappclone/model/WhatsAppUserExtensive.kt → core-uistate/src/main/kotlin/io/getstream/whatsappclone/uistate/WhatsAppUserExtensive.kt

@@ -14,8 +14,12 @@
  * limitations under the License.
  */
 
-package io.getstream.whatsappclone.model
+package io.getstream.whatsappclone.uistate
 
+import androidx.compose.runtime.Immutable
+import io.getstream.whatsappclone.model.WhatsAppUser
+
+@Immutable
 data class WhatsAppUserExtensive(
   val whatsappUserList: List<WhatsAppUser>
 )

feature-calls/build.gradle.kts

@@ -30,19 +30,13 @@ android {
   lint {
     abortOnError = false
   }
-
-  packagingOptions {
-    resources.excludes.add("META-INF/LICENSE.txt")
-    resources.excludes.add("META-INF/NOTICE.txt")
-    resources.excludes.add("LICENSE.txt")
-    resources.excludes.add("/META-INF/{AL2.0,LGPL2.1}")
-  }
 }
 
 dependencies {
   // core modules
   implementation(project(":core-designsystem"))
   implementation(project(":core-navigation"))
+  implementation(project(":core-uistate"))
   implementation(project(":core-data"))
 
   implementation(Dependencies.composeLifecycle)

feature-calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCalls.kt

@@ -21,11 +21,11 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import io.getstream.whatsappclone.data.model.WhatsAppUserUiState
 import io.getstream.whatsappclone.designsystem.component.WhatsAppError
 import io.getstream.whatsappclone.designsystem.component.WhatsAppLoadingColumn
 import io.getstream.whatsappclone.navigation.AppComposeNavigator
 import io.getstream.whatsappclone.navigation.WhatsAppScreens
+import io.getstream.whatsappclone.uistate.WhatsAppUserUiState
 
 @Composable
 fun WhatsAppCalls(

feature-calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCallsViewModel.kt

@@ -19,9 +19,9 @@ package io.getstream.whatsappclone.calls
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import io.getstream.whatsappclone.data.model.WhatsAppUserUiState
 import io.getstream.whatsappclone.data.repository.CallHistoryRepository
-import io.getstream.whatsappclone.model.WhatsAppUserExtensive
+import io.getstream.whatsappclone.uistate.WhatsAppUserExtensive
+import io.getstream.whatsappclone.uistate.WhatsAppUserUiState
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.flatMapLatest

feature-camera/build.gradle.kts

@@ -27,13 +27,6 @@ android {
   lint {
     abortOnError = false
   }
-
-  packagingOptions {
-    resources.excludes.add("META-INF/LICENSE.txt")
-    resources.excludes.add("META-INF/NOTICE.txt")
-    resources.excludes.add("LICENSE.txt")
-    resources.excludes.add("/META-INF/{AL2.0,LGPL2.1}")
-  }
 }
 
 dependencies {

feature-chats/build.gradle.kts

@@ -29,20 +29,14 @@ android {
   lint {
     abortOnError = false
   }
-
-  packagingOptions {
-    resources.excludes.add("META-INF/LICENSE.txt")
-    resources.excludes.add("META-INF/NOTICE.txt")
-    resources.excludes.add("LICENSE.txt")
-    resources.excludes.add("/META-INF/{AL2.0,LGPL2.1}")
-  }
 }
 
 dependencies {
   // core modules
   implementation(project(":core-designsystem"))
   implementation(project(":core-navigation"))
   implementation(project(":core-network"))
+  implementation(project(":core-uistate"))
   implementation(project(":core-data"))
 
   // Stream chat Compose

feature-chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessageTopBar.kt

@@ -39,12 +39,12 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.skydoves.landscapist.glide.GlideImage
 import io.getstream.chat.android.client.ChatClient
-import io.getstream.whatsappclone.data.model.WhatsAppMessageUiState
 import io.getstream.whatsappclone.designsystem.component.WhatsAppLoadingIndicator
 import io.getstream.whatsappclone.designsystem.icon.WhatsAppIcons
 import io.getstream.whatsappclone.designsystem.theme.WhatsAppCloneComposeTheme
 import io.getstream.whatsappclone.navigation.AppComposeNavigator
 import io.getstream.whatsappclone.navigation.WhatsAppCloneComposeNavigator
+import io.getstream.whatsappclone.uistate.WhatsAppMessageUiState
 import kotlinx.coroutines.Dispatchers
 
 @Composable

feature-chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessagesViewModel.kt

@@ -22,9 +22,9 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import io.getstream.chat.android.client.ChatClient
 import io.getstream.chat.android.client.utils.onError
 import io.getstream.chat.android.client.utils.onSuccess
-import io.getstream.whatsappclone.data.model.WhatsAppMessageUiState
 import io.getstream.whatsappclone.network.Dispatcher
 import io.getstream.whatsappclone.network.WhatsAppDispatchers
+import io.getstream.whatsappclone.uistate.WhatsAppMessageUiState
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow

feature-status/build.gradle.kts

@@ -27,13 +27,6 @@ android {
   lint {
     abortOnError = false
   }
-
-  packagingOptions {
-    resources.excludes.add("META-INF/LICENSE.txt")
-    resources.excludes.add("META-INF/NOTICE.txt")
-    resources.excludes.add("LICENSE.txt")
-    resources.excludes.add("/META-INF/{AL2.0,LGPL2.1}")
-  }
 }
 
 dependencies {

settings.gradle.kts

@@ -24,6 +24,7 @@ include(":core-model")
 include(":core-network")
 include(":core-database")
 include(":core-data")
+include(":core-uistate")
 include(":feature-camera")
 include(":feature-chats")
 include(":feature-status")