Feat/statistics

.gitignore

@@ -43,3 +43,5 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+.env

.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "a402d9a4376add5bc2d6b1e33e53edaae58c07f8"
+  revision: "b45fa18946ecc2d9b4009952c636ba7e2ffbb787"
   channel: "stable"
 
 project_type: app
@@ -13,11 +13,26 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: a402d9a4376add5bc2d6b1e33e53edaae58c07f8
-      base_revision: a402d9a4376add5bc2d6b1e33e53edaae58c07f8
+      create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
+      base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
     - platform: android
-      create_revision: a402d9a4376add5bc2d6b1e33e53edaae58c07f8
-      base_revision: a402d9a4376add5bc2d6b1e33e53edaae58c07f8
+      create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
+      base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
+    - platform: ios
+      create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
+      base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
+    - platform: linux
+      create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
+      base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
+    - platform: macos
+      create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
+      base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
+    - platform: web
+      create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
+      base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
+    - platform: windows
+      create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
+      base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
 
   # User provided section
 

android/app/src/main/AndroidManifest.xml

@@ -10,10 +10,14 @@
     <uses-permission android:name="android.permission.INTERNET"/>
    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
+   <!-- 카메라 -->
+    <uses-permission android:name="android.permission.CAMERA"/>
+
     <application
         android:label="해냄"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
+        android:usesCleartextTraffic="true"
         android:enableOnBackInvokedCallback="false">
 
         <activity
@@ -41,8 +45,9 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+            </intent-filter></activity>
 
+<activity android:name="net.openid.appauth.RedirectUriReceiverActivity">
     <intent-filter>
         <action android:name="android.intent.action.VIEW" />
         <category android:name="android.intent.category.DEFAULT" />
@@ -51,18 +56,18 @@
         <data
             android:scheme="com.googleusercontent.apps.433865217738-m3uqqdv9lumpf1ne8e3bkpsbtsa6919i"
             android:host="oauth2redirect" />
-    </intent-filter></activity>
-
-<activity android:name="com.kakao.sdk.flutter.AuthCodeCustomTabsActivity">
-<intent-filter android:label="flutter_web_auth">
+    </intent-filter>
+<!-- 카카오 로그인 (웹뷰 콜백) -->
+    <intent-filter>
         <action android:name="android.intent.action.VIEW" />
         <category android:name="android.intent.category.DEFAULT" />
         <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:scheme="kakao05a36f172ea2945260862834654385ea" android:host="oauth" />
+        <data
+            android:scheme="http"
+            android:host="158.247.216.11:8080"
+            android:pathPrefix="/oauth/kakao/callback" />
     </intent-filter>
 </activity>
-
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data
@@ -75,10 +80,16 @@
 
          In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
     <queries>
+        <package android:name="com.kakao.talk" />
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="kakaotalk" />
+        </intent>
         <intent>
             <action android:name="android.intent.action.PROCESS_TEXT"/>
             <data android:mimeType="text/plain"/>
         </intent>
             <package android:name="com.example.haenaem" />
     </queries>
-</manifest>
+</manifest>

ios/Runner/Info.plist

@@ -30,6 +30,11 @@
 				</array>
 			</dict>
 		</array>
+		<key>NSAppTransportSecurity</key>
+		<dict>
+    		<key>NSAllowsArbitraryLoads</key>
+    		<true/>
+		</dict>
 		<key>NSCameraUsageDescription</key>
 		<string>프로필 사진 촬영을 위해 카메라 권한이 필요합니다.</string>
 		<key>NSPhotoLibraryUsageDescription</key>

lib/app.dart

@@ -1,9 +1,9 @@
 // 최초 작성자: 김채영
 
 import 'package:flutter/material.dart';
-import 'package:haenaem/features/social/screens/social_screen.dart';
+import 'package:haenaem/features/social/screens/social_main_screen.dart';
 import 'features/challenge/create/screens/challenge_create_screen.dart';
-import 'features/user/screens/my_page_screen.dart';
+import 'features/user/screens/my_page_main_screen.dart';
 import 'features/main/screens/main_screen.dart';
 
 class App extends StatelessWidget {
@@ -13,7 +13,7 @@ class App extends StatelessWidget {
   Widget build(BuildContext context) {
     return const MaterialApp(
       // theme:,
-      home: MyPageScreen(),
+      home: MyPageMainScreen(),
       //home: MainScreen(),
       //home: SocialScreen(),
     );

lib/core/network/dio_provider.dart

@@ -13,9 +13,8 @@ part 'dio_provider.g.dart';
 Dio dio(DioRef ref) {
   final dio = Dio(
     BaseOptions(
-      baseUrl: 'https://hanaem.onrender.com/',
-      connectTimeout: const Duration(seconds: 45),
-      receiveTimeout: const Duration(seconds: 45),
+      baseUrl: 'http://158.247.216.11:8080',
+      connectTimeout: const Duration(seconds: 5),
     ),
   );
 
@@ -24,18 +23,55 @@ Dio dio(DioRef ref) {
       onRequest: (options, handler) async {
         const storage = FlutterSecureStorage();
         final String? token = await storage.read(key: 'accessToken');
+        // 💡 [디버깅 로그] 저장소에서 꺼낸 생생한 토큰 상태를 확인합니다.
+        debugPrint('🕵️‍♂️ [Interceptor] Storage Read (accessToken): $token');
         if (token != null) {
           options.headers['Authorization'] = 'Bearer $token';
         }
         return handler.next(options);
       },
       onError: (DioException e, handler) async {
         if (e.response?.statusCode == 401) {
-          final newToken = await AuthService.refreshTokens();
-          if (newToken != null) {
-            e.requestOptions.headers['Authorization'] = 'Bearer $newToken';
-            final response = await dio.fetch(e.requestOptions);
-            return handler.resolve(response);
+          const storage = FlutterSecureStorage();
+          final refreshToken = await storage.read(key: 'refreshToken');
+          if (refreshToken != null) {
+            try {
+              // 🎯 토큰 갱신 전용 가벼운 Dio 생성 (인터셉터 없음)
+              final refreshDio = Dio(
+                BaseOptions(baseUrl: e.requestOptions.baseUrl),
+              );
+
+              final response = await refreshDio.post(
+                '/api/token',
+                data: {"refreshToken": refreshToken},
+              );
+
+              // 1. 서버 응답에서 새 토큰 추출 (백엔드 응답 키값에 맞게 수정하세요)
+              final newAccessToken = response.data['accessToken'];
+              final newRefreshToken = response.data['refreshToken'];
+
+              // 2. 새 토큰 스토리지에 저장
+              await storage.write(key: 'accessToken', value: newAccessToken);
+              if (newRefreshToken != null) {
+                await storage.write(
+                  key: 'refreshToken',
+                  value: newRefreshToken,
+                );
+              }
+
+              // 3. 실패했던 원래 요청의 헤더를 새 토큰으로 변경
+              e.requestOptions.headers['Authorization'] =
+                  'Bearer $newAccessToken';
+
+              // 4. 원래 요청 재시도 및 결과 반환
+              final retryResponse = await dio.fetch(e.requestOptions);
+              return handler.resolve(retryResponse);
+            } catch (err) {
+              // 재발급 실패 시: 토큰 찌꺼기 삭제
+              debugPrint("재발급 실패! 저장된 토큰 삭제");
+              await storage.deleteAll();
+              return handler.next(e);
+            }
           }
         }
         return handler.next(e);

lib/core/theme/app_colors.dart

@@ -9,16 +9,17 @@ class AppColors {
   static const Color gray2 = Color(0xFF616161);
   static const Color gray3 = Color(0xFF8c8c8c);
   static const Color gray4 = Color(0xFFD9D9D9);
-  static final Color gray5 = const Color(0xFFd9d9d9).withValues(alpha: 0.5);
+  static const Color gray5 = Color(0x7Fd9d9d9);
+  //static final Color gray5 = const Color(0xFFd9d9d9).withValues(alpha: 0.5);
 
   // Green - primary
   static const Color primaryAble = Color(0xff009951);
   static const Color selected = Color(0xffe8f5e9);
   static const Color disable = Color(0xffd9e0d7);
 
   // Mainlist
-  static Color success = const Color(0xffbbf4bd).withValues(alpha: 0.5);
-  static Color warning = const Color(0xffffd6c8).withValues(alpha: 0.5);
+  static const success = Color(0x7fbbf4bd);
+  static const warning = Color(0x7fffd6c8);
 
   static const Color fire = Color(0xFFFB7039);
   static const Color notification = Color(0xffD11E1B);

lib/core/theme/app_theme.dart

@@ -1,13 +1,24 @@
 // 최초 작성자: 김채영
 
 import 'package:flutter/material.dart';
+import 'app_colors.dart';
 
 class AppTheme {
   static ThemeData lightTheme = ThemeData(
     useMaterial3: true,
     fontFamily: 'Pretendard',
     scaffoldBackgroundColor: Colors.white,
 
+    // 스피너랑 커서 우리 앱 초록색으로 변경
+    progressIndicatorTheme: const ProgressIndicatorThemeData(
+      color: AppColors.primaryAble,
+    ),
+    textSelectionTheme: TextSelectionThemeData(
+      cursorColor: AppColors.primaryAble,
+      selectionHandleColor: AppColors.primaryAble,
+      selectionColor: AppColors.primaryAble.withValues(alpha: 0.3),
+    ),
+
     // 상단 AppBar 테마 설정
     appBarTheme: const AppBarTheme(
       backgroundColor: Colors.white,

lib/core/utils/image_utils.dart

@@ -0,0 +1,36 @@
+// 최초 작성자: 김채영
+import 'dart:io';
+import 'dart:typed_data';
+import 'package:flutter/material.dart';
+import 'package:flutter_image_compress/flutter_image_compress.dart';
+import 'package:path_provider/path_provider.dart';
+
+// 클라우더리 용량 이슈 때문에 필요한 인증글의 이미지 압축 유틸 함수
+Future<File> compressImageFile(File file) async {
+  final tempDir = await getTemporaryDirectory();
+  final targetPath =
+      '${tempDir.path}/compressed_${DateTime.now().millisecondsSinceEpoch}.jpg';
+
+  final XFile? result = await FlutterImageCompress.compressAndGetFile(
+    file.absolute.path,
+    targetPath,
+    quality: 80, // 80 정도면 육안상 차이 거의 없음
+    minWidth: 1080, // 긴 쪽 기준 최대 해상도
+    minHeight: 1080,
+    format: CompressFormat.jpeg,
+  );
+
+  // ✅ 압축 전후 크기 비교 로그
+  final int originalSize = await file.length();
+  final int compressedSize = result != null
+      ? await File(result.path).length()
+      : 0;
+
+  debugPrint('🖼️ 압축 전: ${(originalSize / 1024).toStringAsFixed(1)} KB');
+  debugPrint('🖼️ 압축 후: ${(compressedSize / 1024).toStringAsFixed(1)} KB');
+  debugPrint(
+    '🖼️ 압축률: ${((1 - compressedSize / originalSize) * 100).toStringAsFixed(1)}%',
+  );
+
+  return result != null ? File(result.path) : file; // 실패 시 원본 반환
+}