Merge branch 'main' into development

mediocre9 · Oct 24, 2023 · 4164af3 · 4164af3
2 parents 4237784 + 0a0a1a5
commit 4164af3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/screens/bluetooth_home_screen/bluetooth_home_screen.dart b/lib/screens/bluetooth_home_screen/bluetooth_home_screen.dart
@@ -146,8 +146,10 @@ class BluetoothHomeScreen extends StatelessWidget with StandardAppWidgets {
 
       case ShowPairedDevices():
         return DevicesListView(devices: state.devices);
+
       case ShowDiscoveredDevices():
         return DevicesListView(devices: state.devices);
+
       case ScanAnimation():
         return RadarAnimation(text: state.text);
 
@@ -165,6 +167,7 @@ class BluetoothHomeScreen extends StatelessWidget with StandardAppWidgets {
             ],
           ),
         );
+
       default:
         return Container();
     }

diff --git a/lib/screens/bluetooth_home_screen/cubit/bluetooth_home_cubit.dart b/lib/screens/bluetooth_home_screen/cubit/bluetooth_home_cubit.dart
@@ -109,4 +109,4 @@ class BluetoothHomeCubit extends Cubit<BluetoothHomeState> {
     final currentState = _paired.isNotEmpty ? ShowPairedDevices(devices: _paired) : Initial(text: Strings.bluetoothOnHomeDescription, icon: Icons.bluetooth_rounded);
     emit(currentState);
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up @@
         final currentState = _paired.isNotEmpty ? ShowPairedDevices(devices: _paired) : Initial(text: Strings.bluetoothOnHomeDescription, icon: Icons.bluetooth_rounded);
         emit(currentState);
       }
-    }
+    }