Merge pull request #207 from kookmin-sw/feature/fe/#185-school-info

Feature/fe/#185 school info
kookmin-sw · May 15, 2024 · feb8cbc · feb8cbc
2 parents 36e42ad + defa0b3
commit feb8cbc
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 14 deletions.
diff --git a/front/capstone_front/assets/images/facility_time_en.jpg b/front/capstone_front/assets/images/facility_time_en.jpg
diff --git a/...one_front/assets/images/facility_time.jpg → ..._front/assets/images/facility_time_ko.jpg b/...one_front/assets/images/facility_time.jpg → ..._front/assets/images/facility_time_ko.jpg
diff --git a/front/capstone_front/assets/images/facility_time_zh.jpg b/front/capstone_front/assets/images/facility_time_zh.jpg
diff --git a/front/capstone_front/lib/screens/home/home_screen.dart b/front/capstone_front/lib/screens/home/home_screen.dart
@@ -35,12 +35,8 @@ class _HomeScreenState extends State<HomeScreen>
   @override
   void initState() {
     super.initState();
-    if (language! != 'KO') {
-      language = "EN-US";
-    } else {
-      language = 'KO';
-    }
-    noticesRes = NoticeService.getNotices(0, 'all', language!);
+
+    noticesRes = NoticeService.getNotices(0, 'all', language);
     _controller = AnimationController(
       vsync: this,
       duration: const Duration(milliseconds: 500),
@@ -322,13 +318,34 @@ class _HomeScreenState extends State<HomeScreen>
                                       title: tr('mainScreen.facility_info'),
                                       icon: Icons.business,
                                       routeCallbackFun: () {
-                                        Navigator.push(
-                                          context,
-                                          MaterialPageRoute(
-                                            builder: (context) => const ImageScreen(
-                                                'assets/images/facility_time.jpg'),
-                                          ),
-                                        );
+                                        if (language == 'EN-US') {
+                                          Navigator.push(
+                                            context,
+                                            MaterialPageRoute(
+                                              builder: (context) =>
+                                                  const ImageScreen(
+                                                      'assets/images/facility_time_en.jpg'),
+                                            ),
+                                          );
+                                        } else if (language == 'ZH') {
+                                          Navigator.push(
+                                            context,
+                                            MaterialPageRoute(
+                                              builder: (context) =>
+                                                  const ImageScreen(
+                                                      'assets/images/facility_time_zh.jpg'),
+                                            ),
+                                          );
+                                        } else {
+                                          Navigator.push(
+                                            context,
+                                            MaterialPageRoute(
+                                              builder: (context) =>
+                                                  const ImageScreen(
+                                                      'assets/images/facility_time_ko.jpg'),
+                                            ),
+                                          );
+                                        }
                                       }),
                                   const SizedBox(
                                     width: 15,

diff --git a/front/capstone_front/pubspec.yaml b/front/capstone_front/pubspec.yaml
@@ -86,7 +86,9 @@ flutter:
     - assets/images/koomin.png
     - assets/images/kookmin_map.jpg
     - assets/images/kookmin_map_row.jpg
-    - assets/images/facility_time.jpg
+    - assets/images/facility_time_ko.jpg
+    - assets/images/facility_time_en.jpg
+    - assets/images/facility_time_zh.jpg
     - assets/audio/sample.wav
 
     - .env