전체적인 시스템 추가.2

android/app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     <application
         android:label="csp2"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/launcher_icon">
 
         <activity
             android:name=".MainActivity"

android/app/src/main/res/drawable-v21/launch_background.xml

@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="?android:colorBackground" />
-
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+    <item>
+        <bitmap android:gravity="fill" android:src="@drawable/background"/>
+    </item>
+    <item>
+        <bitmap android:gravity="center" android:src="@drawable/splash"/>
+    </item>
 </layer-list>

android/app/src/main/res/drawable/launch_background.xml

@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@android:color/white" />
-
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+    <item>
+        <bitmap android:gravity="fill" android:src="@drawable/background"/>
+    </item>
+    <item>
+        <bitmap android:gravity="center" android:src="@drawable/splash"/>
+    </item>
 </layer-list>

android/app/src/main/res/values-night-v31/styles.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>

android/app/src/main/res/values-night/styles.xml

@@ -5,6 +5,10 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your

android/app/src/main/res/values-v31/styles.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>

android/app/src/main/res/values/styles.xml

@@ -5,6 +5,10 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your

ios/Runner.xcodeproj/project.pbxproj

@@ -427,7 +427,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -484,7 +484,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";

ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "background.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json

@@ -1,23 +1,23 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
 }

ios/Runner/Base.lproj/LaunchScreen.storyboard

@@ -16,13 +16,19 @@
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
-                            </imageView>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" image="LaunchBackground" translatesAutoresizingMaskIntoConstraints="NO" id="tWc-Dq-wcI"/>
+                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4"></imageView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="3T2-ad-Qdv"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="RPx-PI-7Xg"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="SdS-ul-q2q"/>
+                            <constraint firstAttribute="trailing" secondItem="tWc-Dq-wcI" secondAttribute="trailing" id="Swv-Gf-Rwn"/>
+                            <constraint firstAttribute="trailing" secondItem="YRO-k0-Ey4" secondAttribute="trailing" id="TQA-XW-tRk"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="duK-uY-Gun"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="kV7-tw-vXt"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="xPn-NY-SIU"/>
                         </constraints>
                     </view>
                 </viewController>
@@ -32,6 +38,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="LaunchImage" width="168" height="185"/>
+        <image name="LaunchImage" width="1500" height="500"/>
+        <image name="LaunchBackground" width="1" height="1"/>
     </resources>
 </document>

ios/Runner/Info.plist

@@ -1,49 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>Csp2</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>csp2</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
-</dict>
+	<dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>$(DEVELOPMENT_LANGUAGE)</string>
+		<key>CFBundleDisplayName</key>
+		<string>Csp2</string>
+		<key>CFBundleExecutable</key>
+		<string>$(EXECUTABLE_NAME)</string>
+		<key>CFBundleIdentifier</key>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundleName</key>
+		<string>csp2</string>
+		<key>CFBundlePackageType</key>
+		<string>APPL</string>
+		<key>CFBundleShortVersionString</key>
+		<string>$(FLUTTER_BUILD_NAME)</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleVersion</key>
+		<string>$(FLUTTER_BUILD_NUMBER)</string>
+		<key>LSRequiresIPhoneOS</key>
+		<true/>
+		<key>UILaunchStoryboardName</key>
+		<string>LaunchScreen</string>
+		<key>UIMainStoryboardFile</key>
+		<string>Main</string>
+		<key>UISupportedInterfaceOrientations</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>UISupportedInterfaceOrientations~ipad</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationPortraitUpsideDown</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>CADisableMinimumFrameDurationOnPhone</key>
+		<true/>
+		<key>UIApplicationSupportsIndirectInputEvents</key>
+		<true/>
+		<key>UIStatusBarHidden</key>
+		<false/>
+	</dict>
 </plist>

lib/career_page.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:csp2/common/widgets/job_card.dart';
 import 'package:http/http.dart' as http;
 import 'dart:convert';
-import 'package:csp2/job.dart';
+import 'package:csp2/common/data/job.dart';
 class JobsPage extends StatefulWidget {
   const JobsPage({super.key});
 

lib/common/data/case_study_plan.dart

@@ -0,0 +1,23 @@
+
+class CaseStudyPlan {
+  final String planId;
+  final String planTitle;
+  final String planTeacher;
+  final String thumbnail;
+
+  CaseStudyPlan({
+    required this.planId,
+    required this.planTitle,
+    required this.planTeacher,
+    required this.thumbnail,
+  });
+
+  factory CaseStudyPlan.fromJson(Map<String, dynamic> json) {
+    return CaseStudyPlan(
+      planId: json['casestudy lesson id'] ?? '아이디 없음',
+      planTitle: json['course_name'] ?? '제목 없음',
+      planTeacher: json['planTeacher'] ?? '',
+      thumbnail: json['course_thumbnail'] ?? '',
+    );
+  }
+}

lib/common/data/new_study.dart

@@ -0,0 +1,22 @@
+class NewStudy {
+  final String planId;
+  final String planTitle;
+  final String planTeacher;
+  final String thumbnail;
+
+  NewStudy({
+    required this.planId,
+    required this.planTitle,
+    required this.planTeacher,
+    required this.thumbnail,
+  });
+
+  factory NewStudy.fromJson(Map<String, dynamic> json) {
+    return NewStudy(
+      planId: json['casestudy lesson id'] ?? '아이디 없음',
+      planTitle: json['course_name'] ?? '제목 없음',
+      planTeacher: json['course_description'] ?? '선생님',
+      thumbnail: json['course_thumbnail'] ?? '',
+    );
+  }
+}

lib/common/data/plan_detail_item.dart

@@ -0,0 +1,29 @@
+
+class PlanDetailItem {
+  final String lessonId;
+  final String lessonTag;
+  final String lessonUrl;
+  final String thumbnail;
+  final String lessonName;
+  final String lessonDescription;
+
+  PlanDetailItem({
+    required this.lessonId,
+    required this.lessonTag,
+    required this.lessonUrl,
+    required this.thumbnail,
+    required this.lessonName,
+    required this.lessonDescription,
+  });
+
+  factory PlanDetailItem.fromJson(Map<String, dynamic> json) {
+    return PlanDetailItem(
+      lessonId: json['casestudy lesson id'] ?? 'ID 없음',
+      lessonTag: json['lesson tag'] ?? '태그 없음',
+      lessonUrl: json['lesson url'] ?? 'URL 없음',
+      thumbnail: json['thumbnail'] ?? '',
+      lessonName: json['lesson_name'] ?? '이름 없음',
+      lessonDescription: json['lesson_description'] ?? '설명 없음',
+    );
+  }
+}

lib/common/data/upcoming_study.dart

@@ -0,0 +1,23 @@
+
+class UpcomingStudy {
+  final String planId;
+  final String planTitle;
+  final String planTeacher;
+  final String thumbnail;
+
+  UpcomingStudy({
+    required this.planId,
+    required this.planTitle,
+    required this.planTeacher,
+    required this.thumbnail,
+  });
+
+  factory UpcomingStudy.fromJson(Map<String, dynamic> json) {
+    return UpcomingStudy(
+      planId: json['casestudy lesson id'] ?? '아이디 없음',
+      planTitle: json['course_name'] ?? '제목 없음',
+      planTeacher: json['course_description'] ?? '선생님',
+      thumbnail: json['course_thumbnail'] ?? '',
+    );
+  }
+}

lib/common/widgets/course_card.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:csp2/course.dart';
+import 'package:csp2/common/data/course.dart';
 class CourseCard extends StatelessWidget {
   final Course course;
 

lib/common/widgets/job_card.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:csp2/job.dart';
+import 'package:csp2/common/data/job.dart';
 class JobCard extends StatelessWidget {
   final Job job;
 

lib/common/widgets/now_study_class_card.dart

@@ -0,0 +1,91 @@
+import 'package:flutter/material.dart';
+import '../data/new_study.dart'; // NewStudy 모델을 import 합니다.
+
+class StudyClassCard extends StatelessWidget {
+  final NewStudy plan;
+  final VoidCallback onTap;
+
+  const StudyClassCard({
+    super.key,
+    required this.plan,
+    required this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      width: MediaQuery.of(context).size.width / 2, // 화면 너비의 절반으로 설정
+      child: InkWell(
+        onTap: onTap,
+        child: Card(
+          margin: const EdgeInsets.only(right: 12.0), // 항목 간의 간격 조정
+          elevation: 2.0,
+          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(5.0)),
+          child: Padding(
+            padding: const EdgeInsets.all(5.0),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: <Widget>[
+                if (plan.thumbnail.isNotEmpty)
+                  Expanded(
+                    child: ClipRRect(
+                      borderRadius: BorderRadius.circular(8.0),
+                      child: Image.network(
+                        plan.thumbnail,
+                        width: double.infinity,
+                        fit: BoxFit.contain,
+                        loadingBuilder: (BuildContext context, Widget child, ImageChunkEvent? loadingProgress) {
+                          if (loadingProgress == null) return child;
+                          return Center(
+                            child: CircularProgressIndicator(
+                              value: loadingProgress.expectedTotalBytes != null
+                                  ? loadingProgress.cumulativeBytesLoaded / loadingProgress.expectedTotalBytes!
+                                  : null,
+                            ),
+                          );
+                        },
+                        errorBuilder: (BuildContext context, Object exception, StackTrace? stackTrace) {
+                          return const Center(child: Icon(Icons.broken_image, color: Colors.grey, size: 50));
+                        },
+                      ),
+                    ),
+                  )
+                else
+                  Expanded(
+                    child: Container(
+                        color: Colors.grey[200],
+                        child: const Center(child: Text('No Image', style: TextStyle(color: Colors.grey)))
+                    ),
+                  ),
+                // const SizedBox(height: 5.0),
+                SizedBox(
+                  height: 70, // 텍스트 영역의 고정 높이 설정 (두 줄 텍스트를 위한 충분한 공간)
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      SizedBox(
+                        height: 48.0, // plan.planTitle이 항상 두 줄 공간을 차지하도록 고정
+                        child: Text(
+                          plan.planTitle,
+                          style: Theme.of(context).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.bold),
+                          overflow: TextOverflow.ellipsis,
+                          maxLines: 2,
+                        ),
+                      ),
+                      const SizedBox(height: 4.0),
+                      Text(
+                        plan.planTeacher,
+                        style: Theme.of(context).textTheme.bodySmall?.copyWith(color: Colors.grey[600]),
+                        maxLines: 1,
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/common/widgets/upcoming_class_card.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
-import '../../home_page.dart'; // CaseStudyPlan 모델을 import 합니다.
+import '../data/upcoming_study.dart'; // UpcomingStudy 모델을 import 합니다.
 
 class UpcomingClassCard extends StatelessWidget {
-  final CaseStudyPlan plan;
+  final UpcomingStudy plan;
   final VoidCallback onTap;
 
   const UpcomingClassCard({

lib/home_page.dart

@@ -3,34 +3,13 @@ import 'package:http/http.dart' as http;
 import 'dart:convert';
 import 'dart:async'; // Timer를 사용하기 위해 추가
 import 'package:intl/intl.dart';
-import 'package:csp2/common/widgets/upcoming_class_card.dart';
-import 'package:csp2/common/widgets/course_card.dart';
-import 'package:csp2/course.dart'; // Course 클래스 import
-import '../plan_page.dart'; // PlanPage import
-
-// CaseStudyPlan 클래스 (변경 없음)
-class CaseStudyPlan {
-  final String planId;
-  final String planTitle;
-  final String planTeacher;
-  final String thumbnail;
-
-  CaseStudyPlan({
-    required this.planId,
-    required this.planTitle,
-    required this.planTeacher,
-    required this.thumbnail,
-  });
-
-  factory CaseStudyPlan.fromJson(Map<String, dynamic> json) {
-    return CaseStudyPlan(
-      planId: json['casestudy lesson id'] ?? '아이디 없음',
-      planTitle: json['course_name'] ?? '제목 없음',
-      planTeacher: json['course_description'] ?? '선생님',
-      thumbnail: json['course_thumbnail'] ?? '',
-    );
-  }
-}
+import 'common/widgets/upcoming_class_card.dart';
+import 'common/widgets/course_card.dart';
+import 'common/data/course.dart'; // Course 클래스 import
+import 'plan_page.dart'; // PlanPage import
+import 'common/widgets/now_study_class_card.dart';
+import 'common/data/upcoming_study.dart';
+import 'common/data/new_study.dart';
 
 // 새로운 추천 플랜 모델
 class RecommendPlan {
@@ -69,7 +48,8 @@ class HomePage extends StatefulWidget {
 }
 
 class _HomePageState extends State<HomePage> {
-  late Future<List<CaseStudyPlan>> _caseStudyPlans;
+  late Future<List<UpcomingStudy>> _upcomingStudies;
+  late Future<List<NewStudy>> _newStudies;
   late Future<List<Course>> _newCoursesFuture; // New: Future for new courses
   DateTime _currentTime = DateTime.now();
   String _currentTimeZone = 'Loading timezone...';
@@ -94,8 +74,8 @@ class _HomePageState extends State<HomePage> {
   @override
   void initState() {
     super.initState();
-    _caseStudyPlans = _fetchCaseStudyPlans();
-
+    _upcomingStudies = _fetchUpcomingStudies();
+    _newStudies = _fetchNewStudies();
     _newCoursesFuture = _fetchNewCourses(); // Initialize new courses future
     _fetchTimezone();
     _clockStream = Stream.periodic(const Duration(seconds: 1), (_) {
@@ -114,7 +94,28 @@ class _HomePageState extends State<HomePage> {
     super.dispose();
   }
 
-  Future<List<CaseStudyPlan>> _fetchCaseStudyPlans() async {
+  Future<List<UpcomingStudy>> _fetchUpcomingStudies() async {
+    final response = await http
+        .get(Uri.parse('https://helloworld6-ad2uqhckxq-uc.a.run.app'));
+    if (response.statusCode == 200) {
+      final Map<String, dynamic> decodedJson = json.decode(response.body);
+      if (decodedJson.containsKey('data') && decodedJson['data'] is List) {
+        final List<dynamic> plansJson = decodedJson['data'];
+        return plansJson
+            .map((jsonItem) =>
+            UpcomingStudy.fromJson(jsonItem as Map<String, dynamic>))
+            .toList();
+      } else {
+        throw Exception(
+            'Invalid data format: "data" field is missing or not a list.');
+      }
+    } else {
+      throw Exception(
+          'Failed to load upcoming studies. Status Code: ${response.statusCode}');
+    }
+  }
+
+  Future<List<NewStudy>> _fetchNewStudies() async {
     final response = await http
         .get(Uri.parse('https://helloworld2-ad2uqhckxq-uc.a.run.app'));
     if (response.statusCode == 200) {
@@ -123,7 +124,7 @@ class _HomePageState extends State<HomePage> {
         final List<dynamic> plansJson = decodedJson['data'];
         return plansJson
             .map((jsonItem) =>
-            CaseStudyPlan.fromJson(jsonItem as Map<String, dynamic>))
+            NewStudy.fromJson(jsonItem as Map<String, dynamic>))
             .toList();
       } else {
         throw Exception(
@@ -131,13 +132,13 @@ class _HomePageState extends State<HomePage> {
       }
     } else {
       throw Exception(
-          'Failed to load case study plans. Status Code: ${response.statusCode}');
+          'Failed to load new studies. Status Code: ${response.statusCode}');
     }
   }
 
   // New: Fetch new courses from API
   Future<List<Course>> _fetchNewCourses() async {
-    final response = await http.get(Uri.parse('https://helloworld5-ad2uqhckxq-uc.a.run.app/'));
+    final response = await http.get(Uri.parse('https://helloworld5-ad2uqhckxq-uc.a.run.app'));
     if (response.statusCode == 200) {
       final Map<String, dynamic> decodedJson = json.decode(response.body);
       if (decodedJson.containsKey('data') && decodedJson['data'] is List) {
@@ -148,7 +149,8 @@ class _HomePageState extends State<HomePage> {
       } else {
         throw Exception('Invalid data format for new courses: "data" field is missing or not a list.');
       }
-    } else {
+    }
+    else {
       throw Exception('Failed to load new courses. Status Code: ${response.statusCode}');
     }
   }
@@ -338,8 +340,8 @@ class _HomePageState extends State<HomePage> {
           ),
           SizedBox(
             height: 200, // 가로 리스트의 높이를 줄입니다.
-            child: FutureBuilder<List<CaseStudyPlan>>(
-              future: _caseStudyPlans,
+            child: FutureBuilder<List<UpcomingStudy>>(
+              future: _upcomingStudies,
               builder: (context, snapshot) {
                 if (snapshot.connectionState == ConnectionState.waiting) {
                   return const Center(child: CircularProgressIndicator());
@@ -415,43 +417,45 @@ class _HomePageState extends State<HomePage> {
             padding: EdgeInsets.fromLTRB(16.0, 16.0, 16.0, 8.0),
             child: Text('Trending On New Study', style: TextStyle(fontSize: 20.0, fontWeight: FontWeight.bold)),
           ),
-          SizedBox(
-            height: 200, // 가로 리스트의 높이를 줄입니다.
-            child: FutureBuilder<List<CaseStudyPlan>>(
-              future: _caseStudyPlans,
-              builder: (context, snapshot) {
-                if (snapshot.connectionState == ConnectionState.waiting) {
-                  return const Center(child: CircularProgressIndicator());
-                } else if (snapshot.hasError) {
-                  return Center(child: Padding(
-                    padding: const EdgeInsets.all(16.0),
-                    child: Text('Error loading upcoming classes: ${snapshot.error}', textAlign: TextAlign.center),
-                  ));
-                } else if (!snapshot.hasData || snapshot.data!.isEmpty) {
-                  return const Center(child: Text('No upcoming classes available.'));
-                } else {
-                  final plans = snapshot.data!;
-                  return ListView.builder(
-                    scrollDirection: Axis.horizontal, // 가로 스크롤로 변경
-                    padding: const EdgeInsets.only(left: 10.0, right: 5.0, top: 8.0, bottom: 5.0),
-                    itemCount: plans.length,
-                    itemBuilder: (context, index) {
-                      final plan = plans[index];
-                      return Align(
-                        alignment: Alignment.topCenter, // 항목을 상단 중앙에 정렬
-                        child: UpcomingClassCard(
-                          plan: plan,
-                          onTap: () {
-                            widget.onNavigateToPlanTab(1);
-                          },
-                        ),
-                      );
-                    },
-                  );
-                }
-              },
-            ),
+          FutureBuilder<List<NewStudy>>(
+            future: _newStudies,
+            builder: (context, snapshot) {
+              if (snapshot.connectionState == ConnectionState.waiting) {
+                return const Center(child: CircularProgressIndicator());
+              } else if (snapshot.hasError) {
+                return Center(child: Padding(
+                  padding: const EdgeInsets.all(16.0),
+                  child: Text('Error loading new studies: ${snapshot.error}', textAlign: TextAlign.center),
+                ));
+              } else if (!snapshot.hasData || snapshot.data!.isEmpty) {
+                return const Center(child: Text('No new studies available.'));
+              } else {
+                final plans = snapshot.data!;
+                return GridView.builder(
+                  shrinkWrap: true, // Column 안에 GridView를 넣을 때 필요
+                  physics: const NeverScrollableScrollPhysics(), // 부모 SingleChildScrollView와 스크롤 충돌 방지
+                  padding: const EdgeInsets.symmetric(horizontal: 10.0, vertical: 8.0),
+                  itemCount: plans.length,
+                  gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                    crossAxisCount: 2, // 한 줄에 2개씩
+                    crossAxisSpacing: 10.0, // 가로 간격
+                    mainAxisSpacing: 10.0, // 세로 간격
+                    childAspectRatio: 1.0, // 아이템의 가로세로 비율 (조정 필요 시 변경)
+                  ),
+                  itemBuilder: (context, index) {
+                    final plan = plans[index];
+                    return StudyClassCard(
+                      plan: plan,
+                      onTap: () {
+                        // widget.onNavigateToPlanTab(1);
+                      },
+                    );
+                  },
+                );
+              }
+            },
           ),
+
         ],
       ),
     );
@@ -568,4 +572,4 @@ class _HomePageState extends State<HomePage> {
       ),
     );
   }
-}
+}

lib/plan_page.dart

@@ -2,32 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
 import 'dart:convert';
 import 'plan_page_detail.dart'; // <<< plan_page_detail.dart 파일을 import 합니다.
-
-// HomePage에서 사용하던 CaseStudyPlan 모델을 PlanPage에서도 사용하거나,
-// PlanPage에 필요한 별도의 데이터 모델을 정의할 수 있습니다.
-// 여기서는 동일한 모델을 재사용한다고 가정합니다.
-class CaseStudyPlan {
-  final String planId;
-  final String planTitle;
-  final String planTeacher;
-  final String thumbnail;
-
-  CaseStudyPlan({
-    required this.planId,
-    required this.planTitle,
-    required this.planTeacher,
-    required this.thumbnail,
-  });
-
-  factory CaseStudyPlan.fromJson(Map<String, dynamic> json) {
-    return CaseStudyPlan(
-      planId: json['casestudy lesson id'] ?? '아이디 없음',
-      planTitle: json['course_name'] ?? '제목 없음',
-      planTeacher: json['planTeacher'] ?? '',
-      thumbnail: json['course_thumbnail'] ?? '',
-    );
-  }
-}
+import 'common/data/case_study_plan.dart';
 
 class PlanPage extends StatefulWidget {
   const PlanPage({super.key});

lib/plan_page_detail.dart

@@ -4,36 +4,7 @@ import 'dart:convert';
 import 'main.dart';
 import 'youtube_player_page.dart'; // YoutubePlayerPage import
 import 'common/widgets/custom_bottom_nav_bar.dart';
-
-// PlanDetailItem 클래스 (이전과 동일)
-class PlanDetailItem {
-  final String lessonId;
-  final String lessonTag;
-  final String lessonUrl;
-  final String thumbnail;
-  final String lessonName;
-  final String lessonDescription;
-
-  PlanDetailItem({
-    required this.lessonId,
-    required this.lessonTag,
-    required this.lessonUrl,
-    required this.thumbnail,
-    required this.lessonName,
-    required this.lessonDescription,
-  });
-
-  factory PlanDetailItem.fromJson(Map<String, dynamic> json) {
-    return PlanDetailItem(
-      lessonId: json['casestudy lesson id'] ?? 'ID 없음',
-      lessonTag: json['lesson tag'] ?? '태그 없음',
-      lessonUrl: json['lesson url'] ?? 'URL 없음',
-      thumbnail: json['thumbnail'] ?? '',
-      lessonName: json['lesson_name'] ?? '이름 없음',
-      lessonDescription: json['lesson_description'] ?? '설명 없음',
-    );
-  }
-}
+import 'common/data/plan_detail_item.dart';
 
 class PlanPageDetail extends StatefulWidget {
   const PlanPageDetail({

pubspec.lock

@@ -1,6 +1,30 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  ansicolor:
+    dependency: transitive
+    description:
+      name: ansicolor
+      sha256: "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.3"
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      sha256: "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.7"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.7.0"
   async:
     dependency: transitive
     description:
@@ -25,6 +49,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.4"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.2"
   clock:
     dependency: transitive
     description:
@@ -49,6 +89,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.6"
+  csslib:
+    dependency: transitive
+    description:
+      name: csslib
+      sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -142,6 +190,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.6.0"
+  flutter_launcher_icons:
+    dependency: "direct dev"
+    description:
+      name: flutter_launcher_icons
+      sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.13.1"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -150,6 +206,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.0.0"
+  flutter_native_splash:
+    dependency: "direct dev"
+    description:
+      name: flutter_native_splash
+      sha256: "8321a6d11a8d13977fa780c89de8d257cce3d841eecfb7a4cadffcc4f12d82dc"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.6"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -168,6 +232,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.2.1"
+  html:
+    dependency: transitive
+    description:
+      name: html
+      sha256: "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.15.6"
   http:
     dependency: "direct main"
     description:
@@ -184,6 +256,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.2"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      sha256: "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.5.4"
   intl:
     dependency: "direct main"
     description:
@@ -192,6 +272,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.20.2"
+  json_annotation:
+    dependency: transitive
+    description:
+      name: json_annotation
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.9.0"
   leak_tracker:
     dependency: transitive
     description:
@@ -304,6 +392,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.0"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      sha256: "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.1.0"
   platform:
     dependency: transitive
     description:
@@ -320,6 +416,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.8"
+  posix:
+    dependency: transitive
+    description:
+      name: posix
+      sha256: "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.0.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -381,6 +485,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
+  universal_io:
+    dependency: transitive
+    description:
+      name: universal_io
+      sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.2"
   vector_math:
     dependency: transitive
     description:
@@ -413,6 +525,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.5.0"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.3"
   youtube_player_flutter:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -6,8 +6,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
 # The following defines the version and build number for your application.
 # A version number is three numbers separated by dots, like 1.2.43
-# followed by an optional build number separated by a +.
-# Both the version and the builder number may be overridden in flutter
+# followed by an optional build number separated by a +.# Both the version and the builder number may be overridden in flutter
 # build by specifying --build-name and --build-number, respectively.
 # In Android, build-name is used as versionName while build-number used as versionCode.
 # Read more about Android versioning at https://developer.android.com/studio/publish/versioning
@@ -42,6 +41,8 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  flutter_native_splash: ^2.3.11 # 최신 버전으로 추가
+  flutter_launcher_icons: ^0.13.1 # 이 줄을 추가합니다.
 
   # The "flutter_lints" package below contains a set of recommended lints to
   # encourage good coding practices. The lint set provided by the package is
@@ -62,9 +63,8 @@ flutter:
   uses-material-design: true
 
   # To add assets to your application, add an assets section, like this:
-  # assets:
-  #   - images/a_dot_burr.jpeg
-  #   - images/a_dot_ham.jpeg
+  assets:
+    - assets/splash/ # 스플래시 이미지 폴더 추가
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/to/resolution-aware-images
@@ -91,3 +91,16 @@ flutter:
   #
   # For details regarding fonts from package dependencies,
   # see https://flutter.dev/to/font-from-package
+
+flutter_native_splash:
+  color: "#ffffff"
+  image: assets/splash/splash.png
+  android: true
+  ios: true
+  web: false
+
+flutter_launcher_icons:
+  android: "launcher_icon"
+  ios: true
+  image_path: "assets/icon/icon.png"
+  min_sdk_android: 21 # android min SDK