From fdbe8ebf1506ec7ba16dba53bcf052cab9af56a8 Mon Sep 17 00:00:00 2001
From: a06246 <a06246@gmail.com>
Date: Mon, 15 Dec 2025 18:59:21 +0900
Subject: [PATCH 1/3] Fix calendar selection style on Android

---
 src/screens/exercise/ExerciseScreen.tsx | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/screens/exercise/ExerciseScreen.tsx b/src/screens/exercise/ExerciseScreen.tsx
index 2c65769..5cd72f6 100644
--- a/src/screens/exercise/ExerciseScreen.tsx
+++ b/src/screens/exercise/ExerciseScreen.tsx
@@ -3989,13 +3989,21 @@ const ExerciseScreen = ({ navigation }: any) => {
                         <View
                           style={[
                             styles.monthDateBadge,
-                            isSelected && styles.monthDateBadgeToday,
+                            isSelected
+                              ? styles.monthDateBadgeSelected
+                              : isToday
+                              ? styles.monthDateBadgeToday
+                              : null,
                           ]}
                         >
                           <Text
                             style={[
                               styles.monthDateText,
-                              isSelected && styles.monthDateTextToday,
+                              isSelected
+                                ? styles.monthDateTextSelected
+                                : isToday
+                                ? styles.monthDateTextToday
+                                : null,
                               !isCurrentMonth && styles.monthDateTextMuted,
                             ]}
                           >
@@ -5119,6 +5127,9 @@ const styles = StyleSheet.create({
     justifyContent: "center",
     alignItems: "center",
   },
+  monthDateBadgeSelected: {
+    backgroundColor: "#e3ff7c",
+  },
   monthDateBadgeToday: {
     backgroundColor: "#ffffff",
   },
@@ -5132,6 +5143,9 @@ const styles = StyleSheet.create({
   monthDateTextToday: {
     color: "#000",
   },
+  monthDateTextSelected: {
+    color: "#000",
+  },
   monthDateTextMuted: {
     color: "#777777",
   },
@@ -5161,7 +5175,8 @@ const styles = StyleSheet.create({
     backgroundColor: "transparent",
   },
   calendarNumberSelected: {
-    backgroundColor: "#ffffff",
+    backgroundColor: "#e3ff7c",
+    borderRadius: 14,
   },
   calendarNumberToday: {
     backgroundColor: "#e3ff7c",

From a8194e95b3bba41cf0cfce56332742da301d8a19 Mon Sep 17 00:00:00 2001
From: a06246 <a06246@gmail.com>
Date: Mon, 15 Dec 2025 19:42:46 +0900
Subject: [PATCH 2/3] Fix calendar selection style to circle on diet screen

---
 src/screens/diet/DietScreen.tsx         | 41 ++++++++++++++++---------
 src/screens/exercise/ExerciseScreen.tsx |  6 ++--
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/src/screens/diet/DietScreen.tsx b/src/screens/diet/DietScreen.tsx
index f4b0d28..ecd15dc 100644
--- a/src/screens/diet/DietScreen.tsx
+++ b/src/screens/diet/DietScreen.tsx
@@ -991,18 +991,27 @@ const DietScreen = ({navigation, route}: any) => {
                         }}
                         activeOpacity={0.7}
                       >
-                        <View style={[
-                          styles.monthDateBadge,
-                          isToday && !isSelected && styles.monthDateBadgeToday,
-                          isSelected && styles.monthDateBadgeSelected
-                        ]}>
-                          <Text style={[
-                            styles.monthDateText,
-                            isToday && !isSelected && styles.monthDateTextToday,
-                            isSelected && styles.monthDateTextSelected,
-                            !isToday && !isSelected && styles.monthDateTextNotSelected,
-                            !isCurrentMonth && styles.monthDateTextMuted
-                          ]}>
+                        <View
+                          style={[
+                            styles.monthDateBadge,
+                            isSelected
+                              ? styles.monthDateBadgeSelected
+                              : isToday
+                              ? styles.monthDateBadgeToday
+                              : null,
+                          ]}
+                        >
+                          <Text
+                            style={[
+                              styles.monthDateText,
+                              isSelected
+                                ? styles.monthDateTextSelected
+                                : isToday
+                                ? styles.monthDateTextToday
+                                : styles.monthDateTextNotSelected,
+                              !isCurrentMonth && styles.monthDateTextMuted,
+                            ]}
+                          >
                             {d.getDate()}
                           </Text>
                         </View>
@@ -1093,14 +1102,14 @@ const DietScreen = ({navigation, route}: any) => {
                         <View
                           style={[
                             styles.calendarNumberInner,
-                            isToday && !isSelected && styles.calendarNumberToday,
+                            isToday && styles.calendarNumberToday,
                             isSelected && styles.calendarNumberSelected,
                           ]}
                         >
                           <Text
                             style={[
                               styles.calendarNumberText,
-                              isToday && !isSelected && styles.calendarNumberTextToday,
+                              isToday && styles.calendarNumberTextToday,
                               isSelected && styles.calendarNumberSelectedText,
                               !isToday && !isSelected && styles.calendarNumberTextNotSelected,
                             ]}
@@ -1633,7 +1642,7 @@ const styles = StyleSheet.create({
     alignItems: 'center',
   },
   monthDateBadge: {
-    minWidth: 28,
+    width: 28,
     height: 28,
     borderRadius: 14,
     justifyContent: 'center',
@@ -1662,6 +1671,7 @@ const styles = StyleSheet.create({
   },
   monthDateBadgeSelected: {
     backgroundColor: '#e3ff7c',
+    borderRadius: 14,
   },
   monthDateTextSelected: {
     color: '#000',
@@ -1692,6 +1702,7 @@ const styles = StyleSheet.create({
   },
   calendarNumberSelected: {
     backgroundColor: '#e3ff7c',
+    borderRadius: 14,
   },
   calendarNumberText: {
     fontSize: 16,
diff --git a/src/screens/exercise/ExerciseScreen.tsx b/src/screens/exercise/ExerciseScreen.tsx
index 5cd72f6..7bc6348 100644
--- a/src/screens/exercise/ExerciseScreen.tsx
+++ b/src/screens/exercise/ExerciseScreen.tsx
@@ -4114,15 +4114,15 @@ const ExerciseScreen = ({ navigation }: any) => {
                         <View
                           style={[
                             styles.calendarNumberInner,
-                            isSelected && styles.calendarNumberSelected,
                             isToday && styles.calendarNumberToday,
+                            isSelected && styles.calendarNumberSelected,
                           ]}
                         >
                           <Text
                             style={[
                               styles.calendarNumberText,
-                              isSelected && styles.calendarNumberSelectedText,
                               isToday && styles.calendarNumberTodayText,
+                              isSelected && styles.calendarNumberSelectedText,
                             ]}
                           >
                             {label}
@@ -5179,7 +5179,7 @@ const styles = StyleSheet.create({
     borderRadius: 14,
   },
   calendarNumberToday: {
-    backgroundColor: "#e3ff7c",
+    backgroundColor: "#ffffff",
   },
   calendarNumberText: {
     fontSize: 16,

From 6649e185d019a83901d5fb048e9c7f6ea299ecfd Mon Sep 17 00:00:00 2001
From: a06246 <a06246@gmail.com>
Date: Mon, 15 Dec 2025 20:01:00 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=EA=B2=B0=EC=A0=9C=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/screens/pay/PaymentSuccessScreen.tsx | 30 ++++++++----------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/screens/pay/PaymentSuccessScreen.tsx b/src/screens/pay/PaymentSuccessScreen.tsx
index 82415d2..44f8f76 100644
--- a/src/screens/pay/PaymentSuccessScreen.tsx
+++ b/src/screens/pay/PaymentSuccessScreen.tsx
@@ -1,13 +1,13 @@
 // src/screens/pay/PaymentSuccessScreen.tsx
 import React, { useEffect, useState } from "react";
-import { View, Text, StyleSheet, TouchableOpacity, Alert } from "react-native";
+import { View, Text, StyleSheet, Alert } from "react-native";
 import { SafeAreaView } from "react-native-safe-area-context";
 import { Ionicons as Icon } from "@expo/vector-icons";
 import { LinearGradient } from "expo-linear-gradient";
 import { useNavigation } from "@react-navigation/native";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import { useRoute } from "@react-navigation/native";
-import { paymentAPI, authAPI } from "../../services";
+import { paymentAPI } from "../../services";
 import { CommonActions } from "@react-navigation/native";
 
 const PaymentSuccessScreen = () => {
@@ -44,24 +44,19 @@ const PaymentSuccessScreen = () => {
       await AsyncStorage.removeItem("testMembershipType");
       console.log("✅ 로컬 PREMIUM 저장 완료");
 
-      // 4. ✅ 로그아웃 처리
-      await AsyncStorage.removeItem("accessToken");
-      await AsyncStorage.removeItem("refreshToken");
-      console.log("✅ 로그아웃 완료");
-
-      // 5. 안내 메시지 + 로그인 화면으로 이동
+      // 4. 안내 메시지 + 홈으로 이동
       Alert.alert(
         "업그레이드 완료! 🎉",
-        "프리미엄 회원이 되셨습니다!\n더 나은 서비스를 위해 다시 로그인해주세요.",
+        "프리미엄 회원이 되셨습니다!\n모든 기능을 자유롭게 이용하세요!",
         [
           {
-            text: "로그인하러 가기",
+            text: "홈으로 가기",
             onPress: () => {
-              // ✅ 스택 초기화하고 Login으로 이동
+              // ✅ 스택 초기화하고 Main(홈)으로 이동
               navigation.dispatch(
                 CommonActions.reset({
                   index: 0,
-                  routes: [{ name: "Login" }],
+                  routes: [{ name: "Main" }],
                 })
               );
             },
@@ -91,22 +86,17 @@ const PaymentSuccessScreen = () => {
       await AsyncStorage.removeItem("testMembershipType");
       console.log("✅ 로컬 PREMIUM 저장 완료");
 
-      // ✅ 로그아웃
-      await AsyncStorage.removeItem("accessToken");
-      await AsyncStorage.removeItem("refreshToken");
-      console.log("✅ 로그아웃 완료");
-
       Alert.alert(
         "업그레이드 완료! 🎉",
-        "프리미엄 회원이 되셨습니다!\n더 나은 서비스를 위해 다시 로그인해주세요.",
+        "프리미엄 회원이 되셨습니다!\n모든 기능을 자유롭게 이용하세요!",
         [
           {
-            text: "로그인하러 가기",
+            text: "홈으로 가기",
             onPress: () => {
               navigation.dispatch(
                 CommonActions.reset({
                   index: 0,
-                  routes: [{ name: "Login" }],
+                  routes: [{ name: "Main" }],
                 })
               );
             },