Merge pull request #243 from I-Taxi/fix/#240

fix[#240]: fix overflow, make text center
I-Taxi · Feb 14, 2023 · 2804c43 · 2804c43
2 parents d32263a + 1ce435c
commit 2804c43
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/lib/controller/ktxPlaceController.dart b/lib/controller/ktxPlaceController.dart
@@ -36,8 +36,7 @@ class KtxPlaceController extends GetxController {
 
   // Places 데이터 가져오기
   List<KtxPlace> PlacefromJson(json) {
-    List<KtxPlace> result = [
-      KtxPlace(id: -1, name: '전체', cnt: 0)];
+    List<KtxPlace> result = [];
     json.forEach((item) {
       result.add(KtxPlace.fromDocs(item));
     });

diff --git a/lib/placeSearch/ktxSearchScreen.dart b/lib/placeSearch/ktxSearchScreen.dart
@@ -90,7 +90,7 @@ class _KtxSearchScreenState extends State<KtxSearchScreen> {
                           // [TODO]: 출발지 도착지 같을때 띄우는거
                           placeSearchSnackBar(
                               context: context,
-                              title: const Text('출발지를 다시 선택해주세요.'),
+                              title: const Text('출발지를 다시 선택해주세요.', textAlign: TextAlign.center),
                               color: colorScheme.error);
                         } else {
                           _ktxPlaceController.selectDep(
@@ -107,7 +107,7 @@ class _KtxSearchScreenState extends State<KtxSearchScreen> {
                           // [TODO]: 출발지 도착지 같을때 띄우는거
                           placeSearchSnackBar(
                               context: context,
-                              title: const Text('도착지를 다시 선택해주세요.'),
+                              title: const Text('도착지를 다시 선택해주세요.', textAlign: TextAlign.center),
                               color: colorScheme.error);
                         } else {
                           _ktxPlaceController.selectDst(

diff --git a/lib/placeSearch/placeSearchScreen.dart b/lib/placeSearch/placeSearchScreen.dart
@@ -308,22 +308,22 @@ class _PlaceSearchScreenState extends State<PlaceSearchScreen> {
                   behavior: HitTestBehavior.opaque,
                   onTap: () async {
                     if (_placeSearchController.postType == 0) {
-                      placeSearchSnackBar(context: context, title: const Text('택시 또는 카풀을 선택해주세요.'), color: Colors.red);
+                      placeSearchSnackBar(context: context, title: const Text('택시 또는 카풀을 선택해주세요.', textAlign: TextAlign.center), color: Colors.red);
                     } else if (_placeController.dep == null) {
-                      placeSearchSnackBar(context: context, title: const Text('출발지를 선택해주세요.'), color: Colors.red);
+                      placeSearchSnackBar(context: context, title: const Text('출발지를 선택해주세요.', textAlign: TextAlign.center), color: Colors.red);
                     } else if (_placeController.dep!.id == -1) {
-                      placeSearchSnackBar(context: context, title: const Text('출발지를 다시 선택해주세요.'), color: Colors.red);
+                      placeSearchSnackBar(context: context, title: const Text('출발지를 다시 선택해주세요.', textAlign: TextAlign.center), color: Colors.red);
                     } else if (_placeController.dst == null) {
-                      placeSearchSnackBar(context: context, title: const Text('도착지를 선택해주세요.'), color: Colors.red);
+                      placeSearchSnackBar(context: context, title: const Text('도착지를 선택해주세요.', textAlign: TextAlign.center), color: Colors.red);
                     } else if (_placeController.dst!.id == -1) {
-                      placeSearchSnackBar(context: context, title: const Text('도착지를 다시 선택해주세요.'), color: Colors.red);
+                      placeSearchSnackBar(context: context, title: const Text('도착지를 다시 선택해주세요.', textAlign: TextAlign.center), color: Colors.red);
                     } else if (DateTime.now()
                         .difference(_dateController.mergeDateAndTime())
                         .isNegative ==
                         false) {
-                      placeSearchSnackBar(context: context, title: const Text('출발시간을 다시 선택해주세요.'), color: Colors.red);
+                      placeSearchSnackBar(context: context, title: const Text('출발시간을 다시 선택해주세요.', textAlign: TextAlign.center), color: Colors.red);
                     } else if (_placeSearchController.peopleCount == 0) {
-                      placeSearchSnackBar(context: context, title: const Text('최대인원을 선택해주세요.'), color: Colors.red);
+                      placeSearchSnackBar(context: context, title: const Text('최대인원을 선택해주세요.', textAlign: TextAlign.center), color: Colors.red);
                     } else {
                       Post post = Post(
                           uid: _userController.uid,

diff --git a/lib/timeline/timelineScreen.dart b/lib/timeline/timelineScreen.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:colorful_safe_area/colorful_safe_area.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -136,7 +138,7 @@ class _TimelineScreenState extends State<TimelineScreen> {
                             crossAxisAlignment: CrossAxisAlignment.center,
                             children: [
                               Container(
-                                height: 636.h,
+                                height: Platform.isIOS ? 620.h : 636.h,
                                 child: Stack(
                                     alignment: Alignment.topCenter,
                                     children: [