refactor: исправления по код ревью

neekeetuh · neekeetuh · commit 027fab575ff4 · 2025-06-02T19:17:21.000+06:00
diff --git a/frontend/lib/common/shared_functions.dart b/frontend/lib/common/shared_functions.dart
@@ -0,0 +1,8 @@
+import 'package:flutter/material.dart';
+
+sealed class SharedFunctions {
+  static bool isTablet(BuildContext context) {
+    final shortestSide = MediaQuery.of(context).size.shortestSide;
+    return shortestSide >= 640;
+  }
+}
diff --git a/frontend/lib/router/router.dart b/frontend/lib/router/router.dart
@@ -69,7 +69,10 @@ final shellRoutes = [
     path: RouteLocations.settingsScreen,
     parentNavigatorKey: shellNavigatorKey,
     builder: (BuildContext context, GoRouterState state) {
-      return GameSettingsView(state.extra as GameModel);
+      return GameSettingsView(
+        state.extra as GameModel,
+        key: gameSettingsViewStateKey,
+      );
     },
   ),
   GoRoute(
diff --git a/frontend/lib/views/components/pro_functions_tooltip.dart b/frontend/lib/views/components/pro_functions_tooltip.dart
@@ -10,13 +10,11 @@ class ProFunctionsTooltip extends StatefulWidget {
     required this.modalHeader,
     required this.child,
     required this.isPro,
-    this.controller,
   });
 
   final String modalHeader;
   final Widget child;
   final bool isPro;
-  final SuperTooltipController? controller;
 
   @override
   State<ProFunctionsTooltip> createState() => _ProFunctionsTooltipState();
@@ -28,7 +26,13 @@ class _ProFunctionsTooltipState extends State<ProFunctionsTooltip> {
   @override
   void initState() {
     super.initState();
-    _controller = widget.controller ?? SuperTooltipController();
+    _controller = SuperTooltipController();
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
   }
 
   @override
@@ -46,7 +50,7 @@ class _ProFunctionsTooltipState extends State<ProFunctionsTooltip> {
       popupDirection: TooltipDirection.up,
       content: DecoratedBox(
         decoration: BoxDecoration(
-          borderRadius: BorderRadius.circular(16), color: Colors.white),
+            borderRadius: BorderRadius.circular(16), color: Colors.white),
         child: Padding(
           padding: const EdgeInsets.symmetric(vertical: 24, horizontal: 32),
           child: Column(
diff --git a/frontend/lib/views/setting_view/components/app_bar_settings.dart b/frontend/lib/views/setting_view/components/app_bar_settings.dart
@@ -1,20 +1,17 @@
 import "package:flutter/material.dart";
+import "package:frontend/common/shared_functions.dart";
 import "package:go_router/go_router.dart";
 import "../../../exports.dart";
 
 class AppBarSettings extends StatelessWidget {
   const AppBarSettings({super.key, required this.label});
 
   final String label;
-  bool _isTablet(BuildContext context) {
-    final shortestSide = MediaQuery.of(context).size.shortestSide;
-    return shortestSide > 640;
-  }
 
   @override
   Widget build(BuildContext context) {
     final scheme = Theme.of(context).colorScheme;
-    final isTablet = _isTablet(context);
+    final isTablet = SharedFunctions.isTablet(context);
     return Row(
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
       children: [
diff --git a/frontend/lib/views/setting_view/components/settings_row.dart b/frontend/lib/views/setting_view/components/settings_row.dart
@@ -1,8 +1,8 @@
 import "package:flutter/material.dart";
 import "package:flutter_svg/flutter_svg.dart";
+import "package:frontend/common/shared_functions.dart";
 import "package:frontend/exports.dart";
 import "package:provider/provider.dart";
-import "package:super_tooltip/super_tooltip.dart";
 
 class SettingsRow extends StatefulWidget {
   const SettingsRow({
@@ -12,44 +12,24 @@ class SettingsRow extends StatefulWidget {
     required this.modalHeader,
     this.choseDiffWidget,
     this.onChanged,
-    this.forceTabletLayout,
   });
 
   final bool? chose;
   final String text;
   final String modalHeader;
   final Widget? choseDiffWidget;
   final void Function(bool)? onChanged;
-  final bool? forceTabletLayout;
 
   @override
   State<SettingsRow> createState() => _SettingsRowState();
 }
 
 class _SettingsRowState extends State<SettingsRow> {
-  late final SuperTooltipController _tooltipController;
-
-  @override
-  void initState() {
-    super.initState();
-    _tooltipController = SuperTooltipController();
-  }
-
-  @override
-  void dispose() {
-    _tooltipController.dispose();
-    super.dispose();
-  }
-
-  bool _isTablet(BuildContext context) {
-    return widget.forceTabletLayout ?? MediaQuery.of(context).size.width >= 640;
-  }
-
   @override
   Widget build(BuildContext context) {
     final scheme = Theme.of(context).colorScheme;
     final isPro = context.watch<ProVersionProvider>().isPro;
-    final isTablet = _isTablet(context);
+    final isTablet = SharedFunctions.isTablet(context);
     return Padding(
       padding: const EdgeInsets.only(bottom: 8),
       child: SizedBox(
@@ -66,17 +46,14 @@ class _SettingsRowState extends State<SettingsRow> {
                     fontSize: isTablet ? 25 : 16,
                   ),
                 ),
-                SizedBox(
-                  width: isTablet ? 16 : 10
-                ),
+                SizedBox(width: isTablet ? 16 : 10),
                 ProFunctionsTooltip(
                   isPro: isPro,
                   modalHeader: widget.modalHeader,
-                  controller: _tooltipController,
                   child: SvgPicture.asset(
                     "assets/images/icons/question_icon.svg",
                     colorFilter: ColorFilter.mode(
-                      isPro
+                        isPro
                             ? scheme.tertiaryContainer
                             : ColorsConst.disabledColor,
                         BlendMode.srcIn),
@@ -86,21 +63,20 @@ class _SettingsRowState extends State<SettingsRow> {
             ),
             Theme(
               data: ThemeData(useMaterial3: false),
-              child: Switch(
-                materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                value: isPro ? widget.chose! : false,
-                inactiveThumbColor:
-                    isPro ? scheme.surfaceTint : ColorsConst.disabledColor,
-                inactiveTrackColor: scheme.outline,
-                activeColor: scheme.inversePrimary,
-                activeTrackColor: ColorsConst.primaryColor100,
-                onChanged: (value) {
-                  if (isPro) {
-                    widget.onChanged?.call(value);
-                  } else {
-                    _tooltipController.showTooltip();
-                  }
-                },
+              child: ProFunctionsTooltip(
+                isPro: isPro,
+                modalHeader: widget.modalHeader,
+                child: Switch(
+                  materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                  value: isPro ? widget.chose! : false,
+                  inactiveThumbColor:
+                      isPro ? scheme.surfaceTint : ColorsConst.disabledColor,
+                  inactiveTrackColor: scheme.outline,
+                  activeColor: scheme.inversePrimary,
+                  activeTrackColor: ColorsConst.primaryColor100,
+                  onChanged:
+                      isPro ? (value) => widget.onChanged?.call(value) : null,
+                ),
               ),
             ),
           ],
diff --git a/frontend/lib/views/setting_view/components/settings_rows_section.dart b/frontend/lib/views/setting_view/components/settings_rows_section.dart
@@ -1,32 +1,16 @@
 import 'package:flutter/material.dart';
+import 'package:frontend/common/shared_functions.dart';
 import 'package:frontend/exports.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class SettingsRowsSection extends StatelessWidget {
-  const SettingsRowsSection(
-      {super.key,
-      required this.choseMoveBack,
-      required this.moveBackOnChanged,
-      required this.choseThreats,
-      required this.threatsOnChanged,
-      required this.choseHints,
-      required this.hintsOnChanged});
-
-  final bool choseMoveBack;
-  final void Function(bool)? moveBackOnChanged;
-  final bool choseThreats;
-  final void Function(bool)? threatsOnChanged;
-  final bool choseHints;
-  final void Function(bool)? hintsOnChanged;
-
-    bool _isTablet(BuildContext context) {
-    final shortestSide = MediaQuery.of(context).size.shortestSide;
-    return shortestSide >= 640;
-  }
+  const SettingsRowsSection({
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
-    final isTablet = _isTablet(context);
+    final settingsState = gameSettingsViewStateKey.currentState;
     final l10n = AppLocalizations.of(context)!;
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
@@ -38,30 +22,30 @@ class SettingsRowsSection extends StatelessWidget {
               l10n.gameSettings,
               style: TextStyles.title3.copyWith(
                 color: Theme.of(context).colorScheme.primary,
-                fontSize: isTablet ? 45 : null,
+                fontSize: SharedFunctions.isTablet(context) ? 45 : null,
               ),
             ),
           ),
         ),
         Column(
           children: [
             SettingsRow(
-              chose: choseMoveBack,
+              chose: settingsState?.isMoveBack,
               text: l10n.undoMoves,
               modalHeader: l10n.undoMovesDescription,
-              onChanged: moveBackOnChanged,
+              onChanged: settingsState?.setIsMoveBack,
             ),
             SettingsRow(
-              chose: choseThreats,
+              chose: settingsState?.isThreats,
               text: l10n.threats,
               modalHeader: l10n.threatsDescription,
-              onChanged: threatsOnChanged,
+              onChanged: settingsState?.setIsThreats,
             ),
             SettingsRow(
-              chose: choseHints,
+              chose: settingsState?.isHints,
               text: l10n.hints,
               modalHeader: l10n.hintsDescription,
-              onChanged: hintsOnChanged,
+              onChanged: settingsState?.setIsHints,
             )
           ],
         ),
diff --git a/frontend/lib/views/setting_view/components/text_heading.dart b/frontend/lib/views/setting_view/components/text_heading.dart
@@ -1,36 +1,32 @@
 import "package:flutter/material.dart";
+import "package:frontend/common/shared_functions.dart";
 import "package:frontend/exports.dart";
 
 class TextHeading extends StatelessWidget {
-  const TextHeading(
-      {super.key,
-      required this.text,
-      required this.topMargin,
-      required this.bottomMargin,
-      this.style,
-      });
+  const TextHeading({
+    super.key,
+    required this.text,
+    required this.topMargin,
+    required this.bottomMargin,
+    this.style,
+  });
 
   final String text;
   final double topMargin;
   final double bottomMargin;
   final TextStyle? style;
 
-  bool _isTablet(BuildContext context) {
-    final shortestSide = MediaQuery.of(context).size.shortestSide;
-    return shortestSide >= 640;
-  }
-
   @override
   Widget build(BuildContext context) {
-    final scheme = Theme.of(context).colorScheme;
-    final isTablet = _isTablet(context);
     return Container(
       margin: EdgeInsets.only(top: topMargin, bottom: bottomMargin),
       child: Text(
         text,
         style: TextStyles.title3.copyWith(
-          color: scheme.primary,
-          fontSize: isTablet ? 45 : TextStyles.title3.fontSize,
+          color: Theme.of(context).colorScheme.primary,
+          fontSize: SharedFunctions.isTablet(context)
+              ? 45
+              : TextStyles.title3.fontSize,
         ),
       ),
     );
diff --git a/frontend/lib/views/setting_view/game_settings_mobile.dart b/frontend/lib/views/setting_view/game_settings_mobile.dart
diff --git a/frontend/lib/views/setting_view/game_settings_tablet.dart b/frontend/lib/views/setting_view/game_settings_tablet.dart
diff --git a/frontend/lib/views/setting_view/game_settings_view.dart b/frontend/lib/views/setting_view/game_settings_view.dart
