Move Light streamer service and connection to separate module

app/build.gradle

@@ -69,9 +69,6 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.4'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
 
-    implementation "com.lightstreamer:ls-android-client:4.2.6"
-    implementation "com.lightstreamer:ls-log-adapter-java:1.0.2"
-
     implementation "androidx.navigation:navigation-compose:2.5.3"
 
 
@@ -90,6 +87,8 @@ dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
 
 
+    implementation project(":core:network:light-streamer")
+    implementation project(":core:common")
 //    testImplementation "io.mockk:mockk:1.12.4"
 //    androidTestImplementation "io.mockk:mockk-android:1.12.4"
 }

app/src/main/java/dev/garousi/stockwatcher/feature/watchlist/data/StockListDto.kt

@@ -16,5 +16,5 @@ data class StockListDto(
     val min: Double? = null,
     val max: Double? = null,
     val ref: Double? = null,
-    val open: Double? = null,
+    val open: Double? = null
 )

app/src/main/java/dev/garousi/stockwatcher/feature/watchlist/data/StockListLightStreamerService.kt

@@ -4,9 +4,11 @@ import android.util.Log
 import com.lightstreamer.client.ItemUpdate
 import com.lightstreamer.client.Subscription
 import com.lightstreamer.client.SubscriptionListener
+import garousi.dev.lightstreamer.connection.LightStreamerConnection
+import garousi.dev.lightstreamer.models.SubscriptionMode
+import garousi.dev.lightstreamer.service.LightStreamerService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -16,15 +18,18 @@ import javax.inject.Inject
 
 class StockListLightStreamerService @Inject constructor(
     private val connection: LightStreamerConnection,
+    private val externalScope: CoroutineScope
 ) : LightStreamerService<StockListDto> {
 
-    private val scope = CoroutineScope(SupervisorJob())
     private var dto = StockListDto()
-    private val _flow: MutableStateFlow<StockListDto> = MutableStateFlow(StockListDto())
-    override val flow = _flow.asStateFlow()
+    private val _stockListStream: MutableStateFlow<StockListDto> = MutableStateFlow(StockListDto())
+    override val stream = _stockListStream.asStateFlow()
 
     init {
-        connection.connect(serverAddress = serverAddress, adapterSet = adapterSet)
+        connection.connect(
+            serverAddress = serverAddress,
+            adapterSet = adapterSet
+        )
     }
 
     companion object {
@@ -152,13 +157,13 @@ class StockListLightStreamerService @Inject constructor(
             ref = ref,
             open = open,
         )
-        scope.launch(Dispatchers.IO) {
-            _flow.emit(dto)
+        externalScope.launch(Dispatchers.IO) {
+            _stockListStream.emit(dto)
         }
     }
 
     override fun unsubscribe() {
         connection.unsubscribe()
-        scope.cancel()
+        externalScope.cancel()
     }
 }

app/src/main/java/dev/garousi/stockwatcher/feature/watchlist/di/LightStreamerModule.kt

@@ -6,14 +6,14 @@ import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import dev.garousi.stockwatcher.feature.watchlist.data.LightStreamerConnection
-import dev.garousi.stockwatcher.feature.watchlist.data.LightStreamerConnectionImpl
+import garousi.dev.lightstreamer.connection.DefaultLightStreamerConnection
+import garousi.dev.lightstreamer.connection.LightStreamerConnection
 import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 abstract class LightStreamerModule {
     @Binds
     @Singleton
-    abstract fun bindsLightStreamerService(impl: LightStreamerConnectionImpl): LightStreamerConnection
+    abstract fun bindsLightStreamerService(impl: DefaultLightStreamerConnection): LightStreamerConnection
 }

app/src/main/java/dev/garousi/stockwatcher/feature/watchlist/di/WatchlistListModule.kt

@@ -1,37 +1,20 @@
 package dev.garousi.stockwatcher.feature.watchlist.di
 
+import dagger.Binds
 import dagger.Module
-import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import dev.garousi.stockwatcher.feature.watchlist.data.LightStreamerConnection
-import dev.garousi.stockwatcher.feature.watchlist.data.LightStreamerService
 import dev.garousi.stockwatcher.feature.watchlist.data.StockListDto
 import dev.garousi.stockwatcher.feature.watchlist.data.StockListLightStreamerService
+import garousi.dev.lightstreamer.service.LightStreamerService
 import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
-object WatchlistListModule {
-//    @Provides
-//    fun provideGetStockListUseCase(
-//        repository: StockRepository
-//    ): GetStockListUseCase {
-//        return GetStockListUseCase(repository)
-//    }
-//
-//    @Provides
-//    fun provideStockListUseCases(
-//        getStockListUseCase: GetStockListUseCase
-//    ): StockListUseCases {
-//        return StockListUseCases(getStockList = getStockListUseCase)
-//    }
-
-    @Provides
+interface WatchlistListModule {
+    @Binds
     @Singleton
-    fun provideStockListLightStreamerService(
-        connection: LightStreamerConnection,
-    ): LightStreamerService<StockListDto> {
-        return StockListLightStreamerService(connection = connection)
-    }
+    fun bindsStockListLightStreamerService(
+        impl: StockListLightStreamerService
+    ): LightStreamerService<StockListDto>
 }

app/src/main/java/dev/garousi/stockwatcher/feature/watchlist/presentation/WatchlistViewModel.kt

@@ -1,19 +1,17 @@
 @file:Suppress("CyclomaticComplexMethod")
+
 package dev.garousi.stockwatcher.feature.watchlist.presentation
 
-import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import dev.garousi.stockwatcher.feature.watchlist.data.LightStreamerService
 import dev.garousi.stockwatcher.feature.watchlist.data.StockListDto
+import garousi.dev.lightstreamer.service.LightStreamerService
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
@@ -30,41 +28,34 @@ class WatchlistViewModel @Inject constructor(
     }
 
     private fun subscribeToDemoAdapterSet() {
-        stockListLightStreamerService
-            .subscribe()
-            .flow
-            .map { stock ->
-                _uiState.update { it.copy(isLoading = false) }
-                stock.itemPos?.let { updatedItemIndex ->
-                    _uiState.update {
-                        it.copy(
-                            stocks = it.stocks.toMutableList().apply {
-                                this[updatedItemIndex - 1] = this[updatedItemIndex - 1].copy(
-                                    name = stock.name ?: it.stocks[updatedItemIndex].name,
-                                    last = stock.last ?: it.stocks[updatedItemIndex].last,
-                                    time = stock.time ?: it.stocks[updatedItemIndex].time,
-                                    change = stock.change ?: it.stocks[updatedItemIndex].change,
-                                    bidSize = stock.bidSize ?: it.stocks[updatedItemIndex].bidSize,
-                                    bid = stock.bid ?: it.stocks[updatedItemIndex].bid,
-                                    ask = stock.ask ?: it.stocks[updatedItemIndex].ask,
-                                    askSize = stock.askSize ?: it.stocks[updatedItemIndex].askSize,
-                                    min = stock.min ?: it.stocks[updatedItemIndex].min,
-                                    max = stock.max ?: it.stocks[updatedItemIndex].max,
-                                    ref = stock.ref ?: it.stocks[updatedItemIndex].ref,
-                                    open = stock.open ?: it.stocks[updatedItemIndex].open,
-                                )
-                            },
-                        )
+        viewModelScope.launch {
+            stockListLightStreamerService
+                .subscribe()
+                .stream
+                .collectLatest { stock ->
+                    stock.itemPos?.let { updatedItemIndex ->
+                        _uiState.update {
+                            it.copy(
+                                stocks = it.stocks.toMutableList().apply {
+                                    this[updatedItemIndex - 1] = this[updatedItemIndex - 1].copy(
+                                        name = stock.name ?: it.stocks[updatedItemIndex].name,
+                                        last = stock.last ?: it.stocks[updatedItemIndex].last,
+                                        time = stock.time ?: it.stocks[updatedItemIndex].time,
+                                        change = stock.change ?: it.stocks[updatedItemIndex].change,
+                                        bidSize = stock.bidSize ?: it.stocks[updatedItemIndex].bidSize,
+                                        bid = stock.bid ?: it.stocks[updatedItemIndex].bid,
+                                        ask = stock.ask ?: it.stocks[updatedItemIndex].ask,
+                                        askSize = stock.askSize ?: it.stocks[updatedItemIndex].askSize,
+                                        min = stock.min ?: it.stocks[updatedItemIndex].min,
+                                        max = stock.max ?: it.stocks[updatedItemIndex].max,
+                                        ref = stock.ref ?: it.stocks[updatedItemIndex].ref,
+                                        open = stock.open ?: it.stocks[updatedItemIndex].open,
+                                    )
+                                }
+                            )
+                        }
                     }
                 }
-            }
-            .catch { cause: Throwable ->
-                Log.i("LOGGER", "" + cause.localizedMessage.orEmpty())
-            }
-            .stateIn(
-                scope = viewModelScope,
-                initialValue = StockListDto(),
-                started = SharingStarted.Eagerly,
-            )
+        }
     }
 }

build.gradle

@@ -15,8 +15,8 @@ plugins {
 }
 
 subprojects {
-    apply from: "../buildscripts/ktlint.gradle"
-    apply from: "../buildscripts/detekt.gradle"
-    apply from: "../buildscripts/git-hooks.gradle"
-    apply from: "../buildscripts/versionsplugin.gradle"
+    apply from: "$rootDir/buildscripts/ktlint.gradle"
+    apply from: "$rootDir/buildscripts/detekt.gradle"
+    apply from: "$rootDir/buildscripts/git-hooks.gradle"
+    apply from: "$rootDir/buildscripts/versionsplugin.gradle"
 }

config/detekt/detekt.yml

@@ -529,7 +529,7 @@ style:
     active: false
     includeLineWrapping: false
   ForbiddenComment:
-    active: true
+    active: false
     values:
       - 'FIXME:'
       - 'STOPSHIP:'

core/common/.gitignore

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

core/common/build.gradle

@@ -0,0 +1,46 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+    id 'kotlin-kapt'
+    id 'com.google.dagger.hilt.android'
+}
+
+android {
+    namespace 'garousi.dev.common'
+    compileSdk 33
+
+    defaultConfig {
+        minSdk 23
+        targetSdk 33
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.8.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+
+    implementation "com.google.dagger:hilt-android:2.44.2"
+    kapt "com.google.dagger:hilt-compiler:2.44.2"
+}

core/common/src/main/AndroidManifest.xml

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

core/common/src/main/java/garousi/dev/common/di/CoroutinesDispatchersModule.kt

@@ -0,0 +1,29 @@
+package garousi.dev.common.di
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+
+@Module
+@InstallIn(SingletonComponent::class)
+object CoroutinesDispatchersModule {
+
+    @DefaultDispatcher
+    @Provides
+    fun providesDefaultDispatcher(): CoroutineDispatcher = Dispatchers.Default
+
+    @IoDispatcher
+    @Provides
+    fun providesIoDispatcher(): CoroutineDispatcher = Dispatchers.IO
+
+    @MainDispatcher
+    @Provides
+    fun providesMainDispatcher(): CoroutineDispatcher = Dispatchers.Main
+
+    @MainImmediateDispatcher
+    @Provides
+    fun providesMainImmediateDispatcher(): CoroutineDispatcher = Dispatchers.Main.immediate
+}

core/common/src/main/java/garousi/dev/common/di/CoroutinesQualifiers.kt

@@ -0,0 +1,23 @@
+package garousi.dev.common.di
+
+import javax.inject.Qualifier
+
+@Retention(AnnotationRetention.BINARY)
+@Qualifier
+annotation class DefaultDispatcher
+
+@Retention(AnnotationRetention.BINARY)
+@Qualifier
+annotation class IoDispatcher
+
+@Retention(AnnotationRetention.BINARY)
+@Qualifier
+annotation class MainDispatcher
+
+@Retention(AnnotationRetention.BINARY)
+@Qualifier
+annotation class MainImmediateDispatcher
+
+@Retention(AnnotationRetention.BINARY)
+@Qualifier
+annotation class ApplicationScope