diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5b994e86c..353842666 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -29,7 +29,7 @@ android { defaultConfig { applicationId = "com.eatssu.android" minSdk = 28 - targetSdk = 35 + targetSdk = 37 versionCode = 66 versionName = "3.2.13" diff --git a/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/ReviewComposeActivity.kt b/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/ReviewComposeActivity.kt index 2c0f7c656..5a1c0f490 100644 --- a/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/ReviewComposeActivity.kt +++ b/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/ReviewComposeActivity.kt @@ -3,6 +3,7 @@ package com.eatssu.android.presentation.cafeteria.review import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -24,7 +25,6 @@ import com.eatssu.common.analytics.AnalyticsTracker import com.eatssu.common.enums.MenuType import com.eatssu.common.enums.Restaurant import com.eatssu.design_system.theme.EatssuTheme -import com.google.firebase.crashlytics.FirebaseCrashlytics import dagger.hilt.android.AndroidEntryPoint import timber.log.Timber import javax.inject.Inject @@ -42,6 +42,7 @@ class ReviewComposeActivity : ComponentActivity() { private lateinit var itemName: String override fun onCreate(savedInstanceState: Bundle?) { + enableEdgeToEdge() super.onCreate(savedInstanceState) getIntents() // 컴포즈 화면 그리기 전에 호출 @@ -84,7 +85,9 @@ class ReviewComposeActivity : ComponentActivity() { @Composable private fun ErrorScreen(onBackClick: () -> Unit) { Column( - modifier = Modifier.fillMaxSize().padding(16.dp), + modifier = Modifier + .fillMaxSize() + .padding(16.dp), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally ) { diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/language/LanguageSelectorActivity.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/language/LanguageSelectorActivity.kt index e0b7c4a78..098cce257 100644 --- a/app/src/main/java/com/eatssu/android/presentation/mypage/language/LanguageSelectorActivity.kt +++ b/app/src/main/java/com/eatssu/android/presentation/mypage/language/LanguageSelectorActivity.kt @@ -3,6 +3,7 @@ package com.eatssu.android.presentation.mypage.language import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge import androidx.activity.viewModels import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope @@ -28,6 +29,7 @@ class LanguageSelectorActivity : ComponentActivity() { private var hasLanguageChanged = false override fun onCreate(savedInstanceState: Bundle?) { + enableEdgeToEdge() super.onCreate(savedInstanceState) hasLanguageChanged = savedInstanceState?.getBoolean(KEY_LANGUAGE_CHANGED) ?: false updateResultIfNeeded() diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewListActivity.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewListActivity.kt index 4826f6fe5..03f7bc767 100644 --- a/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewListActivity.kt +++ b/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewListActivity.kt @@ -3,6 +3,7 @@ package com.eatssu.android.presentation.mypage.myreview import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge import androidx.navigation.compose.rememberNavController import com.eatssu.android.analytics.ProvideAnalyticsTracker import com.eatssu.common.analytics.AnalyticsTracker @@ -17,6 +18,7 @@ class MyReviewListComposeActivity : ComponentActivity() { lateinit var analyticsTracker: AnalyticsTracker override fun onCreate(savedInstanceState: Bundle?) { + enableEdgeToEdge() super.onCreate(savedInstanceState) setContent { diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/terms/TermSelectorActivity.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/terms/TermSelectorActivity.kt index 3a445ff21..d7bd27ca6 100644 --- a/app/src/main/java/com/eatssu/android/presentation/mypage/terms/TermSelectorActivity.kt +++ b/app/src/main/java/com/eatssu/android/presentation/mypage/terms/TermSelectorActivity.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge import androidx.lifecycle.lifecycleScope import com.eatssu.android.R import com.eatssu.android.domain.usecase.user.GetUserCollegeDepartmentUseCase @@ -30,6 +31,7 @@ class TermSelectorActivity : ComponentActivity() { lateinit var getUserCollegeDepartmentUseCase: GetUserCollegeDepartmentUseCase override fun onCreate(savedInstanceState: Bundle?) { + enableEdgeToEdge() super.onCreate(savedInstanceState) setContent { EatssuTheme { diff --git a/app/src/main/java/com/eatssu/android/presentation/widget/ui/WidgetSettingActivity.kt b/app/src/main/java/com/eatssu/android/presentation/widget/ui/WidgetSettingActivity.kt index aab3dd703..b0ca005c4 100644 --- a/app/src/main/java/com/eatssu/android/presentation/widget/ui/WidgetSettingActivity.kt +++ b/app/src/main/java/com/eatssu/android/presentation/widget/ui/WidgetSettingActivity.kt @@ -5,6 +5,7 @@ import android.content.Intent import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -41,6 +42,7 @@ class WidgetSettingActivity : ComponentActivity() { lateinit var analyticsTracker: AnalyticsTracker override fun onCreate(savedInstanceState: Bundle?) { + enableEdgeToEdge() super.onCreate(savedInstanceState) setContent { ProvideAnalyticsTracker(analyticsTracker) { diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts index b060a19bd..8498be426 100644 --- a/core/common/build.gradle.kts +++ b/core/common/build.gradle.kts @@ -6,7 +6,7 @@ plugins { android { namespace = "com.eatssu.common" - compileSdk = 35 + compileSdk = 36 defaultConfig { minSdk = 23 diff --git a/core/design-system/build.gradle.kts b/core/design-system/build.gradle.kts index ec7690b9e..67f672603 100644 --- a/core/design-system/build.gradle.kts +++ b/core/design-system/build.gradle.kts @@ -6,7 +6,7 @@ plugins { android { namespace = "com.eatssu.design_system" - compileSdk = 35 + compileSdk = 36 defaultConfig { minSdk = 28