fix typo

Author: pablobaldez

Diff for: app/src/main/kotlin/br/com/mob1st/bet/init/KoinInitializer.kt

@@ -33,7 +33,7 @@ class KoinInitializer : Initializer<KoinApplication> {
 private fun Context.createDependencyGraph() =
     startKoin {
         androidLogger()
-        androidContext(this@createDependencyGraph)
+        androidContext(this@createDependencyGraph.applicationContext)
         modules(
             FirebaseComponent().module,
             firebaseModule,

Diff for: core/androidx/src/main/kotlin/br/com/mob1st/core/androidx/flows/WhileSubscribedOrRetained.kt

@@ -1,86 +1,24 @@
 package br.com.mob1st.core.androidx.flows
 
-import android.os.Handler
-import android.os.Looper
-import android.view.Choreographer
-import android.view.Choreographer.FrameCallback
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.SharingCommand
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.dropWhile
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlin.coroutines.resume
 
-/**
- * Behaves like [SharingStarted.WhileSubscribed] but it will also wait for config changes to settle and for the UI to
- * have a chance to resubscribe before stopping the upstream flow
- * @see <a href="https://blog.p-y.wtf/whilesubscribed5000">WhileSubscribed(5000)</a>
- */
-object WhileSubscribedOrRetained : SharingStarted {
-    private val handler = Handler(Looper.getMainLooper())
-
-    @OptIn(ExperimentalCoroutinesApi::class)
-    override fun command(subscriptionCount: StateFlow<Int>): Flow<SharingCommand> =
-        subscriptionCount
-            .map { it > 0 }
-            .distinctUntilChanged()
-            .mapLatest { hasSubscribers ->
-                if (hasSubscribers) {
-                    SharingCommand.START
-                } else {
-                    awaitChoreographerFramePostFrontOfQueue()
-                    SharingCommand.STOP
-                }
-            }
-            .dropWhile { it != SharingCommand.START }
-            .distinctUntilChanged()
-
-    private suspend fun awaitChoreographerFramePostFrontOfQueue() = suspendCancellableCoroutine { continuation ->
-        val frameCallback = postPostPost {
-            if (!continuation.isCompleted) {
-                continuation.resume(Unit)
-            }
-        }
-        continuation.invokeOnCancellation {
-            Choreographer.getInstance().removeFrameCallback(frameCallback)
-        }
-    }
-
-    private fun postPostPost(postBlock: () -> Unit): FrameCallback {
-        // This code is perfect. Do not change a thing.
-        val frameCallback = FrameCallback {
-            handler.postAtFrontOfQueue {
-                handler.post {
-                    postBlock()
-                }
-            }
-        }
-        return frameCallback.apply {
-            Choreographer.getInstance().postFrameCallback(this)
-        }
-    }
-}
+private const val ANR_TIMEOUT = 5_000L
 
 /**
- * Converts a cold flow in a hot flow using the [WhileSubscribedOrRetained] to avoid collections when there is no
- * subscribers to the given [scope].
- * @param scope the [CoroutineScope] to use to collect the flow.
- * @see initialValue to set an initial value to the flow.
- * @see [WhileSubscribedOrRetained]
+ * Default sharing strategy for a flow that will be retained.
+ * It uses the [SharingStarted.WhileSubscribed] strategy using the ANR timeout to decide if the flow should be
+ * restarted when there is no subscribers.
  */
-fun <T> Flow<T>.stateInRetained(
+fun <T> Flow<T>.stateInWhileSubscribed(
     scope: CoroutineScope,
     initialValue: T,
 ): StateFlow<T> =
     stateIn(
         scope = scope,
-        started = WhileSubscribedOrRetained,
+        started = SharingStarted.WhileSubscribed(ANR_TIMEOUT),
         initialValue = initialValue,
     )

Diff for: core/database/src/main/sqldelight/br/com/mob1st/core/database/Schema.sq

@@ -309,3 +309,15 @@ BEGIN
         'Update of category_id is not allowed in SeasonalRecurrences'
     );
 END;
+
+CREATE VIEW category_view AS
+SELECT
+    cat.id AS cat_id, cat.name AS cat_name,
+    cat.amount AS cat_amount, cat.is_expense AS cat_is_expense,
+    cat.linked_suggestion_id AS cat_linked_suggestion_id,
+    cat.created_at AS cat_created_at,
+    frc.day_of_month AS frc_day_of_month,
+    src.month AS src_month, src.day AS src_day
+FROM Categories AS cat
+LEFT JOIN FixedRecurrences AS frc ON cat.id = frc.category_id
+LEFT JOIN SeasonalRecurrences AS src ON cat.id = src.category_id;

Diff for: core/design/src/main/kotlin/br/com/mob1st/core/design/atoms/typography/DefaultFontRoles.kt

@@ -23,12 +23,12 @@ data object DefaultFontRoles : Material3Roles {
         ),
         medium = scale.style(
             fontFamily = montserrat,
-            fontWeight = FontWeight.Bold,
+            fontWeight = FontWeight.ExtraBold,
             sizePower = 10,
         ),
         large = scale.style(
             fontFamily = montserrat,
-            fontWeight = FontWeight.Bold,
+            fontWeight = FontWeight.Black,
             sizePower = 12,
         ),
     )
@@ -40,19 +40,19 @@ data object DefaultFontRoles : Material3Roles {
         ),
         medium = scale.style(
             fontFamily = montserrat,
-            fontWeight = FontWeight.SemiBold,
+            fontWeight = FontWeight.Bold,
             sizePower = 6,
         ),
         large = scale.style(
             fontFamily = montserrat,
-            fontWeight = FontWeight.Bold,
+            fontWeight = FontWeight.ExtraBold,
             sizePower = 7,
         ),
     )
     override val title = FontRole(
         small = scale.style(
             fontFamily = montserrat,
-            fontWeight = FontWeight.Bold,
+            fontWeight = FontWeight.Black,
             sizePower = -1,
         ),
         medium = scale.style(
@@ -68,35 +68,35 @@ data object DefaultFontRoles : Material3Roles {
     )
     override val body = FontRole(
         small = scale.style(
-            fontFamily = notoSansFlex,
+            fontFamily = notoSans,
             fontWeight = FontWeight.Normal,
             sizePower = -1,
         ),
         medium = scale.style(
-            fontFamily = notoSansFlex,
+            fontFamily = notoSans,
             fontWeight = FontWeight.Medium,
             sizePower = 0,
         ),
         large = scale.style(
-            fontFamily = notoSansFlex,
+            fontFamily = notoSans,
             fontWeight = FontWeight.Bold,
             sizePower = 1,
         ),
     )
 
     override val label = FontRole(
         small = scale.style(
-            fontFamily = notoSansFlex,
+            fontFamily = notoSans,
             fontWeight = FontWeight.Light,
             sizePower = -2,
         ),
         medium = scale.style(
-            fontFamily = notoSansFlex,
+            fontFamily = notoSans,
             fontWeight = FontWeight.Bold,
             sizePower = -1,
         ),
         large = scale.style(
-            fontFamily = notoSansFlex,
+            fontFamily = notoSans,
             fontWeight = FontWeight.Bold,
             sizePower = 0,
         ),

Diff for: core/design/src/main/kotlin/br/com/mob1st/core/design/atoms/typography/Families.kt

@@ -1,64 +1,64 @@
 package br.com.mob1st.core.design.atoms.typography
 
-import androidx.compose.ui.text.ExperimentalTextApi
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.text.font.FontVariation
 import androidx.compose.ui.text.font.FontWeight
 import br.com.mob1st.core.design.R
 
-@OptIn(ExperimentalTextApi::class)
 internal val montserrat = FontFamily(
     Font(
-        R.font.montserrat_flex,
+        R.font.montserrat__regular,
         weight = FontWeight.Normal,
-        variationSettings = FontVariation.Settings(
-            FontVariation.weight(FontWeight.Normal.weight),
-        ),
     ),
     Font(
-        R.font.montserrat_flex,
-        variationSettings = FontVariation.Settings(
-            FontVariation.weight(FontWeight.SemiBold.weight),
-        ),
+        R.font.montserrat__medium,
+        weight = FontWeight.Medium,
     ),
     Font(
-        R.font.montserrat_flex,
-        variationSettings = FontVariation.Settings(
-            FontVariation.weight(FontWeight.Bold.weight),
-        ),
+        R.font.montserrat__semi_bold,
+        weight = FontWeight.SemiBold,
+    ),
+    Font(
+        R.font.montserrat__bold,
+        weight = FontWeight.Bold,
+    ),
+    Font(
+        R.font.montserrat__extra_bold,
+        weight = FontWeight.ExtraBold,
+    ),
+    Font(
+        R.font.montserrat__black,
+        weight = FontWeight.Black,
     ),
 )
 
-@OptIn(ExperimentalTextApi::class)
-internal val notoSansFlex = FontFamily(
+internal val notoSans = FontFamily(
     Font(
-        R.font.noto_sans_flex,
-        variationSettings = FontVariation.Settings(FontWeight.Light, FontStyle.Normal),
+        R.font.noto_sans__light,
+        weight = FontWeight.Light,
     ),
     Font(
-        R.font.noto_sans_flex,
-        variationSettings = FontVariation.Settings(FontWeight.Normal, FontStyle.Normal),
+        R.font.noto_sans__regular,
+        weight = FontWeight.Normal,
     ),
     Font(
-        R.font.noto_sans_flex,
-        variationSettings = FontVariation.Settings(FontWeight.Medium, FontStyle.Normal),
+        R.font.noto_sans__medium,
+        weight = FontWeight.Medium,
     ),
     Font(
-        R.font.noto_sans_flex,
-        variationSettings = FontVariation.Settings(FontWeight.SemiBold, FontStyle.Normal),
+        R.font.noto_sans__semi_bold,
+        weight = FontWeight.SemiBold,
     ),
     Font(
-        R.font.noto_sans_flex,
-        variationSettings = FontVariation.Settings(FontWeight.Bold, FontStyle.Normal),
+        R.font.noto_sans__bold,
+        weight = FontWeight.Bold,
     ),
     Font(
-        R.font.noto_sans_flex,
-        variationSettings = FontVariation.Settings(FontWeight.ExtraBold, FontStyle.Normal),
+        R.font.noto_sans__extra_bold,
+        weight = FontWeight.ExtraBold,
     ),
     Font(
-        R.font.noto_sans_flex,
-        variationSettings = FontVariation.Settings(FontWeight.Black, FontStyle.Normal),
+        R.font.noto_sans__black,
+        weight = FontWeight.Black,
     ),
 )

Diff for: core/design/src/main/kotlin/br/com/mob1st/core/design/organisms/section/Section.kt

@@ -11,6 +11,7 @@ import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ProvideTextStyle
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -62,32 +63,41 @@ fun SectionTitle(
             .padding(top = Spacings.x6, bottom = Spacings.x2),
         contentAlignment = Alignment.CenterStart,
     ) {
-        ProvideTextStyle(MaterialTheme.typography.labelLarge) {
+        ProvideTextStyle(SectionDefaults.titleTextStyle) {
             titleContent()
         }
     }
 }
 
 object SectionTitleContentType
 
+internal object SectionDefaults {
+    val titleTextStyle
+        @Composable get() = MaterialTheme.typography.labelLarge.copy(
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+        )
+}
+
 @Composable
 @ThemedPreview
 private fun SectionPreview() {
     TwoCentsTheme {
-        LazyColumn(
-            modifier = Modifier.fillMaxWidth(),
-        ) {
-            section(
-                titleContent = {
-                    Text("Title")
-                },
-                items = persistentListOf("Item 1", "Item 2", "Item 3"),
-                itemContent = { _, item ->
-                    ListItem(
-                        headlineContent = { Text(item) },
-                    )
-                },
-            )
+        Surface {
+            LazyColumn(
+                modifier = Modifier.fillMaxWidth(),
+            ) {
+                section(
+                    titleContent = {
+                        Text("Title")
+                    },
+                    items = persistentListOf("Item 1", "Item 2", "Item 3"),
+                    itemContent = { _, item ->
+                        ListItem(
+                            headlineContent = { Text(item) },
+                        )
+                    },
+                )
+            }
         }
     }
 }

Diff for: core/design/src/main/res/font/lato_black.ttf

@@ -2,7 +2,7 @@ package br.com.mob1st.features.dev.impl.presentation.menu
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import br.com.mob1st.core.androidx.flows.stateInRetained
+import br.com.mob1st.core.androidx.flows.stateInWhileSubscribed
 import br.com.mob1st.core.state.contracts.NavigationDelegate
 import br.com.mob1st.core.state.contracts.NavigationManager
 import br.com.mob1st.core.state.contracts.UiStateOutputManager
@@ -26,7 +26,7 @@ internal class DevMenuViewModel(
     SnackbarManager<DevMenuSnackbar> by SnackbarDelegate(),
     DialogManager<CommonError> by DialogDelegate() {
     override val uiStateOutput: StateFlow<DevMenuUiState> = getDevMenu()
-        .stateInRetained(
+        .stateInWhileSubscribed(
             scope = viewModelScope,
             initialValue = DevMenuUiState.Empty,
         )

Diff for: core/design/src/main/res/font/lato_bold.ttf

@@ -7,7 +7,7 @@ import br.com.mob1st.features.dev.impl.domain.GetDevMenuUseCase
 import br.com.mob1st.features.dev.publicapi.domain.BackendEnvironment
 import br.com.mob1st.features.dev.publicapi.presentation.DevSettingsNavTarget
 import br.com.mob1st.features.utils.errors.CommonError
-import br.com.mob1st.tests.featuresutils.ViewModelTestExtension
+import br.com.mob1st.tests.featuresutils.MainDispatcherTestExtension
 import io.mockk.every
 import io.mockk.mockk
 import kotlinx.collections.immutable.persistentListOf
@@ -18,7 +18,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import kotlin.test.assertEquals
 
-@ExtendWith(ViewModelTestExtension::class)
+@ExtendWith(MainDispatcherTestExtension::class)
 internal class DevMenuViewModelTest {
     private lateinit var getDevMenuUseCase: GetDevMenuUseCase
     private lateinit var stateHolder: DevMenuUiStateHolder