From 6d258154a02d939473dfac43d0e964841bc659b1 Mon Sep 17 00:00:00 2001
From: HDDen <62592944+HDDen@users.noreply.github.com>
Date: Sat, 23 May 2026 18:26:45 +0300
Subject: [PATCH] fix Flutter SDK update

PR #458 included
---
 lib/main.dart                    | 24 +++++++++++++++++++++++-
 lib/screens/channels_screen.dart |  5 +++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index cd622811..37aa29ff 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
 import 'l10n/app_localizations.dart';
 import 'package:provider/provider.dart';
 
@@ -214,7 +215,10 @@ class MeshCoreApp extends StatelessWidget {
               // Update notification service with resolved locale
               final locale = Localizations.localeOf(context);
               NotificationService().setLocale(locale);
-              return child ?? const SizedBox.shrink();
+              return AnnotatedRegion<SystemUiOverlayStyle>(
+                value: _systemUiOverlayStyle(context),
+                child: child ?? const SizedBox.shrink(),
+              );
             },
             home: (PlatformInfo.isWeb && !PlatformInfo.isChrome)
                 ? const ChromeRequiredScreen()
@@ -236,6 +240,24 @@ class MeshCoreApp extends StatelessWidget {
     }
   }
 
+  SystemUiOverlayStyle _systemUiOverlayStyle(BuildContext context) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    final isDark = theme.brightness == Brightness.dark;
+    final iconBrightness = isDark ? Brightness.light : Brightness.dark;
+
+    // Keep Android system bars aligned with the resolved Flutter theme.
+    return SystemUiOverlayStyle(
+      statusBarColor: Colors.transparent,
+      statusBarIconBrightness: iconBrightness,
+      statusBarBrightness: isDark ? Brightness.dark : Brightness.light,
+      systemNavigationBarColor: colorScheme.surface,
+      systemNavigationBarIconBrightness: iconBrightness,
+      systemNavigationBarDividerColor: colorScheme.surface,
+      systemNavigationBarContrastEnforced: false,
+    );
+  }
+
   Locale? _localeFromSetting(String? languageCode) {
     if (languageCode == null) return null;
     return Locale(languageCode);
diff --git a/lib/screens/channels_screen.dart b/lib/screens/channels_screen.dart
index 8b05b8ce..d305a6f3 100644
--- a/lib/screens/channels_screen.dart
+++ b/lib/screens/channels_screen.dart
@@ -273,8 +273,9 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                           ),
                           buildDefaultDragHandles: false,
                           itemCount: filteredChannels.length,
-                          onReorder: (oldIndex, newIndex) {
-                            if (newIndex > oldIndex) newIndex -= 1;
+                          onReorderItem: (oldIndex, newIndex) {
+                            // onReorderItem already adjusts newIndex after the
+                            // removed item, unlike the deprecated onReorder.
                             final reordered = List<Channel>.from(
                               filteredChannels,
                             );