fix: replace uncertain meaning return types #20

androidApp/.gitignore

@@ -2,4 +2,5 @@
 *.apk
 /src/test
 /src/androidTest
-/release
+/release
+/debug

androidApp/src/main/java/com/m3u/androidApp/navigation/M3UNavHost.kt

@@ -7,21 +7,20 @@ import androidx.compose.animation.slideOutVertically
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import com.m3u.features.about.navigation.aboutScreen
 import com.m3u.features.console.navigation.consoleScreen
 import com.m3u.features.feed.navigation.feedScreen
 import com.m3u.features.live.navigation.livePlaylistScreen
 import com.m3u.features.live.navigation.liveScreen
 import com.m3u.i18n.R.string
+import com.m3u.material.model.LocalNavController
 import com.m3u.ui.Destination
 import com.m3u.ui.LocalHelper
 import com.m3u.ui.Navigate
 
 @Composable
 fun M3UNavHost(
-    navController: NavHostController,
     currentPage: Int,
     onCurrentPage: (Int) -> Unit,
     navigate: Navigate,
@@ -30,6 +29,7 @@ fun M3UNavHost(
 ) {
     val helper = LocalHelper.current
     val context = LocalContext.current
+    val navController = LocalNavController.current
     NavHost(
         navController = navController,
         startDestination = startDestination,

androidApp/src/main/java/com/m3u/androidApp/ui/App.kt

@@ -2,11 +2,13 @@ package com.m3u.androidApp.ui
 
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.m3u.androidApp.navigation.M3UNavHost
+import com.m3u.material.model.LocalNavController
 import com.m3u.ui.EmptyHelper
 import com.m3u.ui.EventHandler
 import com.m3u.ui.Helper
@@ -40,7 +42,7 @@ fun App(
 
     AppScaffold(
         title = title,
-        snacker = snacker,
+        snacker = snacker.value,
         actionsFactory = { actions },
         rootDestination = rootDestination,
         fob = fob,
@@ -54,13 +56,16 @@ fun App(
         cinemaMode = cinemaMode,
         isPlaying = isPlaying
     ) {
-        M3UNavHost(
-            navController = appState.navController,
-            currentPage = appState.currentPage,
-            onCurrentPage = { appState.currentPage = it },
-            navigate = appState::navigate,
-            modifier = Modifier.fillMaxSize()
-        )
+        CompositionLocalProvider(
+            LocalNavController provides appState.navController
+        ) {
+            M3UNavHost(
+                currentPage = appState.currentPage,
+                onCurrentPage = { appState.currentPage = it },
+                navigate = appState::navigate,
+                modifier = Modifier.fillMaxSize()
+            )
+        }
     }
 
     EventHandler(state.rootDestination) { root ->

androidApp/src/main/java/com/m3u/androidApp/ui/AppScaffold.kt

@@ -25,7 +25,7 @@ import com.m3u.material.components.AppTopBar
 import com.m3u.material.components.IconButton
 import com.m3u.material.model.LocalSpacing
 import com.m3u.material.model.Theme
-import com.m3u.ui.Action
+import com.m3u.ui.ActionsFactory
 import com.m3u.ui.Destination
 import com.m3u.ui.Fob
 import com.m3u.ui.Helper
@@ -39,7 +39,7 @@ import kotlin.time.Duration.Companion.milliseconds
 internal fun AppScaffold(
     title: String,
     snacker: String,
-    actionsFactory: () -> List<Action>,
+    actionsFactory: ActionsFactory,
     rootDestination: Destination.Root?,
     fob: Fob?,
     isSystemBarVisible: Boolean,

core/src/main/java/com/m3u/core/util/compose/ObservableState.kt

@@ -4,20 +4,13 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.snapshots.StateFactoryMarker
 
-@StateFactoryMarker
-fun <T> observableStateOf(
-    delegate: MutableState<T>,
-    onChanged: (T) -> Unit
-): MutableState<T> {
-    return ObservableState(delegate, onChanged)
-}
-
 @StateFactoryMarker
 fun <T> observableStateOf(
     value: T,
     onChanged: (T) -> Unit
 ): MutableState<T> {
-    return ObservableState(mutableStateOf(value), onChanged)
+    val delegate = mutableStateOf(value)
+    return ObservableState(delegate, onChanged)
 }
 
 private class ObservableState<T>(

core/src/main/java/com/m3u/core/util/context/SharedPreferences.kt

@@ -4,7 +4,6 @@ package com.m3u.core.util.context
 
 import android.content.SharedPreferences
 import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.mutableStateOf
 import com.m3u.core.util.compose.observableStateOf
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
@@ -78,6 +77,6 @@ private fun <T> SharedPreferences.delegateAsState(
     getter: SharedPreferences.(String, T) -> T,
     setter: SharedPreferences.Editor.(String, T) -> SharedPreferences.Editor
 ): MutableState<T> = observableStateOf(
-    delegate = mutableStateOf(getter(key, defaultValue)),
+    value = getter(key, defaultValue),
     onChanged = { edit().setter(key, it).apply() }
 )

data/src/main/java/com/m3u/data/contract/Apis.kt

@@ -2,5 +2,4 @@ package com.m3u.data.contract
 
 object Apis {
     const val GITHUB_BASE_URL = "https://api.github.com"
-    const val DROPBOX_BASE_URL = "https://api.dropboxapi.com/2"
 }

data/src/main/java/com/m3u/data/di/ApiModule.kt

@@ -4,7 +4,6 @@ package com.m3u.data.di
 
 import com.m3u.core.architecture.configuration.SharedConfiguration
 import com.m3u.core.util.serialization.asConverterFactory
-import com.m3u.data.api.DropboxApi
 import com.m3u.data.api.GithubApi
 import com.m3u.data.contract.Apis
 import dagger.Module
@@ -59,12 +58,4 @@ internal object ApiModule {
         .baseUrl(Apis.GITHUB_BASE_URL)
         .build()
         .create()
-
-    @Provides
-    fun provideDropboxApi(
-        builder: Retrofit.Builder
-    ): DropboxApi = builder
-        .baseUrl(Apis.DROPBOX_BASE_URL)
-        .build()
-        .create()
 }

data/src/main/java/com/m3u/data/logger/UiLogger.kt

@@ -1,6 +1,7 @@
 package com.m3u.data.logger
 
 import com.m3u.core.architecture.Logger
+import com.m3u.data.service.Message
 import com.m3u.data.service.UiService
 import javax.inject.Inject
 
@@ -14,7 +15,7 @@ class UiLogger @Inject constructor(
     private val logger: Logger
 ) : Logger {
     override fun log(text: String) {
-        uiService.snack(text)
+        uiService.snack(Message(text))
     }
 
     override fun log(throwable: Throwable) {

data/src/main/java/com/m3u/data/service/UiService.kt

@@ -2,9 +2,16 @@ package com.m3u.data.service
 
 import kotlinx.coroutines.flow.StateFlow
 
+@JvmInline
+value class Message(val value: String) {
+    companion object {
+        val Empty = Message("")
+    }
+}
+
 interface UiService {
-    fun snack(message: String)
-    fun toast(message: String)
-    val snacker: StateFlow<String>
-    val toaster: StateFlow<String>
+    fun snack(message: Message)
+    fun toast(message: Message)
+    val snacker: StateFlow<Message>
+    val toaster: StateFlow<Message>
 }

data/src/main/java/com/m3u/data/service/impl/UiServiceImpl.kt

@@ -1,5 +1,6 @@
 package com.m3u.data.service.impl
 
+import com.m3u.data.service.Message
 import com.m3u.data.service.UiService
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.MainScope
@@ -14,27 +15,27 @@ import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
 class UiServiceImpl @Inject constructor() : UiService {
-    override fun snack(message: String) {
+    override fun snack(message: Message) {
         MainScope().launch {
             _snacker.notify(message)
         }
     }
 
-    override fun toast(message: String) {
+    override fun toast(message: Message) {
         MainScope().launch {
             _toaster.notify(message)
         }
     }
 
-    private val _snacker = MutableStateFlow("")
-    override val snacker: StateFlow<String> get() = _snacker.asStateFlow()
+    private val _snacker = MutableStateFlow(Message.Empty)
+    override val snacker: StateFlow<Message> get() = _snacker.asStateFlow()
 
-    private val _toaster = MutableStateFlow("")
-    override val toaster: StateFlow<String> get() = _toaster.asStateFlow()
+    private val _toaster = MutableStateFlow(Message.Empty)
+    override val toaster: StateFlow<Message> get() = _toaster.asStateFlow()
 
     private var job: Job? = null
-    private suspend fun MutableStateFlow<String>.notify(
-        value: String,
+    private suspend fun MutableStateFlow<Message>.notify(
+        value: Message,
         duration: Duration = 3.seconds
     ) {
         job?.cancel()
@@ -44,7 +45,7 @@ class UiServiceImpl @Inject constructor() : UiService {
                 delay(duration)
             }.apply {
                 invokeOnCompletion {
-                    this@notify.value = ""
+                    this@notify.value = Message.Empty
                 }
             }
         }