chore(#646): adapt paddings

hpi-dhc · Aug 23, 2023 · a12c088 · a12c088
1 parent 15d1de3
commit a12c088
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 38 deletions.
diff --git a/app/lib/common/theme.dart b/app/lib/common/theme.dart
@@ -74,6 +74,7 @@ class PharMeTheme {
   static final borderColor = Colors.black.withOpacity(.2);
 
   static const smallSpace = 8.0;
+  static const smallToMediumSpace = 12.0;
   static const mediumSpace = 16.0;
   static const largeSpace = 32.0;
 

diff --git a/app/lib/common/widgets/drug_search.dart b/app/lib/common/widgets/drug_search.dart
@@ -38,25 +38,28 @@ class DrugSearch extends HookWidget {
                 Row(
                   children: [
                     Expanded(
-                      child: Padding(
-                        padding: EdgeInsets.all(PharMeTheme.smallSpace),
-                        child: CupertinoSearchTextField(
-                          controller: searchController,
-                          onChanged: (value) {
-                            context.read<DrugListCubit>().search(query: value);
-                          },
-                        ),
+                      child: CupertinoSearchTextField(
+                        controller: searchController,
+                        onChanged: (value) {
+                          context.read<DrugListCubit>().search(query: value);
+                        },
                       ),
                     ),
-                    SizedBox(width: 12),
+                    SizedBox(width: PharMeTheme.smallToMediumSpace),
                     TooltipIcon(context.l10n.search_page_tooltip_search),
                     if (showFilter) buildFilter(context),
                   ]
                 ),
+                SizedBox(height: PharMeTheme.smallSpace),
                 Expanded(
                   child: Scrollbar(
                     thumbVisibility: true,
+                    thickness: PharMeTheme.smallSpace / 2,
                     child: ListView(
+                      padding: EdgeInsets.only(
+                      right: PharMeTheme.smallSpace * 1.5
+                      // right: 0
+                    ),
                       children: buildDrugList(
                         context,
                         state,

diff --git a/app/lib/common/widgets/page_scaffold.dart b/app/lib/common/widgets/page_scaffold.dart
@@ -44,6 +44,7 @@ Scaffold pageScaffold({
 
 Scaffold unscrollablePageScaffold({
   required Widget body,
+  double? padding,
   String? title,
   Widget? barBottom,
   List<Widget>? actions,
@@ -66,7 +67,7 @@ Scaffold unscrollablePageScaffold({
     appBar: appBar,
     body: SafeArea(
       child: Padding(
-        padding: const EdgeInsets.all(PharMeTheme.smallSpace),
+        padding: EdgeInsets.all(padding ?? PharMeTheme.smallSpace),
         child: body,
       ),
     ),

diff --git a/app/lib/drug_selection/pages/drug_selection.dart b/app/lib/drug_selection/pages/drug_selection.dart
@@ -21,6 +21,7 @@ class DrugSelectionPage extends HookWidget {
         builder: (context, state) {
           return unscrollablePageScaffold(
             title: context.l10n.drug_selection_header,
+            padding: PharMeTheme.mediumSpace,
             body: Column(
               children: [
                 _buildDescription(context),
@@ -32,7 +33,7 @@ class DrugSelectionPage extends HookWidget {
             ),
           );
         }
-      )
+      ),
     );
   }
 
@@ -44,19 +45,16 @@ class DrugSelectionPage extends HookWidget {
   }
 
   Widget _buildDescription(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.all(8),
-      child: Column(
-        children: [
-          Text(
-            context.l10n.drug_selection_description,
-            style: PharMeTheme.textTheme.bodyLarge),
-          SizedBox(height: PharMeTheme.mediumSpace),
-          Text(
-            context.l10n.drug_selection_later,
-            style: PharMeTheme.textTheme.bodyLarge),
-        ]
-      ),
+    return Column(
+      children: [
+        Text(
+          context.l10n.drug_selection_description,
+          style: PharMeTheme.textTheme.bodyLarge),
+        SizedBox(height: PharMeTheme.mediumSpace),
+        Text(
+          context.l10n.drug_selection_later,
+          style: PharMeTheme.textTheme.bodyLarge),
+      ]
     );
   }
 

diff --git a/app/lib/login/pages/login.dart b/app/lib/login/pages/login.dart
@@ -22,6 +22,7 @@ class LoginPage extends HookWidget {
       child: BlocBuilder<LoginPageCubit, LoginPageState>(
         builder: (context, state) {
           return unscrollablePageScaffold(
+            padding: PharMeTheme.mediumSpace,
             body: Stack(
               children: [
                 Positioned.fill(
@@ -35,16 +36,13 @@ class LoginPage extends HookWidget {
                 Positioned(
                   child: Align(
                     alignment: Alignment.bottomCenter,
-                    child: Padding(
-                      padding: const EdgeInsets.all(PharMeTheme.smallSpace),
-                      child: state.when(
-                        initial: () =>
-                            _buildInitialScreen(context, dropdownValue),
-                        loadingUserData: CircularProgressIndicator.new,
-                        loadedUserData: () => _buildLoadedScreen(context),
-                        error: (message) =>
-                            _buildErrorScreen(context, message),
-                      ),
+                    child: state.when(
+                      initial: () =>
+                          _buildInitialScreen(context, dropdownValue),
+                      loadingUserData: CircularProgressIndicator.new,
+                      loadedUserData: () => _buildLoadedScreen(context),
+                      error: (message) =>
+                          _buildErrorScreen(context, message),
                     ),
                   ),
                 ),
@@ -162,7 +160,8 @@ class LoginPage extends HookWidget {
       children: [
         ...children,
         SizedBox(height: PharMeTheme.mediumSpace),
-        FullWidthButton(actionText, action ?? () {}),      ],
+        FullWidthButton(actionText, action ?? () {}),
+      ],
     );
   }
 }
diff --git a/app/lib/report/pages/gene.dart b/app/lib/report/pages/gene.dart
@@ -20,7 +20,10 @@ class GenePage extends HookWidget {
           title: context.l10n.gene_page_headline(phenotype.geneSymbol),
           body: [
             Padding(
-              padding: EdgeInsets.symmetric(horizontal: 12, vertical: 16),
+              padding: EdgeInsets.symmetric(
+                horizontal: PharMeTheme.smallToMediumSpace,
+                vertical: PharMeTheme.mediumSpace
+              ),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
@@ -29,7 +32,7 @@ class GenePage extends HookWidget {
                     tooltip: context.l10n
                         .gene_page_name_tooltip(phenotype.geneSymbol),
                   ),
-                  SizedBox(height: 12),
+                  SizedBox(height: PharMeTheme.smallToMediumSpace),
                   RoundedCard(
                     child: Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
@@ -63,9 +66,10 @@ class GenePage extends HookWidget {
                           ],
                     ],
                   )),
-                  SizedBox(height: 12),
+                  SizedBox(height: PharMeTheme.smallToMediumSpace),
                   SubHeader(context.l10n.gene_page_affected_drugs,
                       tooltip: context.l10n.gene_page_affected_drugs_tooltip),
+                  SizedBox(height: PharMeTheme.smallSpace),
                   ...buildDrugList(context, state,
                       noDrugsMessage: context.l10n.gene_page_no_affected_drugs)
                 ],