Merge remote-tracking branch 'origin/develop'

Oztechan · Jul 18, 2023 · 8e53f66 · 8e53f66
2 parents f0ef488 + 7542404
commit 8e53f66
Show file tree

Hide file tree

Showing 68 changed files with 730 additions and 674 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -83,14 +83,14 @@ jobs:
           echo "${{ secrets.AG_CONNECT_SERVICES_JSON_ASC }}" > agconnect-services.json.asc
           gpg -d --passphrase "${{ secrets.SECRET_PASSWORD }}" --batch agconnect-services.json.asc > android/app/src/release/agconnect-services.json
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
 
       - name: Assemble
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v2.6.0
         with:
           arguments: assemble
 
@@ -183,14 +183,14 @@ jobs:
           echo "${{ secrets.IOS_GPG_RELEASE_XCCONFIG }}" > Release.xcconfig.asc
           gpg -d --passphrase "${{ secrets.SECRET_PASSWORD }}" --batch Release.xcconfig.asc > ios/CCC/Resources/Release/Config.xcconfig
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
 
       - name: Generate Pods
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v2.6.0
         with:
           arguments: :ios:provider:podGenIOS :client:core:res:podGenIOS --parallel
 
@@ -259,14 +259,14 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
 
       - name: Run Quality Jobs
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v2.6.0
         with:
           arguments: check koverMergedXmlReport --parallel
 
@@ -342,14 +342,14 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
 
       - name: Detekt
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v2.6.0
         with:
           arguments: detektAll
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -78,14 +78,14 @@ jobs:
           echo "${{ secrets.AG_CONNECT_SERVICES_JSON_ASC }}" > agconnect-services.json.asc
           gpg -d --passphrase "${{ secrets.SECRET_PASSWORD }}" --batch agconnect-services.json.asc > android/app/src/release/agconnect-services.json
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
 
       - name: Generate Artifacts
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v2.6.0
         with:
           arguments: :android:app:bundleRelease :backend:app:jar --parallel
 
@@ -163,7 +163,7 @@ jobs:
         with:
           client-id: ${{secrets.HUAWEI_CLIENT_ID}}
           client-key: ${{secrets.HUAWEI_CLIENT_KEY}}
-          app-id: ${{secrets.HUAWEI_APP_ID}}
+          app-id: "com.oztechan.ccc.huawei"
           file-extension: "aab"
           file-path: "app-huawei-release.aab"
           file-name: "app-huawei-release"
@@ -219,10 +219,10 @@ jobs:
           submodules: 'recursive'
           fetch-depth: 0
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
 
       - name: Adding secret files
@@ -235,7 +235,7 @@ jobs:
           gpg -d --passphrase "${{ secrets.SECRET_PASSWORD }}" --batch Release.xcconfig.asc > ios/CCC/Resources/Release/Config.xcconfig
 
       - name: Generate Pods
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v2.6.0
         with:
           arguments: :ios:provider:podGenIOS :client:core:res:podGenIOS --parallel
 

diff --git a/CCC.gradle.kts b/CCC.gradle.kts
@@ -54,7 +54,7 @@ allprojects {
             buildUponDefaultConfig = true
             allRules = true
             parallel = true
-            config = files("${rootProject.projectDir}/detekt.yml")
+            config.from("${rootProject.projectDir}/detekt.yml")
         }
         tasks.withType<Detekt> {
             setSource(files(project.projectDir))

diff --git a/android/app/android-app.gradle.kts b/android/app/android-app.gradle.kts
@@ -40,6 +40,8 @@ android {
         }
     }
 
+    buildFeatures.buildConfig = true
+
     signingConfigs {
         create(BuildType.release) {
             storeFile = file(secret(Key.ANDROID_KEY_STORE_PATH))
@@ -155,7 +157,7 @@ dependencies {
         implementation(project(widget))
     }
 
-    Modules.Submodules.apply {
-        implementation(project(logmob))
+    Submodules.apply {
+        implementation(logmob)
     }
 }
diff --git a/android/core/billing/android-core-billing.gradle.kts b/android/core/billing/android-core-billing.gradle.kts
@@ -53,7 +53,7 @@ dependencies {
         }
     }
 
-    Modules.Submodules.apply {
-        implementation(project(scopemob))
+    Submodules.apply {
+        implementation(scopemob)
     }
 }
diff --git a/android/ui/mobile/android-ui-mobile.gradle.kts b/android/ui/mobile/android-ui-mobile.gradle.kts
@@ -26,6 +26,7 @@ android {
     buildFeatures {
         viewBinding = true
         compose = true
+        buildConfig = true
     }
 
     composeOptions {
@@ -98,8 +99,8 @@ dependencies {
         implementation(project(premium))
     }
 
-    Modules.Submodules.apply {
-        implementation(project(scopemob))
-        implementation(project(basemob))
+    Submodules.apply {
+        implementation(scopemob)
+        implementation(basemob)
     }
 }
diff --git a/...ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/main/MainActivity.kt b/...ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/main/MainActivity.kt
@@ -29,6 +29,7 @@ import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class MainActivity : BaseActivity() {
+    override var containerId: Int = R.id.content
 
     private val adManager: AdManager by inject()
     private val mainViewModel: MainViewModel by viewModel()

diff --git a/...e/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/settings/SettingsFragment.kt b/...e/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/settings/SettingsFragment.kt
@@ -30,10 +30,10 @@ import com.oztechan.ccc.client.core.analytics.AnalyticsManager
 import com.oztechan.ccc.client.core.analytics.model.ScreenName
 import com.oztechan.ccc.client.core.shared.model.AppTheme
 import com.oztechan.ccc.client.core.shared.util.MAXIMUM_FLOATING_POINT
-import com.oztechan.ccc.client.core.shared.util.numberToIndex
 import com.oztechan.ccc.client.viewmodel.settings.SettingsEffect
 import com.oztechan.ccc.client.viewmodel.settings.SettingsViewModel
 import com.oztechan.ccc.client.viewmodel.settings.model.PremiumStatus
+import com.oztechan.ccc.client.viewmodel.settings.util.numberToIndex
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.koin.android.ext.android.inject

diff --git a/...obile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/watchers/WatchersView.kt b/...obile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/watchers/WatchersView.kt
@@ -33,6 +33,7 @@ import com.oztechan.ccc.android.ui.mobile.util.toColor
 import com.oztechan.ccc.android.ui.mobile.util.toPainter
 import com.oztechan.ccc.android.ui.mobile.util.toText
 import com.oztechan.ccc.client.viewmodel.watchers.WatchersEffect
+import com.oztechan.ccc.client.viewmodel.watchers.WatchersEvent
 import com.oztechan.ccc.client.viewmodel.watchers.WatchersState
 import com.oztechan.ccc.client.viewmodel.watchers.WatchersViewModel
 import com.oztechan.ccc.common.core.model.Watcher
@@ -61,21 +62,15 @@ fun NavHostController.WatchersView(
     SnackViewHost(snackbarHostState) {
         WatchersViewContent(
             state = vm.state.collectAsState(),
-            onAddClick = vm.event::onAddClick,
-            onRateChange = vm.event::onRateChange,
-            onBaseClick = vm.event::onBaseClick,
-            onTargetClick = vm.event::onTargetClick
+            event = vm.event
         )
     }
 }
 
 @Composable
 fun WatchersViewContent(
     state: State<WatchersState>,
-    onAddClick: () -> Unit,
-    onRateChange: (watcher: Watcher, rate: String) -> String,
-    onBaseClick: (watcher: Watcher) -> Unit,
-    onTargetClick: (watcher: Watcher) -> Unit,
+    event: WatchersEvent
 ) {
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
@@ -96,13 +91,13 @@ fun WatchersViewContent(
                 WatcherItem(
                     watcher = it,
                     onRateChange = { rate ->
-                        onRateChange(it, rate)
+                        event.onRateChange(it, rate)
                     },
                     onBaseClick = {
-                        onBaseClick(it)
+                        event.onBaseClick(it)
                     },
                     onTargetClick = {
-                        onTargetClick(it)
+                        event.onTargetClick(it)
                     }
                 )
             }
@@ -116,7 +111,7 @@ fun WatchersViewContent(
             contentAlignment = Alignment.Center
         ) {
             TextButton(
-                onClick = onAddClick,
+                onClick = event::onAddClick,
             ) {
                 ImageView(
                     painter = R.drawable.ic_plus.toPainter(),
@@ -146,9 +141,16 @@ fun WatchersViewContentPreview() = Preview {
                 )
             )
         ),
-        onAddClick = {},
-        onRateChange = { _, _ -> "" },
-        onBaseClick = {},
-        onTargetClick = {}
+        event = object : WatchersEvent {
+            override fun onBackClick() = Unit
+            override fun onBaseClick(watcher: Watcher) = Unit
+            override fun onTargetClick(watcher: Watcher) = Unit
+            override fun onBaseChanged(watcher: Watcher, newBase: String) = Unit
+            override fun onTargetChanged(watcher: Watcher, newTarget: String) = Unit
+            override fun onAddClick() = Unit
+            override fun onDeleteClick(watcher: Watcher) = Unit
+            override fun onRelationChange(watcher: Watcher, isGreater: Boolean) = Unit
+            override fun onRateChange(watcher: Watcher, rate: String) = ""
+        }
     )
 }
diff --git a/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/util/ViewExtensions.kt b/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/util/ViewExtensions.kt
@@ -22,6 +22,7 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import com.github.submob.scopemob.castTo
+import com.github.submob.scopemob.whether
 import com.oztechan.ccc.android.core.ad.AdManager
 import com.oztechan.ccc.android.core.ad.BannerAdView
 import com.oztechan.ccc.android.ui.mobile.R
@@ -76,8 +77,8 @@ fun <T> Fragment.getNavigationResult(
     key: String,
     destinationId: Int
 ) = findNavController()
-    .backQueue
-    .lastOrNull { it.destination.id == destinationId }
+    .currentBackStackEntry
+    ?.whether { it.destination.id == destinationId }
     ?.savedStateHandle
     ?.getLiveData<T>(key)
 
@@ -86,10 +87,9 @@ fun <T> Fragment.setNavigationResult(
     result: T,
     key: String
 ) = findNavController()
-    .backQueue
-    .lastOrNull { it.destination.id == destinationId }
-    ?.savedStateHandle
-    ?.set(key, result)
+    .previousBackStackEntry
+    ?.whether { it.destination.id == destinationId }
+    ?.savedStateHandle?.set(key, result)
 
 fun View?.visibleIf(visible: Boolean, bringFront: Boolean = false) = this?.apply {
     if (visible) {

diff --git a/android/ui/widget/android-ui-widget.gradle.kts b/android/ui/widget/android-ui-widget.gradle.kts
@@ -32,11 +32,12 @@ dependencies {
     libs.apply {
         android.apply {
             implementation(glance)
+            implementation(lifecycleViewmodel)
         }
 
         common.apply {
             implementation(koinCore)
-            testImplementation(test)
+            implementation(kermit)
         }
     }
 
@@ -45,6 +46,7 @@ dependencies {
     implementation(project(Modules.Common.Core.model))
 
     Modules.Client.Core.apply {
+        implementation(project(viewModel))
         implementation(project(res))
         implementation(project(analytics))
     }

diff --git a/android/ui/widget/src/main/kotlin/com/oztechan/ccc/android/ui/widget/AppWidget.kt b/android/ui/widget/src/main/kotlin/com/oztechan/ccc/android/ui/widget/AppWidget.kt
@@ -1,8 +1,15 @@
 package com.oztechan.ccc.android.ui.widget
 
-import androidx.compose.runtime.Composable
+import android.content.Context
+import android.content.Intent
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.glance.GlanceId
 import androidx.glance.appwidget.GlanceAppWidget
+import androidx.glance.appwidget.provideContent
+import co.touchlab.kermit.Logger
 import com.oztechan.ccc.android.ui.widget.content.WidgetView
+import com.oztechan.ccc.android.viewmodel.widget.WidgetEffect
 import com.oztechan.ccc.android.viewmodel.widget.WidgetViewModel
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
@@ -11,8 +18,31 @@ class AppWidget : GlanceAppWidget(), KoinComponent {
 
     private val viewModel: WidgetViewModel by inject()
 
-    @Composable
-    override fun Content() {
-        WidgetView(state = viewModel.state)
+    override suspend fun provideGlance(context: Context, id: GlanceId) {
+        provideContent {
+            LaunchedEffect(key1 = viewModel.effect) {
+                viewModel.effect.collect {
+                    Logger.i { "AppWidget observeEffects ${it::class.simpleName}" }
+
+                    when (it) {
+                        WidgetEffect.OpenApp ->
+                            context.packageManager
+                                .getLaunchIntentForPackage(context.packageName)
+                                ?.apply {
+                                    addFlags(
+                                        Intent.FLAG_ACTIVITY_CLEAR_TASK or
+                                            Intent.FLAG_ACTIVITY_CLEAR_TOP or
+                                            Intent.FLAG_ACTIVITY_NEW_TASK
+                                    )
+                                }?.let { intent -> context.startActivity(intent) }
+                    }
+                }
+            }
+
+            WidgetView(
+                state = viewModel.state.collectAsState().value,
+                event = viewModel.event
+            )
+        }
     }
 }