fix conflicts

Signed-off-by: ZTL-UwU <[email protected]>
lichess-org · Apr 12, 2024 · 3ed4ffc · 3ed4ffc
1 parent 326aabf
commit 3ed4ffc
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 50 deletions.
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -4,3 +4,7 @@ android.enableJetifier=true
 android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
+systemProp.http.proxyHost=127.0.0.1
+systemProp.http.proxyPort=7890
+systemProp.https.proxyHost=127.0.0.1
+systemProp.https.proxyPort=7890
diff --git a/lib/src/view/game/game_list_tile.dart b/lib/src/view/game/game_list_tile.dart
@@ -458,37 +458,37 @@ class ExtendedGameListTile extends StatelessWidget {
   final LightArchivedGame game;
   final UserId? userId;
 
-  Widget getResultIcon(LightArchivedGame game, Side mySide) {
-    if (game.status == GameStatus.aborted ||
-        game.status == GameStatus.noStart) {
-      return const Icon(
-        CupertinoIcons.xmark_square_fill,
-        color: LichessColors.grey,
-      );
-    } else {
-      return game.winner == null
-          ? const Icon(
-              CupertinoIcons.equal_square_fill,
-              color: LichessColors.brag,
-            )
-          : game.winner == mySide
-              ? const Icon(
-                  CupertinoIcons.plus_square_fill,
-                  color: LichessColors.good,
-                )
-              : const Icon(
-                  CupertinoIcons.minus_square_fill,
-                  color: LichessColors.red,
-                );
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
     final mySide = game.white.user?.id == userId ? Side.white : Side.black;
     final me = game.white.user?.id == userId ? game.white : game.black;
     final opponent = game.white.user?.id == userId ? game.black : game.white;
 
+    Widget getResultIcon(LightArchivedGame game, Side mySide) {
+      if (game.status == GameStatus.aborted ||
+          game.status == GameStatus.noStart) {
+        return const Icon(
+          CupertinoIcons.xmark_square_fill,
+          color: LichessColors.grey,
+        );
+      } else {
+        return game.winner == null
+            ? Icon(
+                CupertinoIcons.equal_square_fill,
+                color: context.lichessColors.brag,
+              )
+            : game.winner == mySide
+                ? Icon(
+                    CupertinoIcons.plus_square_fill,
+                    color: context.lichessColors.good,
+                  )
+                : Icon(
+                    CupertinoIcons.minus_square_fill,
+                    color: context.lichessColors.error,
+                  );
+      }
+    }
+
     return GameListTile(
       game: game,
       mySide: userId == game.white.user?.id ? Side.white : Side.black,

diff --git a/lib/src/view/user/recent_games.dart b/lib/src/view/user/recent_games.dart
@@ -50,31 +50,6 @@ class RecentGames extends ConsumerWidget {
 
     final userId = user?.id ?? ref.watch(authSessionProvider)?.user.id;
 
-    Widget getResultIcon(LightArchivedGame game, Side mySide) {
-      if (game.status == GameStatus.aborted ||
-          game.status == GameStatus.noStart) {
-        return const Icon(
-          CupertinoIcons.xmark_square_fill,
-          color: LichessColors.grey,
-        );
-      } else {
-        return game.winner == null
-            ? Icon(
-                CupertinoIcons.equal_square_fill,
-                color: context.lichessColors.brag,
-              )
-            : game.winner == mySide
-                ? Icon(
-                    CupertinoIcons.plus_square_fill,
-                    color: context.lichessColors.good,
-                  )
-                : Icon(
-                    CupertinoIcons.minus_square_fill,
-                    color: context.lichessColors.error,
-                  );
-      }
-    }
-
     return recentGames.when(
       data: (data) {
         if (data.isEmpty) {