Merge pull request #83 from sparcs-kaist/#82-fix-taxidialog-button-ov…

…erflow Fix: taxiDialog button expanded
sparcs-kaist · Sep 12, 2023 · 0ebe5ff · 0ebe5ff
2 parents 04558a2 + 10627dd
commit 0ebe5ff
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 23 deletions.
diff --git a/lib/constants/theme.dart b/lib/constants/theme.dart
@@ -47,7 +47,8 @@ final defaultDialogPadding =
 
 final defaultDialogButtonSize = Size(147.50, 35);
 
-final defaultDialogButtonInnerPadding = EdgeInsets.only(top: 9, bottom: 9);
+final defaultDialogButtonInnerPadding =
+    EdgeInsets.symmetric(vertical: 9, horizontal: 15);
 
 final defaultDialogButtonBorderRadius = BorderRadius.circular(8.0);
 
@@ -109,14 +110,14 @@ ThemeData buildTheme() {
         labelLarge: TextStyle(
             fontFamily: 'NanumSquare_acB',
             color: Color(0xFFEEEEEE),
-            fontSize: 14,
+            fontSize: 13,
             fontWeight: FontWeight.w700),
 
         //Dialog Elevated 버튼 텍스트
         labelMedium: TextStyle(
             fontFamily: 'NanumSquare',
             color: Color.fromARGB(255, 129, 129, 129),
-            fontSize: 14,
+            fontSize: 13,
             fontWeight: FontWeight.w400)),
   );
   return base;

diff --git a/lib/views/taxiDialog.dart b/lib/views/taxiDialog.dart
@@ -44,27 +44,37 @@ class TaxiDialog extends StatelessWidget {
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
                   defaultDialogPadding,
-                  ElevatedButton(
-                      style: Theme.of(context).elevatedButtonTheme.style,
-                      child: Text(leftButtonContent,
-                          style: Theme.of(context).textTheme.labelMedium),
-                      onPressed: () async {
-                        if (Platform.isIOS) {
-                          exit(0);
-                        } else {
-                          SystemNavigator.pop();
-                        }
-                      }),
+                  Expanded(
+                    child: ElevatedButton(
+                        style: Theme.of(context).elevatedButtonTheme.style,
+                        child: Text(
+                          leftButtonContent,
+                          style: Theme.of(context).textTheme.labelMedium,
+                          overflow: TextOverflow.visible,
+                        ),
+                        onPressed: () async {
+                          if (Platform.isIOS) {
+                            exit(0);
+                          } else {
+                            SystemNavigator.pop();
+                          }
+                        }),
+                  ),
                   defaultDialogVerticalMedianButtonPadding,
-                  OutlinedButton(
-                      style: Theme.of(context).outlinedButtonTheme.style,
-                      child: Text(rightButtonContent,
-                          style: Theme.of(context).textTheme.labelLarge),
-                      onPressed: () async {
-                        OpenStore.instance.open(
-                            androidAppBundleId: dotenv.get("ANDROID_APPID"),
-                            appStoreId: dotenv.get("IOS_APPID"));
-                      }),
+                  Expanded(
+                    child: OutlinedButton(
+                        style: Theme.of(context).outlinedButtonTheme.style,
+                        child: Text(
+                          rightButtonContent,
+                          style: Theme.of(context).textTheme.labelLarge,
+                          overflow: TextOverflow.visible,
+                        ),
+                        onPressed: () async {
+                          OpenStore.instance.open(
+                              androidAppBundleId: dotenv.get("ANDROID_APPID"),
+                              appStoreId: dotenv.get("IOS_APPID"));
+                        }),
+                  ),
                   defaultDialogPadding,
                 ],
               ),