Seventh Version

OPENER-next · Dec 11, 2023 · 05e021d · 05e021d
1 parent efd1d9f
commit 05e021d
Show file tree

Hide file tree

Showing 8 changed files with 192 additions and 212 deletions.
diff --git a/lib/screens/home.dart b/lib/screens/home.dart
diff --git a/lib/widgets/home_sidebar/home_sidebar.dart b/lib/widgets/home_sidebar/home_sidebar.dart
@@ -60,19 +60,6 @@ class HomeSidebar extends ViewFragment<HomeViewModel> {
             title: appLocale.helpTitle,
             onTap: () => Navigator.push(context, Routes.help),
           ),
-          Visibility(
-            visible: false,
-            maintainState: true,
-            maintainSemantics: true,
-            maintainSize: true,
-            maintainAnimation: true,
-            maintainInteractivity: true,
-            child: CustomListTile(
-              leadingIcon: Icons.arrow_back,
-              title: appLocale.semanticsCloseNavigationMenuButton,
-              onTap: () => Navigator.pop(context),
-            ),
-          ),
         ],
       ),
     );

diff --git a/lib/widgets/map_overlay/zoom_button.dart b/lib/widgets/map_overlay/zoom_button.dart
@@ -26,8 +26,6 @@ class ZoomButton extends StatelessWidget {
         child: Column(
           children: [
             Semantics( 
-              container: true,
-              sortKey: const OrdinalSortKey(1.0, name: 'ZoomButton'),
               child: SizedBox(
                 height: (Theme.of(context).floatingActionButtonTheme.smallSizeConstraints?.minHeight ?? 48.0) * 1.25,
                 width: Theme.of(context).floatingActionButtonTheme.smallSizeConstraints?.minWidth ?? 48.0,
@@ -47,8 +45,6 @@ class ZoomButton extends StatelessWidget {
               color: Theme.of(context).colorScheme.onPrimaryContainer.withOpacity(0.1),
             ),
             Semantics(
-              container: true,
-              sortKey: const OrdinalSortKey(2.0, name: 'ZoomButton'),
               child: SizedBox(
                 height: (Theme.of(context).floatingActionButtonTheme.smallSizeConstraints?.minHeight ?? 48.0) * 1.25,
                 width: Theme.of(context).floatingActionButtonTheme.smallSizeConstraints?.minWidth ?? 48.0,

diff --git a/lib/widgets/osm_element_layer/osm_element_marker.dart b/lib/widgets/osm_element_layer/osm_element_marker.dart
@@ -61,9 +61,9 @@ class _OsmElementMarkerState extends State<OsmElementMarker> with SingleTickerPr
     // add repaint boundary for performance improvement
     // this way a marker will only be redrawn if itself changes
     return Semantics(
-      label: widget.label,
       excludeSemantics: widget.active ? true : false,
       blockUserActions: widget.active ? true : false,
+      label: widget.active ? null : widget.label,
       child: RepaintBoundary(
         child: Center(
           child: GestureDetector(

diff --git a/lib/widgets/question_dialog/question_navigation_bar.dart b/lib/widgets/question_dialog/question_navigation_bar.dart
@@ -70,27 +70,29 @@ class QuestionNavigationBar extends StatelessWidget {
               child: nextText == null
               ? null
               : Semantics(
-                container: true,
-                button: true,
-                enabled: onNext != null,
-                sortKey: const OrdinalSortKey(1.0, name: 'questionDialog'),
-                child: TextButton(
-                  key: ValueKey(nextText),
-                  // mimic disabled style
-                  style: onNext != null
-                    ? _buttonStyle
-                    : _buttonStyle.merge(disabledButtonStyle),
-                  // if button is disabled vibrate when pressed as additional feedback
-                  onPressed: onNext ?? HapticFeedback.vibrate,
-                  isSemanticButton: true,
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.end,
-                    children: [
-                      Text(nextText!, semanticsLabel: nextTextSemantics,),
-                      const Icon(Icons.chevron_right_rounded),
-                    ],
+                  container: true,
+                  sortKey: const OrdinalSortKey(1.0, name: 'questionDialog'),
+                  child: TextButton(
+                    key: ValueKey(nextText),
+                    // mimic disabled style
+                    style: onNext != null
+                      ? _buttonStyle
+                      : _buttonStyle.merge(disabledButtonStyle),
+                    // if button is disabled vibrate when pressed as additional feedback
+                    onPressed: onNext ?? HapticFeedback.vibrate,
+                    isSemanticButton: false,
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.end,
+                      children: [
+                        Semantics(
+                          button: true,
+                          enabled: onNext != null,
+                          child: Text(nextText!, semanticsLabel: nextTextSemantics,),
+                        ),
+                        const Icon(Icons.chevron_right_rounded),
+                      ],
+                    ),
                   ),
-                ),
               ),
             ),
           ),

diff --git a/lib/widgets/question_inputs/bool_input.dart b/lib/widgets/question_inputs/bool_input.dart
@@ -31,17 +31,19 @@ class BoolInput extends QuestionInputWidget<BoolAnswerDefinition, BoolAnswer> {
             child:_BoolInputItem(
               label: Semantics(
                 container: true, 
+                checked: controller.answer?.value == state, 
                 selected: controller.answer?.value == state, 
                 child: Text(definition.input[index].name ?? 
                   (state ? appLocale.yes : appLocale.no)),
               ),
-            onTap: () => _handleChange(state, appLocale),
-            active: controller.answer?.value == state,
-            backgroundColor: theme.colorScheme.primary.withOpacity(0),
-            activeBackgroundColor: theme.colorScheme.primary,
-            foregroundColor: theme.colorScheme.primary,
-            activeForegroundColor: theme.colorScheme.onPrimary,
-          ),);
+              onTap: () => _handleChange(state, appLocale),
+              active: controller.answer?.value == state,
+              backgroundColor: theme.colorScheme.primary.withOpacity(0),
+              activeBackgroundColor: theme.colorScheme.primary,
+              foregroundColor: theme.colorScheme.primary,
+              activeForegroundColor: theme.colorScheme.onPrimary,
+            ),
+          );
         }, growable: false),
       ),
     );

diff --git a/lib/widgets/question_inputs/list_input.dart b/lib/widgets/question_inputs/list_input.dart
@@ -26,6 +26,7 @@ class ListInput extends QuestionInputWidget<ListAnswerDefinition, ListAnswer> {
           description: item.description,
           imagePath: item.image,
           onTap: () => _handleChange(index, appLocale),
+          isMultiList: false,
         );
       }, growable: false),
     );
@@ -49,10 +50,12 @@ class ListInputItem extends StatefulWidget {
   final double imagePadding;
   final bool active;
   final VoidCallback onTap;
+  final bool isMultiList;
 
   const ListInputItem({
     required this.label,
     required this.onTap,
+    required this.isMultiList,
     this.active = false,
     this.description,
     this.imagePath,
@@ -123,7 +126,9 @@ class _ListInputItemState extends State<ListInputItem> with SingleTickerProvider
                     ),
                     child: Semantics(
                       container: true,
-                      selected: widget.active,
+                      inMutuallyExclusiveGroup: widget.isMultiList ? true : null,
+                      checked: widget.active,
+                      selected: widget.isMultiList ? widget.active : null,
                       child: Text(
                         semanticsLabel: '${widget.label} ${widget.description ?? ''}',
                         widget.label,

diff --git a/lib/widgets/question_inputs/multi_list_input.dart b/lib/widgets/question_inputs/multi_list_input.dart
@@ -27,6 +27,7 @@ class MultiListInput extends QuestionInputWidget<MultiListAnswerDefinition, Mult
           description: item.description,
           imagePath: item.image,
           onTap: () => _handleChange(index, appLocale),
+          isMultiList: true,
         );
       }, growable: false),
     );