feat(app): adapt more content

hpi-dhc · Dec 9, 2024 · b555af4 · b555af4
1 parent 05379de
commit b555af4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 19 deletions.
diff --git a/app/lib/l10n/app_en.arb b/app/lib/l10n/app_en.arb
@@ -519,6 +519,8 @@
 
   "more_page_account_settings": "Settings",
   "@more_page_account_settings": {},
+  "more_page_edit_current_medications": "Edit current medications",
+  "@more_page_edit_current_medications": {},
   "more_page_delete_data": "Delete app data",
   "@more_page_delete_data": {},
   "more_page_delete_data_text": "Are you sure that you want to delete all app data? This also includes your genetic data and will reset the app.",
@@ -529,7 +531,7 @@
   "@more_page_delete_data_confirmation": {},
   "more_page_app_information": "App information",
   "@more_page_app_information": {},
-  "more_page_onboarding": "Repeat onboarding",
+  "more_page_onboarding": "Repeat app intro",
   "@more_page_onboarding": {},
   "more_page_app_tour": "Repeat app tour",
   "@more_page_app_tour": {},
@@ -545,7 +547,7 @@
   "@more_page_terms_and_conditions": {},
   "more_page_terms_and_conditions_text": "These aren't the Droids you're looking for.",
   "@more_page_terms_and_conditions_text": {},
-  "more_page_help_and_feedback": "Help & Feedback",
+  "more_page_help_and_feedback": "Help & feedback",
   "@more_page_help_and_feedback": {},
   "more_page_genetic_information": "Learn about genetics (MedlinePlus)",
   "@more_page_genetic_information": {},

diff --git a/app/lib/more/pages/more.dart b/app/lib/more/pages/more.dart
@@ -18,7 +18,7 @@ class MorePage extends StatelessWidget {
             useLine: false,
           ),
           _buildSettingsItem(
-            title: context.l10n.drug_selection_header,
+            title: context.l10n.more_page_edit_current_medications,
             onTap: () => context.router.push(
               DrugSelectionRoute(concludesOnboarding: false)
             ),
@@ -31,14 +31,12 @@ class MorePage extends StatelessWidget {
             ),
           ),
           SubheaderDivider(
-            text: context.l10n.more_page_app_information,
+            text: context.l10n.more_page_help_and_feedback,
             useLine: false,
           ),
-          _buildSettingsItem(
-            title: context.l10n.more_page_onboarding,
-            onTap: () =>
-              context.router.push(OnboardingRoute(isRevisiting: true)),
-          ),
+           _buildSettingsItem(
+              title: context.l10n.more_page_contact_us,
+              onTap: () => sendEmail(context)),
           _buildSettingsItem(
             title: context.l10n.more_page_app_tour,
             onTap: () async => showAppTour(
@@ -47,6 +45,18 @@ class MorePage extends StatelessWidget {
               revisiting: true,
             ),
           ),
+          _buildSettingsItem(
+            title: context.l10n.more_page_onboarding,
+            onTap: () =>
+              context.router.push(OnboardingRoute(isRevisiting: true)),
+          ),
+          _buildSettingsItem(
+              title: context.l10n.more_page_genetic_information,
+              onTap: openFurtherGeneticInformation),
+          SubheaderDivider(
+            text: context.l10n.more_page_app_information,
+            useLine: false,
+          ),
           _buildSettingsItem(
             title: context.l10n.more_page_about_us,
             onTap: () => context.router.push(AboutRoute()),
@@ -59,16 +69,6 @@ class MorePage extends StatelessWidget {
             title: context.l10n.more_page_terms_and_conditions,
             onTap: () => context.router.push(TermsRoute()),
           ),
-          SubheaderDivider(
-            text: context.l10n.more_page_help_and_feedback,
-            useLine: false,
-          ),
-          _buildSettingsItem(
-              title: context.l10n.more_page_genetic_information,
-              onTap: openFurtherGeneticInformation),
-          _buildSettingsItem(
-              title: context.l10n.more_page_contact_us,
-              onTap: () => sendEmail(context)),
         ]
       ),
     );