Adapt to YaruPage removal

See ubuntu/yaru.dart#244
ubuntu-flutter-community · Oct 7, 2022 · d1fa5a7 · d1fa5a7
1 parent c0304a5
commit d1fa5a7
Show file tree

Hide file tree

Showing 32 changed files with 96 additions and 43 deletions.
diff --git a/lib/view/pages/accessibility/accessibility_page.dart b/lib/view/pages/accessibility/accessibility_page.dart
@@ -8,6 +8,7 @@ import 'package:settings/view/pages/accessibility/hearing_section.dart';
 import 'package:settings/view/pages/accessibility/pointing_and_clicking_section.dart';
 import 'package:settings/view/pages/accessibility/seeing_section.dart';
 import 'package:settings/view/pages/accessibility/typing_section.dart';
+import 'package:settings/view/pages/settings_page.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class AccessibilityPage extends StatelessWidget {
@@ -33,7 +34,7 @@ class AccessibilityPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return const YaruPage(
+    return const SettingsPage(
       children: [
         GlobalSection(),
         SeeingSection(),

diff --git a/lib/view/pages/appearance/appearance_page.dart b/lib/view/pages/appearance/appearance_page.dart
@@ -5,6 +5,7 @@ import 'package:settings/services/settings_service.dart';
 import 'package:settings/view/pages/appearance/dock_model.dart';
 import 'package:settings/view/pages/appearance/theme_section.dart';
 import 'package:settings/view/pages/appearance/dock_section.dart';
+import 'package:settings/view/pages/settings_page.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class AppearancePage extends StatelessWidget {
@@ -30,7 +31,7 @@ class AppearancePage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return const YaruPage(
+    return const SettingsPage(
       children: [
         ThemeSection(),
         DockSection(),

diff --git a/lib/view/pages/apps/apps_page.dart b/lib/view/pages/apps/apps_page.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:settings/l10n/l10n.dart';
+import 'package:settings/view/pages/settings_page.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class AppsPage extends StatelessWidget {
@@ -17,7 +18,7 @@ class AppsPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return YaruPage(
+    return SettingsPage(
       children: [
         Center(
           child: Text(context.l10n.appsPageTitle),

diff --git a/lib/view/pages/bluetooth/bluetooth_page.dart b/lib/view/pages/bluetooth/bluetooth_page.dart
@@ -5,6 +5,7 @@ import 'package:settings/constants.dart';
 import 'package:settings/l10n/l10n.dart';
 import 'package:settings/view/pages/bluetooth/bluetooth_device_row.dart';
 import 'package:settings/view/pages/bluetooth/bluetooth_model.dart';
+import 'package:settings/view/pages/settings_page.dart';
 import 'package:yaru_settings/yaru_settings.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
@@ -43,7 +44,7 @@ class _BluetoothPageState extends State<BluetoothPage> {
   @override
   Widget build(BuildContext context) {
     final model = context.watch<BluetoothModel>();
-    return YaruPage(
+    return SettingsPage(
       children: [
         SizedBox(
           width: kDefaultWidth,

diff --git a/lib/view/pages/color/color_page.dart b/lib/view/pages/color/color_page.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:settings/l10n/l10n.dart';
+import 'package:settings/view/pages/settings_page.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class ColorPage extends StatelessWidget {
@@ -17,7 +18,7 @@ class ColorPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return YaruPage(
+    return SettingsPage(
       children: [Center(child: Text(context.l10n.color))],
     );
   }

diff --git a/lib/view/pages/connections/connections_page.dart b/lib/view/pages/connections/connections_page.dart
@@ -4,6 +4,7 @@ import 'package:provider/provider.dart';
 import 'package:settings/constants.dart';
 import 'package:settings/l10n/l10n.dart';
 import 'package:settings/view/pages/connections/wifi_content.dart';
+import 'package:settings/view/pages/settings_page.dart';
 import 'package:yaru_icons/yaru_icons.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
@@ -44,13 +45,13 @@ class ConnectionsPage extends StatelessWidget {
         wifiModel.isWifiDeviceAvailable
             ? const WifiDevicesContent()
             : const WifiAdaptorNotFound(),
-        const YaruPage(
+        const SettingsPage(
           children: [
             // TODO: Implement Ethernet page
             Text('Ethernet - Please implement 🥲️'),
           ],
         ),
-        const YaruPage(
+        const SettingsPage(
           children: [
             // TODO: Implement Cellular page
             Text('Cellular - Please implement 🥲️'),

diff --git a/lib/view/pages/connections/wifi_content.dart b/lib/view/pages/connections/wifi_content.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:settings/constants.dart';
 import 'package:settings/l10n/l10n.dart';
+import 'package:settings/view/pages/settings_page.dart';
 import 'package:yaru_icons/yaru_icons.dart';
 import 'package:yaru_settings/yaru_settings.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
@@ -18,7 +19,7 @@ class WifiDevicesContent extends StatelessWidget {
   Widget build(BuildContext context) {
     final wifiModel = context.watch<WifiModel>();
 
-    return YaruPage(
+    return SettingsPage(
       children: [
         SizedBox(
           width: kDefaultWidth,

diff --git a/lib/view/pages/date_and_time/date_time_page.dart b/lib/view/pages/date_and_time/date_time_page.dart
@@ -6,6 +6,7 @@ import 'package:settings/services/date_time_service.dart';
 import 'package:settings/services/settings_service.dart';
 import 'package:settings/view/pages/date_and_time/date_time_model.dart';
 import 'package:settings/view/pages/date_and_time/timezones.dart';
+import 'package:settings/view/pages/settings_page.dart';
 import 'package:yaru_settings/yaru_settings.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
@@ -45,7 +46,7 @@ class _DateTimePageState extends State<DateTimePage> {
   @override
   Widget build(BuildContext context) {
     final model = context.watch<DateTimeModel>();
-    return YaruPage(
+    return SettingsPage(
       children: [
         SizedBox(
           width: kDefaultWidth,
@@ -159,7 +160,7 @@ class _TimezoneSelectDialog extends StatelessWidget {
     final model = context.read<DateTimeModel>();
     return YaruAlertDialog(
       title: 'Select a timezone',
-      child: YaruPage(
+      child: SettingsPage(
         children: [
           for (var timezone in timezones)
             InkWell(

diff --git a/lib/view/pages/default_apps/default_apps_page.dart b/lib/view/pages/default_apps/default_apps_page.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:settings/l10n/l10n.dart';
+import 'package:settings/view/pages/settings_page.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class DefaultAppsPage extends StatelessWidget {
@@ -19,7 +20,7 @@ class DefaultAppsPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return YaruPage(
+    return SettingsPage(
       children: [
         Center(
           child: Text(context.l10n.defaultAppsPageTitle),

diff --git a/lib/view/pages/displays/displays_page.dart b/lib/view/pages/displays/displays_page.dart
@@ -6,6 +6,7 @@ import 'package:settings/services/display/display_service.dart';
 import 'package:settings/view/pages/displays/displays_configuration.dart';
 import 'package:settings/view/pages/displays/displays_model.dart';
 import 'package:settings/view/pages/displays/widgets/monitor_section.dart';
+import 'package:settings/view/pages/settings_page.dart';
 import 'package:yaru_icons/yaru_icons.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
@@ -65,7 +66,7 @@ class _DisplaysPageState extends State<DisplaysPage> {
   ) {
     switch (section) {
       case DisplaysPageSection.displays:
-        return YaruPage(
+        return SettingsPage(
           children: [
             SizedBox(
               width: kDefaultWidth,
@@ -80,7 +81,7 @@ class _DisplaysPageState extends State<DisplaysPage> {
           ],
         );
       case DisplaysPageSection.night:
-        return YaruPage(
+        return SettingsPage(
           children: [
             Center(
               child: Text(context.l10n.nightMode),

diff --git a/lib/view/pages/info/info_page.dart b/lib/view/pages/info/info_page.dart
@@ -7,6 +7,7 @@ import 'package:settings/constants.dart';
 import 'package:settings/l10n/l10n.dart';
 import 'package:settings/services/hostname_service.dart';
 import 'package:settings/services/pdf_service.dart';
+import 'package:settings/view/pages/settings_page.dart';
 import 'package:udisks/udisks.dart';
 import 'package:yaru_colors/yaru_colors.dart';
 import 'package:yaru_icons/yaru_icons.dart';
@@ -63,7 +64,7 @@ class _InfoPageState extends State<InfoPage> {
       ),
     );
 
-    return YaruPage(
+    return SettingsPage(
       children: [
         const SizedBox(height: 20),
         Row(

diff --git a/lib/view/pages/keyboard/keyboard_settings_page.dart b/lib/view/pages/keyboard/keyboard_settings_page.dart
@@ -7,7 +7,7 @@ import 'package:settings/view/pages/keyboard/input_source_section.dart';
 import 'package:settings/view/pages/keyboard/input_source_selection_section.dart';
 import 'package:settings/view/pages/keyboard/special_characters_model.dart';
 import 'package:settings/view/pages/keyboard/special_characters_section.dart';
-import 'package:yaru_widgets/yaru_widgets.dart';
+import 'package:settings/view/pages/settings_page.dart';
 
 class KeyboardSettingsPage extends StatelessWidget {
   const KeyboardSettingsPage({
@@ -21,7 +21,7 @@ class KeyboardSettingsPage extends StatelessWidget {
     final inputSourceService =
         Provider.of<InputSourceService>(context, listen: false);
 
-    return YaruPage(
+    return SettingsPage(
       children: [
         ChangeNotifierProvider(
           create: (_) => InputSourceModel(settingsService, inputSourceService),

diff --git a/lib/view/pages/keyboard/keyboard_shortcuts_page.dart b/lib/view/pages/keyboard/keyboard_shortcuts_page.dart
@@ -6,14 +6,15 @@ import 'package:settings/services/keyboard_service.dart';
 import 'package:settings/services/settings_service.dart';
 import 'package:settings/view/pages/keyboard/keyboard_shortcut_row.dart';
 import 'package:settings/view/pages/keyboard/keyboard_shortcuts_model.dart';
+import 'package:settings/view/pages/settings_page.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class KeyboardShortcutsPage extends StatelessWidget {
   const KeyboardShortcutsPage({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    return YaruPage(
+    return SettingsPage(
       children: [
         ChangeNotifierProvider(
           create: (_) => KeyboardShortcutsModel(

diff --git a/lib/view/pages/mouse_and_touchpad/mouse_and_touchpad_page.dart b/lib/view/pages/mouse_and_touchpad/mouse_and_touchpad_page.dart
@@ -6,6 +6,7 @@ import 'package:settings/view/pages/mouse_and_touchpad/general_section.dart';
 import 'package:settings/view/pages/mouse_and_touchpad/mouse_and_touchpad_model.dart';
 import 'package:settings/view/pages/mouse_and_touchpad/mouse_section.dart';
 import 'package:settings/view/pages/mouse_and_touchpad/touchpad_section.dart';
+import 'package:settings/view/pages/settings_page.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class MouseAndTouchpadPage extends StatelessWidget {
@@ -31,7 +32,7 @@ class MouseAndTouchpadPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return const YaruPage(
+    return const SettingsPage(
       children: [
         GeneralSection(),
         MouseSection(),

diff --git a/lib/view/pages/multitasking/multi_tasking_page.dart b/lib/view/pages/multitasking/multi_tasking_page.dart
@@ -7,6 +7,7 @@ import 'package:settings/l10n/l10n.dart';
 import 'package:settings/services/settings_service.dart';
 import 'package:settings/utils.dart';
 import 'package:settings/view/pages/multitasking/multi_tasking_model.dart';
+import 'package:settings/view/pages/settings_page.dart';
 import 'package:yaru_settings/yaru_settings.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
@@ -39,7 +40,7 @@ class MultiTaskingPage extends StatelessWidget {
         ? Theme.of(context).primaryColor
         : lighten(Theme.of(context).primaryColor, 20);
 
-    return YaruPage(
+    return SettingsPage(
       children: [
         YaruSection(
           width: kDefaultWidth,

diff --git a/lib/view/pages/notifications/notifications_page.dart b/lib/view/pages/notifications/notifications_page.dart
@@ -5,6 +5,7 @@ import 'package:settings/services/settings_service.dart';
 import 'package:settings/view/pages/notifications/app_notifications_section.dart';
 import 'package:settings/view/pages/notifications/global_notifications_section.dart';
 import 'package:settings/view/pages/notifications/notifications_model.dart';
+import 'package:settings/view/pages/settings_page.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class NotificationsPage extends StatelessWidget {
@@ -30,7 +31,7 @@ class NotificationsPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return const YaruPage(
+    return const SettingsPage(
       children: [
         GlobalNotificationsSection(),
         AppNotificationsSection(),

diff --git a/lib/view/pages/online_accounts/online_accounts_page.dart b/lib/view/pages/online_accounts/online_accounts_page.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:settings/l10n/l10n.dart';
+import 'package:settings/view/pages/settings_page.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class OnlineAccountsPage extends StatelessWidget {
@@ -19,7 +20,7 @@ class OnlineAccountsPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return YaruPage(
+    return SettingsPage(
       children: [Center(child: Text(context.l10n.onlineAccountsPageTitle))],
     );
   }

diff --git a/lib/view/pages/power/power_page.dart b/lib/view/pages/power/power_page.dart
@@ -6,6 +6,7 @@ import 'package:settings/view/pages/power/lid_close_section.dart';
 import 'package:settings/view/pages/power/power_profile_section.dart';
 import 'package:settings/view/pages/power/power_settings_section.dart';
 import 'package:settings/view/pages/power/suspend_section.dart';
+import 'package:settings/view/pages/settings_page.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class PowerPage extends StatelessWidget {
@@ -23,7 +24,7 @@ class PowerPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return YaruPage(
+    return SettingsPage(
       children: <Widget>[
         BatterySection.create(context),
         PowerProfileSection.create(context),

diff --git a/lib/view/pages/privacy/connectivity_page.dart b/lib/view/pages/privacy/connectivity_page.dart
@@ -4,6 +4,7 @@ import 'package:provider/provider.dart';
 import 'package:settings/constants.dart';
 import 'package:settings/l10n/l10n.dart';
 import 'package:settings/view/pages/privacy/connectivity_model.dart';
+import 'package:settings/view/pages/settings_page.dart';
 import 'package:settings/view/section_description.dart';
 import 'package:yaru_settings/yaru_settings.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
@@ -31,7 +32,7 @@ class _ConnectivityPageState extends State<ConnectivityPage> {
   @override
   Widget build(BuildContext context) {
     final model = context.watch<ConnectivityModel>();
-    return YaruPage(
+    return SettingsPage(
       children: [
         SectionDescription(
           width: kDefaultWidth,

diff --git a/lib/view/pages/privacy/house_keeping_page.dart b/lib/view/pages/privacy/house_keeping_page.dart
@@ -5,6 +5,7 @@ import 'package:settings/l10n/l10n.dart';
 import 'package:settings/services/house_keeping_service.dart';
 import 'package:settings/services/settings_service.dart';
 import 'package:settings/view/pages/privacy/privacy_model.dart';
+import 'package:settings/view/pages/settings_page.dart';
 import 'package:settings/view/section_description.dart';
 import 'package:yaru_icons/yaru_icons.dart';
 import 'package:yaru_settings/yaru_settings.dart';
@@ -24,7 +25,7 @@ class HouseKeepingPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final model = context.watch<PrivacyModel>();
-    return YaruPage(
+    return SettingsPage(
       children: [
         YaruSection(
           width: kDefaultWidth,

diff --git a/lib/view/pages/privacy/location_page.dart b/lib/view/pages/privacy/location_page.dart
@@ -5,6 +5,7 @@ import 'package:settings/l10n/l10n.dart';
 import 'package:settings/services/settings_service.dart';
 import 'package:settings/view/link.dart';
 import 'package:settings/view/pages/privacy/location_model.dart';
+import 'package:settings/view/pages/settings_page.dart';
 import 'package:settings/view/section_description.dart';
 import 'package:yaru_settings/yaru_settings.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
@@ -23,7 +24,7 @@ class LocationPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final model = context.watch<LocationModel>();
-    return YaruPage(
+    return SettingsPage(
       children: [
         SectionDescription(
           width: kDefaultWidth,

diff --git a/lib/view/pages/privacy/privacy_page.dart b/lib/view/pages/privacy/privacy_page.dart
@@ -6,6 +6,7 @@ import 'package:settings/view/pages/privacy/house_keeping_page.dart';
 import 'package:settings/view/pages/privacy/location_page.dart';
 import 'package:settings/view/pages/privacy/reporting_page.dart';
 import 'package:settings/view/pages/privacy/screen_saver_page.dart';
+import 'package:settings/view/pages/settings_page.dart';
 import 'package:yaru_icons/yaru_icons.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
@@ -50,7 +51,7 @@ class PrivacyPage extends StatelessWidget {
       views: [
         ConnectivityPage.create(context),
         LocationPage.create(context),
-        const YaruPage(
+        const SettingsPage(
           // TODO: implement Thunderbolt!
           children: [
             Padding(