fix: исправление ошибки, при которой в локальную бд записывались локализированные данные

neekeetuh · neekeetuh · commit 502be15b5041 · 2025-06-05T16:19:14.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
@@ -3,28 +3,30 @@ import 'package:sqflite/sqflite.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import '../../../exports.dart';
 
-String getResultForHistory(GameModel gameModel, AppLocalizations l10n) {
+enum GameResult { draw, blackVictory, whiteVictory }
+
+String getResultForHistory(GameModel gameModel) {
   if (gameModel.gameOver) {
     if (gameModel.stalemate || gameModel.draw) {
-      return l10n.draw;
+      return GameResult.draw.name;
     } else {
       if (gameModel.turn == Player.player1) {
-        return l10n.blackVictory;
+        return GameResult.blackVictory.name;
       } else {
-        return l10n.whiteVictory;
+        return GameResult.whiteVictory.name;
       }
     }
   } else {
-    return l10n.draw;
+    return GameResult.draw.name;
   }
 }
 
 List<String> getPartyData(GameModel gameModel, AppLocalizations l10n) {
-  String enemy = gameModel.playerCount == 1 ? l10n.computer : l10n.friend;
+  String enemy = l10n.friend;
   String formattedDate = DateFormat("dd.MM.yyyy").format(DateTime.now());
   String formattedTime = DateFormat.Hm().format(DateTime.now());
   String durationGame = _formatDuration(gameModel.durationOfGame);
-  String result = getResultForHistory(gameModel, l10n);
+  String result = getResultForHistory(gameModel);
   String color = gameModel.playerSide == Player.player1
       ? l10n.whitePieces
       : l10n.blackPieces;
diff --git a/frontend/lib/views/game_view/constants/game_page_const.dart b/frontend/lib/views/game_view/constants/game_page_const.dart
@@ -7,21 +7,4 @@ class GamePageConst {
   static const startPos =
       "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
   static List<String> listOfColumns = ["h", "g", "f", "e", "d", "c", "b", "a"];
-  static const gameStatusEnemyMove = "Ход противника ";
-  static const gameStatusOurMove = "Ваш ход";
-  static const gameStatusWhiteMove = "Ход белых";
-  static const gameStatusBlackMove = "Ход чёрных";
-  static const gameStatusStalemate = "Пат (Ничья)";
-  static const gameStatusDraw = "Ничья";
-  static const gameStatusBlackWin = "Выиграли чёрные";
-  static const gameStatusWhiteWin = "Выиграли белые";
-  static const gameEndText = "В главное меню";
-  static const continueGameText = "Продолжить игру";
-  static const gameRestartText = "Новая игра";
-  static const gameGiveUpText = "Сдаться";
-  static const gameBackModalHeader = "Сдаться?";
-  static const gameResultWin = "Победа";
-  static const gameResultLose = "Поражение";
-  static const gameResultWinBlack = "Победа чёрных";
-  static const gameResultWinWhite = "Победа белых";
 }
diff --git a/frontend/lib/views/party_history_view/components/info_bar_item.dart b/frontend/lib/views/party_history_view/components/info_bar_item.dart
@@ -3,45 +3,28 @@ import 'package:flutter_svg/svg.dart';
 import 'package:frontend/exports.dart';
 
 class InfoBarItem extends StatelessWidget {
-  const InfoBarItem({super.key, required this.index, required this.isComputer});
+  const InfoBarItem({super.key, required this.text, required this.iconColor});
 
-  final int index;
-  final bool isComputer;
+  final String text;
+  final Color iconColor;
 
   @override
   Widget build(BuildContext context) {
-    final scheme = Theme.of(context).colorScheme;
-    List<Color> computerColors = [
-      scheme.onSecondaryContainer,
-      scheme.primary,
-      ColorsConst.secondaryColor100
-    ];
-
-    List<Color> friendColors = [
-      scheme.primaryContainer,
-      scheme.onSecondary,
-      scheme.onSurface
-    ];
-
     return Row(
       children: <Widget>[
         SvgPicture.asset(
           PartyHistoryConst.infoPartyIconName,
           height: 24,
           width: 24,
-          colorFilter: ColorFilter.mode(
-              isComputer ? computerColors[index] : friendColors[index],
-              BlendMode.srcIn),
+          colorFilter: ColorFilter.mode(iconColor, BlendMode.srcIn),
         ),
         const SizedBox(
           width: 4,
         ),
         Text(
-          isComputer
-              ? PartyHistoryConst.gameResults[index]
-              : PartyHistoryConst.friendGameResults[index],
+          text,
           style: TextStyles.caption2.copyWith(
-            color: scheme.primary,
+            color: Theme.of(context).colorScheme.primary,
             height: 0.09,
           ),
         ),
diff --git a/frontend/lib/views/party_history_view/components/info_party_bar.dart b/frontend/lib/views/party_history_view/components/info_party_bar.dart
@@ -1,20 +1,19 @@
 import 'package:flutter/material.dart';
 import 'package:frontend/exports.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class InfoPartyBar extends StatelessWidget {
   const InfoPartyBar({
     super.key,
     required this.height,
-    required this.isComputer,
   });
 
   final double height;
-  final bool isComputer;
 
   @override
   Widget build(BuildContext context) {
     final scheme = Theme.of(context).colorScheme;
-
+    final l10n = AppLocalizations.of(context);
     return Container(
         height: height,
         width: double.infinity,
@@ -23,49 +22,33 @@ class InfoPartyBar extends StatelessWidget {
         decoration: BoxDecoration(
             color: scheme.onSurfaceVariant,
             borderRadius: BorderRadius.circular(16)),
-        child: isComputer
-            ? Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                mainAxisSize: MainAxisSize.min,
-                children: List.generate(PartyHistoryConst.gameResults.length,
-                    (index) {
-                  return Row(
-                    children: [
-                      InfoBarItem(
-                        index: index,
-                        isComputer: isComputer,
-                      ),
-                    ],
-                  );
-                }),
-              )
-            : Column(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
-                      InfoBarItem(
-                        index: 0,
-                        isComputer: isComputer,
-                      ),
-                      const SizedBox(),
-                      InfoBarItem(
-                        index: 1,
-                        isComputer: isComputer,
-                      )
-                    ],
-                  ),
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      InfoBarItem(
-                        index: 2,
-                        isComputer: isComputer,
-                      ),
-                    ],
-                  )
-                ],
-              ));
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                InfoBarItem(
+                  text: l10n.whiteVictory,
+                  iconColor: scheme.primaryContainer,
+                ),
+                const SizedBox(),
+                InfoBarItem(
+                  text: l10n.blackVictory,
+                  iconColor: scheme.onSecondary,
+                )
+              ],
+            ),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                InfoBarItem(
+                  text: l10n.draw,
+                  iconColor: scheme.onSurface,
+                ),
+              ],
+            )
+          ],
+        ));
   }
 }
diff --git a/frontend/lib/views/party_history_view/components/one_party_view_widget.dart b/frontend/lib/views/party_history_view/components/one_party_view_widget.dart
@@ -4,26 +4,19 @@ import 'package:frontend/exports.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class OnePartyViewWidget extends StatelessWidget {
-  const OnePartyViewWidget(
-      {super.key, required this.partyData, required this.isComputer});
+  const OnePartyViewWidget({super.key, required this.partyData});
 
   final Map partyData;
-  final bool isComputer;
 
   @override
   Widget build(BuildContext context) {
     final scheme = Theme.of(context).colorScheme;
     final l10n = AppLocalizations.of(context);
-    Map<String, Color> computerListOfColorsIcons = {
-      l10n.victory: scheme.onSecondaryContainer,
-      l10n.defeat: scheme.primary,
-      l10n.draw: ColorsConst.secondaryColor100
-    };
 
     Map<String, Color> friendListOfColorsIcons = {
-      l10n.whiteVictory: scheme.primaryContainer,
-      l10n.blackVictory: scheme.onSecondary,
-      l10n.draw: scheme.onSurface
+      GameResult.whiteVictory.name: scheme.primaryContainer,
+      GameResult.blackVictory.name: scheme.onSecondary,
+      GameResult.draw.name: scheme.onSurface
     };
     return Container(
       margin: const EdgeInsets.only(bottom: 12, left: 24, right: 24),
@@ -36,9 +29,8 @@ class OnePartyViewWidget extends StatelessWidget {
             height: 35,
             width: 35,
             colorFilter: ColorFilter.mode(
-                isComputer
-                    ? computerListOfColorsIcons[partyData["result"]]!
-                    : friendListOfColorsIcons[partyData["result"]]!,
+                friendListOfColorsIcons[partyData["result"]] ??
+                    ColorsConst.disabledColor,
                 BlendMode.srcIn),
           ),
           const SizedBox(
@@ -68,9 +60,7 @@ class OnePartyViewWidget extends StatelessWidget {
             child: Row(
               children: [
                 Column(
-                  mainAxisAlignment: isComputer
-                      ? MainAxisAlignment.spaceBetween
-                      : MainAxisAlignment.center,
+                  mainAxisAlignment: MainAxisAlignment.center,
                   crossAxisAlignment: CrossAxisAlignment.end,
                   children: [
                     Text(
@@ -82,23 +72,12 @@ class OnePartyViewWidget extends StatelessWidget {
                         height: 1,
                       ),
                     ),
-                    isComputer
-                        ? Text(
-                            l10n.pieceColor,
-                            style: TextStyles.caption1.copyWith(
-                              color: scheme.error,
-                              height: 1,
-                            ),
-                          )
-                        : const SizedBox(),
                   ],
                 ),
                 SizedBox(
                   width: 50,
                   child: Column(
-                    mainAxisAlignment: isComputer
-                        ? MainAxisAlignment.spaceBetween
-                        : MainAxisAlignment.center,
+                    mainAxisAlignment: MainAxisAlignment.center,
                     crossAxisAlignment: CrossAxisAlignment.end,
                     children: [
                       partyData["durationGame"] != "00:00"
@@ -110,18 +89,6 @@ class OnePartyViewWidget extends StatelessWidget {
                               ),
                             )
                           : const SizedBox(),
-                      isComputer
-                          ? Container(
-                              width: 12,
-                              height: 12,
-                              margin: const EdgeInsets.only(right: 4),
-                              decoration: BoxDecoration(
-                                  borderRadius: BorderRadius.circular(50),
-                                  color: partyData["color"] == l10n.whitePieces
-                                      ? scheme.inverseSurface
-                                      : ColorsConst.neutralColor100),
-                            )
-                          : const SizedBox()
                     ],
                   ),
                 )
diff --git a/frontend/lib/views/party_history_view/constants/party_history_const.dart b/frontend/lib/views/party_history_view/constants/party_history_const.dart
@@ -1,22 +1,10 @@
 class PartyHistoryConst {
-  static String partyHistoryHeader = "История партий";
-
   static String appbarIconName = "assets/images/icons/left_big_arrow_icon.svg";
 
   static String appbarMainIcon = "assets/images/icons/cancel.svg";
 
   static String infoPartyIconName = "assets/images/icons/black.svg";
 
-  static List<String> gameResults = ["Победа", "Поражение", "Ничья"];
-
-  static List<String> friendGameResults = [
-    "Победа белых",
-    "Победа чёрных",
-    "Ничья"
-  ];
-
-  static List<String> gameEnemies = ["Компьютер", "Друг"];
-
   static String dbCreateScript = """CREATE TABLE History (
   id INTEGER PRIMARY KEY, 
   enemy STRING, 
diff --git a/frontend/lib/views/party_history_view/party_history_main_view.dart b/frontend/lib/views/party_history_view/party_history_main_view.dart
@@ -65,7 +65,6 @@ class _PartyHistoryMainViewState extends State<PartyHistoryMainView> {
                       children: [
                         InfoPartyBar(
                           height: 80,
-                          isComputer: false,
                         ),
                         SizedBox(height: 24),
                       ],
@@ -76,7 +75,6 @@ class _PartyHistoryMainViewState extends State<PartyHistoryMainView> {
                       itemCount: friendParties.length,
                       itemBuilder: (context, index) {
                         return OnePartyViewWidget(
-                          isComputer: false,
                           partyData: friendParties[index],
                         );
                       },
