fix: migration

hpi-studyu · Jan 31, 2023 · 3ac8f19 · 3ac8f19
1 parent c4afe51
commit 3ac8f19
Show file tree

Hide file tree

Showing 47 changed files with 86 additions and 91 deletions.
diff --git a/app/lib/routes.dart b/app/lib/routes.dart
@@ -58,7 +58,7 @@ class Routes {
       case loading:
         return MaterialPageRoute(builder: (_) => const LoadingScreen(), settings: settings);
       case dashboard:
-        return MaterialPageRoute(builder: (_) => DashboardScreen(), settings: settings);
+        return MaterialPageRoute(builder: (_) => const DashboardScreen(), settings: settings);
       case welcome:
         return MaterialPageRoute(builder: (_) => WelcomeScreen(), settings: settings);
       case about:

diff --git a/app/lib/screens/app_onboarding/terms.dart b/app/lib/screens/app_onboarding/terms.dart
@@ -113,7 +113,7 @@ class LegalSection extends StatelessWidget {
     final theme = Theme.of(context);
     return Column(
       children: [
-        Text(title, style: theme.textTheme.headline4.copyWith(color: theme.primaryColor)),
+        Text(title, style: theme.textTheme.headlineMedium.copyWith(color: theme.primaryColor)),
         const SizedBox(height: 20),
         Text(description),
         const SizedBox(height: 20),

diff --git a/app/lib/screens/study/dashboard/contact_tab/contact_screen.dart b/app/lib/screens/study/dashboard/contact_tab/contact_screen.dart
@@ -76,9 +76,9 @@ class ContactWidget extends StatelessWidget {
       return Container();
     }
 
-    final titles = [Text(title, style: theme.textTheme.headline6.copyWith(color: color))];
+    final titles = [Text(title, style: theme.textTheme.titleLarge.copyWith(color: color))];
     if (subtitle != null && subtitle.isNotEmpty) {
-      titles.add(Text(subtitle, style: theme.textTheme.subtitle1.copyWith(fontSize: 14)));
+      titles.add(Text(subtitle, style: theme.textTheme.titleMedium.copyWith(fontSize: 14)));
     }
 
     return Column(

diff --git a/app/lib/screens/study/dashboard/dashboard.dart b/app/lib/screens/study/dashboard/dashboard.dart
@@ -106,6 +106,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                   onTap: () async {
                     final iconAuthors = ['Kiranshastry'];
                     final PackageInfo packageInfo = await PackageInfo.fromPlatform();
+                    if(!mounted) return;
                     showAboutDialog(
                       context: context,
                       applicationIcon: const Image(image: AssetImage('assets/images/icon.png'), height: 32),

diff --git a/app/lib/screens/study/dashboard/settings.dart b/app/lib/screens/study/dashboard/settings.dart
@@ -80,13 +80,13 @@ class _SettingsState extends State<Settings> {
             const SizedBox(height: 24),
             Text(
               '${AppLocalizations.of(context).study_current} ${subject.study.title}',
-              style: theme.textTheme.headline6,
+              style: theme.textTheme.titleLarge,
             ),
             const SizedBox(height: 8),
             ElevatedButton.icon(
               icon: const Icon(MdiIcons.exitToApp),
               label: Text(AppLocalizations.of(context).opt_out),
-              style: ElevatedButton.styleFrom(primary: Colors.orange[800]),
+              style: ElevatedButton.styleFrom(backgroundColor: Colors.orange[800]),
               onPressed: () {
                 showDialog(context: context, builder: (_) => OptOutAlertDialog(subject: subject));
               },
@@ -95,7 +95,7 @@ class _SettingsState extends State<Settings> {
             ElevatedButton.icon(
               icon: const Icon(Icons.delete),
               label: Text(AppLocalizations.of(context).delete_data),
-              style: ElevatedButton.styleFrom(primary: Colors.red),
+              style: ElevatedButton.styleFrom(backgroundColor: Colors.red),
               onPressed: () {
                 showDialog(context: context, builder: (_) => DeleteAlertDialog());
               },
@@ -136,7 +136,7 @@ class OptOutAlertDialog extends StatelessWidget {
         ElevatedButton.icon(
           icon: const Icon(MdiIcons.exitToApp),
           label: const Text('Opt-out'),
-          style: ElevatedButton.styleFrom(primary: Colors.orange[800], elevation: 0),
+          style: ElevatedButton.styleFrom(backgroundColor: Colors.orange[800], elevation: 0),
           onPressed: () async {
             subject.delete();
             deleteActiveStudyReference();
@@ -159,7 +159,7 @@ class DeleteAlertDialog extends StatelessWidget {
           ElevatedButton.icon(
             icon: const Icon(Icons.delete),
             label: const Text('Delete all local data'),
-            style: ElevatedButton.styleFrom(primary: Colors.red, elevation: 0),
+            style: ElevatedButton.styleFrom(backgroundColor: Colors.red, elevation: 0),
             onPressed: () async {
               deleteLocalData();
               Navigator.pushNamedAndRemoveUntil(context, Routes.welcome, (_) => false);

diff --git a/app/lib/screens/study/onboarding/consent.dart b/app/lib/screens/study/onboarding/consent.dart
@@ -103,15 +103,15 @@ class _ConsentScreenState extends State<ConsentScreen> {
                     children: [
                       TextSpan(
                         text: AppLocalizations.of(context).please_give_consent,
-                        style: theme.textTheme.subtitle1,
+                        style: theme.textTheme.titleMedium,
                       ),
                       TextSpan(
                         text: ' ',
-                        style: theme.textTheme.subtitle1,
+                        style: theme.textTheme.titleMedium,
                       ),
                       TextSpan(
                         text: AppLocalizations.of(context).please_give_consent_why,
-                        style: theme.textTheme.subtitle2.copyWith(color: theme.primaryColor),
+                        style: theme.textTheme.titleSmall.copyWith(color: theme.primaryColor),
                         recognizer: TapGestureRecognizer()
                           ..onTap = () => showDialog(
                                 context: context,
@@ -212,7 +212,7 @@ class ConsentCard extends StatelessWidget {
             children: [
               Icon(MdiIcons.fromString(consent.iconName), size: 60, color: Colors.blue),
               const SizedBox(height: 10),
-              Text(consent.title, style: Theme.of(context).textTheme.subtitle2),
+              Text(consent.title, style: Theme.of(context).textTheme.titleSmall),
             ],
           ),
         ),

diff --git a/app/lib/screens/study/onboarding/eligibility_screen.dart b/app/lib/screens/study/onboarding/eligibility_screen.dart
@@ -77,7 +77,7 @@ class _EligibilityScreenState extends State<EligibilityScreen> {
           color: Colors.green,
           size: 32,
         ),
-        content: Text(AppLocalizations.of(context).eligible_yes, style: Theme.of(context).textTheme.subtitle1),
+        content: Text(AppLocalizations.of(context).eligible_yes, style: Theme.of(context).textTheme.titleMedium),
         actions: [Container()],
         forceActionsBelow: true,
         backgroundColor: Colors.green[50],
@@ -92,7 +92,7 @@ class _EligibilityScreenState extends State<EligibilityScreen> {
         content: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Text(AppLocalizations.of(context).eligible_no, style: Theme.of(context).textTheme.subtitle1),
+            Text(AppLocalizations.of(context).eligible_no, style: Theme.of(context).textTheme.titleMedium),
             const SizedBox(height: 4),
             Text(activeResult.firstFailed.reason),
             const SizedBox(height: 4),
@@ -125,7 +125,7 @@ class _EligibilityScreenState extends State<EligibilityScreen> {
             padding: const EdgeInsets.all(8),
             child: Text(
               AppLocalizations.of(context).please_answer_eligibility,
-              style: theme.textTheme.subtitle1,
+              style: theme.textTheme.titleMedium,
             ),
           ),
           Expanded(

diff --git a/app/lib/screens/study/onboarding/intervention_selection.dart b/app/lib/screens/study/onboarding/intervention_selection.dart
@@ -33,12 +33,12 @@ class _InterventionSelectionScreenState extends State<InterventionSelectionScree
         children: [
           Text(
             AppLocalizations.of(context).please_select_interventions,
-            style: theme.textTheme.subtitle1,
+            style: theme.textTheme.titleMedium,
           ),
           const SizedBox(height: 8),
           Text(
             AppLocalizations.of(context).please_select_interventions_description,
-            style: theme.textTheme.bodyText2.copyWith(color: theme.textTheme.caption.color),
+            style: theme.textTheme.bodyMedium.copyWith(color: theme.textTheme.bodySmall.color),
           ),
         ],
       ),

diff --git a/app/lib/screens/study/onboarding/journey_overview.dart b/app/lib/screens/study/onboarding/journey_overview.dart
@@ -96,7 +96,7 @@ class Timeline extends StatelessWidget {
             date: now.add(Duration(days: index * subject.study.schedule.phaseDuration)),
             isFirst: index == 0,
           );
-        }).toList(),
+        }),
         InterventionTile(
           title: AppLocalizations.of(context).journey_results_available,
           iconName: 'flagCheckered',
@@ -144,7 +144,7 @@ class InterventionTile extends StatelessWidget {
       beforeLineStyle: LineStyle(color: theme.primaryColor),
       afterLineStyle: LineStyle(color: theme.primaryColor),
       endChild: TimelineChild(
-        child: Text(title, style: theme.textTheme.headline6.copyWith(color: theme.primaryColor)),
+        child: Text(title, style: theme.textTheme.titleLarge.copyWith(color: theme.primaryColor)),
       ),
       startChild: TimelineChild(
         child: Text(DateFormat('dd-MM-yyyy').format(date), style: const TextStyle(fontWeight: FontWeight.bold)),

diff --git a/app/lib/screens/study/onboarding/study_selection.dart b/app/lib/screens/study/onboarding/study_selection.dart
@@ -39,23 +39,23 @@ class StudySelectionScreen extends StatelessWidget {
                   children: [
                     Text(
                       AppLocalizations.of(context).study_selection_description,
-                      style: theme.textTheme.headline5,
+                      style: theme.textTheme.headlineSmall,
                     ),
                     const SizedBox(height: 8),
                     RichText(
                       text: TextSpan(
                         children: [
                           TextSpan(
                             text: AppLocalizations.of(context).study_selection_single,
-                            style: theme.textTheme.subtitle2,
+                            style: theme.textTheme.titleSmall,
                           ),
                           TextSpan(
                             text: ' ',
-                            style: theme.textTheme.subtitle2,
+                            style: theme.textTheme.titleSmall,
                           ),
                           TextSpan(
                             text: AppLocalizations.of(context).study_selection_single_why,
-                            style: theme.textTheme.subtitle2.copyWith(color: theme.primaryColor),
+                            style: theme.textTheme.titleSmall.copyWith(color: theme.primaryColor),
                             recognizer: TapGestureRecognizer()
                               ..onTap = () => showDialog(
                                     context: context,

diff --git a/app/lib/screens/study/report/performance/performance_details.dart b/app/lib/screens/study/report/performance/performance_details.dart
@@ -35,7 +35,7 @@ class PerformanceDetailsScreen extends StatelessWidget {
               children: <Widget>[
                 Padding(
                   padding: const EdgeInsets.all(8),
-                  child: Text(AppLocalizations.of(context).performance_overview, style: theme.textTheme.subtitle1),
+                  child: Text(AppLocalizations.of(context).performance_overview, style: theme.textTheme.titleMedium),
                 ),
                 Padding(
                   padding: const EdgeInsets.all(8),

diff --git a/app/lib/screens/study/report/report_history.dart b/app/lib/screens/study/report/report_history.dart
@@ -61,7 +61,7 @@ class ReportHistoryItem extends StatelessWidget {
                 ),
                 Text(
                   subject.study.title,
-                  style: theme.textTheme.headline5.copyWith(color: isActiveStudy ? Colors.white : Colors.black),
+                  style: theme.textTheme.headlineSmall.copyWith(color: isActiveStudy ? Colors.white : Colors.black),
                 ),
               ],
             ),

diff --git a/app/lib/screens/study/report/sections/average_section_widget.dart b/app/lib/screens/study/report/sections/average_section_widget.dart
@@ -67,7 +67,7 @@ class AverageSectionWidget extends ReportSectionWidget {
           charts.ChartTitle(
             AppLocalizations.of(context).report_axis_phase,
             behaviorPosition: charts.BehaviorPosition.bottom,
-            titleStyleSpec: convertTextTheme(Theme.of(context).textTheme.caption),
+            titleStyleSpec: convertTextTheme(Theme.of(context).textTheme.bodySmall),
           )
       ],
       domainAxis: charts.NumericAxisSpec(

diff --git a/app/lib/util/save_pdf.dart b/app/lib/util/save_pdf.dart
@@ -29,7 +29,7 @@ Future<String> savePDF(BuildContext context, String title, List<pw.Widget> conte
 
     return filePath.split(':')[1];
   } catch (e) {
-    print('Error saving file with FileDialog ${e.toString()}');
+    print('Error saving file with FileDialog $e');
     return null;
   }
 }
diff --git a/app/lib/widgets/fhir_questionnaire/annotated_scale_question_widget.dart b/app/lib/widgets/fhir_questionnaire/annotated_scale_question_widget.dart
@@ -30,7 +30,7 @@ class _AnnotatedScaleQuestionWidgetState extends State<AnnotatedScaleQuestionWid
   }
 
   Widget _constructAnnotationWidgetFor(Annotation annotation, BuildContext context) {
-    return Text(annotation.annotation, style: Theme.of(context).textTheme.headline6);
+    return Text(annotation.annotation, style: Theme.of(context).textTheme.titleLarge);
   }
 
   List<Widget> _generateAnnotations(BuildContext context) {

diff --git a/app/lib/widgets/fhir_questionnaire/choice_question_widget.dart b/app/lib/widgets/fhir_questionnaire/choice_question_widget.dart
@@ -66,7 +66,7 @@ class _ChoiceQuestionWidgetState extends State<ChoiceQuestionWidget> {
       choiceWidgets.add(
         ElevatedButton(
           onPressed: confirm,
-          style: ElevatedButton.styleFrom(primary: Theme.of(context).colorScheme.secondary),
+          style: ElevatedButton.styleFrom(backgroundColor: Theme.of(context).colorScheme.secondary),
           child: Text(AppLocalizations.of(context).confirm),
         ),
       );

diff --git a/app/lib/widgets/fhir_questionnaire/question_header.dart b/app/lib/widgets/fhir_questionnaire/question_header.dart
@@ -11,7 +11,7 @@ class QuestionHeader extends StatelessWidget {
     if (subtitle == null) return [];
     return [
       const SizedBox(height: 8),
-      Text(subtitle, style: Theme.of(context).textTheme.caption),
+      Text(subtitle, style: Theme.of(context).textTheme.bodySmall),
     ];
   }
 
@@ -44,7 +44,7 @@ class QuestionHeader extends StatelessWidget {
             mainAxisSize: MainAxisSize.min,
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              Text(prompt, style: Theme.of(context).textTheme.subtitle1),
+              Text(prompt, style: Theme.of(context).textTheme.titleMedium),
               ..._buildSubtitle(context),
             ],
           ),

diff --git a/app/lib/widgets/intervention_card.dart b/app/lib/widgets/intervention_card.dart
@@ -72,7 +72,7 @@ class InterventionCardTitle extends StatelessWidget {
       dense: true,
       title: Row(
         children: [
-          Expanded(child: Text(intervention.name, style: theme.textTheme.headline6)),
+          Expanded(child: Text(intervention.name, style: theme.textTheme.titleLarge)),
           if (showDescriptionButton)
             IconButton(
               icon: const Icon(Icons.info_outline),
@@ -85,7 +85,7 @@ class InterventionCardTitle extends StatelessWidget {
                     title: ListTile(
                       leading: Icon(MdiIcons.fromString(intervention.icon), color: theme.colorScheme.secondary),
                       dense: true,
-                      title: Text(intervention.name, style: theme.textTheme.headline6),
+                      title: Text(intervention.name, style: theme.textTheme.titleLarge),
                     ),
                     content: Text(description ?? ''),
                   );
@@ -114,7 +114,7 @@ class InterventionCardDescription extends StatelessWidget {
       padding: const EdgeInsets.fromLTRB(16, 4, 16, 8),
       child: Text(
         description,
-        style: theme.textTheme.bodyText2.copyWith(color: theme.textTheme.caption.color),
+        style: theme.textTheme.bodyMedium.copyWith(color: theme.textTheme.bodySmall.color),
       ),
     );
   }
@@ -141,7 +141,7 @@ class _TaskList extends StatelessWidget {
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
-              Text(AppLocalizations.of(context).tasks_daily, style: theme.textTheme.bodyText2),
+              Text(AppLocalizations.of(context).tasks_daily, style: theme.textTheme.bodyMedium),
             ],
           ),
         ),
@@ -156,15 +156,15 @@ class _TaskList extends StatelessWidget {
                   padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
                   child: Row(
                     children: [
-                      Expanded(child: Text(task.title, style: theme.textTheme.bodyText2)),
+                      Expanded(child: Text(task.title, style: theme.textTheme.bodyMedium)),
                       Row(
                         children: [
-                          Icon(Icons.access_time, size: 16, color: theme.textTheme.caption.color),
+                          Icon(Icons.access_time, size: 16, color: theme.textTheme.bodySmall.color),
                           const SizedBox(width: 4),
                           Text(
                             scheduleString(task.schedule.completionPeriods),
                             style:
-                                theme.textTheme.bodyText2.copyWith(fontSize: 12, color: theme.textTheme.caption.color),
+                                theme.textTheme.bodyMedium.copyWith(fontSize: 12, color: theme.textTheme.bodySmall.color),
                           ),
                         ],
                       ),

diff --git a/app/lib/widgets/questionnaire/annotated_scale_question_widget.dart b/app/lib/widgets/questionnaire/annotated_scale_question_widget.dart
@@ -30,7 +30,7 @@ class _AnnotatedScaleQuestionWidgetState extends State<AnnotatedScaleQuestionWid
   }
 
   Widget _constructAnnotationWidgetFor(Annotation annotation, BuildContext context) {
-    return Text(annotation.annotation, style: Theme.of(context).textTheme.headline6);
+    return Text(annotation.annotation, style: Theme.of(context).textTheme.titleLarge);
   }
 
   List<Widget> _generateAnnotations(BuildContext context) {

diff --git a/app/lib/widgets/questionnaire/question_header.dart b/app/lib/widgets/questionnaire/question_header.dart
@@ -11,7 +11,7 @@ class QuestionHeader extends StatelessWidget {
     if (subtitle == null) return [];
     return [
       const SizedBox(height: 8),
-      Text(subtitle, style: Theme.of(context).textTheme.caption),
+      Text(subtitle, style: Theme.of(context).textTheme.bodySmall),
     ];
   }
 
@@ -44,7 +44,7 @@ class QuestionHeader extends StatelessWidget {
             mainAxisSize: MainAxisSize.min,
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              Text(prompt, style: Theme.of(context).textTheme.subtitle1),
+              Text(prompt, style: Theme.of(context).textTheme.titleMedium),
               ..._buildSubtitle(context),
             ],
           ),

diff --git a/app/lib/widgets/selectable_button.dart b/app/lib/widgets/selectable_button.dart
@@ -20,8 +20,7 @@ class SelectableButton extends StatelessWidget {
       height: 48,
       child: OutlinedButton(
         style: OutlinedButton.styleFrom(
-          primary: _getTextColor(theme),
-          backgroundColor: _getFillColor(theme),
+          foregroundColor: _getTextColor(theme), backgroundColor: _getFillColor(theme),
         ),
         onPressed: onTap,
         child: child,

diff --git a/app/lib/widgets/study_tile.dart b/app/lib/widgets/study_tile.dart
@@ -45,7 +45,7 @@ class StudyTile extends StatelessWidget {
         ListTile(
           contentPadding: contentPadding,
           onTap: onTap,
-          title: Center(child: Text(title, style: theme.textTheme.headline6.copyWith(color: theme.primaryColor))),
+          title: Center(child: Text(title, style: theme.textTheme.titleLarge.copyWith(color: theme.primaryColor))),
           subtitle: Center(child: Text(description)),
           leading: Icon(MdiIcons.fromString(iconName ?? 'accountHeart'), color: theme.primaryColor),
         ),

diff --git a/core/lib/src/models/questionnaire/answer.dart b/core/lib/src/models/questionnaire/answer.dart
@@ -11,7 +11,7 @@ class Answer<V> {
   DateTime timestamp;
 
   static const String keyResponse = 'response';
-  @JsonKey(ignore: true)
+  @JsonKey(includeToJson: false, includeFromJson: false)
   late V response;
 
   Answer(this.question, this.timestamp);

diff --git a/core/lib/src/models/questionnaire/question_conditional.dart b/core/lib/src/models/questionnaire/question_conditional.dart
@@ -7,7 +7,7 @@ part 'question_conditional.g.dart';
 @JsonSerializable()
 class QuestionConditional<V> {
   static const String keyDefaultValue = 'defaultValue';
-  @JsonKey(ignore: true)
+  @JsonKey(includeToJson: false, includeFromJson: false)
   V? defaultValue;
   late Expression condition;
 

diff --git a/core/lib/src/models/questionnaire/questionnaire_state.dart b/core/lib/src/models/questionnaire/questionnaire_state.dart
@@ -21,7 +21,7 @@ class QuestionnaireState {
     if (answer is Answer<T>) {
       return answer.response;
     } else {
-      throw ArgumentError("'Answer<${T.toString()}>' requested but found '${answer.runtimeType.toString()}'.");
+      throw ArgumentError("'Answer<$T>' requested but found '${answer.runtimeType}'.");
     }
   }
 }