chore(layout): minor ui adjustments

Kounex · Nov 27, 2023 · 882a788 · 882a788
1 parent af4103a
commit 882a788
Show file tree

Hide file tree

Showing 20 changed files with 263 additions and 279 deletions.
diff --git a/lib/shared/general/custom_sliver_list.dart b/lib/shared/general/custom_sliver_list.dart
@@ -18,11 +18,11 @@ class CustomSliverList extends StatelessWidget {
     return SliverPadding(
       padding: EdgeInsets.only(
         top: this.customTopPadding ?? 0.0,
-        right: MediaQuery.viewPaddingOf(context).right,
+        right: MediaQuery.paddingOf(context).right,
         bottom: this.customBottomPadding ??
             (2 * kBottomNavigationBarHeight +
-                MediaQuery.viewPaddingOf(context).bottom),
-        left: MediaQuery.viewPaddingOf(context).left,
+                MediaQuery.paddingOf(context).bottom / 2),
+        left: MediaQuery.paddingOf(context).left,
       ),
       sliver: SliverList(
         delegate: SliverChildListDelegate(this.children),

diff --git a/lib/shared/general/formatted_text.dart b/lib/shared/general/formatted_text.dart
@@ -25,16 +25,17 @@ class FormattedText extends StatelessWidget {
           text:
               (this.text ?? '-') + (this.text != null ? (this.unit ?? '') : ''),
         ),
-        style: const TextStyle(
+        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
           fontFeatures: [
-            FontFeature.tabularFigures(),
+            const FontFeature.tabularFigures(),
           ],
         ),
         decoration: InputDecoration(
           isDense: true,
           enabled: false,
           labelText: this.label,
-          labelStyle: const TextStyle(height: 0.75),
+          labelStyle:
+              Theme.of(context).textTheme.bodyMedium!.copyWith(height: 0.75),
         ),
       ),
     );

diff --git a/lib/shared/general/social_block.dart b/lib/shared/general/social_block.dart
@@ -125,7 +125,7 @@ class SocialBlock extends StatelessWidget {
                   social.linkText ?? social.link,
                   softWrap: true,
                   style: (social.textStyle ??
-                          Theme.of(context).textTheme.bodyLarge!)
+                          Theme.of(context).textTheme.bodyMedium!)
                       .copyWith(
                     color: Theme.of(context).colorScheme.secondary,
                     // decoration: TextDecoration.underline,
@@ -139,8 +139,10 @@ class SocialBlock extends StatelessWidget {
     }
 
     return Padding(
-      padding:
-          EdgeInsets.only(top: this.topPadding, bottom: this.bottomPadding),
+      padding: EdgeInsets.only(
+        top: this.topPadding,
+        bottom: this.bottomPadding,
+      ),
       child: Wrap(
         spacing: 12.0,
         runSpacing: 12.0,

diff --git a/lib/shared/general/transculent_cupertino_navbar_wrapper.dart b/lib/shared/general/transculent_cupertino_navbar_wrapper.dart
@@ -46,8 +46,7 @@ class TransculentCupertinoNavBarWrapper extends StatelessWidget {
       physics: StylingHelper.platformAwareScrollPhysics,
       slivers: [
         CustomSliverList(
-          customTopPadding:
-              MediaQuery.viewPaddingOf(context).top + kToolbarHeight,
+          customTopPadding: MediaQuery.paddingOf(context).top + kToolbarHeight,
           children: this.listViewChildren,
         ),
       ],
@@ -65,7 +64,7 @@ class TransculentCupertinoNavBarWrapper extends StatelessWidget {
         if (this.customBody != null)
           Padding(
             padding: EdgeInsets.only(
-              top: MediaQuery.viewPaddingOf(context).top +
+              top: MediaQuery.paddingOf(context).top +
                   kMinInteractiveDimensionCupertino,
             ),
             child: this.customBody,

diff --git a/lib/utils/modal_handler.dart b/lib/utils/modal_handler.dart
@@ -38,8 +38,8 @@ class ModalHandler {
               children: [
                 content,
                 Positioned(
-                  top: 12.0 + MediaQuery.viewPaddingOf(context).top,
-                  right: 12.0 + MediaQuery.viewPaddingOf(context).right,
+                  top: 12.0 + MediaQuery.paddingOf(context).top,
+                  right: 12.0 + MediaQuery.paddingOf(context).right,
                   child: IconButton(
                     onPressed: () {
                       onClose?.call();
@@ -87,7 +87,7 @@ class ModalHandler {
             mainAxisSize: MainAxisSize.min,
             children: [
               builder(context),
-              SizedBox(height: MediaQuery.viewPaddingOf(context).bottom),
+              SizedBox(height: MediaQuery.paddingOf(context).bottom),
             ],
           ),
           maxHeight: MediaQuery.sizeOf(context).height / 1.5,
@@ -120,7 +120,7 @@ class ModalHandler {
           context: context,
           additionalBottomViewInsets: additionalBottomViewInsets,
           blurryBackground: blurryBackground ?? StylingHelper.isApple(context),
-          includeCloseButton: true,
+          includeCloseButton: includeCloseButton,
           modalWidget: modalWidgetBuilder(
             context,
             ModalScrollController.of(context)!,
@@ -162,11 +162,9 @@ class ModalHandler {
                 ),
               ),
             ),
-          Expanded(
-            child: Padding(
-              padding: EdgeInsets.only(top: includeCloseButton ? 24.0 : 0),
-              child: modalWidget,
-            ),
+          Padding(
+            padding: EdgeInsets.only(top: includeCloseButton ? 24.0 : 0),
+            child: modalWidget,
           ),
         ],
       ),

diff --git a/lib/views/dashboard/dashboard.dart b/lib/views/dashboard/dashboard.dart
@@ -195,7 +195,7 @@ class _DashboardViewState extends State<DashboardView> {
               ],
             ),
             Positioned(
-              top: kToolbarHeight + MediaQuery.viewPaddingOf(context).top,
+              top: kToolbarHeight + MediaQuery.paddingOf(context).top,
               child: const Align(
                 alignment: Alignment.center,
                 child: FittedBox(

diff --git a/lib/views/dashboard/screenshot_preview.dart b/lib/views/dashboard/screenshot_preview.dart
@@ -39,7 +39,7 @@ class _ScreenshotPreviewState extends State<ScreenshotPreview> {
       fit: StackFit.expand,
       children: [
         Positioned(
-          top: MediaQuery.viewPaddingOf(context).top + 24,
+          top: MediaQuery.paddingOf(context).top + 24,
           left: 0,
           right: 0,
           child: Text(
@@ -49,7 +49,7 @@ class _ScreenshotPreviewState extends State<ScreenshotPreview> {
           ),
         ),
         Positioned(
-          bottom: MediaQuery.viewPaddingOf(context).bottom + 24,
+          bottom: MediaQuery.paddingOf(context).bottom + 24,
           left: 24.0,
           right: 24.0,
           child: Column(

diff --git a/lib/views/dashboard/widgets/scenes/exposed_controls/hotkeys_control/hotkey_list.dart b/lib/views/dashboard/widgets/scenes/exposed_controls/hotkeys_control/hotkey_list.dart
@@ -108,9 +108,8 @@ class _HotkeyListState extends State<HotkeyList> {
                         controller: this.widget.controller,
                         padding: const EdgeInsets.symmetric(horizontal: 24.0) +
                             EdgeInsets.only(
-                                bottom:
-                                    MediaQuery.viewPaddingOf(context).bottom +
-                                        12.0),
+                                bottom: MediaQuery.paddingOf(context).bottom +
+                                    12.0),
                         children: [
                           if (hotkeyBox.values.isNotEmpty) ...[
                             const SectionHeader(

diff --git a/lib/views/home/widgets/connect_box/quick_connect/quick_connect.dart b/lib/views/home/widgets/connect_box/quick_connect/quick_connect.dart
@@ -25,6 +25,7 @@ class QuickConnect extends StatelessWidget {
             onPressed: () =>
                 ModalHandler.showBaseCupertinoBottomSheet<Connection?>(
               context: context,
+              includeCloseButton: false,
               modalWidgetBuilder: (context, controller) => const QRScan(),
             ).then(
               (connection) {

diff --git a/lib/views/home/widgets/refresher_app_bar/refresher_app_bar.dart b/lib/views/home/widgets/refresher_app_bar/refresher_app_bar.dart
@@ -49,7 +49,7 @@ class RefresherAppBar extends StatelessWidget {
           title: LayoutBuilder(
             builder: (context, constraints) {
               if ((constraints.maxHeight -
-                          (MediaQuery.viewPaddingOf(context).top - 16))
+                          (MediaQuery.paddingOf(context).top - 16))
                       .toInt() <=
                   kRefresherAppBarHeight.toInt()) {
                 return Fader(

diff --git a/lib/views/home/widgets/saved_connections/edit_dialog.dart b/lib/views/home/widgets/saved_connections/edit_dialog.dart
@@ -181,7 +181,6 @@ class _EditConnectionDialogState extends State<EditConnectionDialog> {
             placeholder: 'Password',
             autocorrect: false,
             obscureText: _obscurePW,
-            errorPaddingAlways: true,
             suffixIcon: StylingHelper.isApple(context)
                 ? Container(
                     decoration: BoxDecoration(

diff --git a/lib/views/intro/widgets/back_so_selection_wrapper.dart b/lib/views/intro/widgets/back_so_selection_wrapper.dart
@@ -17,7 +17,7 @@ class BackToSelectionWrapper extends StatelessWidget {
   Widget build(BuildContext context) {
     return Column(
       children: [
-        SizedBox(height: MediaQuery.viewPaddingOf(context).top),
+        SizedBox(height: MediaQuery.paddingOf(context).top),
         ThemedCupertinoButton(
           child: Row(
             children: [

diff --git a/lib/views/intro/widgets/getting_started.dart b/lib/views/intro/widgets/getting_started.dart
@@ -41,6 +41,10 @@ class GettingStarted extends StatelessWidget {
                   delay: const Duration(milliseconds: 500),
                   curve: Curves.easeIn,
                   child: ThemedRichText(
+                    textAlign: TextAlign.center,
+                    textStyle: Theme.of(context).textTheme.labelSmall!.copyWith(
+                          fontSize: 18,
+                        ),
                     textSpans: [
                       const TextSpan(
                         text: 'An unofficial, ',
@@ -90,10 +94,6 @@ class GettingStarted extends StatelessWidget {
                         text: ' plugin!',
                       ),
                     ],
-                    textAlign: TextAlign.center,
-                    textStyle: Theme.of(context).textTheme.labelSmall!.copyWith(
-                          fontSize: 18,
-                        ),
                   ),
                 ),
               ],

diff --git a/lib/views/intro/widgets/intro_slides/intro_slide.dart b/lib/views/intro/widgets/intro_slides/intro_slide.dart
@@ -41,10 +41,10 @@ class IntroSlide extends StatelessWidget {
     //   duration: const Duration(milliseconds: 750),
     //   child: Padding(
     //     padding: EdgeInsets.only(
-    //       top: MediaQuery.viewPaddingOf(context).top + 32.0,
+    //       top: MediaQuery.paddingOf(context).top + 32.0,
     //       left: 24.0,
     //       right: 24.0,
-    //       bottom: MediaQuery.viewPaddingOf(context).bottom +
+    //       bottom: MediaQuery.paddingOf(context).bottom +
     //           kIntroControlsBottomPadding,
     //     ),
     //     child: Column(

diff --git a/lib/views/intro/widgets/intro_slides/intro_slides.dart b/lib/views/intro/widgets/intro_slides/intro_slides.dart
@@ -183,7 +183,7 @@ class _IntroSlidesState extends State<IntroSlides> {
             const SizedBox(height: 12.0),
             Padding(
               padding: EdgeInsets.only(
-                bottom: MediaQuery.viewPaddingOf(context).bottom +
+                bottom: MediaQuery.paddingOf(context).bottom +
                     kIntroControlsBottomPadding,
               ),
               child: ConstrainedBox(

diff --git a/lib/views/settings/about/about.dart b/lib/views/settings/about/about.dart
@@ -114,6 +114,7 @@ class AboutView extends StatelessWidget {
                               // showAboutDialog(context: context),
                               ModalHandler.showBaseCupertinoBottomSheet(
                             context: context,
+                            includeCloseButton: false,
                             modalWidgetBuilder: (context, scrollController) =>
                                 LicenseModal(
                               scrollController: scrollController,

diff --git a/lib/views/settings/about/widgets/license_modal/license_entries.dart b/lib/views/settings/about/widgets/license_modal/license_entries.dart
@@ -90,8 +90,8 @@ class _LicenseEntriesState extends State<LicenseEntries> {
             child: ListView.builder(
               shrinkWrap: true,
               controller: this.widget.scrollController,
-              padding: EdgeInsets.only(
-                  bottom: MediaQuery.viewPaddingOf(context).bottom),
+              padding:
+                  EdgeInsets.only(bottom: MediaQuery.paddingOf(context).bottom),
               itemCount: snapshot.data!.packages.length,
               itemBuilder: (context, index) => ListTile(
                 dense: true,