Clean up network page (#432)

- no part off - no typedefs
ubuntu-flutter-community · Aug 6, 2023 · fa7014b · fa7014b
1 parent f7b7626
commit fa7014b
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 26 deletions.
diff --git a/lib/view/pages/connections/models/access_point_model.dart b/lib/view/pages/connections/models/access_point_model.dart
@@ -1,4 +1,6 @@
-part of 'wifi_model.dart';
+import 'package:flutter/foundation.dart';
+import 'package:nm/nm.dart';
+import 'package:settings/view/pages/connections/models/property_stream_notifier.dart';
 
 enum ActiveConnectionState {
   unknown,
@@ -17,6 +19,8 @@ class AccessPointModel extends PropertyStreamNotifier {
     addPropertyListener('Strength', notifyListeners);
   }
   final NetworkManagerAccessPoint _networkManagerAccessPoint;
+  NetworkManagerAccessPoint get networkManagerAccessPoint =>
+      _networkManagerAccessPoint;
   late final NetworkManagerDeviceWireless _networkManagerDeviceWireless;
 
   bool get isActive =>

diff --git a/lib/view/pages/connections/models/wifi_device_model.dart b/lib/view/pages/connections/models/wifi_device_model.dart
@@ -1,4 +1,8 @@
-part of 'wifi_model.dart';
+import 'package:collection/collection.dart';
+import 'package:flutter/foundation.dart';
+import 'package:nm/nm.dart';
+import 'package:settings/view/pages/connections/models/access_point_model.dart';
+import 'package:settings/view/pages/connections/models/property_stream_notifier.dart';
 
 class WifiDeviceModel extends PropertyStreamNotifier {
   WifiDeviceModel(this._networkManagerDevice) {
@@ -10,6 +14,7 @@ class WifiDeviceModel extends PropertyStreamNotifier {
     addPropertyListener('LastScan', notifyListeners);
   }
   final NetworkManagerDevice _networkManagerDevice;
+  NetworkManagerDevice get networkManagerDevice => _networkManagerDevice;
   late final NetworkManagerDeviceWireless _networkManagerDeviceWireless;
 
   List<AccessPointModel> get accesPoints {

diff --git a/lib/view/pages/connections/models/wifi_model.dart b/lib/view/pages/connections/models/wifi_model.dart
@@ -1,19 +1,10 @@
-import 'package:collection/collection.dart';
 import 'package:dbus/dbus.dart';
-import 'package:flutter/foundation.dart';
 import 'package:nm/nm.dart';
-
-import '../data/authentication.dart';
-import '../extensions/network_service_x.dart';
-import 'property_stream_notifier.dart';
-
-part 'access_point_model.dart';
-part 'wifi_device_model.dart';
-
-typedef OnAuthenticate = Future<Authentication?> Function(
-  WifiDeviceModel wifiAdaptor,
-  AccessPointModel accessPoint,
-);
+import 'package:settings/view/pages/connections/data/authentication.dart';
+import 'package:settings/view/pages/connections/extensions/network_service_x.dart';
+import 'package:settings/view/pages/connections/models/access_point_model.dart';
+import 'package:settings/view/pages/connections/models/property_stream_notifier.dart';
+import 'package:settings/view/pages/connections/models/wifi_device_model.dart';
 
 class WifiModel extends PropertyStreamNotifier {
   WifiModel(this._networkManagerClient) {
@@ -47,14 +38,17 @@ class WifiModel extends PropertyStreamNotifier {
   void connectToAccesPoint(
     AccessPointModel accessPointModel,
     WifiDeviceModel wifiAdaptorModel,
-    OnAuthenticate onAuth,
+    Future<Authentication?> Function(
+      WifiDeviceModel wifiAdaptor,
+      AccessPointModel accessPoint,
+    ) onAuth,
   ) async {
     if (accessPointModel.isActive) return;
 
     try {
       var connection = await _networkManagerClient.findConnectionFor(
-        accessPointModel._networkManagerAccessPoint,
-        wifiAdaptorModel._networkManagerDevice,
+        accessPointModel.networkManagerAccessPoint,
+        wifiAdaptorModel.networkManagerDevice,
       );
       if (connection == null) {
         Authentication? authentication;
@@ -73,9 +67,9 @@ class WifiModel extends PropertyStreamNotifier {
       }
 
       await _networkManagerClient.activateConnection(
-        device: wifiAdaptorModel._networkManagerDevice,
+        device: wifiAdaptorModel.networkManagerDevice,
         connection: connection,
-        accessPoint: accessPointModel._networkManagerAccessPoint,
+        accessPoint: accessPointModel.networkManagerAccessPoint,
       );
     } on DBusMethodResponseException catch (e) {
       errorMessage = e.toString();

diff --git a/lib/view/pages/connections/widgets/access_point_tile.dart b/lib/view/pages/connections/widgets/access_point_tile.dart
@@ -1,9 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:settings/view/pages/connections/models/access_point_model.dart';
 import 'package:yaru_icons/yaru_icons.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
-import '../models/wifi_model.dart';
-
 class AccessPointTile extends StatelessWidget {
   const AccessPointTile({
     required this.accessPointModel,

diff --git a/lib/view/pages/connections/widgets/authentication_dialog.dart b/lib/view/pages/connections/widgets/authentication_dialog.dart
@@ -1,10 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'package:settings/view/pages/connections/data/authentication.dart';
+import 'package:settings/view/pages/connections/models/access_point_model.dart';
 import 'package:yaru_icons/yaru_icons.dart';
 
-import '../data/authentication.dart';
-import '../models/wifi_model.dart';
-
 class AuthenticationDialog extends StatelessWidget {
   AuthenticationDialog({super.key});
 

diff --git a/lib/view/pages/connections/wifi_content.dart b/lib/view/pages/connections/wifi_content.dart
@@ -3,6 +3,7 @@ import 'package:provider/provider.dart';
 import 'package:settings/constants.dart';
 import 'package:settings/l10n/l10n.dart';
 import 'package:settings/view/common/yaru_switch_row.dart';
+import 'package:settings/view/pages/connections/models/access_point_model.dart';
 import 'package:settings/view/pages/settings_page.dart';
 import 'package:settings/view/settings_section.dart';
 import 'package:yaru_icons/yaru_icons.dart';