[#199][#221] 그룹상세 이미지뷰어 연결

presentation/src/main/AndroidManifest.xml

@@ -21,6 +21,10 @@
             android:name="com.mashup.gabbangzip.sharedalbum.presentation.ui.main.MainActivity"
             android:exported="true" />
 
+        <activity
+            android:name=".ui.main.groupdetail.HistoryDetailActivity"
+            android:exported="false" />
+
         <activity
             android:name=".ui.invitation.InvitationCodeActivity"
             android:exported="false"

presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/theme/Theme.kt

@@ -1,6 +1,5 @@
 package com.mashup.gabbangzip.sharedalbum.presentation.theme
 
-import android.app.Activity
 import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme
@@ -9,11 +8,7 @@ import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
-import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalView
-import androidx.core.view.WindowCompat
 
 private val DarkColorScheme =
     darkColorScheme(
@@ -48,14 +43,6 @@ fun SharedAlbumTheme(
             darkTheme -> DarkColorScheme
             else -> LightColorScheme
         }
-    val view = LocalView.current
-    if (!view.isInEditMode) {
-        SideEffect {
-            val window = (view.context as Activity).window
-            window.statusBarColor = Gray0.toArgb()
-            WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = true
-        }
-    }
     MaterialTheme(
         colorScheme = colorScheme,
         typography = MaterialTheme.typography,

presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/eventcreation/EventCreationActivity.kt

@@ -2,9 +2,12 @@ package com.mashup.gabbangzip.sharedalbum.presentation.ui.eventcreation
 
 import android.content.Context
 import android.content.Intent
+import android.graphics.Color
 import android.os.Bundle
 import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
@@ -16,7 +19,6 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.core.view.WindowCompat
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.compose.rememberNavController
 import com.mashup.gabbangzip.sharedalbum.presentation.R
@@ -38,7 +40,12 @@ class EventCreationActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        WindowCompat.setDecorFitsSystemWindows(window, false)
+        enableEdgeToEdge(
+            SystemBarStyle.light(
+                Color.TRANSPARENT,
+                Color.TRANSPARENT,
+            ),
+        )
         photoPicker = PicPhotoPicker.create(
             activity = this@EventCreationActivity,
             max = PICTURES_MAX_COUNT,

presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/groupcreation/GroupCreationActivity.kt

@@ -2,9 +2,12 @@ package com.mashup.gabbangzip.sharedalbum.presentation.ui.groupcreation
 
 import android.content.Context
 import android.content.Intent
+import android.graphics.Color
 import android.os.Bundle
 import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
@@ -17,7 +20,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.core.content.ContextCompat
-import androidx.core.view.WindowCompat
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.compose.rememberNavController
 import com.mashup.gabbangzip.sharedalbum.presentation.R
@@ -40,7 +42,12 @@ class GroupCreationActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        WindowCompat.setDecorFitsSystemWindows(window, false)
+        enableEdgeToEdge(
+            SystemBarStyle.light(
+                Color.TRANSPARENT,
+                Color.TRANSPARENT,
+            ),
+        )
         photoPicker = PicPhotoPicker.create(this@GroupCreationActivity) {
             viewModel.updateThumbnail(it)
         }

presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/invitation/InvitationCodeActivity.kt

@@ -2,9 +2,12 @@ package com.mashup.gabbangzip.sharedalbum.presentation.ui.invitation
 
 import android.content.Context
 import android.content.Intent
+import android.graphics.Color
 import android.os.Bundle
 import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
@@ -29,6 +32,12 @@ class InvitationCodeActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge(
+            SystemBarStyle.light(
+                Color.TRANSPARENT,
+                Color.TRANSPARENT,
+            ),
+        )
         setContent {
             val state by viewModel.uiState.collectAsStateWithLifecycle()
             val snackbarHostState = remember { SnackbarHostState() }

presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/login/LoginActivity.kt

@@ -2,10 +2,13 @@ package com.mashup.gabbangzip.sharedalbum.presentation.ui.login
 
 import android.app.Activity
 import android.content.Intent
+import android.graphics.Color
 import android.os.Bundle
 import android.util.Log
 import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
@@ -30,6 +33,12 @@ class LoginActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge(
+            SystemBarStyle.light(
+                Color.TRANSPARENT,
+                Color.TRANSPARENT,
+            ),
+        )
         setContent {
             val state by viewModel.uiState.collectAsStateWithLifecycle()
             val snackbarHostState = remember { SnackbarHostState() }

presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/MainActivity.kt

@@ -2,11 +2,15 @@ package com.mashup.gabbangzip.sharedalbum.presentation.ui.main
 
 import android.app.Activity
 import android.content.Intent
+import android.graphics.Color.TRANSPARENT
 import android.os.Bundle
 import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 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.material3.SnackbarHostState
@@ -41,6 +45,12 @@ class MainActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge(
+            SystemBarStyle.light(
+                TRANSPARENT,
+                TRANSPARENT,
+            ),
+        )
         viewModel.registerFcmToken()
         initPhotoPicker()
 
@@ -52,7 +62,9 @@ class MainActivity : ComponentActivity() {
             SharedAlbumTheme {
                 ObserveEvent(snackbarHostState)
                 Scaffold(
-                    modifier = Modifier.fillMaxSize(),
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .navigationBarsPadding(),
                     snackbarHost = { PicSnackbarHost(state = snackbarHostState) },
                 ) { innerPadding ->
                     MainNavHost(

presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/groupdetail/GroupDetailScreen.kt

@@ -1,6 +1,7 @@
 package com.mashup.gabbangzip.sharedalbum.presentation.ui.main.groupdetail
 
 import android.graphics.Bitmap
+import android.util.Log
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
@@ -43,7 +44,7 @@ fun GroupDetailScreen(
     onClickVoteButton: (eventId: Long) -> Unit,
     onClickShareButton: (Bitmap) -> Unit,
     onClickEventMake: () -> Unit,
-    onClickHistoryItem: (HistoryItem) -> Unit,
+    onClickHistoryItem: (HistoryDetailState) -> Unit,
     onErrorEvent: () -> Unit,
     viewModel: GroupDetailViewModel = hiltViewModel(),
 ) {
@@ -94,7 +95,18 @@ fun GroupDetailScreen(
         },
         onClickEventMake = onClickEventMake,
         onClickShareButton = onClickShareButton,
-        onClickHistoryItem = onClickHistoryItem,
+        onClickHistoryItem = { history ->
+            state.groupInfo?.run {
+                Log.d("TAG", "GroupDetailScreen: 히스토리")
+                onClickHistoryItem(
+                    HistoryDetailState(
+                        groupName = name,
+                        keyword = keyword.name,
+                        history = history,
+                    ),
+                )
+            }
+        },
     )
 }
 

presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/groupdetail/HistoryDetailActivity.kt

@@ -0,0 +1,49 @@
+package com.mashup.gabbangzip.sharedalbum.presentation.ui.main.groupdetail
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.Color.TRANSPARENT
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import com.mashup.gabbangzip.sharedalbum.presentation.theme.SharedAlbumTheme
+import com.mashup.gabbangzip.sharedalbum.presentation.ui.model.GroupKeyword
+
+class HistoryDetailActivity : ComponentActivity() {
+    private val state by lazy { intent.getSerializableExtra(KEY_HISTORY) as HistoryDetailState? }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge(
+            statusBarStyle = SystemBarStyle.dark(
+                TRANSPARENT,
+            ),
+        )
+        setContent {
+            SharedAlbumTheme {
+                state?.let { state ->
+                    HistoryDetailScreen(
+                        groupName = state.groupName,
+                        keyword = GroupKeyword.getKeyword(state.keyword),
+                        item = state.history,
+                        onClickBackButton = { finish() },
+                    )
+                }
+            }
+        }
+    }
+
+    companion object {
+        private const val KEY_HISTORY = "history"
+
+        fun openActivity(context: Context, state: HistoryDetailState) {
+            context.startActivity(
+                Intent(context, HistoryDetailActivity::class.java).apply {
+                    putExtra(KEY_HISTORY, state)
+                },
+            )
+        }
+    }
+}

presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/groupdetail/HistoryDetailState.kt

@@ -0,0 +1,10 @@
+package com.mashup.gabbangzip.sharedalbum.presentation.ui.main.groupdetail
+
+import com.mashup.gabbangzip.sharedalbum.presentation.ui.main.groupdetail.model.HistoryItem
+import java.io.Serializable
+
+data class HistoryDetailState(
+    val groupName: String,
+    val keyword: String,
+    val history: HistoryItem,
+) : Serializable

presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/groupdetail/model/HistoryItem.kt

@@ -5,13 +5,14 @@ import com.mashup.gabbangzip.sharedalbum.presentation.ui.main.grouphome.model.Ca
 import com.mashup.gabbangzip.sharedalbum.presentation.ui.main.grouphome.model.toUiModel
 import com.mashup.gabbangzip.sharedalbum.presentation.utils.ImmutableList
 import com.mashup.gabbangzip.sharedalbum.presentation.utils.LocalDateUtil
+import java.io.Serializable
 
 data class HistoryItem(
     val id: Long = 0,
     val title: String,
     val date: String,
     val images: ImmutableList<CardBackImage> = ImmutableList(emptyList()),
-)
+) : Serializable
 
 fun HistoryDomainModel.toUiModel(): HistoryItem {
     return HistoryItem(

presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/groupdetail/navigation/GroupDetailNavigation.kt

@@ -7,7 +7,7 @@ import androidx.navigation.NavType
 import androidx.navigation.compose.composable
 import androidx.navigation.navArgument
 import com.mashup.gabbangzip.sharedalbum.presentation.ui.main.groupdetail.GroupDetailScreen
-import com.mashup.gabbangzip.sharedalbum.presentation.ui.main.groupdetail.model.HistoryItem
+import com.mashup.gabbangzip.sharedalbum.presentation.ui.main.groupdetail.HistoryDetailState
 import com.mashup.gabbangzip.sharedalbum.presentation.ui.main.navigation.MainRoute
 import com.mashup.gabbangzip.sharedalbum.presentation.ui.main.navigation.MainRoute.GroupDetailRoute.KEY_GROUP_ID
 
@@ -23,7 +23,7 @@ fun NavGraphBuilder.groupDetailNavGraph(
     onClickVoteButton: (eventId: Long) -> Unit,
     onClickEventMake: (Long) -> Unit,
     onClickShareButton: (Bitmap) -> Unit,
-    onClickHistoryItem: (HistoryItem) -> Unit,
+    onClickHistoryItem: (HistoryDetailState) -> Unit,
     onErrorEvent: () -> Unit,
 ) {
     composable(

presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/grouphome/GroupHomeScreen.kt

@@ -126,7 +126,6 @@ fun GroupHomeScreen(
                 .align(Alignment.TopCenter),
         ) {
             PicTopBar(
-                modifier = Modifier.padding(top = 56.dp),
                 rightIcon = PicTopBarIcon.USER,
                 rightIconClicked = onClickMyPage,
             )

presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/grouphome/model/CardBackImage.kt

@@ -2,11 +2,12 @@ package com.mashup.gabbangzip.sharedalbum.presentation.ui.main.grouphome.model
 
 import com.mashup.gabbangzip.sharedalbum.domain.model.group.CardBackImageDomainModel
 import com.mashup.gabbangzip.sharedalbum.presentation.ui.model.PicPhotoFrame
+import java.io.Serializable
 
 data class CardBackImage(
     val frameType: PicPhotoFrame,
     val imageUrl: String,
-)
+) : Serializable
 
 fun CardBackImageDomainModel.toUiModel(): CardBackImage {
     return CardBackImage(

presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/navigation/MainNavHost.kt

@@ -12,6 +12,7 @@ import com.mashup.gabbangzip.sharedalbum.presentation.ui.common.model.PicSnackba
 import com.mashup.gabbangzip.sharedalbum.presentation.ui.eventcreation.EventCreationActivity
 import com.mashup.gabbangzip.sharedalbum.presentation.ui.groupcreation.GroupCreationActivity
 import com.mashup.gabbangzip.sharedalbum.presentation.ui.invitation.InvitationCodeActivity
+import com.mashup.gabbangzip.sharedalbum.presentation.ui.main.groupdetail.HistoryDetailActivity
 import com.mashup.gabbangzip.sharedalbum.presentation.ui.main.groupdetail.navigation.groupDetailNavGraph
 import com.mashup.gabbangzip.sharedalbum.presentation.ui.main.groupdetail.navigation.navigateGroupDetail
 import com.mashup.gabbangzip.sharedalbum.presentation.ui.main.grouphome.navigation.groupHomeNavGraph
@@ -62,7 +63,9 @@ fun MainNavHost(
             onClickVoteButton = { eventId -> VoteActivity.openActivity(context, eventId) },
             onClickEventMake = { id -> EventCreationActivity.openActivity(context, id) },
             onClickShareButton = onClickShareButton,
-            onClickHistoryItem = { /* TODO */ },
+            onClickHistoryItem = {
+                HistoryDetailActivity.openActivity(context, it)
+            },
             onErrorEvent = onErrorEvent,
         )
         groupMemberNavGraph(