Connections and Wallpaper: increase radii (#279)

ubuntu-flutter-community · Feb 19, 2022 · a4316d1 · a4316d1
1 parent 52f7940
commit a4316d1
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 28 deletions.
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
@@ -1,7 +1,7 @@
 {
   "appTitle": "Ubuntu Einstellungen",
   "searchHint": "Suche...",
-  "connected": "Verbunden",
+  "connected": "verbunden",
   "disonnected": "Nicht verbunden",
   "yes": "Ja",
   "no": "Nein",
@@ -73,6 +73,7 @@
   "screenLockPageTitle": "Bildschirmsperre",
   "diagnosisPageTitle": "Fehlerdiagnose",
   "connectionsPageTitle": "Verbindungen",
+  "connectionsPageHeadline": "Sichtbare Netzwerke",
   "wifiPageTitle": "Wi-Fi",
   "ethernetPageTitle": "Ethernet",
   "cellularPageTitle": "Mobilfunk",

diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -73,6 +73,7 @@
   "screenLockPageTitle": "Screen Lock",
   "diagnosisPageTitle": "Diagnostics",
   "connectionsPageTitle": "Connections",
+  "connectionsPageHeadline": "Visible networks",
   "wifiPageTitle": "Wi-Fi",
   "ethernetPageTitle": "Ethernet",
   "cellularPageTitle": "Cellular",

diff --git a/lib/view/pages/connections/connections_page.dart b/lib/view/pages/connections/connections_page.dart
@@ -9,7 +9,7 @@ import 'package:yaru_widgets/yaru_widgets.dart';
 
 import 'models/wifi_model.dart';
 
-class ConnectionsPage extends StatefulWidget {
+class ConnectionsPage extends StatelessWidget {
   static Widget create(BuildContext context) {
     final service = Provider.of<NetworkManagerClient>(context, listen: false);
     return ChangeNotifierProvider<WifiModel>(
@@ -30,20 +30,6 @@ class ConnectionsPage extends StatefulWidget {
 
   const ConnectionsPage({Key? key}) : super(key: key);
 
-  @override
-  State<ConnectionsPage> createState() => _ConnectionsPageState();
-}
-
-class _ConnectionsPageState extends State<ConnectionsPage>
-    with TickerProviderStateMixin {
-  late TabController tabController;
-
-  @override
-  void initState() {
-    tabController = TabController(length: 3, vsync: this);
-    super.initState();
-  }
-
   @override
   Widget build(BuildContext context) {
     final wifiModel = context.watch<WifiModel>();
@@ -59,12 +45,14 @@ class _ConnectionsPageState extends State<ConnectionsPage>
       wifiModel.isWifiDeviceAvailable
           ? const WifiDevicesContent()
           : const WifiAdaptorNotFound(),
-      Column(
-        children: const [Text('Ethernet')],
-      ),
-      Column(
-        children: const [Text('Cellular')],
-      )
+      const YaruPage(children: [
+        // TODO: Implement Ethernet page
+        Text('Ethernet - Please implement 🥲️'),
+      ]),
+      const YaruPage(children: [
+        // TODO: Implement Cellular page
+        Text('Cellular - Please implement 🥲️'),
+      ]),
     ], width: kDefaultWidth);
   }
 }
diff --git a/lib/view/pages/connections/wifi_content.dart b/lib/view/pages/connections/wifi_content.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:settings/constants.dart';
+import 'package:settings/l10n/l10n.dart';
 import 'package:yaru_icons/yaru_icons.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
@@ -25,7 +26,9 @@ class WifiDevicesContent extends StatelessWidget {
             actionWidget: Row(
               children: [
                 Text(
-                  wifiModel.isWifiEnabled ? 'connected' : 'disconnected',
+                  wifiModel.isWifiEnabled
+                      ? context.l10n.connected
+                      : context.l10n.disonnected,
                   style: TextStyle(
                       color: Theme.of(context)
                           .colorScheme
@@ -44,7 +47,7 @@ class WifiDevicesContent extends StatelessWidget {
                 builder: (_, __) {
                   return YaruSection(
                     width: kDefaultWidth,
-                    headline: 'Visible Networks',
+                    headline: context.l10n.connectionsPageHeadline,
                     children: [
                       for (final accessPoint in wifiDevice.accesPoints)
                         AccessPointTile(

diff --git a/lib/view/pages/wallpaper/wallpaper_page.dart b/lib/view/pages/wallpaper/wallpaper_page.dart
@@ -179,15 +179,30 @@ class _AddWallpaperTile extends StatelessWidget {
     final model = context.read<WallpaperModel>();
     return Padding(
       padding: const EdgeInsets.all(6.0),
-      child: OutlinedButton(
-        onPressed: () async {
+      child: InkWell(
+        borderRadius: BorderRadius.circular(8),
+        onTap: () async {
           final picPath = await openFilePicker(context);
           if (null != picPath) {
             model.pictureUri = picPath;
             model.copyToCollection(picPath);
           }
         },
-        child: const Icon(YaruIcons.plus),
+        child: Container(
+          decoration: BoxDecoration(
+            border: Border.all(
+              color: Theme.of(context).colorScheme.onSurface.withOpacity(0.15),
+            ),
+            borderRadius: BorderRadius.circular(8),
+          ),
+          child: Padding(
+            padding: const EdgeInsets.all(6.0),
+            child: ClipRRect(
+              borderRadius: BorderRadius.circular(8),
+              child: const Icon(YaruIcons.plus),
+            ),
+          ),
+        ),
       ),
     );
   }

diff --git a/pubspec.lock b/pubspec.lock
@@ -952,7 +952,7 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: cd5058fe96f00615870af34f03c152ad19c4c42e
+      resolved-ref: "5148015afc952dbe0770aea4af44f7abaf921be8"
       url: "https://github.com/ubuntu/yaru_widgets.dart"
     source: git
     version: "1.0.5"