Merge remote-tracking branch 'origin/develop'

Oztechan · Sep 16, 2024 · 1e0c33d · 1e0c33d
2 parents b952d94 + b90e9ad
commit 1e0c33d
Show file tree

Hide file tree

Showing 97 changed files with 888 additions and 689 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -61,7 +61,7 @@ jobs:
     steps:
 
       - name: Setup Gradle Repo
-        uses: Oztechan/Global/actions/setup-gradle-repo@007659c3464bb29eeaaed0abfd2822af806dfe1e
+        uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
 
       - name: Adding secret files
         uses: ./.github/actions/add-secret-files

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -70,7 +70,7 @@ jobs:
     steps:
 
       - name: Setup Gradle Repo
-        uses: Oztechan/Global/actions/setup-gradle-repo@007659c3464bb29eeaaed0abfd2822af806dfe1e
+        uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
 
       - name: Adding secret files
         uses: ./.github/actions/add-secret-files
@@ -89,7 +89,7 @@ jobs:
         run: ./gradlew assemble${{ env.BUILD_TYPE }}
 
       - name: Upload Android ${{ env.BUILD_TYPE }} Artifacts
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.4.0
         if: github.event_name == 'push' || github.event_name == 'schedule'
         with:
           name: androidArtifacts
@@ -138,7 +138,7 @@ jobs:
           file: huawei/${{ env.BUILD_TYPE_LOWERCASE }}/app-huawei-${{ env.BUILD_TYPE_LOWERCASE }}.apk
 
       - name: Delete Android ${{ env.BUILD_TYPE }} Artifacts
-        uses: geekyeggo/delete-artifact@v5.0.0
+        uses: geekyeggo/delete-artifact@v5.1.0
         with:
           name: androidArtifacts
 
@@ -153,7 +153,7 @@ jobs:
     steps:
 
       - name: Setup Gradle Repo
-        uses: Oztechan/Global/actions/setup-gradle-repo@007659c3464bb29eeaaed0abfd2822af806dfe1e
+        uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
 
       - name: Adding secret files
         uses: ./.github/actions/add-secret-files
@@ -173,14 +173,16 @@ jobs:
         run: fastlane build${{ env.BUILD_TYPE }}
 
       - name: Upload iOS Debug Artifacts
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.4.0
         if: github.event_name == 'push'
         with:
           name: iOSArtifacts
-          path: ios/CCC_I.ipa
+          path: |
+            ios/CCC_I.ipa
+            ios/CCC_I.app.dSYM.zip
 
       - name: Upload iOS Artifacts
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.4.0
         if: github.event_name == 'schedule'
         with:
           name: iOSArtifacts
@@ -220,7 +222,7 @@ jobs:
           fastlane distribute${{ env.BUILD_TYPE }}
 
       - name: Delete iOS ${{ env.BUILD_TYPE }} Artifacts
-        uses: geekyeggo/delete-artifact@v5.0.0
+        uses: geekyeggo/delete-artifact@v5.1.0
         with:
           name: iOSArtifacts
 
@@ -235,7 +237,7 @@ jobs:
     steps:
 
       - name: Setup Gradle Repo
-        uses: Oztechan/Global/actions/setup-gradle-repo@007659c3464bb29eeaaed0abfd2822af806dfe1e
+        uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
 
       - name: Test
         run: ./gradlew test
@@ -255,7 +257,7 @@ jobs:
     steps:
 
       - name: Setup Gradle Repo
-        uses: Oztechan/Global/actions/setup-gradle-repo@007659c3464bb29eeaaed0abfd2822af806dfe1e
+        uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
 
       - name: Generate Coverage
         run: ./gradlew koverXmlReport
@@ -273,7 +275,7 @@ jobs:
           coverage-reports: build/reports/kover/report.xml
 
       - name: SonarCloud Scan
-        uses: sonarsource/sonarcloud-github-action@v2.3.0
+        uses: sonarsource/sonarcloud-github-action@v3.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
@@ -298,7 +300,7 @@ jobs:
     steps:
 
       - name: Setup Gradle Repo
-        uses: Oztechan/Global/actions/setup-gradle-repo@007659c3464bb29eeaaed0abfd2822af806dfe1e
+        uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
 
       - name: Detekt & Lint
         run: ./gradlew detektAll lint

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   ProjectAutomations:
-    uses: Oztechan/Global/.github/workflows/reusable-project.yml@007659c3464bb29eeaaed0abfd2822af806dfe1e
+    uses: Oztechan/Global/.github/workflows/reusable-project.yml@f2926167f4c8103dca1abd9cf2908c83733e1898
     with:
       project_id: 2
     secrets: inherit
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -8,7 +8,7 @@ on:
 jobs:
 
   PublishRelease:
-    uses: Oztechan/Global/.github/workflows/reusable-publish.yml@007659c3464bb29eeaaed0abfd2822af806dfe1e
+    uses: Oztechan/Global/.github/workflows/reusable-publish.yml@f2926167f4c8103dca1abd9cf2908c83733e1898
     with:
       slack_channel: "ccc-github"
     secrets: inherit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -61,7 +61,7 @@ jobs:
     steps:
 
       - name: Setup Gradle Repo
-        uses: Oztechan/Global/actions/setup-gradle-repo@007659c3464bb29eeaaed0abfd2822af806dfe1e
+        uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
 
       - name: Adding secret files
         uses: ./.github/actions/add-secret-files
@@ -80,19 +80,19 @@ jobs:
         run: ./gradlew :android:app:bundleRelease :backend:app:jar --parallel
 
       - name: Upload Google App Bundle
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.4.0
         with:
           name: googleBundle
           path: android/app/build/outputs/bundle/googleRelease/app-google-release.aab
 
       - name: Upload Huawei App Bundle
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.4.0
         with:
           name: huaweiBundle
           path: android/app/build/outputs/bundle/huaweiRelease/app-huawei-release.aab
 
       - name: Upload Backend Jar
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.4.0
         with:
           name: backendJar
           path: backend/app/build/libs/app-*.jar
@@ -139,7 +139,7 @@ jobs:
           status: completed
 
       - name: Delete App Bundle
-        uses: geekyeggo/delete-artifact@v5.0.0
+        uses: geekyeggo/delete-artifact@v5.1.0
         with:
           name: googleBundle
 
@@ -170,7 +170,7 @@ jobs:
           file-name: "app-huawei-release"
 
       - name: Delete App Bundle
-        uses: geekyeggo/delete-artifact@v5.0.0
+        uses: geekyeggo/delete-artifact@v5.1.0
         with:
           name: huaweiBundle
 
@@ -201,7 +201,7 @@ jobs:
           SOURCE: "artifact/"
 
       - name: Delete Backend Jar
-        uses: geekyeggo/delete-artifact@v5.0.0
+        uses: geekyeggo/delete-artifact@v5.1.0
         with:
           name: backendJar
 
@@ -215,7 +215,7 @@ jobs:
       status: ${{ steps.status.outputs.status }}
     steps:
       - name: Setup Gradle Repo
-        uses: Oztechan/Global/actions/setup-gradle-repo@007659c3464bb29eeaaed0abfd2822af806dfe1e
+        uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
 
       - name: Adding secret files
         uses: ./.github/actions/add-secret-files

diff --git a/android/app/src/main/kotlin/com/oztechan/ccc/android/app/Application.kt b/android/app/src/main/kotlin/com/oztechan/ccc/android/app/Application.kt
@@ -10,8 +10,8 @@ import android.os.StrictMode.ThreadPolicy
 import android.os.StrictMode.VmPolicy
 import co.touchlab.kermit.Logger
 import com.github.submob.logmob.ANRWatchDogHandler
+import com.github.submob.logmob.enableCrashlyticsCollection
 import com.github.submob.logmob.initLogger
-import com.github.submob.logmob.setCrashlyticsCollection
 import com.oztechan.ccc.android.app.di.initKoin
 import com.oztechan.ccc.client.core.analytics.initAnalytics
 
@@ -20,11 +20,9 @@ class Application : Application() {
     override fun onCreate() {
         super.onCreate()
 
-        setCrashlyticsCollection(!BuildConfig.DEBUG)
+        enableCrashlyticsCollection()
 
-        if (!BuildConfig.DEBUG) {
-            initAnalytics(this)
-        }
+        initAnalytics(this)
 
         initLogger()
 

diff --git a/android/ui/mobile/src/main/ic_launcher-playstore.png b/android/ui/mobile/src/main/ic_launcher-playstore.png
diff --git a/...c/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/calculator/CalculatorFragment.kt b/...c/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/calculator/CalculatorFragment.kt
@@ -9,6 +9,7 @@ import android.view.View
 import android.widget.Button
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.findNavController
 import co.touchlab.kermit.Logger
 import com.github.submob.basemob.fragment.BaseVBFragment
 import com.oztechan.ccc.android.core.ad.AdManager
@@ -19,7 +20,6 @@ import com.oztechan.ccc.android.ui.mobile.util.copyToClipBoard
 import com.oztechan.ccc.android.ui.mobile.util.dataState
 import com.oztechan.ccc.android.ui.mobile.util.destroyBanner
 import com.oztechan.ccc.android.ui.mobile.util.getFromClipBoard
-import com.oztechan.ccc.android.ui.mobile.util.getNavigationResult
 import com.oztechan.ccc.android.ui.mobile.util.setBackgroundByName
 import com.oztechan.ccc.android.ui.mobile.util.setBannerAd
 import com.oztechan.ccc.android.ui.mobile.util.showSnack
@@ -55,7 +55,6 @@ class CalculatorFragment : BaseVBFragment<FragmentCalculatorBinding>() {
         binding.observeStates()
         binding.setListeners()
         observeEffects()
-        observeNavigationResults()
     }
 
     override fun onResume() {
@@ -76,14 +75,6 @@ class CalculatorFragment : BaseVBFragment<FragmentCalculatorBinding>() {
         super.onDestroyView()
     }
 
-    private fun observeNavigationResults() = getNavigationResult<String>(
-        CHANGE_BASE_EVENT,
-        R.id.calculatorFragment
-    )?.observe(viewLifecycleOwner) {
-        Logger.i { "CalculatorFragment observeNavigationResults $it" }
-        viewModel.event.onBaseChange(it)
-    }
-
     private fun FragmentCalculatorBinding.initViews() {
         adViewContainer.setBannerAd(
             adManager = adManager,
@@ -200,13 +191,15 @@ class CalculatorFragment : BaseVBFragment<FragmentCalculatorBinding>() {
             ac.setKeyboardListener()
             del.setKeyboardListener()
         }
+
+        findNavController().addOnDestinationChangedListener { _, navDestination, _ ->
+            if (navDestination.id == R.id.calculatorFragment) {
+                onSheetDismissed()
+            }
+        }
     }
 
     private fun Button.setKeyboardListener() = setOnClickListener {
         viewModel.event.onKeyPress(text.toString())
     }
-
-    companion object {
-        const val CHANGE_BASE_EVENT = "change_base"
-    }
 }
diff --git a/...c/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/currencies/CurrenciesFragment.kt b/...c/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/currencies/CurrenciesFragment.kt
@@ -18,12 +18,10 @@ import com.github.submob.basemob.fragment.BaseVBFragment
 import com.oztechan.ccc.android.core.ad.AdManager
 import com.oztechan.ccc.android.ui.mobile.BuildConfig
 import com.oztechan.ccc.android.ui.mobile.R
-import com.oztechan.ccc.android.ui.mobile.content.calculator.CalculatorFragment.Companion.CHANGE_BASE_EVENT
 import com.oztechan.ccc.android.ui.mobile.databinding.FragmentCurrenciesBinding
 import com.oztechan.ccc.android.ui.mobile.util.destroyBanner
 import com.oztechan.ccc.android.ui.mobile.util.hideKeyboard
 import com.oztechan.ccc.android.ui.mobile.util.setBannerAd
-import com.oztechan.ccc.android.ui.mobile.util.setNavigationResult
 import com.oztechan.ccc.android.ui.mobile.util.showSnack
 import com.oztechan.ccc.android.ui.mobile.util.visibleIf
 import com.oztechan.ccc.client.core.analytics.AnalyticsManager
@@ -131,12 +129,6 @@ class CurrenciesFragment : BaseVBFragment<FragmentCurrenciesBinding>() {
                     findNavController().popBackStack()
                     view?.hideKeyboard()
                 }
-
-                is CurrenciesEffect.ChangeBase -> setNavigationResult(
-                    R.id.calculatorFragment,
-                    viewEffect.newBase,
-                    CHANGE_BASE_EVENT
-                )
             }
         }.launchIn(viewLifecycleOwner.lifecycleScope)
 

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
@@ -105,12 +105,12 @@ class MainActivity : BaseActivity() {
     override fun onResume() {
         super.onResume()
         Logger.i { "MainActivity onResume" }
-        viewModel.event.onResume()
+        viewModel.event.onAppForeground()
     }
 
     override fun onPause() {
         Logger.i { "MainActivity onPause" }
-        viewModel.event.onPause()
+        viewModel.event.onAppBackground()
         super.onPause()
     }
 

diff --git a/.../src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/premium/PremiumBottomSheet.kt b/.../src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/premium/PremiumBottomSheet.kt
@@ -4,6 +4,7 @@
 
 package com.oztechan.ccc.android.ui.mobile.content.premium
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.flowWithLifecycle
@@ -15,8 +16,8 @@ import com.oztechan.ccc.android.core.billing.BillingEffect
 import com.oztechan.ccc.android.core.billing.BillingManager
 import com.oztechan.ccc.android.ui.mobile.BuildConfig
 import com.oztechan.ccc.android.ui.mobile.R
+import com.oztechan.ccc.android.ui.mobile.content.main.MainActivity
 import com.oztechan.ccc.android.ui.mobile.databinding.BottomSheetPremiumBinding
-import com.oztechan.ccc.android.ui.mobile.util.resolveAndStartIntent
 import com.oztechan.ccc.android.ui.mobile.util.showDialog
 import com.oztechan.ccc.android.ui.mobile.util.showSnack
 import com.oztechan.ccc.android.ui.mobile.util.toOldPurchaseList
@@ -112,6 +113,7 @@ class PremiumBottomSheet : BaseVBBottomSheetDialogFragment<BottomSheetPremiumBin
                 } else {
                     billingManager.acknowledgePurchase()
                 }
+
                 is PremiumEffect.ConsumePurchase -> billingManager.consumePurchase(viewEffect.token)
             }
         }.launchIn(viewLifecycleOwner.lifecycleScope)
@@ -156,8 +158,10 @@ class PremiumBottomSheet : BaseVBBottomSheetDialogFragment<BottomSheetPremiumBin
         )
     }
 
-    private fun restartActivity() = activity?.run {
-        finish()
-        resolveAndStartIntent(intent)
+    private fun restartActivity() {
+        val intent = Intent(requireContext(), MainActivity::class.java)
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
+        startActivity(intent)
+        requireActivity().finish()
     }
 }
diff --git a/...kotlin/com/oztechan/ccc/android/ui/mobile/content/selectcurrency/SelectCurrencyAdapter.kt b/...kotlin/com/oztechan/ccc/android/ui/mobile/content/selectcurrency/SelectCurrencyAdapter.kt
@@ -7,6 +7,7 @@ import com.github.submob.basemob.adapter.BaseVBRecyclerViewAdapter
 import com.oztechan.ccc.android.ui.mobile.databinding.ItemSelectCurrencyBinding
 import com.oztechan.ccc.android.ui.mobile.util.setBackgroundByName
 import com.oztechan.ccc.client.viewmodel.selectcurrency.SelectCurrencyEvent
+import com.oztechan.ccc.client.viewmodel.selectcurrency.model.SelectCurrencyPurpose
 import com.oztechan.ccc.common.core.model.Currency
 
 class SelectCurrencyAdapter(
@@ -30,7 +31,12 @@ class SelectCurrencyAdapter(
         override fun onItemBind(item: Currency) = with(itemBinding) {
             imgIcon.setBackgroundByName(item.code)
             txtSettingItem.text = item.getVariablesOneLine()
-            root.setOnClickListener { selectCurrencyEvent.onItemClick(item) }
+            root.setOnClickListener {
+                selectCurrencyEvent.onItemClick(
+                    item,
+                    SelectCurrencyPurpose.Base
+                )
+            }
         }
     }