From c1ccad104b15960f46e928da8a835f3a1d0dfbb2 Mon Sep 17 00:00:00 2001
From: Harinandan <harinandan.alukkal@gmail.com>
Date: Thu, 20 Jan 2022 08:13:38 +0530
Subject: [PATCH] Fixed adaptive Size issue

---
 .../settings/settings_dialog.dart             | 67 ++++++-------------
 .../widgets/settings_menu_element.dart        |  1 +
 2 files changed, 23 insertions(+), 45 deletions(-)

diff --git a/frontend/app_flowy/lib/workspace/presentation/settings/settings_dialog.dart b/frontend/app_flowy/lib/workspace/presentation/settings/settings_dialog.dart
index e4e73204c7..ef00dfd46d 100644
--- a/frontend/app_flowy/lib/workspace/presentation/settings/settings_dialog.dart
+++ b/frontend/app_flowy/lib/workspace/presentation/settings/settings_dialog.dart
@@ -24,62 +24,39 @@ class _SettingsDialogState extends State<SettingsDialog> {
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.circular(10),
       ),
-      title: ConstrainedBox(
+      title: const Text(
+        'Settings',
+        style: TextStyle(
+          fontWeight: FontWeight.bold,
+        ),
+      ),
+      content: ConstrainedBox(
         constraints: const BoxConstraints(
           maxHeight: 600,
         ),
-        child: Column(
+        child: Row(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            const SettingsPanelHeader(),
             Expanded(
-              child: Row(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Expanded(
-                    flex: 1,
-                    child: SettingsMenu(
-                      changeSelectedIndex: (index) {
-                        setState(() {
-                          _selectedViewIndex = index;
-                        });
-                      },
-                      currentIndex: _selectedViewIndex,
-                    ),
-                  ),
-                  const VerticalDivider(),
-                  const SizedBox(width: 10),
-                  Expanded(
-                    flex: 4,
-                    child: settingsViews[_selectedViewIndex],
-                  )
-                ],
+              flex: 1,
+              child: SettingsMenu(
+                changeSelectedIndex: (index) {
+                  setState(() {
+                    _selectedViewIndex = index;
+                  });
+                },
+                currentIndex: _selectedViewIndex,
               ),
             ),
+            const VerticalDivider(),
+            const SizedBox(width: 10),
+            Expanded(
+              flex: 4,
+              child: settingsViews[_selectedViewIndex],
+            )
           ],
         ),
       ),
     );
   }
 }
-
-class SettingsPanelHeader extends StatelessWidget {
-  const SettingsPanelHeader({
-    Key? key,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return const Padding(
-      padding: EdgeInsets.all(16.0),
-      child: Text(
-        //TODO: Change to i10n
-        'Settings',
-        style: TextStyle(
-          fontWeight: FontWeight.bold,
-          fontSize: 24,
-        ),
-      ),
-    );
-  }
-}
diff --git a/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_menu_element.dart b/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_menu_element.dart
index 6127ea96ae..fe3d83bbb3 100644
--- a/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_menu_element.dart
+++ b/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_menu_element.dart
@@ -42,6 +42,7 @@ class SettingsMenuElement extends StatelessWidget {
         style: const TextStyle(
           fontSize: 14,
           fontWeight: FontWeight.w600,
+          overflow: TextOverflow.ellipsis,
         ),
       ),
     );