PrivacyPanel: add kDefaultWidth and enabled flags (#271)

ubuntu-flutter-community · Feb 17, 2022 · 9b5d866 · 9b5d866
1 parent 0a45e3d
commit 9b5d866
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/lib/view/pages/privacy/reporting_page.dart b/lib/view/pages/privacy/reporting_page.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'package:settings/constants.dart';
 import 'package:settings/services/settings_service.dart';
 import 'package:settings/view/pages/privacy/reporting_model.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
@@ -19,11 +20,13 @@ class ReportingPage extends StatelessWidget {
     final model = context.watch<ReportingModel>();
     return YaruPage(children: [
       YaruSwitchRow(
+        width: kDefaultWidth,
         trailingWidget: const Text('Send error reports to Ubuntu'),
         value: model.reportTechnicalProblems,
         onChanged: (value) => model.reportTechnicalProblems = value,
       ),
       YaruSwitchRow(
+        width: kDefaultWidth,
         trailingWidget: const Text('Send software usage to Ubuntu'),
         value: model.sendSoftwareUsageStats,
         onChanged: (value) => model.sendSoftwareUsageStats = value,

diff --git a/lib/view/pages/privacy/screen_saver_page.dart b/lib/view/pages/privacy/screen_saver_page.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'package:settings/constants.dart';
 import 'package:settings/services/settings_service.dart';
 import 'package:settings/view/pages/power/power_settings.dart';
 import 'package:settings/view/pages/power/power_settings_widgets.dart';
@@ -20,6 +21,7 @@ class ScreenSaverPage extends StatelessWidget {
     final model = context.watch<ScreenSaverModel>();
     return YaruPage(children: [
       YaruRow(
+        width: kDefaultWidth,
         enabled: model.idleDelay != null,
         trailingWidget: const Text('Blank Screen'),
         actionWidget: DurationDropdownButton(
@@ -29,20 +31,28 @@ class ScreenSaverPage extends StatelessWidget {
         ),
       ),
       YaruSwitchRow(
+          enabled: model.showOnLockScreen != null,
+          width: kDefaultWidth,
           trailingWidget: const Text('Show notifications on lock screen'),
           value: model.showOnLockScreen,
           onChanged: (v) => model.showOnLockScreen = v),
       YaruSwitchRow(
+          enabled: model.lockEnabled != null,
+          width: kDefaultWidth,
           trailingWidget: const Text('Auto lock screen'),
           value: model.lockEnabled,
           onChanged: (v) => model.lockEnabled = v),
       YaruSliderRow(
+          enabled: model.lockDelay != null,
+          width: kDefaultWidth,
           actionLabel: 'Time',
           value: model.lockDelay?.toDouble(),
           min: 0,
           max: 3600,
           onChanged: (v) => model.lockDelay = v.toInt()),
       YaruSwitchRow(
+          enabled: model.ubuntuLockOnSuspend != null,
+          width: kDefaultWidth,
           trailingWidget: const Text('Lock screen on suspend'),
           value: model.ubuntuLockOnSuspend,
           onChanged: (v) => model.ubuntuLockOnSuspend = v),