Disable UI elements if models return null (#233)

mivoligo · web-flow · commit da63f5aab1e5 · 2022-01-08T11:15:33.000+01:00
* Add alternative Yaru widgets to pubspec

* Update A11y page

* Update Info page

* Update Bluetooth page

* Update Connections page

* Update Multitasking page

* Update Removable Media page

* Update Keyboard page

* Update Wallpaper page

* Update Power page

* Update Appearance page

* Remove unused test

* Add default values for checkboxes in A11y page

* Fix enabled values for checkboxes in seeing section of A11y page

* Change import for yaru_widgets in pubspec file
diff --git a/lib/view/pages/accessibility/accessibility_model.dart b/lib/view/pages/accessibility/accessibility_model.dart
@@ -380,6 +380,9 @@ class AccessibilityModel extends ChangeNotifier {
     notifyListeners();
   }
 
+  bool get typingAssistAvailable =>
+      stickyKeys != null || slowKeys != null || bounceKeys != null;
+
   bool get _typingAssist =>
       (stickyKeys ?? false) || (slowKeys ?? false) || (bounceKeys ?? false);
 
@@ -501,10 +504,13 @@ class AccessibilityModel extends ChangeNotifier {
     notifyListeners();
   }
 
-  bool get clickAssist =>
+  bool get clickAssistAvailable =>
+      simulatedSecondaryClick != null || dwellClick != null;
+
+  bool get _clickAssist =>
       (simulatedSecondaryClick ?? false) || (dwellClick ?? false);
 
-  String get clickAssistString => clickAssist ? 'On' : 'Off';
+  String get clickAssistString => _clickAssist ? 'On' : 'Off';
 
   bool? get simulatedSecondaryClick =>
       _a11yMouseSettings?.boolValue(_secondaryClickEnabledKey);
diff --git a/lib/view/pages/accessibility/pointing_and_clicking_section.dart b/lib/view/pages/accessibility/pointing_and_clicking_section.dart
@@ -45,6 +45,7 @@ class _ClickAssist extends StatelessWidget {
   Widget build(BuildContext context) {
     final model = Provider.of<AccessibilityModel>(context);
     return YaruRow(
+      enabled: model.clickAssistAvailable,
       trailingWidget: const Text('Click Assist'),
       actionWidget: Row(
         children: [
diff --git a/lib/view/pages/accessibility/seeing_section.dart b/lib/view/pages/accessibility/seeing_section.dart
@@ -65,6 +65,7 @@ class _CursorSize extends StatelessWidget {
   Widget build(BuildContext context) {
     final model = Provider.of<AccessibilityModel>(context);
     return YaruRow(
+      enabled: model.cursorSize != null,
       trailingWidget: const Text('Cursor Size'),
       description: 'Cursor size can be combined with zoom '
           'to make it easier to see the cursor',
@@ -211,6 +212,7 @@ class _MagnifierOptions extends StatelessWidget {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           YaruRow(
+            enabled: model.magFactor != null,
             trailingWidget: const Text('Magnification'),
             actionWidget: SizedBox(
               height: 40,
@@ -277,7 +279,7 @@ class _MagnifierPositionOptions extends StatelessWidget {
             children: [
               YaruCheckboxRow(
                 enabled: model.screenPartEnabled,
-                value: model.scrollAtEdges,
+                value: model.scrollAtEdges ?? false,
                 onChanged: (value) => model.setScrollAtEdges(value!),
                 text: 'Magnifier extends outside of screen',
               ),
@@ -371,14 +373,14 @@ class _CrosshairsOptions extends StatelessWidget {
       child: Column(
         children: [
           YaruCheckboxRow(
-            enabled: true,
-            value: model.crossHairs,
+            enabled: model.crossHairs != null,
+            value: model.crossHairs ?? false,
             onChanged: (value) => model.setCrossHairs(value!),
             text: 'Visible',
           ),
           YaruCheckboxRow(
-            enabled: true,
-            value: model.crossHairsClip,
+            enabled: model.crossHairsClip != null,
+            value: model.crossHairsClip ?? false,
             onChanged: (value) => model.setCrossHairsClip(value!),
             text: 'Overlaps mouse cursor',
           ),
@@ -432,8 +434,8 @@ class _ColorEffectsOptions extends StatelessWidget {
       child: Column(
         children: [
           YaruCheckboxRow(
-            enabled: true,
-            value: model.inverseLightness,
+            enabled: model.inverseLightness != null,
+            value: model.inverseLightness ?? false,
             onChanged: (value) => model.setInverseLightness(value!),
             text: 'White on black',
           ),
diff --git a/lib/view/pages/accessibility/typing_section.dart b/lib/view/pages/accessibility/typing_section.dart
@@ -137,6 +137,7 @@ class _TypingAssist extends StatelessWidget {
     final model = Provider.of<AccessibilityModel>(context);
 
     return YaruRow(
+      enabled: model.typingAssistAvailable,
       trailingWidget: const Text('Typing Assist (AccessX)'),
       actionWidget: Row(
         children: [
@@ -219,14 +220,14 @@ class _StickyKeysSettings extends StatelessWidget {
       child: Column(
         children: [
           YaruCheckboxRow(
-            enabled: model.stickyKeys,
-            value: model.stickyKeysTwoKey,
+            enabled: model.stickyKeys ?? false,
+            value: model.stickyKeysTwoKey ?? false,
             onChanged: (value) => model.setStickyKeysTwoKey(value!),
             text: 'Disable if two keys are pressed at the same time',
           ),
           YaruCheckboxRow(
-            enabled: model.stickyKeys,
-            value: model.stickyKeysBeep,
+            enabled: model.stickyKeys ?? false,
+            value: model.stickyKeysBeep ?? false,
             onChanged: (value) => model.setStickyKeysBeep(value!),
             text: 'Beep when a modifier key is pressed',
           ),
@@ -256,20 +257,20 @@ class _SlowKeysSettings extends StatelessWidget {
             onChanged: (value) => model.setSlowKeysDelay(value),
           ),
           YaruCheckboxRow(
-            enabled: model.slowKeys,
-            value: model.slowKeysBeepPress,
+            enabled: model.slowKeys ?? false,
+            value: model.slowKeysBeepPress ?? false,
             onChanged: (value) => model.setSlowKeysBeepPress(value!),
             text: 'Beep when a key is pressed',
           ),
           YaruCheckboxRow(
-            enabled: model.slowKeys,
-            value: model.slowKeysBeepAccept,
+            enabled: model.slowKeys ?? false,
+            value: model.slowKeysBeepAccept ?? false,
             onChanged: (value) => model.setSlowKeysBeepAccept(value!),
             text: 'Beep when a key is accepted',
           ),
           YaruCheckboxRow(
-            enabled: model.slowKeys,
-            value: model.slowKeysBeepReject,
+            enabled: model.slowKeys ?? false,
+            value: model.slowKeysBeepReject ?? false,
             onChanged: (value) => model.setSlowKeysBeepReject(value!),
             text: 'Beep when a key is rejected',
           ),
@@ -299,8 +300,8 @@ class _BounceKeysSettings extends StatelessWidget {
             onChanged: (value) => model.setBounceKeysDelay(value),
           ),
           YaruCheckboxRow(
-            enabled: model.bounceKeys,
-            value: model.bounceKeysBeepReject,
+            enabled: model.bounceKeys ?? false,
+            value: model.bounceKeysBeepReject ?? false,
             onChanged: (value) => model.setBounceKeysBeepReject(value!),
             text: 'Beep when a key is rejected',
           ),
diff --git a/lib/view/pages/appearance/appearance_model.dart b/lib/view/pages/appearance/appearance_model.dart
@@ -70,10 +70,10 @@ class AppearanceModel extends ChangeNotifier {
 
   static const dockPositions = ['LEFT', 'RIGHT', 'BOTTOM'];
 
-  String get _realDockPosition =>
-      _dashToDockSettings?.stringValue(_dockPositionKey) ?? 'LEFT';
+  String? get _realDockPosition =>
+      _dashToDockSettings?.stringValue(_dockPositionKey);
 
-  String get dockPosition =>
+  String? get dockPosition =>
       dockPositions.contains(_realDockPosition) ? _realDockPosition : 'LEFT';
 
   set dockPosition(String? value) {
@@ -87,10 +87,10 @@ class AppearanceModel extends ChangeNotifier {
     'cycle-windows'
   ];
 
-  String get _realClickAction =>
-      _dashToDockSettings?.stringValue(_clickActionKey) ?? clickActions.first;
+  String? get _realClickAction =>
+      _dashToDockSettings?.stringValue(_clickActionKey);
 
-  String get clickAction => clickActions.contains(_realClickAction)
+  String? get clickAction => clickActions.contains(_realClickAction)
       ? _realClickAction
       : clickActions.first;
 
diff --git a/lib/view/pages/appearance/dock_section.dart b/lib/view/pages/appearance/dock_section.dart
@@ -84,6 +84,7 @@ class DockSection extends StatelessWidget {
           onChanged: (value) => model.setMaxIconSize(value),
         ),
         YaruRow(
+          enabled: model.dockPosition != null,
           trailingWidget: const Text('Dock Position'),
           actionWidget: DropdownButton<String>(
             onChanged: (value) => model.dockPosition = value,
@@ -95,6 +96,7 @@ class DockSection extends StatelessWidget {
           ),
         ),
         YaruRow(
+          enabled: model.clickAction != null,
           trailingWidget: const Text('Click Action'),
           actionWidget: DropdownButton<String>(
             onChanged: (value) => model.clickAction = value,
diff --git a/lib/view/pages/bluetooth/bluetooth_device_row.dart b/lib/view/pages/bluetooth/bluetooth_device_row.dart
@@ -78,6 +78,7 @@ class _BluetoothDeviceRowState extends State<BluetoothDeviceRow> {
                         child: Column(
                           children: [
                             YaruRow(
+                                enabled: true,
                                 trailingWidget: model.connected
                                     ? const Text('Connected')
                                     : const Text('Disconnected'),
@@ -90,18 +91,21 @@ class _BluetoothDeviceRowState extends State<BluetoothDeviceRow> {
                                       setState(() {});
                                     })),
                             YaruRow(
+                                enabled: true,
                                 trailingWidget: const Text('Paired'),
                                 actionWidget: Padding(
                                   padding: const EdgeInsets.only(right: 8),
                                   child: Text(model.paired ? 'Yes' : 'No'),
                                 )),
                             YaruRow(
+                                enabled: true,
                                 trailingWidget: const Text('Address'),
                                 actionWidget: Padding(
                                   padding: const EdgeInsets.only(right: 8),
                                   child: Text(model.address),
                                 )),
                             YaruRow(
+                                enabled: true,
                                 trailingWidget: const Text('Type'),
                                 actionWidget: Padding(
                                   padding: const EdgeInsets.only(right: 8),
@@ -156,6 +160,7 @@ class _BluetoothDeviceRowState extends State<BluetoothDeviceRow> {
       child: Padding(
         padding: const EdgeInsets.all(8.0),
         child: YaruRow(
+            enabled: true,
             trailingWidget: Text(model.name),
             actionWidget: Text(
               model.connected ? 'connected' : 'disconnected',
diff --git a/lib/view/pages/connections/widgets/access_point_tile.dart b/lib/view/pages/connections/widgets/access_point_tile.dart
@@ -22,6 +22,7 @@ class AccessPointTile extends StatelessWidget {
             borderRadius: BorderRadius.circular(4),
             onTap: onTap,
             child: YaruRow(
+              enabled: true,
               trailingWidget: Row(
                 children: [
                   Icon(accessPointModel.wifiIconData),
diff --git a/lib/view/pages/connections/wifi_content.dart b/lib/view/pages/connections/wifi_content.dart
@@ -18,6 +18,7 @@ class WifiDevicesContent extends StatelessWidget {
     return Column(
       children: [
         YaruRow(
+            enabled: true,
             trailingWidget: const Text('Wi-Fi'),
             actionWidget: Row(
               children: [
diff --git a/lib/view/pages/info/info_page.dart b/lib/view/pages/info/info_page.dart
@@ -141,6 +141,7 @@ class _Computer extends StatelessWidget {
 
     return YaruSection(headline: 'Computer', children: [
       YaruRow(
+        enabled: true,
         trailingWidget: const Text('Hostname'),
         actionWidget: Row(
           children: [
diff --git a/lib/view/pages/keyboard/input_source_selection_section.dart b/lib/view/pages/keyboard/input_source_selection_section.dart
@@ -78,6 +78,7 @@ class _InputTypeRow extends StatelessWidget {
   Widget build(BuildContext context) {
     final model = context.watch<InputSourceModel>();
     return YaruRow(
+        enabled: true,
         actionWidget: Row(
           children: [
             YaruOptionButton(
@@ -129,6 +130,7 @@ class _AddKeymapDialogState extends State<_AddKeymapDialog> {
                       variantsLoad = true;
                     }),
                     child: YaruRow(
+                      enabled: true,
                       width: 100,
                       description: model.inputSources[i].name,
                       actionWidget: const SizedBox(),
@@ -158,6 +160,7 @@ class _AddKeymapDialogState extends State<_AddKeymapDialog> {
                     },
                     borderRadius: BorderRadius.circular(4.0),
                     child: YaruRow(
+                        enabled: true,
                         width: 100,
                         trailingWidget: Text(variant.description ?? ''),
                         description: variant.name ?? '',
diff --git a/lib/view/pages/keyboard/keyboard_shortcut_row.dart b/lib/view/pages/keyboard/keyboard_shortcut_row.dart
@@ -29,6 +29,7 @@ class _KeyboardShortcutRowState extends State<KeyboardShortcutRow> {
 
     return InkWell(
       child: YaruRow(
+        enabled: true,
         trailingWidget: Text(widget.label),
         actionWidget: Row(
           children: [
diff --git a/lib/view/pages/keyboard/special_characters_section.dart b/lib/view/pages/keyboard/special_characters_section.dart
@@ -26,6 +26,7 @@ class SpecialCharactersSection extends StatelessWidget {
                   ),
                 ),
                 child: YaruRow(
+                  enabled: true,
                   trailingWidget: const Text('Compose Key'),
                   actionWidget: Text(snapshot.hasData
                       ? model.composeOptionsToStringMap[snapshot.data]!
@@ -43,6 +44,7 @@ class SpecialCharactersSection extends StatelessWidget {
                     child: const _Lv3OptionsDialog(),
                   )),
           child: YaruRow(
+            enabled: true,
             trailingWidget: const Text('Lv3 Key'),
             actionWidget: Text(snapshot.hasData
                 ? model.lv3OptionsToStringMap[snapshot.data]!
diff --git a/lib/view/pages/multitasking/multi_tasking_page.dart b/lib/view/pages/multitasking/multi_tasking_page.dart
@@ -86,12 +86,8 @@ class MultiTaskingPage extends StatelessWidget {
             onChanged: (bool? value) => model.dynamicWorkspaces = value!,
           ),
           YaruRow(
-              trailingWidget: Text(
-                'Number of workspaces',
-                style: model.dynamicWorkspaces
-                    ? TextStyle(color: Theme.of(context).disabledColor)
-                    : null,
-              ),
+              enabled: !model.dynamicWorkspaces,
+              trailingWidget: const Text('Number of workspaces'),
               actionWidget: SizedBox(
                 height: 40,
                 width: 150,
diff --git a/lib/view/pages/power/power_settings_section.dart b/lib/view/pages/power/power_settings_section.dart
@@ -69,6 +69,7 @@ class _PowerSettingsSectionState extends State<PowerSettingsSection> {
           onChanged: model.setIdleDim,
         ),
         YaruRow(
+          enabled: model.idleDelay != null,
           trailingWidget: const Text('Blank Screen'),
           actionWidget: DurationDropdownButton(
             value: model.idleDelay,
@@ -77,6 +78,7 @@ class _PowerSettingsSectionState extends State<PowerSettingsSection> {
           ),
         ),
         YaruRow(
+          enabled: true,
           trailingWidget: const Text('Automatic Suspend'),
           description: model.automaticSuspend.localize(context),
           actionWidget: SizedBox(
diff --git a/lib/view/pages/power/suspend_section.dart b/lib/view/pages/power/suspend_section.dart
@@ -29,6 +29,7 @@ class _SuspendSectionState extends State<SuspendSection> {
       headline: 'Suspend & Power Button',
       children: <Widget>[
         YaruRow(
+          enabled: model.powerButtonAction != null,
           trailingWidget: const Text('Power Button Behavior'),
           actionWidget: DropdownButton<PowerButtonAction?>(
             value: model.powerButtonAction,
diff --git a/lib/view/pages/removable_media/removable_media_page.dart b/lib/view/pages/removable_media/removable_media_page.dart
@@ -33,6 +33,7 @@ class RemovableMediaPage extends StatelessWidget {
       ),
       for (var mimeType in RemovableMediaModel.mimeTypes.entries)
         YaruRow(
+            enabled: true,
             trailingWidget: Text(mimeType.value),
             actionWidget: DropdownButton<String>(
                 value: model.getMimeTypeBehavior(mimeType.key),
diff --git a/lib/view/pages/wallpaper/color_shading_option_row.dart b/lib/view/pages/wallpaper/color_shading_option_row.dart
@@ -22,6 +22,7 @@ class ColorShadingOptionRow extends StatelessWidget {
   Widget build(BuildContext context) {
     final model = context.read<WallpaperModel>();
     return YaruRow(
+      enabled: true,
       trailingWidget: Text(actionLabel),
       description: actionDescription,
       actionWidget: Row(
diff --git a/lib/view/pages/wallpaper/wallpaper_page.dart b/lib/view/pages/wallpaper/wallpaper_page.dart
@@ -26,6 +26,7 @@ class WallpaperPage extends StatelessWidget {
 
     return YaruSection(headline: 'Set your wallpaper', children: [
       YaruRow(
+          enabled: true,
           trailingWidget: const Text('Background mode'),
           actionWidget: Row(
             children: [
@@ -102,6 +103,7 @@ class WallpaperPage extends StatelessWidget {
       if (model.wallpaperMode == WallpaperMode.imageOfTheDay)
         //TODO: Add the title and copyright info
         YaruRow(
+            enabled: true,
             trailingWidget: const Text('Image of the day from Bing'),
             actionWidget: SizedBox(
               width: 40,
@@ -119,6 +121,7 @@ class WallpaperPage extends StatelessWidget {
             const Padding(
               padding: EdgeInsets.only(top: 10),
               child: YaruRow(
+                  enabled: true,
                   trailingWidget: Text('Your wallpapers'),
                   actionWidget: SizedBox(
                     width: 40,
@@ -203,6 +206,7 @@ class WallpaperPage extends StatelessWidget {
             const Padding(
               padding: EdgeInsets.only(top: 10),
               child: YaruRow(
+                  enabled: true,
                   trailingWidget: Text('Default wallpapers'),
                   actionWidget: SizedBox(
                     width: 0,
diff --git a/pubspec.lock b/pubspec.lock
diff --git a/test/widgets/checkbox_row_test.dart b/test/widgets/checkbox_row_test.dart
