Merge pull request #208 from YAPP-Github/release/1.2.1

[release] v1.2.1

Author: ikseong00

.github/workflows/daily-ga-report.yml

@@ -0,0 +1,28 @@
+name: GA4 Daily Report
+
+on:
+  schedule:
+    - cron: '0 1 * * *'  # 매일 10:00 KST
+  workflow_dispatch:
+
+jobs:
+  report:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+
+      - name: Install dependencies
+        run: pip install google-analytics-data requests
+
+      - name: Run GA4 daily report
+        env:
+          DISCORD_WEBHOOK_URL: ${{ secrets.GA_DISCORD_WEBHOOK_URL }}
+          GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
+          GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }}
+          GOOGLE_REFRESH_TOKEN: ${{ secrets.GOOGLE_REFRESH_TOKEN }}
+        run: python scripts/ga_daily_report.py

app/build.gradle.kts

@@ -71,6 +71,7 @@ dependencies {
     implementation(projects.core.model)
     implementation(projects.core.navigation)
     implementation(projects.core.ui)
+    implementation(projects.core.analytics)
     implementation(projects.feature.auth.api)
     implementation(projects.feature.auth.impl)
     implementation(projects.feature.pose.api)
@@ -83,11 +84,12 @@ dependencies {
     implementation(projects.feature.mypage.impl)
     implementation(projects.feature.photoUpload.api)
     implementation(projects.feature.photoUpload.impl)
+    implementation(projects.feature.selectAlbum.api)
+    implementation(projects.feature.selectAlbum.impl)
 
     implementation(libs.timber)
 
     implementation(platform(libs.firebase.bom))
-    implementation(libs.firebase.analytics)
     implementation(libs.firebase.crashlytics)
 
     implementation(libs.androidx.activity.compose)

app/src/main/AndroidManifest.xml

@@ -29,6 +29,16 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+            </intent-filter>
         </activity>
 
         <activity

app/src/main/java/com/neki/android/app/MainActivity.kt

@@ -1,5 +1,6 @@
 package com.neki.android.app
 
+import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
 import android.widget.Toast
@@ -8,7 +9,10 @@ import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation3.runtime.entryProvider
 import com.neki.android.app.main.MainRoute
@@ -28,11 +32,31 @@ import com.neki.android.core.navigation.root.RootNavigator
 import com.neki.android.feature.auth.api.AuthNavKey
 import com.neki.android.feature.auth.impl.navigation.authEntryProvider
 import com.neki.android.feature.photo_upload.api.navigateToQRScan
-import com.neki.android.feature.photo_upload.api.navigateToUploadAlbum
+import com.neki.android.feature.select_album.api.navigateToSelectAlbum
+import android.net.Uri
+import androidx.core.content.IntentCompat
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
+private fun Intent.extractShareUriStrings(): ImmutableList<String> {
+    val uris: List<Uri> = when (action) {
+        Intent.ACTION_SEND -> {
+            IntentCompat.getParcelableExtra(this, Intent.EXTRA_STREAM, Uri::class.java)
+                ?.let { listOf(it) } ?: emptyList()
+        }
+        Intent.ACTION_SEND_MULTIPLE -> {
+            IntentCompat.getParcelableArrayListExtra(this, Intent.EXTRA_STREAM, Uri::class.java)
+                ?: emptyList()
+        }
+        else -> emptyList()
+    }
+    return uris.map { it.toString() }.toImmutableList()
+}
+
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
 
@@ -54,9 +78,13 @@ class MainActivity : ComponentActivity() {
     @Inject
     lateinit var authEventManager: AuthEventManager
 
+    private var pendingShareUriStrings by mutableStateOf<ImmutableList<String>>(persistentListOf())
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        pendingShareUriStrings = intent.extractShareUriStrings()
+
         enableEdgeToEdge(
             navigationBarStyle = SystemBarStyle.auto(
                 lightScrim = Color.TRANSPARENT,
@@ -95,8 +123,9 @@ class MainActivity : ComponentActivity() {
                                     onTabSelected = { mainNavigator.navigate(it) },
                                     onBack = { mainNavigator.goBack() },
                                     navigateToQRScan = mainNavigator::navigateToQRScan,
-                                    navigateToUploadAlbumWithGallery = mainNavigator::navigateToUploadAlbum,
-                                    navigateToUploadAlbumWithQRScan = mainNavigator::navigateToUploadAlbum,
+                                    navigateToSelectAlbum = { action -> mainNavigator.navigateToSelectAlbum(action) },
+                                    pendingShareUriStrings = pendingShareUriStrings,
+                                    onShareUrisConsumed = { pendingShareUriStrings = persistentListOf() },
                                 )
                             }
                         }
@@ -107,6 +136,14 @@ class MainActivity : ComponentActivity() {
         observeAuthEvents()
     }
 
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        val uriStrings = intent.extractShareUriStrings()
+        if (uriStrings.isNotEmpty()) {
+            pendingShareUriStrings = uriStrings
+        }
+    }
+
     private fun observeAuthEvents() {
         lifecycleScope.launch {
             authEventManager.authEvent.collect { event ->

app/src/main/java/com/neki/android/app/main/MainContract.kt

@@ -1,6 +1,7 @@
 package com.neki.android.app.main
 
 import android.net.Uri
+import com.neki.android.feature.select_album.api.SelectAlbumAction
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 
@@ -18,6 +19,7 @@ sealed interface MainIntent {
     data object ClickQRScan : MainIntent
     data object ClickGalleryUpload : MainIntent
     data class SelectGalleryImage(val uris: List<Uri>) : MainIntent
+    data class ShareImageReceived(val uris: List<Uri>) : MainIntent
     data class QRCodeScanned(val imageUrl: String) : MainIntent
     data object DismissSelectWithAlbumDialog : MainIntent
     data object ClickUploadWithAlbum : MainIntent
@@ -27,8 +29,7 @@ sealed interface MainIntent {
 sealed interface MainSideEffect {
     data object NavigateToQRScan : MainSideEffect
     data object OpenGallery : MainSideEffect
-    data class NavigateToUploadAlbumWithGallery(val uriStrings: List<String>) : MainSideEffect
-    data class NavigateToUploadAlbumWithQRScan(val imageUrl: String) : MainSideEffect
+    data class NavigateToSelectAlbum(val action: SelectAlbumAction) : MainSideEffect
     data class ShowToast(val message: String) : MainSideEffect
     data object RefreshArchive : MainSideEffect
 }

app/src/main/java/com/neki/android/app/main/MainScreen.kt

@@ -1,44 +1,49 @@
 package com.neki.android.app.main
 
-import androidx.compose.animation.ContentTransform
-import androidx.compose.animation.EnterTransition
-import androidx.compose.animation.ExitTransition
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.animation.ContentTransform
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.core.net.toUri
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation3.runtime.NavEntry
 import androidx.navigation3.runtime.NavKey
 import androidx.navigation3.ui.NavDisplay
 import com.neki.android.app.main.component.AddPhotoBottomSheet
 import com.neki.android.app.main.component.AlbumUploadOption
-import com.neki.android.app.ui.BottomNavigationBar
 import com.neki.android.app.main.component.SelectWithAlbumDialog
+import com.neki.android.app.ui.BottomNavigationBar
 import com.neki.android.core.navigation.result.LocalResultEventBus
 import com.neki.android.core.navigation.result.ResultEffect
 import com.neki.android.core.ui.component.LoadingDialog
 import com.neki.android.core.ui.compose.collectWithLifecycle
 import com.neki.android.core.ui.toast.NekiToast
 import com.neki.android.feature.archive.api.ArchiveNavKey
-import com.neki.android.feature.archive.api.ArchiveResult
+import com.neki.android.feature.archive.api.PhotoUploadedResult
 import com.neki.android.feature.map.api.MapNavKey
 import com.neki.android.feature.mypage.api.MyPageNavKey
 import com.neki.android.feature.photo_upload.api.PhotoUploadNavKey
 import com.neki.android.feature.photo_upload.api.QRScanResult
 import com.neki.android.feature.pose.api.PoseNavKey
+import com.neki.android.feature.select_album.api.SelectAlbumAction
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
 import timber.log.Timber
 
 @Composable
@@ -50,8 +55,9 @@ fun MainRoute(
     onTabSelected: (NavKey) -> Unit,
     onBack: () -> Unit,
     navigateToQRScan: () -> Unit,
-    navigateToUploadAlbumWithGallery: (List<String>) -> Unit,
-    navigateToUploadAlbumWithQRScan: (String) -> Unit,
+    navigateToSelectAlbum: (SelectAlbumAction) -> Unit,
+    pendingShareUriStrings: ImmutableList<String> = persistentListOf(),
+    onShareUrisConsumed: () -> Unit = {},
     viewModel: MainViewModel = hiltViewModel(),
 ) {
     val uiState by viewModel.store.uiState.collectAsStateWithLifecycle()
@@ -69,6 +75,13 @@ fun MainRoute(
         }
     }
 
+    LaunchedEffect(pendingShareUriStrings) {
+        if (pendingShareUriStrings.isNotEmpty()) {
+            viewModel.store.onIntent(MainIntent.ShareImageReceived(pendingShareUriStrings.map { it.toUri() }))
+            onShareUrisConsumed()
+        }
+    }
+
     ResultEffect<QRScanResult>(resultBus) { result ->
         when (result) {
             is QRScanResult.QRCodeScanned -> viewModel.store.onIntent(MainIntent.QRCodeScanned(result.imageUrl))
@@ -83,10 +96,9 @@ fun MainRoute(
                 PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly),
             )
 
-            is MainSideEffect.NavigateToUploadAlbumWithGallery -> navigateToUploadAlbumWithGallery(sideEffect.uriStrings)
-            is MainSideEffect.NavigateToUploadAlbumWithQRScan -> navigateToUploadAlbumWithQRScan(sideEffect.imageUrl)
+            is MainSideEffect.NavigateToSelectAlbum -> navigateToSelectAlbum(sideEffect.action)
             is MainSideEffect.ShowToast -> nekiToast.showToast(sideEffect.message)
-            MainSideEffect.RefreshArchive -> resultBus.sendResult<ArchiveResult>(result = ArchiveResult.PhotoUploaded)
+            MainSideEffect.RefreshArchive -> resultBus.sendResult(result = PhotoUploadedResult, allowDuplicate = false)
         }
     }
 
@@ -116,7 +128,6 @@ fun MainScreen(
     val shouldShowBottomBar by remember(currentKey) {
         mutableStateOf(currentKey in topLevelKeys)
     }
-
     Scaffold(
         modifier = Modifier
             .fillMaxSize()
@@ -153,7 +164,7 @@ fun MainScreen(
         )
     }
 
-    if (uiState.isLoading) {
+    if (uiState.isLoading && !uiState.isShowSelectWithAlbumDialog) {
         LoadingDialog()
     }