Merge remote-tracking branch 'origin' into healthx-demo-deep-linking

hpi-dhc · Nov 22, 2024 · 8746a9c · 8746a9c
2 parents e526d62 + f072f24
commit 8746a9c
Show file tree

Hide file tree

Showing 13 changed files with 608 additions and 223 deletions.
diff --git a/app/ios/Runner.xcodeproj/project.pbxproj b/app/ios/Runner.xcodeproj/project.pbxproj
@@ -360,7 +360,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = H4NQ8HX57R;
+				DEVELOPMENT_TEAM = ML9QV973KL;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -495,7 +495,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = H4NQ8HX57R;
+				DEVELOPMENT_TEAM = ML9QV973KL;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -525,7 +525,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = H4NQ8HX57R;
+				DEVELOPMENT_TEAM = ML9QV973KL;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (

diff --git a/app/ios/Runner/Info.plist b/app/ios/Runner/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
@@ -29,6 +31,8 @@
 	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -46,9 +50,5 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
 </dict>
 </plist>
diff --git a/app/lib/app.dart b/app/lib/app.dart
@@ -38,6 +38,7 @@ class PharMeApp extends StatelessWidget {
               }
               return getInitialRoute();
             },
+            navigatorObservers:  () => [RemoveFocusOnNavigate()],
           ),
           theme: PharMeTheme.light,
           localizationsDelegates: [
@@ -52,3 +53,13 @@ class PharMeApp extends StatelessWidget {
     );
   }
 }
+
+// Based on https://github.com/flutter/flutter/issues/48464#issuecomment-586635827
+class RemoveFocusOnNavigate extends NavigatorObserver {
+  @override
+  void didPush(Route route, Route? previousRoute) {
+    super.didPush(route, previousRoute);
+    final focus = FocusManager.instance.primaryFocus;
+    focus?.unfocus();
+  }
+}
diff --git a/app/lib/common/widgets/dialog_wrapper.dart b/app/lib/common/widgets/dialog_wrapper.dart
@@ -3,12 +3,12 @@ import '../module.dart';
 class DialogWrapper extends StatelessWidget {
   const DialogWrapper({
     super.key,
-    required this.title,
-    required this.content,
     required this.actions,
+    this.title,
+    this.content,
   });
 
-  final String title;
+  final String? title;
   final Widget? content;
   final List<DialogAction> actions;
 
@@ -22,7 +22,7 @@ class DialogWrapper extends StatelessWidget {
         )
       : content;
     return AlertDialog.adaptive(
-      title: Text(title),
+      title: title != null ? Text(title!) : null,
       content: materialContent,
       actions: actions,
       elevation: 0,

diff --git a/app/lib/common/widgets/drug_activity_selection.dart b/app/lib/common/widgets/drug_activity_selection.dart
@@ -15,15 +15,19 @@ SwitchListTile buildDrugActivitySelection({
   required bool isActive,
   required bool disabled,
   EdgeInsetsGeometry? contentPadding,
+  bool warnIfInhibitor = true,
 }) => SwitchListTile.adaptive(
   key: key,
   value: isActive,
   activeColor: PharMeTheme.primaryColor,
+  inactiveThumbColor: PharMeTheme.surfaceColor,
+  inactiveTrackColor: PharMeTheme.borderColor,
+  trackOutlineColor: WidgetStatePropertyAll(Colors.transparent),
   title: Text(title),
   subtitle: subtitle.isNotNullOrBlank ? Text(subtitle!, style: PharMeTheme.textTheme.bodyMedium): null,
   contentPadding: contentPadding,
   onChanged: disabled ? null : (newValue) {
-    if (isInhibitor(drug.name)) {
+    if (warnIfInhibitor && isInhibitor(drug.name)) {
       showAdaptiveDialog(
         context: context,
         builder: (context) => DialogWrapper(

diff --git a/app/lib/common/widgets/drug_list/drug_items/drug_selection_list.dart b/app/lib/common/widgets/drug_list/drug_items/drug_selection_list.dart
@@ -46,6 +46,7 @@ List<SwitchListTile> _buildSelectionList(
       subtitle: (drug.annotations.brandNames.isNotEmpty) ?
         formatBrandNames(context, drug) :
         null,
+      warnIfInhibitor: showDrugInteractionIndicator,
     )
   ).toList();
 }
diff --git a/app/lib/common/widgets/page_scaffold.dart b/app/lib/common/widgets/page_scaffold.dart
@@ -29,45 +29,58 @@ Widget buildTitle(String text, { String? tooltipText }) {
   );
 }
 
-Scaffold pageScaffold({
+Widget pageScaffold({
   required List<Widget> body,
   required String title,
   List<Widget>? actions,
   bool canNavigateBack = true,
+  BuildContext? contextToDismissFocusOnTap,
+  bool resizeToAvoidBottomInset = false,
   Key? key,
 }) {
-  return Scaffold(
-    key: key,
-    body: CustomScrollView(slivers: [
-      SliverAppBar(
-        scrolledUnderElevation: 0,
-        backgroundColor: PharMeTheme.appBarTheme.backgroundColor,
-        foregroundColor: PharMeTheme.appBarTheme.foregroundColor,
-        elevation: PharMeTheme.appBarTheme.elevation,
-        leadingWidth: PharMeTheme.appBarTheme.leadingWidth,
-        automaticallyImplyLeading: canNavigateBack,
-        floating: true,
-        pinned: true,
-        snap: false,
-        centerTitle: PharMeTheme.appBarTheme.centerTitle,
-        title: buildTitle(title),
-        actions: actions,
-        titleSpacing: _getTitleSpacing(backButtonPresent: canNavigateBack),
-      ),
-      SliverPadding(
-        padding: pagePadding(),
-        sliver: SliverList(delegate: SliverChildListDelegate(body)),  
-      ),
-    ]),
+  return GestureDetector(
+    onTap: () => _maybeRemoveFocus(contextToDismissFocusOnTap),
+    child: Scaffold(
+      key: key,
+      resizeToAvoidBottomInset: resizeToAvoidBottomInset,
+      body: CustomScrollView(slivers: [
+        SliverAppBar(
+          scrolledUnderElevation: 0,
+          backgroundColor: PharMeTheme.appBarTheme.backgroundColor,
+          foregroundColor: PharMeTheme.appBarTheme.foregroundColor,
+          elevation: PharMeTheme.appBarTheme.elevation,
+          leadingWidth: PharMeTheme.appBarTheme.leadingWidth,
+          automaticallyImplyLeading: canNavigateBack,
+          floating: true,
+          pinned: true,
+          snap: false,
+          centerTitle: PharMeTheme.appBarTheme.centerTitle,
+          title: buildTitle(title),
+          actions: actions,
+          titleSpacing: _getTitleSpacing(backButtonPresent: canNavigateBack),
+        ),
+        SliverPadding(
+          padding: pagePadding(),
+          sliver: SliverList(delegate: SliverChildListDelegate(body)),  
+        ),
+      ]),
+    ),
   );
 }
 
-Scaffold unscrollablePageScaffold({
+void _maybeRemoveFocus(BuildContext? contextToDismissFocusOnTap) =>
+  contextToDismissFocusOnTap != null
+      ? FocusScope.of(contextToDismissFocusOnTap).unfocus()
+      : null;
+
+Widget unscrollablePageScaffold({
   required Widget body,
   String? title,
   String? titleTooltip,
   List<Widget>? actions,
   bool canNavigateBack = true,
+  BuildContext? contextToDismissFocusOnTap,
+  bool resizeToAvoidBottomInset = false,
   Key? key,
 }) {
   final appBar = title == null
@@ -84,13 +97,17 @@ Scaffold unscrollablePageScaffold({
         scrolledUnderElevation: 0,
         titleSpacing: _getTitleSpacing(backButtonPresent: canNavigateBack),
       );
-  return Scaffold(
-    key: key,
-    appBar: appBar,
-    body: SafeArea(
-      child: Padding(
-        padding: pagePadding(),
-        child: body,
+  return GestureDetector(
+    onTap: () => _maybeRemoveFocus(contextToDismissFocusOnTap),
+    child: Scaffold(
+      key: key,
+      appBar: appBar,
+      resizeToAvoidBottomInset: resizeToAvoidBottomInset,
+      body: SafeArea(
+        child: Padding(
+          padding: pagePadding(),
+          child: body,
+        ),
       ),
     ),
   );

diff --git a/app/lib/common/widgets/scroll_list.dart b/app/lib/common/widgets/scroll_list.dart
@@ -14,6 +14,7 @@ Widget scrollList(List<Widget> body, { bool keepPosition = false }) {
       child: Padding(
         padding: EdgeInsets.only(right: PharMeTheme.mediumSpace),
         child: FlutterListView(
+          keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.onDrag,
           delegate: FlutterListViewDelegate(
               (context, index) => body[index],
               childCount: body.length,

diff --git a/app/lib/drug_selection/pages/drug_selection.dart b/app/lib/drug_selection/pages/drug_selection.dart
@@ -32,15 +32,14 @@ class DrugSelectionPage extends HookWidget {
             return unscrollablePageScaffold(
               title: context.l10n.drug_selection_header,
               canNavigateBack: !concludesOnboarding,
+              contextToDismissFocusOnTap: context,
               body: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   Padding(
                     padding: EdgeInsets.symmetric(vertical: PharMeTheme.smallSpace),
                     child: PageDescription.fromText(
-                      concludesOnboarding
-                        ? context.l10n.drug_selection_onboarding_description
-                        : context.l10n.drug_selection_settings_description,
+                      context.l10n.drug_selection_settings_description,
                     ),
                   ),
                   Expanded(child: _buildDrugList(context, state)),
@@ -67,10 +66,29 @@ class DrugSelectionPage extends HookWidget {
       child: FullWidthButton(
         context.l10n.action_continue,
         () async {
-          MetaData.instance.initialDrugSelectionDone = true;
-          await MetaData.save();
-          // ignore: use_build_context_synchronously
-          await overwriteRoutes(context, nextPage: MainRoute());
+          await showAdaptiveDialog(
+            context: context,
+            builder: (context) => DialogWrapper(
+              title: context.l10n.drug_selection_continue_warning_title,
+              content: Text(context.l10n.drug_selection_continue_warning),
+              actions: [
+                DialogAction(
+                  onPressed: context.router.root.maybePop,
+                  text: context.l10n.action_cancel,
+                ),
+                DialogAction(
+                  onPressed: () async {
+                    MetaData.instance.initialDrugSelectionDone = true;
+                    await MetaData.save();
+                    // ignore: use_build_context_synchronously
+                    await overwriteRoutes(context, nextPage: MainRoute());
+                  },
+                  text: context.l10n.action_understood,
+                  isDefault: true,
+                ),
+              ],
+            ),
+          );
         },
         enabled: _isEditable(state),
       )