Added more icons

vovagorodok · Jun 10, 2024 · 354fd78 · 354fd78
1 parent 9be1cd1
commit 354fd78
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 20 deletions.
diff --git a/lib/src/screens/pin_screen.dart b/lib/src/screens/pin_screen.dart
@@ -122,12 +122,12 @@ class PinScreenState extends State<PinScreen> {
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
                     ElevatedButton.icon(
-                      icon: const Icon(Icons.upload),
+                      icon: const Icon(Icons.upload_rounded),
                       label: Text(tr('Set')),
                       onPressed: _canSetPin() ? _setPin : null,
                     ),
                     ElevatedButton.icon(
-                      icon: const Icon(Icons.delete),
+                      icon: const Icon(Icons.delete_rounded),
                       label: Text(tr('Remove')),
                       onPressed: _canChange() ? _removePin : null,
                     ),

diff --git a/lib/src/screens/scanner_screen.dart b/lib/src/screens/scanner_screen.dart
@@ -55,7 +55,7 @@ class ScannerScreenState extends State<ScannerScreen> {
         child: ListTile(
           title: Text(device.name),
           subtitle: Text("${device.id}\nRSSI: ${device.rssi}"),
-          leading: const Icon(Icons.bluetooth),
+          leading: const Icon(Icons.bluetooth_rounded),
           onTap: () async {
             _stopScan();
             await Navigator.push(
@@ -103,7 +103,7 @@ class ScannerScreenState extends State<ScannerScreen> {
         centerTitle: true,
         actions: [
           IconButton(
-            icon: const Icon(Icons.settings),
+            icon: const Icon(Icons.settings_rounded),
             onPressed: () async {
               _stopScan();
               await Navigator.push(
@@ -132,14 +132,14 @@ class ScannerScreenState extends State<ScannerScreen> {
                   mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                   children: [
                     ElevatedButton.icon(
-                      icon: const Icon(Icons.search),
+                      icon: const Icon(Icons.search_rounded),
                       label: Text(tr('Scan')),
                       onPressed: !bleScanner.state.scanIsInProgress
                           ? _startScan
                           : null,
                     ),
                     ElevatedButton.icon(
-                      icon: const Icon(Icons.search_off),
+                      icon: const Icon(Icons.search_off_rounded),
                       label: Text(tr('Stop')),
                       onPressed:
                           bleScanner.state.scanIsInProgress ? _stopScan : null,

diff --git a/lib/src/screens/settings_screen.dart b/lib/src/screens/settings_screen.dart
@@ -19,7 +19,7 @@ class SettingsScreenState extends State<SettingsScreen> {
         centerTitle: true,
         actions: [
           IconButton(
-            icon: const Icon(Icons.cached),
+            icon: const Icon(Icons.cached_rounded),
             onPressed: () => setState(Settings.clearCache),
           ),
         ],

diff --git a/lib/src/screens/status_screen.dart b/lib/src/screens/status_screen.dart
@@ -31,6 +31,23 @@ class StatusScreenState extends State<StatusScreen> {
     }
   }
 
+  IconData _determineIcon(BleStatus status) {
+    switch (status) {
+      case BleStatus.unsupported:
+        return Icons.bluetooth_disabled_rounded;
+      case BleStatus.unauthorized:
+        return Icons.person_off_rounded;
+      case BleStatus.poweredOff:
+        return Icons.bluetooth_disabled_rounded;
+      case BleStatus.locationServicesDisabled:
+        return Icons.location_off_rounded;
+      case BleStatus.ready:
+        return Icons.bluetooth_rounded;
+      default:
+        return Icons.autorenew_rounded;
+    }
+  }
+
   void _evaluateBleStatus(BleStatus status) {
     setState(() {
       if (status == BleStatus.ready) {
@@ -62,15 +79,24 @@ class StatusScreenState extends State<StatusScreen> {
           body: SafeArea(
             child: Padding(
               padding: const EdgeInsets.all(25.0),
-              child: Center(
-                child: Text(
-                  _determineText(ble.status),
-                  textAlign: TextAlign.center,
-                  style: const TextStyle(
-                    fontWeight: FontWeight.bold,
-                    fontSize: 30.0,
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Text(
+                    _determineText(ble.status),
+                    textAlign: TextAlign.center,
+                    style: const TextStyle(
+                      fontWeight: FontWeight.bold,
+                      fontSize: 30.0,
+                    ),
+                  ),
+                  const SizedBox(height: 20),
+                  Icon(
+                    _determineIcon(ble.status),
+                    size: 100,
                   ),
-                ),
+                ],
               ),
             ),
           ),

diff --git a/lib/src/screens/upload_screen.dart b/lib/src/screens/upload_screen.dart
@@ -169,13 +169,13 @@ class UploadScreenState extends State<UploadScreen> {
     } else if (uploadStatus == WorkStatus.error ||
         infoStatus == WorkStatus.error) {
       return const Icon(
-        Icons.error,
+        Icons.error_rounded,
         color: Colors.red,
         size: 56,
       );
     } else if (uploadStatus == WorkStatus.success) {
       return const Icon(
-        Icons.done,
+        Icons.done_rounded,
         color: Colors.green,
         size: 56,
       );
@@ -220,7 +220,7 @@ class UploadScreenState extends State<UploadScreen> {
           subtitle: Text("v${sw.version}"),
           trailing: sw.text != null
               ? IconButton(
-                  icon: const Icon(Icons.info),
+                  icon: const Icon(Icons.info_rounded),
                   onPressed: () async => await Navigator.push(
                     context,
                     MaterialPageRoute(
@@ -322,7 +322,7 @@ class UploadScreenState extends State<UploadScreen> {
           centerTitle: true,
           actions: [
             IconButton(
-              icon: const Icon(Icons.pin),
+              icon: const Icon(Icons.pin_rounded),
               onPressed: _canUpload()
                   ? () async => await Navigator.push(
                         context,
@@ -360,7 +360,7 @@ class UploadScreenState extends State<UploadScreen> {
                 ),
                 if (_canUploadLocalFile())
                   ElevatedButton.icon(
-                    icon: const Icon(Icons.file_open),
+                    icon: const Icon(Icons.file_open_rounded),
                     label: Text(tr('UploadFile')),
                     onPressed: _canUpload() ? _pickFile : null,
                   ),