Feature/base module

app/build.gradle.kts

@@ -51,6 +51,7 @@ android {
 
 dependencies {
     implementation(project(":library:sync"))
+    implementation(project(":library:base"))
     implementation(project(":library:navigation"))
     implementation(project(":library:designsystem"))
     DIDependencies.apply {

app/src/main/java/ir/kaaveh/composenews/navigation/ComposeNewsNavHost.kt

@@ -7,7 +7,7 @@ import androidx.navigation.compose.NavHost
 import ir.kaaveh.navigation.graph.favoriteMarketList
 import ir.kaaveh.navigation.graph.marketDetail
 import ir.kaaveh.navigation.graph.marketList
-import ir.kaaveh.designsystem.base.BaseViewModel
+import ir.kaaveh.base.BaseViewModel
 import ir.kaaveh.navigation.Destinations
 
 @Composable

app/src/main/java/ir/kaaveh/composenews/ui/MainActivity.kt

@@ -24,8 +24,8 @@ import ir.kaaveh.composenews.permission.enum.PermissionType
 import ir.kaaveh.composenews.permission.manager.PermissionManager
 import ir.kaaveh.composenews.permission.manager.PermissionManagerImpl
 import ir.kaaveh.composenews.ui.component.BottomNavigationBar
-import ir.kaaveh.designsystem.base.BaseRoute
-import ir.kaaveh.designsystem.base.BaseViewModel
+import ir.kaaveh.base.BaseRoute
+import ir.kaaveh.base.BaseViewModel
 import ir.kaaveh.designsystem.theme.ComposeNewsTheme
 import ir.kaaveh.navigation.BottomNavItem
 import ir.kaaveh.navigation.Destinations

feature/marketdetail/build.gradle.kts

@@ -42,6 +42,7 @@ android {
 
 dependencies {
     api(project(":library:designsystem"))
+    api(project(":library:base"))
     implementation(project(":data:market-repository"))
     implementation(ComposeDependencies.accompanistWebview)
     DIDependencies.apply {

feature/marketdetail/src/main/java/ir/kaaveh/marketdetail/MarketDetailContract.kt

@@ -1,6 +1,6 @@
 package ir.kaaveh.marketdetail
 
-import ir.kaaveh.designsystem.UnidirectionalViewModel
+import ir.kaaveh.base.UnidirectionalViewModel
 import ir.kaaveh.domain.model.Chart
 import ir.kaaveh.domain.model.Market
 

feature/marketdetail/src/main/java/ir/kaaveh/marketdetail/MarketDetailScreen.kt

@@ -23,12 +23,12 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import coil.compose.rememberAsyncImagePainter
-import ir.kaaveh.designsystem.base.BaseViewModel
+import ir.kaaveh.base.BaseViewModel
 import ir.kaaveh.designsystem.component.FavoriteIcon
 import ir.kaaveh.designsystem.component.QuadLineChart
 import ir.kaaveh.designsystem.preview.ThemePreviews
 import ir.kaaveh.designsystem.theme.ComposeNewsTheme
-import ir.kaaveh.designsystem.use
+import ir.kaaveh.base.use
 import ir.kaaveh.domain.model.Market
 import ir.kaaveh.marketdetail.preview_provider.MarketDetailStateProvider
 

feature/marketdetail/src/main/java/ir/kaaveh/marketdetail/MarketDetailViewModel.kt

@@ -3,8 +3,8 @@ package ir.kaaveh.marketdetail
 import androidx.lifecycle.viewModelScope
 import ir.kaaveh.core_test.dispatcher.DispatcherProvider
 import dagger.hilt.android.lifecycle.HiltViewModel
-import ir.kaaveh.designsystem.base.BaseContract
-import ir.kaaveh.designsystem.base.BaseViewModel
+import ir.kaaveh.base.BaseContract
+import ir.kaaveh.base.BaseViewModel
 import ir.kaaveh.domain.model.Market
 import ir.kaaveh.domain.model.Resource
 import ir.kaaveh.domain.use_case.GetMarketChartUseCase

feature/marketdetail/src/test/java/ir/kaaveh/marketdetail/MarketDetailViewModelTest.kt

@@ -5,7 +5,7 @@ import ir.kaaveh.core_test.dispatcher.TestDispatcherProvider
 import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.mockk
-import ir.kaaveh.designsystem.base.BaseContract
+import ir.kaaveh.base.BaseContract
 import ir.kaaveh.domain.model.Chart
 import ir.kaaveh.domain.model.Market
 import ir.kaaveh.domain.model.Resource

feature/marketlist/build.gradle.kts

@@ -42,6 +42,7 @@ android {
 
 dependencies {
     api(project(":library:designsystem"))
+    api(project(":library:base"))
     implementation(project(":data:market-repository"))
     DIDependencies.apply {
         implementation(hiltAndroid)

feature/marketlist/src/main/java/ir/kaaveh/marketlist/MarketListContract.kt

@@ -1,6 +1,6 @@
 package ir.kaaveh.marketlist
 
-import ir.kaaveh.designsystem.UnidirectionalViewModel
+import ir.kaaveh.base.UnidirectionalViewModel
 import ir.kaaveh.domain.model.Market
 
 interface MarketListContract :

feature/marketlist/src/main/java/ir/kaaveh/marketlist/MarketListScreen.kt

@@ -17,10 +17,10 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.hilt.navigation.compose.hiltViewModel
-import ir.kaaveh.designsystem.base.BaseViewModel
+import ir.kaaveh.base.BaseViewModel
 import ir.kaaveh.designsystem.preview.ThemePreviews
 import ir.kaaveh.designsystem.theme.ComposeNewsTheme
-import ir.kaaveh.designsystem.use
+import ir.kaaveh.base.use
 import ir.kaaveh.domain.model.Market
 import ir.kaaveh.marketlist.component.MarketListItem
 import ir.kaaveh.marketlist.preview_provider.MarketListStateProvider

feature/marketlist/src/main/java/ir/kaaveh/marketlist/MarketListViewModel.kt

@@ -1,10 +1,10 @@
 package ir.kaaveh.marketlist
 
 import androidx.lifecycle.viewModelScope
-import ir.kaaveh.core_test.dispatcher.DispatcherProvider
 import dagger.hilt.android.lifecycle.HiltViewModel
-import ir.kaaveh.designsystem.base.BaseContract
-import ir.kaaveh.designsystem.base.BaseViewModel
+import ir.kaaveh.base.BaseContract
+import ir.kaaveh.base.BaseViewModel
+import ir.kaaveh.core_test.dispatcher.DispatcherProvider
 import ir.kaaveh.domain.model.Market
 import ir.kaaveh.domain.use_case.GetFavoriteMarketListUseCase
 import ir.kaaveh.domain.use_case.GetMarketListUseCase

library/base/.gitignore

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

library/base/build.gradle.kts

@@ -0,0 +1,49 @@
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.android")
+}
+
+android {
+    namespace = "ir.kaaveh.base"
+    compileSdk = projectCompileSdkVersion
+
+    defaultConfig {
+        minSdk = projectMinSdkVersion
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
+    buildFeatures {
+        compose = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = ComposeDependencies.kotlinCompilerExtensionVersion
+    }
+}
+
+dependencies {
+
+    api(project(":library:core-test"))
+    implementation(project(":library:designsystem"))
+
+    LifeCycleDependencies.apply {
+        implementation(lifeCycleViewModelKtx)
+    }
+}

library/base/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

library/base/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest />

library/designsystem/src/main/java/ir/kaaveh/designsystem/base/BaseContract.kt → library/base/src/main/java/ir/kaaveh/base/BaseContract.kt

@@ -1,6 +1,4 @@
-package ir.kaaveh.designsystem.base
-
-import ir.kaaveh.designsystem.BaseUnidirectionalViewModel
+package ir.kaaveh.base
 
 interface BaseContract :
     BaseUnidirectionalViewModel<BaseContract.BaseEvent, BaseContract.BaseEffect, BaseContract.BaseState> {

library/designsystem/src/main/java/ir/kaaveh/designsystem/base/BaseScreen.kt → library/base/src/main/java/ir/kaaveh/base/BaseScreen.kt

@@ -1,13 +1,11 @@
-package ir.kaaveh.designsystem.base
+package ir.kaaveh.base
 
 import android.app.Activity
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import ir.kaaveh.designsystem.collectInLaunchedEffect
-import ir.kaaveh.designsystem.useBase
 import ir.kaaveh.designsystem.widget.ErrorView
 import ir.kaaveh.designsystem.widget.LoadingView
 
@@ -49,10 +47,12 @@ private fun BaseScreen(
             BaseContract.BaseState.OnLoading -> {
                 LoadingView(modifier = Modifier.fillMaxSize())
             }
+
             BaseContract.BaseState.OnLoadingDialog -> TODO()
             is BaseContract.BaseState.OnError -> {
                 ErrorView(errorMessage = baseState.errorMessage)
             }
+
             BaseContract.BaseState.OnSuccess -> content()
         }
     }

library/designsystem/src/main/java/ir/kaaveh/designsystem/base/BaseViewModel.kt → library/base/src/main/java/ir/kaaveh/base/BaseViewModel.kt

@@ -1,4 +1,4 @@
-package ir.kaaveh.designsystem.base
+package ir.kaaveh.base
 
 import androidx.lifecycle.ViewModel
 import ir.kaaveh.core_test.dispatcher.DispatcherProvider

library/designsystem/src/main/java/ir/kaaveh/designsystem/ComposeArchHelper.kt → library/base/src/main/java/ir/kaaveh/base/ComposeArchHelper.kt

@@ -1,4 +1,4 @@
-package ir.kaaveh.designsystem
+package ir.kaaveh.base
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect

library/designsystem/build.gradle.kts

@@ -38,7 +38,6 @@ android {
 }
 
 dependencies {
-    api(project(":library:core-test"))
     ComposeDependencies.apply {
         api(platform(composeBOM))
         api(composeUi)
@@ -50,6 +49,5 @@ dependencies {
     }
     LifeCycleDependencies.apply {
         api(lifeCycleRuntimeCompose)
-        implementation(lifeCycleViewModelKtx)
     }
 }

library/navigation/src/main/java/ir/kaaveh/navigation/graph/FavoriteNews.kt

@@ -4,10 +4,10 @@ import androidx.core.os.bundleOf
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
-import ir.kaaveh.designsystem.base.BaseViewModel
+import ir.kaaveh.base.BaseViewModel
+import ir.kaaveh.marketlist.MarketListRoute
 import ir.kaaveh.navigation.Destinations
 import ir.kaaveh.navigation.extension_function.navigate
-import ir.kaaveh.marketlist.MarketListRoute
 
 fun NavGraphBuilder.favoriteMarketList(
     navController: NavController,

library/navigation/src/main/java/ir/kaaveh/navigation/graph/NewsDetail.kt

@@ -2,11 +2,11 @@ package ir.kaaveh.navigation.graph
 
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
-import ir.kaaveh.navigation.Destinations
-import ir.kaaveh.navigation.extension_function.parcelableData
-import ir.kaaveh.designsystem.base.BaseViewModel
+import ir.kaaveh.base.BaseViewModel
 import ir.kaaveh.domain.model.Market
 import ir.kaaveh.marketdetail.MarketDetailRoute
+import ir.kaaveh.navigation.Destinations
+import ir.kaaveh.navigation.extension_function.parcelableData
 
 fun NavGraphBuilder.marketDetail(
     onProvideBaseViewModel: (baseViewModel: BaseViewModel) -> Unit,

library/navigation/src/main/java/ir/kaaveh/navigation/graph/NewsList.kt

@@ -4,10 +4,10 @@ import androidx.core.os.bundleOf
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
+import ir.kaaveh.base.BaseViewModel
+import ir.kaaveh.marketlist.MarketListRoute
 import ir.kaaveh.navigation.Destinations
 import ir.kaaveh.navigation.extension_function.navigate
-import ir.kaaveh.designsystem.base.BaseViewModel
-import ir.kaaveh.marketlist.MarketListRoute
 
 fun NavGraphBuilder.marketList(
     navController: NavController,

settings.gradle

@@ -24,3 +24,4 @@ include ':feature:marketdetail'
 include ':library:sync'
 include ':library:navigation'
 include ':library:core-test'
+include ':library:base'