Merge branch 'development' of https://github.com/VPNclient/VPNclient-app into development

Author: WishyutC

.github/workflows/quality.yml

@@ -11,7 +11,7 @@ jobs:
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
       - run: flutter pub get
-      - run: flutter format --set-exit-if-changed .
+      - run: dart format --set-exit-if-changed .
       - run: flutter analyze
       - name: Run Dart Code Metrics
         run: |

lib/pages/apps/apps_list_item.dart.orig

@@ -0,0 +1,137 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+class AppListItem extends StatelessWidget {
+  final IconData? icon;
+  final dynamic image;
+  final String text;
+  final bool isSwitch;
+  final bool isActive;
+  final bool isEnabled;
+  final VoidCallback onTap;
+
+  const AppListItem({
+    super.key,
+    this.icon,
+    this.image,
+    required this.text,
+    required this.isSwitch,
+    required this.isActive,
+    required this.isEnabled,
+    required this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    Color getColor(Set<WidgetState> states) {
+      return Theme.of(context).colorScheme.primary;
+    }
+
+    return GestureDetector(
+      onTap: isEnabled ? onTap : null,
+      child: Container(
+        height: 52,
+        margin: const EdgeInsets.symmetric(vertical: 8),
+        decoration: BoxDecoration(
+          color: Colors.white,
+          borderRadius: BorderRadius.circular(10),
+          boxShadow: [
+            BoxShadow(
+<<<<<<< HEAD
+              color: Colors.grey.withValues(alpha: 0.2),
+||||||| parent of f5f79a8 (fix quality check)
+            color: Colors.grey.withAlpha((255 * 0.2).toInt()),
+=======
+              color: Colors.grey.withAlpha((255 * 0.2).toInt()),
+>>>>>>> f5f79a8 (fix quality check)
+              blurRadius: 10,
+              offset: const Offset(0, 1),
+            ),
+          ],
+        ),
+        child: Stack(
+          children: [
+            Padding(
+              padding: const EdgeInsets.all(0),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  Row(
+                    children: [
+                      if (icon != null)
+                        Icon(
+                          icon,
+                          size: 52,
+                          color: Theme.of(context).colorScheme.primary,
+                        ),
+                      if (image != null)
+                        image is String
+                            ? Image.asset(image!, width: 52, height: 52)
+                            : Image.memory(image!, width: 52, height: 52),
+                      if (icon == null && image == null)
+                        const SizedBox(width: 16),
+                      Container(
+                        alignment: Alignment.center,
+                        height: 52,
+                        child: Text(
+                          text,
+                          style: const TextStyle(
+                            fontSize: 16,
+                            color: Colors.black,
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                  isSwitch
+                      ? Transform.scale(
+                        scale: 0.7,
+                        child: CupertinoSwitch(
+                          value: isActive,
+                          onChanged: null,
+                          inactiveTrackColor:
+                              Theme.of(context).colorScheme.onSecondary,
+                        ),
+                      )
+                      : Checkbox(
+                        value: isActive,
+                        onChanged: null,
+                        checkColor: Colors.white,
+                        fillColor: WidgetStateProperty.resolveWith((states) {
+                          if (!isActive) {
+                            return Theme.of(context).colorScheme.onSecondary;
+                          }
+                          return getColor(states);
+                        }),
+                        shape: RoundedRectangleBorder(
+                          borderRadius: BorderRadius.circular(4),
+                        ),
+                        side: WidgetStateBorderSide.resolveWith((states) {
+                          return BorderSide(
+                            color: Theme.of(context).colorScheme.onSecondary,
+                            width: 0.0,
+                          );
+                        }),
+                      ),
+                ],
+              ),
+            ),
+            if (!isEnabled)
+              Container(
+                decoration: BoxDecoration(
+<<<<<<< HEAD
+                  color: Colors.grey.withValues(alpha: 0.4),
+||||||| parent of f5f79a8 (fix quality check)
+                 color: Colors.grey.withAlpha((255 * 0.2).toInt()),
+=======
+                  color: Colors.grey.withAlpha((255 * 0.2).toInt()),
+>>>>>>> f5f79a8 (fix quality check)
+                  borderRadius: BorderRadius.circular(10),
+                ),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/pages/main/main_btn.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
-import 'dart:developer' as dev;
+import 'dart:developer';
+import 'dart:developer';
 import 'package:flutter/material.dart';
 import 'package:vpn_client/design/colors.dart';
 import 'package:vpn_client/design/dimensions.dart';
@@ -127,7 +128,7 @@ class MainBtnState extends State<MainBtn> with SingleTickerProviderStateMixin {
       V2RayURL parser = FlutterV2ray.parseFromURL(link);
 
       // Get Server Delay
-      dev.log(
+      log(
         '${flutterV2ray.getServerDelay(config: parser.getFullConfiguration())}ms',
         name: 'ServerDelay',
       );
@@ -156,7 +157,7 @@ class MainBtnState extends State<MainBtn> with SingleTickerProviderStateMixin {
       // >>>>>>> Stashed changes
       VPNclientEngine.pingServer(subscriptionIndex: 0, index: 1);
       VPNclientEngine.onPingResult.listen((result) {
-        dev.log(
+        log(
           "Ping result: ${result.latencyInMs} ms",
           name: 'PingLogger',
         ); // <- Use dev.log instead of print.(It build to log meta data)