From 157ada08d5897dfa41f918a7b783d1dae920a0e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=A2=85=EC=88=98?= Date: Mon, 21 Sep 2026 20:51:08 +0900 Subject: [PATCH 1/3] =?UTF-8?q?FavoriteScreen.kt=20Typo=20Figma=20?= =?UTF-8?q?=EC=9D=BC=EC=B9=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/presentation/favorite/FavoriteScreen.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/eatssu/android/presentation/favorite/FavoriteScreen.kt b/app/src/main/java/com/eatssu/android/presentation/favorite/FavoriteScreen.kt index 9b9958b3c..b2b1c7924 100644 --- a/app/src/main/java/com/eatssu/android/presentation/favorite/FavoriteScreen.kt +++ b/app/src/main/java/com/eatssu/android/presentation/favorite/FavoriteScreen.kt @@ -503,7 +503,7 @@ private fun FavoriteTabs( ) { Text( text = label, - style = EatssuTheme.typography.h2, + style = EatssuTheme.typography.subtitle2, color = if (selectedPage == page) Primary else Gray400, modifier = Modifier.padding(vertical = 18.dp), ) @@ -581,7 +581,7 @@ private fun FavoriteFilters( val selected = selectedStoreType == type Text( text = label, - style = EatssuTheme.typography.body3, + style = EatssuTheme.typography.body2, fontWeight = if (selected) FontWeight.W500 else FontWeight.W400, color = if (selected) Primary else Gray400, modifier = Modifier @@ -720,7 +720,7 @@ private fun FavoritePartnershipRow( Row(verticalAlignment = Alignment.CenterVertically) { Text( text = item.storeName, - style = EatssuTheme.typography.h2, + style = EatssuTheme.typography.subtitle1, color = Color.Black, maxLines = 1, overflow = TextOverflow.Ellipsis, @@ -728,7 +728,7 @@ private fun FavoritePartnershipRow( Spacer(modifier = Modifier.width(8.dp)) Text( text = item.storeType.value, - style = EatssuTheme.typography.body3, + style = EatssuTheme.typography.caption2, color = Gray600, ) } From 667cc5b08f2a4e1247c05b74c808c9601ba9b020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=A2=85=EC=88=98?= Date: Mon, 21 Sep 2026 20:55:48 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=A7=80=EB=8F=84=20=EC=9C=84=20=EC=B0=9C?= =?UTF-8?q?=20=EB=B2=84=ED=8A=BC=20=EC=9C=84=EC=B9=98=20=EC=83=81=EB=8B=A8?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eatssu/android/presentation/map/MapFragmentView.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/eatssu/android/presentation/map/MapFragmentView.kt b/app/src/main/java/com/eatssu/android/presentation/map/MapFragmentView.kt index 0994d5b08..891467de4 100644 --- a/app/src/main/java/com/eatssu/android/presentation/map/MapFragmentView.kt +++ b/app/src/main/java/com/eatssu/android/presentation/map/MapFragmentView.kt @@ -508,12 +508,12 @@ internal fun MapScreen( Surface( modifier = Modifier - .align(Alignment.BottomEnd) + .align(Alignment.TopEnd) .padding( end = 18.dp, - bottom = dimensionResource(R.dimen.bottom_nav_height) + 18.dp, + top = 15.dp, ) - .size(48.dp), + .size(36.dp), shape = CircleShape, color = Color.White, shadowElevation = 4.dp, @@ -521,7 +521,7 @@ internal fun MapScreen( ) { Box(contentAlignment = Alignment.Center) { Image( - painter = painterResource(R.drawable.ic_like_selected), + painter = painterResource(R.drawable.ic_like_line), contentDescription = stringResource(R.string.favorite_open), modifier = Modifier.size(24.dp), ) From 09f3aaf620234867a4b628508ff5fdd12d1105a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=A2=85=EC=88=98?= Date: Sun, 4 Oct 2026 20:35:54 +0900 Subject: [PATCH 3/3] fix: avoid obsolete Android SDK tools package in CI --- .github/workflows/debug.yml | 7 ++++--- .github/workflows/release.yml | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index e203b41d1..4a5d1f027 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -38,11 +38,12 @@ jobs: - name: Set up Android SDK uses: android-actions/setup-android@v3 + with: + packages: platform-tools - - name: Install Android SDK (API 35) + - name: Install Android SDK (API 36) run: | - sdkmanager --install "platform-tools" "platforms;android-35" "build-tools;35.0.0" - yes | sdkmanager --licenses + sdkmanager --install "platform-tools" "platforms;android-36" "build-tools;35.0.0" - name: Create Local Properties run: touch local.properties diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4286feb66..026933de5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -93,11 +93,12 @@ jobs: - name: Set up Android SDK uses: android-actions/setup-android@v3 + with: + packages: platform-tools - - name: Install Android SDK (API 35) + - name: Install Android SDK (API 36) run: | - sdkmanager --install "platform-tools" "platforms;android-35" "build-tools;35.0.0" - yes | sdkmanager --licenses + sdkmanager --install "platform-tools" "platforms;android-36" "build-tools;35.0.0" - name: Grant execute permission for gradlew run: chmod +x gradlew