fix: исправлена ошибка, приводящая к наслаиванию адаптивных экранов друг на друга на главном экране

neekeetuh · neekeetuh · commit d70f3f9256fe · 2025-05-20T18:19:07.000+06:00
diff --git a/frontend/lib/views/game_view/components/shared_functions.dart b/frontend/lib/views/game_view/components/shared_functions.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:sqflite/sqflite.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
diff --git a/frontend/lib/views/menu_view/menu_page_view.dart b/frontend/lib/views/menu_view/menu_page_view.dart
@@ -2,7 +2,6 @@ import "package:flutter/material.dart";
 import "package:go_router/go_router.dart";
 import "package:provider/provider.dart";
 import "../../exports.dart";
-import "package:flutter_gen/gen_l10n/app_localizations.dart";
 import '../menu_view/phone_menu_layout.dart';
 import '../menu_view/tablet_menu_layout.dart';
 
@@ -23,23 +22,15 @@ class _MyMenuViewState extends State<MyMenuView> {
 
   @override
   Widget build(BuildContext context) {
-    final provider = Provider.of<ThemeProvider>(context, listen: false);
-    final scheme = Theme.of(context).colorScheme;
-    final width = MediaQuery.of(context).size.width;
-    final height = MediaQuery.of(context).size.height;
-    final aspectRatio = MediaQuery.of(context).size.aspectRatio;
-    final l10n = AppLocalizations.of(context)!;
-
     return Scaffold(
-      backgroundColor: scheme.background,
+      backgroundColor: Theme.of(context).colorScheme.background,
       body: Consumer<GameModel>(
         builder: (context, gameModel, child) {
           return SafeArea(
             child: LayoutBuilder(
               builder: (context, constraints) {
                 final isTablet = constraints.maxWidth >= 640;
                 final size = Size(constraints.maxWidth, constraints.maxHeight);
-
                 final menuView = isTablet
                     ? TabletMenuView(
                         gameModel: gameModel,
@@ -49,64 +40,7 @@ class _MyMenuViewState extends State<MyMenuView> {
                         gameModel: gameModel,
                         size: size,
                       );
-
-                return Column(
-                  children: [
-                    Expanded(child: menuView),
-                    SizedBox(height: height * 0.04),
-                    Padding(
-                      padding: aspectRatio < 0.65
-                          ? EdgeInsets.zero
-                          : const EdgeInsets.only(left: 15),
-                      child: ConstrainedBox(
-                        constraints: BoxConstraints(maxHeight: height * 0.2),
-                        child: FittedBox(
-                          child: Text(
-                            aspectRatio < 0.65 ? l10n.slogan : l10n.sloganWide,
-                            style: TextStyles.title1.copyWith(
-                              color: scheme.primary,
-                            ),
-                          ),
-                        ),
-                      ),
-                    ),
-                    Expanded(
-                      child: Padding(
-                        padding: aspectRatio < 0.65
-                            ? EdgeInsets.zero
-                            : EdgeInsets.only(
-                                top: height * 0.1,
-                                left: width * 0.15,
-                                right: width * 0.05,
-                                bottom: height * 0.03),
-                        child: SvgPicture.asset(
-                          alignment: Alignment.bottomRight,
-                          width: double.infinity,
-                          "${MenuPageStringConst.pathToIcon}pieces.svg",
-                        ),
-                      ),
-                    ),
-                    Align(
-                      alignment: Alignment.bottomCenter,
-                      child: Padding(
-                        padding: const EdgeInsets.only(bottom: 20),
-                        child: ConstrainedBox(
-                          constraints: BoxConstraints(maxHeight: height * 0.08),
-                          child: NextPageButton(
-                            text: l10n.startGameButton,
-                            textColor: ColorsConst.primaryColor0,
-                            buttonColor: scheme.secondaryContainer,
-                            isClickable: true,
-                            onTap: () {
-                              context.go(RouteLocations.settingsScreen,
-                                  extra: gameModel);
-                            },
-                          ),
-                        ),
-                      ),
-                    ),
-                  ],
-                );
+                return menuView;
               },
             ),
           );
diff --git a/frontend/lib/views/menu_view/phone_menu_layout.dart b/frontend/lib/views/menu_view/phone_menu_layout.dart
@@ -3,6 +3,7 @@ import "package:flutter_svg/svg.dart";
 import "../../exports.dart";
 import '../menu_view/components/menu_app_bar.dart';
 import '../menu_view/components/menu_button.dart';
+import "package:flutter_gen/gen_l10n/app_localizations.dart";
 
 class PhoneMenuView extends StatelessWidget {
   final GameModel gameModel;
@@ -18,8 +19,8 @@ class PhoneMenuView extends StatelessWidget {
   Widget build(BuildContext context) {
     final width = MediaQuery.of(context).size.width;
     final height = MediaQuery.of(context).size.height;
-    final bool isTablet = MediaQuery.of(context).size.aspectRatio < 0.65;
     final colorScheme = Theme.of(context).colorScheme;
+    final l10n = AppLocalizations.of(context)!;
 
     return ConstrainedBox(
       constraints: BoxConstraints(minWidth: width, minHeight: height),
@@ -36,16 +37,12 @@ class PhoneMenuView extends StatelessWidget {
               ),
               SizedBox(height: height * 0.04),
               Padding(
-                padding: isTablet
-                    ? EdgeInsets.zero
-                    : const EdgeInsets.only(left: 15),
+                padding: const EdgeInsets.only(left: 15),
                 child: ConstrainedBox(
                   constraints: BoxConstraints(maxHeight: height * 0.2),
                   child: FittedBox(
                     child: Text(
-                      isTablet
-                          ? MenuPageStringConst.slogan
-                          : MenuPageStringConst.sloganWide,
+                      l10n.slogan,
                       style: TextStyles.title1.copyWith(
                         color: colorScheme.primary,
                       ),
@@ -54,25 +51,16 @@ class PhoneMenuView extends StatelessWidget {
                 ),
               ),
               Expanded(
-                child: Padding(
-                  padding: isTablet
-                      ? EdgeInsets.zero
-                      : EdgeInsets.only(
-                          top: height * 0.1,
-                          left: width * 0.15,
-                          right: width * 0.05,
-                          bottom: height * 0.03),
-                  child: SvgPicture.asset(
-                    alignment: Alignment.bottomRight,
-                    width: double.infinity,
-                    "${MenuPageStringConst.pathToIcon}pieces.svg",
-                  ),
+                child: SvgPicture.asset(
+                  alignment: Alignment.bottomRight,
+                  width: double.infinity,
+                  "${MenuPageStringConst.pathToIcon}pieces.svg",
                 ),
               ),
               MenuButton(
                 gameModel: gameModel,
                 height: height,
-                buttonText: MenuPageStringConst.localButton,
+                buttonText: l10n.startGame,
                 settingsScreenRoute: RouteLocations.settingsScreen,
               ),
             ],
diff --git a/frontend/lib/views/menu_view/tablet_menu_layout.dart b/frontend/lib/views/menu_view/tablet_menu_layout.dart
@@ -3,6 +3,7 @@ import "package:flutter_svg/svg.dart";
 import "../../exports.dart";
 import '../menu_view/components/menu_app_bar.dart';
 import '../menu_view/components/menu_button.dart';
+import "package:flutter_gen/gen_l10n/app_localizations.dart";
 
 class TabletMenuView extends StatelessWidget {
   final GameModel gameModel;
@@ -18,8 +19,8 @@ class TabletMenuView extends StatelessWidget {
   Widget build(BuildContext context) {
     final width = MediaQuery.of(context).size.width;
     final height = MediaQuery.of(context).size.height;
-    final bool isTablet = MediaQuery.of(context).size.aspectRatio < 0.65;
     final colorScheme = Theme.of(context).colorScheme;
+    final l10n = AppLocalizations.of(context)!;
 
     return ConstrainedBox(
       constraints: BoxConstraints(minWidth: width, minHeight: height),
@@ -37,26 +38,19 @@ class TabletMenuView extends StatelessWidget {
                     guidebookScreenRoute: RouteLocations.guidebookScreen,
                   ),
                   SizedBox(height: height * 0.04),
-                  Padding(
-                    padding: isTablet 
-                        ? EdgeInsets.zero
-                        : const EdgeInsets.only(left: 15),
-                    child: ConstrainedBox(
-                      constraints: BoxConstraints(
-                        maxHeight: height * 0.2,
-                        maxWidth: width * 0.8,
-                      ),
-                      child: FittedBox(
-                        fit: BoxFit.scaleDown,
-                        alignment: Alignment.centerLeft,
-                        child: Text(
-                          isTablet
-                              ? MenuPageStringConst.slogan
-                              : MenuPageStringConst.sloganWide,
-                          style: TextStyles.title1.copyWith(
-                            color: colorScheme.primary,
-                            fontSize: TextStyles.title1.fontSize! * 1.9,
-                          ),
+                  ConstrainedBox(
+                    constraints: BoxConstraints(
+                      maxHeight: height * 0.2,
+                      maxWidth: width * 0.8,
+                    ),
+                    child: FittedBox(
+                      fit: BoxFit.scaleDown,
+                      alignment: Alignment.centerLeft,
+                      child: Text(
+                        l10n.sloganWide,
+                        style: TextStyles.title1.copyWith(
+                          color: colorScheme.primary,
+                          fontSize: TextStyles.title1.fontSize! * 1.9,
                         ),
                       ),
                     ),

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import 'package:flutter/material.dart';`
`2`	`1`	`import 'package:intl/intl.dart';`
`3`	`2`	`import 'package:sqflite/sqflite.dart';`
`4`	`3`	`import 'package:flutter_gen/gen_l10n/app_localizations.dart';`