Merge pull request #360 from swetar-mecha/revamp/settings-app

fix(settigns): add lint rules for const & updated code; code updated where const required;

Author: mineshp-mecha

apps/settings/analysis_options.yaml

@@ -21,6 +21,8 @@ linter:
   # `// ignore_for_file: name_of_lint` syntax on the line or in the file
   # producing the lint.
   rules:
+    - prefer_const_constructors
+    - prefer_const_literals_to_create_immutables
     # avoid_print: false  # Uncomment to disable the `avoid_print` rule
     # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
 

apps/settings/lib/main.dart

@@ -107,14 +107,16 @@ class MechanixSettingsApp extends StatelessWidget with WatchItMixin {
         watchPropertyValue((ThemeToggle t) => t.mechanixVariant);
 
     return MechanixTheme(
-      data: MechanixThemeData(mechanixVariant: mechanixVariant, extensions: [
+      data: MechanixThemeData(mechanixVariant: mechanixVariant, extensions: const [
         MechanixNavigationBarThemeData(
-            scrolledUnderElevation: 0,
-            titleStyle: TextStyle(fontSize: 24,),
-            titleSpacing: 0,
-            backgroundColor: Colors.transparent,
-            elevation: 0,
+          scrolledUnderElevation: 0,
+          titleStyle: TextStyle(
+            fontSize: 24,
           ),
+          titleSpacing: 0,
+          backgroundColor: Colors.transparent,
+          elevation: 0,
+        ),
         MechanixSwitchThemeData(
           style: MechanixSwitchStyle(
             inactiveThumbColor: Color(0xFF989898),
@@ -215,53 +217,65 @@ class MainApp extends StatelessWidget {
         themeMode: themeMode,
         routes: {
           // Sound Routes
-          AppRoutes.sound: (context) => Sound(),
-          AppRoutes.vibrationLevel: (context) => VibrationLevel(),
-          AppRoutes.soundOutputDevices: (context) => OutputDevices(),
-          AppRoutes.soundInputDevices: (context) => InputDevices(),
-          AppRoutes.notificationSound: (context) => NotificationSound(),
+          AppRoutes.sound: (context) => const Sound(),
+          AppRoutes.vibrationLevel: (context) => const VibrationLevel(),
+          AppRoutes.soundOutputDevices: (context) => const OutputDevices(),
+          AppRoutes.soundInputDevices: (context) => const InputDevices(),
+          AppRoutes.notificationSound: (context) => const NotificationSound(),
 
           // Wireless Routes
-          AppRoutes.wireless: (context) => WirelessSettings(),
-          AppRoutes.wirelessNetworkDetails: (context) => NetworkDetails(),
-          AppRoutes.ipSettings: (context) => IpSettings(),
-          AppRoutes.ethernetDetails: (context) => EthernetSettings(),
-          AppRoutes.dnsDetails: (context) => DnsSettings(),
-          AppRoutes.wirelessNetworkSettings: (context) => NetworkSettings(),
-          AppRoutes.wirelessSavedNetworkDetails: (context) => SavedNetworkDetails(),
+          AppRoutes.wireless: (context) => const WirelessSettings(),
+          AppRoutes.wirelessNetworkDetails: (context) => const NetworkDetails(),
+          // TODO: for route level bloc 
+          // AppRoutes.wireless: (context) => BlocProvider(
+          //       create: (context) => WirelessSettingsBloc(
+          //         wifiRepository: context.read<WifiRepository>(),
+          //       )..add(InitWifi()),
+          //       child: const WirelessSettings(),
+          //     ),
+          // AppRoutes.wirelessNetworkDetails: (context) => BlocProvider.value(  // make common widget 
+          //       value: context.read<WirelessSettingsBloc>(),
+          //       child: const NetworkDetails(),
+          //     ),
+          AppRoutes.ipSettings: (context) => const IpSettings(),
+          AppRoutes.ethernetDetails: (context) => const EthernetSettings(),
+          AppRoutes.dnsDetails: (context) => const DnsSettings(),
+          AppRoutes.wirelessNetworkSettings: (context) => const NetworkSettings(),
+          AppRoutes.wirelessSavedNetworkDetails: (context) =>
+              const SavedNetworkDetails(),
           AppRoutes.wirelessConnectSecureNetwork: (context) =>
-              ConnectSecureNetwork(),
-          AppRoutes.wirelessConnectHiddenNetwork: (context) => AddNetwork(),
-          AppRoutes.configureDNS: (context) => ConfigureDnsWidget(),
-          AppRoutes.configureProxy: (context) => ConfigureProxyWidget(),
-          AppRoutes.ipv4Address: (context) => Ipv4AddressWidget(),
-          AppRoutes.security: (context) => WifiSecurityWidget(),
+              const ConnectSecureNetwork(),
+          AppRoutes.wirelessConnectHiddenNetwork: (context) => const AddNetwork(),
+          AppRoutes.configureDNS: (context) => const ConfigureDnsWidget(),
+          AppRoutes.configureProxy: (context) => const ConfigureProxyWidget(),
+          AppRoutes.ipv4Address: (context) => const Ipv4AddressWidget(),
+          AppRoutes.security: (context) => const WifiSecurityWidget(),
 
           // Bluetooth Routes
-          AppRoutes.bluetooth: (context) => Bluetooth(),
-          AppRoutes.bluetoothDeviceInfo: (context) => BluetoothDeviceInfo(),
-          AppRoutes.adapterSettings: (context) => AdapterSettings(),
-          AppRoutes.adapterRename: (context) => RenameAdapter(),
+          AppRoutes.bluetooth: (context) => const Bluetooth(),
+          AppRoutes.bluetoothDeviceInfo: (context) => const BluetoothDeviceInfo(),
+          AppRoutes.adapterSettings: (context) => const AdapterSettings(),
+          AppRoutes.adapterRename: (context) => const RenameAdapter(),
           AppRoutes.bluetoothDiscoverable: (context) =>
-              BluetoothDeviceDiscoverable(),
-          AppRoutes.bluetoothDeviceTypes: (context) => DeviceTypes(),
+              const BluetoothDeviceDiscoverable(),
+          AppRoutes.bluetoothDeviceTypes: (context) => const DeviceTypes(),
 
           // Battery Routes
-          AppRoutes.battery: (context) => Battery(),
-          AppRoutes.batteryPerformance: (context) => BatteryPerformance(),
+          AppRoutes.battery: (context) => const Battery(),
+          AppRoutes.batteryPerformance: (context) => const BatteryPerformance(),
 
           // Display Routes
-          AppRoutes.display: (context) => DisplayPage(),
-          AppRoutes.appearance: (context) => Appearance(),
-          AppRoutes.applyWallpaper: (context) => ApplyWallpaper(),
-          AppRoutes.displayScreenOffTime: (context) => ScreenOffTimeSettings(),
-          AppRoutes.lockScreenTimeout: (context) => LockScreenTimeout(),
+          AppRoutes.display: (context) => const DisplayPage(),
+          AppRoutes.appearance: (context) => const Appearance(),
+          AppRoutes.applyWallpaper: (context) => const ApplyWallpaper(),
+          AppRoutes.displayScreenOffTime: (context) => const ScreenOffTimeSettings(),
+          AppRoutes.lockScreenTimeout: (context) => const LockScreenTimeout(),
 
           // Other Routes
-          AppRoutes.about: (context) => About(),
-          AppRoutes.dateTime: (context) => DateTimeSettings(),
-          AppRoutes.timeSettings: (context) => TimeSettings(),
-          AppRoutes.dateSettings: (context) => DateSettings(),
+          AppRoutes.about: (context) => const About(),
+          AppRoutes.dateTime: (context) => const DateTimeSettings(),
+          AppRoutes.timeSettings: (context) => const TimeSettings(),
+          AppRoutes.dateSettings: (context) => const DateSettings(),
         },
       ),
     );

apps/settings/lib/src/features/about/presentation/about.dart

@@ -19,9 +19,9 @@ class _AboutState extends State<About> {
     return BlocBuilder<AboutBloc, AboutState>(
       builder: (context, state) {
         return Scaffold(
-          appBar: MechanixNavigationBar(title: 'About this Comet'),
+          appBar: const MechanixNavigationBar(title: 'About this Comet'),
           body: SingleChildScrollView(
-            physics: BouncingScrollPhysics(),
+            physics: const BouncingScrollPhysics(),
             child: ContainerWidget(
                 child: Column(
               children: [

apps/settings/lib/src/features/appearance/presentation/appearance.dart

@@ -28,7 +28,7 @@ class _AppearanceState extends State<Appearance> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: MechanixNavigationBar(
+      appBar: const MechanixNavigationBar(
         title: 'Appearance',
       ),
       body: ContainerWidget(

apps/settings/lib/src/features/appearance/presentation/apply_wallpaper.dart

@@ -23,7 +23,7 @@ class _ApplyWallpaperState extends State<ApplyWallpaper> {
     final imagePath = args['imagePath'] as String;
 
     return Scaffold(
-      appBar: MechanixNavigationBar(
+      appBar: const MechanixNavigationBar(
         title: 'Apply Wallpaper',
       ),
       body: ContainerWidget(

apps/settings/lib/src/features/battery/presentation/battery.dart

@@ -39,7 +39,7 @@ class BatteryScreenState extends State<Battery> {
         ].join(' ');
 
         return Scaffold(
-          appBar: MechanixNavigationBar(
+          appBar: const MechanixNavigationBar(
             title: "Battery",
           ),
           body: SingleChildScrollView(

apps/settings/lib/src/features/battery/presentation/battery_indicator.dart

@@ -25,7 +25,7 @@ class BatteryIndicator extends StatelessWidget {
     if (state.batteryPercentage > 20) {
       return getModeDetails(state.performanceMode ?? '').color;
     }
-    return Color(0xFFB90C2C);
+    return const Color(0xFFB90C2C);
   }
 
   @override
@@ -55,7 +55,7 @@ class BatteryIndicator extends StatelessWidget {
                       child: Stack(
                         children: [
                           AnimatedContainer(
-                            duration: Duration(milliseconds: 700),
+                            duration: const Duration(milliseconds: 700),
                             width:
                                 batteryWidth * (state.batteryPercentage / 100),
                             height: height,
@@ -64,7 +64,7 @@ class BatteryIndicator extends StatelessWidget {
                             ),
                           ),
                           // Percentage text
-                          Center(
+                          const Center(
                             child: IconWidget(
                                 boxWidth: 24,
                                 boxHeight: 28,

apps/settings/lib/src/features/battery/presentation/battery_performance.dart

@@ -25,7 +25,7 @@ class BatteryPerformanceState extends State<BatteryPerformance> {
   Widget build(BuildContext context) {
     return BlocBuilder<BatteryBloc, BatteryState>(builder: (context, state) {
       return Scaffold(
-        appBar: MechanixNavigationBar(title: 'Performance Mode'),
+        appBar: const MechanixNavigationBar(title: 'Performance Mode'),
         body: ContainerWidget(
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,

apps/settings/lib/src/features/bluetooth/models/device_type.dart

@@ -63,11 +63,11 @@ class DeviceType extends StatelessWidget {
       case 'phone':
         return Row(
           children: [
-            IconWidget(iconPath: Images.mobile).padRight(8),
-            CustomTrailingText(
+            const IconWidget(iconPath: Images.mobile).padRight(8),
+            const CustomTrailingText(
               title: 'Mobile',
             ).padRight(8),
-            IconWidget(
+            const IconWidget(
               iconWidth: 10,
               iconHeight: 17,
               iconPath: Images.rightIconArrow,
@@ -78,11 +78,11 @@ class DeviceType extends StatelessWidget {
       case 'computer':
         return Row(
           children: [
-            IconWidget(iconPath: Images.tv).padRight(8),
-            CustomTrailingText(
+            const IconWidget(iconPath: Images.tv).padRight(8),
+            const CustomTrailingText(
               title: 'TV',
             ).padRight(8),
-            IconWidget(
+            const IconWidget(
               iconWidth: 10,
               iconHeight: 17,
               iconPath: Images.rightIconArrow,
@@ -93,18 +93,20 @@ class DeviceType extends StatelessWidget {
       case 'multimedia-player':
         return Row(
           children: [
-            IconWidget(iconPath: Images.speaker).padRight(8),
-            CustomTrailingText(
+            const IconWidget(iconPath: Images.speaker).padRight(8),
+            const CustomTrailingText(
               title: 'Car',
             ).padRight(8),
-            IconWidget(
+            const IconWidget(
               iconWidth: 10,
               iconHeight: 17,
               iconPath: Images.rightIconArrow,
             ).padRight(8)
           ],
         );
 
+
+      // TODO: add more device types like mouse , keyboard
       default:
         return Row(
           children: [

apps/settings/lib/src/features/bluetooth/presentation/adapter_settings.dart

@@ -33,13 +33,13 @@ class AdapterSettings extends StatelessWidget {
       String deviceName = state.bluetoothAdapter?.alias ?? '';
 
       return Scaffold(
-        appBar: MechanixNavigationBar(title: 'Bluetooth Settings'),
+        appBar: const MechanixNavigationBar(title: 'Bluetooth Settings'),
         body: SingleChildScrollView(
           physics: const BouncingScrollPhysics(),
           child: ContainerWidget(
             child: ListTile(
-              title: Text('Device name',
-                  style: const TextStyle(color: Colors.white, fontSize: 24)),
+              title: const Text('Device name',
+                  style: TextStyle(color: Colors.white, fontSize: 24)),
               trailing: Text(
                 deviceName,
                 style: const TextStyle(