From a8c1a5943100711df4bd7b28f6521a26758a7921 Mon Sep 17 00:00:00 2001 From: Jihye Joo Date: Sun, 18 Aug 2024 20:05:03 +0900 Subject: [PATCH 1/6] =?UTF-8?q?:sparkles:=20#199=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=EB=B7=B0=EC=96=B4=EC=97=90=20=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20Serializable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/main/groupdetail/HistoryDetailState.kt | 10 ++++++++++ .../ui/main/groupdetail/model/HistoryItem.kt | 3 ++- .../ui/main/grouphome/model/CardBackImage.kt | 3 ++- .../sharedalbum/presentation/utils/ImmutableList.kt | 3 ++- 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/groupdetail/HistoryDetailState.kt diff --git a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/groupdetail/HistoryDetailState.kt b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/groupdetail/HistoryDetailState.kt new file mode 100644 index 000000000..dc8f6f7d9 --- /dev/null +++ b/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 diff --git a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/groupdetail/model/HistoryItem.kt b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/groupdetail/model/HistoryItem.kt index 1c6deef3e..2798c9631 100644 --- a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/groupdetail/model/HistoryItem.kt +++ b/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 = ImmutableList(emptyList()), -) +) : Serializable fun HistoryDomainModel.toUiModel(): HistoryItem { return HistoryItem( diff --git a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/grouphome/model/CardBackImage.kt b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/grouphome/model/CardBackImage.kt index 380ae35b2..ea2a7aa02 100644 --- a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/grouphome/model/CardBackImage.kt +++ b/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( diff --git a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/utils/ImmutableList.kt b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/utils/ImmutableList.kt index 113446a56..7789e2de5 100644 --- a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/utils/ImmutableList.kt +++ b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/utils/ImmutableList.kt @@ -1,6 +1,7 @@ package com.mashup.gabbangzip.sharedalbum.presentation.utils import androidx.compose.runtime.Immutable +import java.io.Serializable @Immutable -class ImmutableList(private val list: List) : List by list +class ImmutableList(private val list: List) : List by list, Serializable From 335ea430d2116e1bb70eb723b9318fa235d3af30 Mon Sep 17 00:00:00 2001 From: Jihye Joo Date: Sun, 18 Aug 2024 20:05:37 +0900 Subject: [PATCH 2/6] =?UTF-8?q?:sparkles:=20#199=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=EB=B7=B0=EC=96=B4=20=EC=95=A1=ED=8B=B0=EB=B9=84?= =?UTF-8?q?=ED=8B=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- presentation/src/main/AndroidManifest.xml | 4 ++ .../main/groupdetail/HistoryDetailActivity.kt | 41 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/groupdetail/HistoryDetailActivity.kt diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml index 7f3c69210..1fd5d6545 100644 --- a/presentation/src/main/AndroidManifest.xml +++ b/presentation/src/main/AndroidManifest.xml @@ -21,6 +21,10 @@ android:name="com.mashup.gabbangzip.sharedalbum.presentation.ui.main.MainActivity" android:exported="true" /> + + + 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) + }, + ) + } + } +} From a728605ea6aba8b7c1729a4c3a8505ee4aec0802 Mon Sep 17 00:00:00 2001 From: Jihye Joo Date: Sun, 18 Aug 2024 20:05:45 +0900 Subject: [PATCH 3/6] =?UTF-8?q?:sparkles:=20#199=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=EB=B7=B0=EC=96=B4=20=ED=99=94=EB=A9=B4=20=EC=97=B0?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/main/groupdetail/GroupDetailScreen.kt | 16 ++++++++++++++-- .../navigation/GroupDetailNavigation.kt | 4 ++-- .../ui/main/navigation/MainNavHost.kt | 5 ++++- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/groupdetail/GroupDetailScreen.kt b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/groupdetail/GroupDetailScreen.kt index 8d4871993..0fbae9020 100644 --- a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/groupdetail/GroupDetailScreen.kt +++ b/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, + ), + ) + } + }, ) } diff --git a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/groupdetail/navigation/GroupDetailNavigation.kt b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/groupdetail/navigation/GroupDetailNavigation.kt index ec29ffa13..e1f3dc564 100644 --- a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/groupdetail/navigation/GroupDetailNavigation.kt +++ b/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( diff --git a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/navigation/MainNavHost.kt b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/navigation/MainNavHost.kt index f63d4cdba..25c37bfe5 100644 --- a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/navigation/MainNavHost.kt +++ b/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( From 223d881b414dd0b9a1d1c086e381294f4c84e971 Mon Sep 17 00:00:00 2001 From: Jihye Joo Date: Sun, 18 Aug 2024 20:37:01 +0900 Subject: [PATCH 4/6] =?UTF-8?q?:sparkles:=20#199=20statusbar=20=EC=98=81?= =?UTF-8?q?=EC=97=AD=20=EC=83=89=EC=83=81=20=EC=A0=9C=EC=96=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/main/groupdetail/HistoryDetailActivity.kt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/groupdetail/HistoryDetailActivity.kt b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/groupdetail/HistoryDetailActivity.kt index e5b179cb6..8ada2969b 100644 --- a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/groupdetail/HistoryDetailActivity.kt +++ b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/groupdetail/HistoryDetailActivity.kt @@ -2,9 +2,12 @@ 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 @@ -13,6 +16,11 @@ class HistoryDetailActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + enableEdgeToEdge( + statusBarStyle = SystemBarStyle.dark( + TRANSPARENT, + ), + ) setContent { SharedAlbumTheme { state?.let { state -> From 56e381907aa09c552ff88526c5d90ed64056b5f8 Mon Sep 17 00:00:00 2001 From: Jihye Joo Date: Sun, 18 Aug 2024 21:01:45 +0900 Subject: [PATCH 5/6] =?UTF-8?q?:sparkles:=20#221=20=EC=8A=A4=ED=94=8C?= =?UTF-8?q?=EB=9E=98=EC=8B=9C,=20=EB=A9=94=EC=9D=B8=20statusbar=20?= =?UTF-8?q?=EC=83=89=EC=83=81=20=EC=A0=9C=EC=96=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sharedalbum/presentation/theme/Theme.kt | 13 ------------- .../presentation/ui/main/MainActivity.kt | 14 +++++++++++++- .../presentation/ui/splash/SplashActivity.kt | 11 +++++++++++ 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/theme/Theme.kt b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/theme/Theme.kt index 1e5ad0074..886d473e5 100644 --- a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/theme/Theme.kt +++ b/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, diff --git a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/MainActivity.kt b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/MainActivity.kt index c2a14a89c..b3e85f329 100644 --- a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/MainActivity.kt +++ b/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( diff --git a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/splash/SplashActivity.kt b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/splash/SplashActivity.kt index dc7f3c611..df9327df4 100644 --- a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/splash/SplashActivity.kt +++ b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/splash/SplashActivity.kt @@ -1,8 +1,11 @@ package com.mashup.gabbangzip.sharedalbum.presentation.ui.splash +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.material3.MaterialTheme @@ -21,6 +24,14 @@ class SplashActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + enableEdgeToEdge( + statusBarStyle = SystemBarStyle.dark( + TRANSPARENT, + ), + navigationBarStyle = SystemBarStyle.dark( + TRANSPARENT, + ) + ) viewModel.checkUserLoggedIn() setContent { val state by viewModel.state.collectAsStateWithLifecycle() From 99e367877c7086790582b6fe149610fd0bd2c6aa Mon Sep 17 00:00:00 2001 From: Jihye Joo Date: Sun, 18 Aug 2024 21:10:35 +0900 Subject: [PATCH 6/6] =?UTF-8?q?:sparkles:=20#221=20statusbar=20=EC=83=89?= =?UTF-8?q?=EC=83=81=20=EC=A0=9C=EC=96=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/eventcreation/EventCreationActivity.kt | 11 +++++++++-- .../ui/groupcreation/GroupCreationActivity.kt | 11 +++++++++-- .../ui/invitation/InvitationCodeActivity.kt | 9 +++++++++ .../presentation/ui/login/LoginActivity.kt | 9 +++++++++ .../presentation/ui/main/grouphome/GroupHomeScreen.kt | 1 - .../presentation/ui/splash/SplashActivity.kt | 2 +- .../sharedalbum/presentation/ui/vote/VoteActivity.kt | 9 +++++++++ 7 files changed, 46 insertions(+), 6 deletions(-) diff --git a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/eventcreation/EventCreationActivity.kt b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/eventcreation/EventCreationActivity.kt index 5eb7234df..f2073e8d7 100644 --- a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/eventcreation/EventCreationActivity.kt +++ b/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, diff --git a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/groupcreation/GroupCreationActivity.kt b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/groupcreation/GroupCreationActivity.kt index 7831ff92a..8a87752c2 100644 --- a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/groupcreation/GroupCreationActivity.kt +++ b/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) } diff --git a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/invitation/InvitationCodeActivity.kt b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/invitation/InvitationCodeActivity.kt index 05cfe6b80..2f3ee6d09 100644 --- a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/invitation/InvitationCodeActivity.kt +++ b/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() } diff --git a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/login/LoginActivity.kt b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/login/LoginActivity.kt index e507bff62..f439e1d2f 100644 --- a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/login/LoginActivity.kt +++ b/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() } diff --git a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/grouphome/GroupHomeScreen.kt b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/grouphome/GroupHomeScreen.kt index ec59208a0..1bfaa8fa0 100644 --- a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/grouphome/GroupHomeScreen.kt +++ b/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, ) diff --git a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/splash/SplashActivity.kt b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/splash/SplashActivity.kt index df9327df4..1529f7d82 100644 --- a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/splash/SplashActivity.kt +++ b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/splash/SplashActivity.kt @@ -30,7 +30,7 @@ class SplashActivity : ComponentActivity() { ), navigationBarStyle = SystemBarStyle.dark( TRANSPARENT, - ) + ), ) viewModel.checkUserLoggedIn() setContent { diff --git a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/vote/VoteActivity.kt b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/vote/VoteActivity.kt index cf6c49666..94a5efb06 100644 --- a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/vote/VoteActivity.kt +++ b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/vote/VoteActivity.kt @@ -2,9 +2,12 @@ package com.mashup.gabbangzip.sharedalbum.presentation.ui.vote 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.runtime.getValue import androidx.lifecycle.compose.collectAsStateWithLifecycle @@ -22,6 +25,12 @@ class VoteActivity : ComponentActivity() { private val viewModel: VoteViewModel by viewModels() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + enableEdgeToEdge( + SystemBarStyle.light( + Color.TRANSPARENT, + Color.TRANSPARENT, + ), + ) fetchVoteData() setContent {