Merge pull request 'fix/stone-count-text' (#2) from fix/stone-count-text into main

Reviewed-on: #2

apps/frontend/src/components/board/BoardView.tsx

@@ -14,14 +14,25 @@ const BoardView: FunctionComponent<{
   boardViewModel: BoardViewModel;
   revert: boolean;
   onPitSelect: (index: number, pit: Pit) => void;
-}> = ({ game, context, boardId, boardViewModel, revert, onPitSelect: onPitSelect }) => {
+}> = ({ game, context, boardId, boardViewModel, revert, onPitSelect }) => {
   const mancalaGame = game?.mancalaGame;
   const theme = context.themeManager.theme;
 
-  const createPitView = (key: any, pit: Pit, pitViewModel: PitViewModel) => {
+  // Compute pit width based on viewport (each column is 11vw)
-    return <PitView key={key} pitViewModel={pitViewModel} onClick={() => onPitSelect(pit.index, pit)} context={context} />;
+  const pitWidth = typeof window !== "undefined" ? window.innerWidth * 0.11 : 100;
-  };
+
-  const createPitViewList = (pits: Pit[]) => pits.map((pit, index) => createPitView(index, pit, boardViewModel.pits[pit.index]));
+  const createPitView = (key: any, pit: Pit, pitViewModel: PitViewModel) => (
+    <PitView
+      key={key}
+      pitViewModel={pitViewModel}
+      context={context}
+      onClick={() => onPitSelect(pit.index, pit)}
+      fontSize={pitWidth / 6}
+    />
+  );
+
+  const createPitViewList = (pits: Pit[]) =>
+    pits.map((pit, index) => createPitView(index, pit, boardViewModel.pits[pit.index]));
 
   const player1Pits = createPitViewList(mancalaGame?.board.player1Pits);
   const player2Pits = createPitViewList(mancalaGame?.board.player2Pits);
@@ -29,6 +40,7 @@ const BoardView: FunctionComponent<{
   const player2BankIndex = mancalaGame?.board.player2BankIndex();
   const player1BankViewModel = boardViewModel.pits[player1BankIndex];
   const player2BankViewModel = boardViewModel.pits[player2BankIndex];
+
   return (
     <div className="board" style={{ background: theme.boardColor }}>
       <StoreView
@@ -36,12 +48,14 @@ const BoardView: FunctionComponent<{
         pitViewModel={revert ? player2BankViewModel : player1BankViewModel}
         gridColumn="8 / 9"
         gridRow="1 / 3"
+        fontSize={pitWidth / 6}
       />
       <StoreView
         context={context}
         pitViewModel={revert ? player1BankViewModel : player2BankViewModel}
         gridColumn="1 / 2"
         gridRow="1 / 3"
+        fontSize={pitWidth / 6}
       />
       {revert ? player1Pits?.reverse() : player2Pits?.reverse()}
       {revert ? player2Pits : player1Pits}

apps/frontend/src/components/board/PitView.tsx

@@ -1,29 +1,56 @@
 import * as React from "react";
 import { FunctionComponent } from "react";
-import { getColorByBrightness } from "@mancala/core";
+import { getColorByBrightness, PitViewModel } from "@mancala/core";
 import { Context } from "../../context/context";
 import Util from "../../util/Util";
-import { PitViewModel } from "@mancala/core";
 import StoneView from "./StoneView";
 
-const PitView: FunctionComponent<{
+interface PitViewProps {
   pitViewModel: PitViewModel;
-    onClick: () => void;
   context: Context;
-}> = ({ pitViewModel, onClick, context }) => {
+  onClick: () => void;
+  fontSize: number;
+}
+
+const PitView: FunctionComponent<PitViewProps> = ({ pitViewModel, context, onClick, fontSize }) => {
   const textColor = getColorByBrightness(
     pitViewModel.pitColor,
     context.themeManager.theme.textColor,
     context.themeManager.theme.textLightColor
   );
+
   const stones = [...Util.range(pitViewModel.stoneCount)].map((i, index) => (
     <StoneView key={index} color={pitViewModel.stoneColor} />
   ));
 
   return (
-        <div className="pit" onClick={onClick} style={{ background: pitViewModel.pitColor }}>
+    <div
+      className="pit"
+      onClick={onClick}
+      style={{
+        background: pitViewModel.pitColor,
+        position: "relative",
+      }}
+    >
       {stones}
-            <span className="stone-count">{pitViewModel.stoneCount}</span>
+      {pitViewModel.stoneCount > 0 && (
+        <span
+          className="stone-count"
+          style={{
+            color: textColor,
+            position: "absolute",
+            bottom: fontSize / 2,
+            left: "50%",
+            transform: "translateX(-50%)",
+            fontFamily: "monospace",
+            fontWeight: "bold",
+            fontSize: fontSize,
+            pointerEvents: "none",
+          }}
+        >
+          {pitViewModel.stoneCount}
+        </span>
+      )}
       <style jsx>{`
         .pit {
           margin: 5px;
@@ -46,8 +73,6 @@ const PitView: FunctionComponent<{
           font-family: monospace;
           font-size: 1.5vw;
           font-weight: bold;
-                    color: ${textColor};
-
           pointer-events: none;
         }
       `}</style>

apps/mobile/package.json

@@ -21,8 +21,8 @@
     "react-i18next": "^14.1.0",
     "react-native": "0.82.1",
     "react-native-get-random-values": "^1.11.0",
-    "react-native-mmkv": "^4.0.0",
+    "react-native-mmkv": "^4.3.2",
-    "react-native-nitro-modules": "^0.31.6",
+    "react-native-nitro-modules": "^0.36.1",
     "react-native-safe-area-context": "^5.5.2",
     "react-native-screens": "^4.18.0",
     "react-native-snackbar": "^2.6.2",

apps/mobile/src/components/board/BoardView.tsx

@@ -17,9 +17,9 @@ const BoardView: FunctionComponent<{
   boardViewModel: BoardViewModel;
   revert: boolean;
   onPitSelect: (index: number, pit: Pit) => void;
-}> = ({ game, context, boardId, boardViewModel, revert, onPitSelect: onPitSelect }) => {
+}> = ({ game, context, boardId, boardViewModel, revert, onPitSelect }) => {
   const windowWidth = Dimensions.get('window').width;
-  const windowHeight = Dimensions.get('window').height;
+  const windowHeight = Dimensions.get('window').height; // Currently unused but kept for potential future use
 
   const boardMargin = 0;
   const boardPadding = 10;
@@ -35,17 +35,20 @@ const BoardView: FunctionComponent<{
     const stones = [...Util.range(pitViewModel.stoneCount)].map((i, index) => (
       <StoneView key={index} color={pitViewModel.stoneColor} style={{ width: pitWidth / 10, height: pitWidth / 10 }} />
     ));
-    return <PitView 
+    return (
+      <PitView
         key={key}
         pitViewModel={pitViewModel}
+        context={context}
         onClick={() => onPitSelect(pit.index, pit)}
         style={{ width: pitWidth, height: pitWidth }}
-    context={context}
+        fontSize={pitWidth / 5} // keep original divisor as per revert request
-    fontSize={pitWidth / 5}
       >
         {stones}
-    </PitView>;
+      </PitView>
+    );
   };
+
   const createPitViewList = (pits: Pit[]) => pits.map((pit, index) => createPitView(index, pit, boardViewModel.pits[pit.index]));
 
   const player1Pits = createPitViewList(mancalaGame?.board.player1Pits);
@@ -57,22 +60,26 @@ const BoardView: FunctionComponent<{
 
   const primaryStoreViewModel = revert ? player1BankViewModel : player2BankViewModel;
   const secondaryStoreViewModel = revert ? player2BankViewModel : player1BankViewModel;
+
   const stonesPrimaryStore = [...Util.range(primaryStoreViewModel.stoneCount)].map((i, index) => (
     <StoneView key={index} color={primaryStoreViewModel.stoneColor} style={{ width: pitWidth / 10, height: pitWidth / 10 }} />
   ));
+
   const stonesSecondaryStore = [...Util.range(secondaryStoreViewModel.stoneCount)].map((i, index) => (
     <StoneView key={index} color={secondaryStoreViewModel.stoneColor} style={{ width: pitWidth / 10, height: pitWidth / 10 }} />
   ));
 
   return (
-    <View style={{
+    <View
+      style={{
         backgroundColor: theme.boardColor,
         padding: boardPadding,
         borderRadius: 20,
         flexDirection: "row",
         gap: gap,
         height: "auto",
-    }}>
+      }}
+    >
       <StoreView
         context={context}
         pitViewModel={primaryStoreViewModel}
@@ -82,20 +89,24 @@ const BoardView: FunctionComponent<{
         {stonesPrimaryStore}
       </StoreView>
       <View style={{ flex: 6 }}>
-        <View style={{
+        <View
+          style={{
             flexDirection: "row",
-          width: '100%',
+            width: "100%",
             flex: 1,
-          gap: gap
+            gap: gap,
-        }}>
+          }}
+        >
           {revert ? player1Pits?.reverse() : player2Pits?.reverse()}
         </View>
-        <View style={{
+        <View
+          style={{
             flexDirection: "row",
-          width: '100%',
+            width: "100%",
             flex: 1,
-          gap: gap
+            gap: gap,
-        }}>
+          }}
+        >
           {revert ? player2Pits : player1Pits}
         </View>
       </View>

apps/mobile/src/components/board/PitView.tsx

@@ -3,50 +3,45 @@ import { FunctionComponent } from "react";
 import { PitViewModel, getColorByBrightness } from "@mancala/core";
 import { Context } from "../../context/context";
 import { Pressable, View, ViewStyle, Text } from "react-native";
+import Util from "../../util/Util";
+import StoneView from "./StoneView";
 
-const PitView: FunctionComponent<{
+interface PitViewProps {
   pitViewModel: PitViewModel;
   context: Context;
   onClick: () => void;
-    style: ViewStyle,
+  style: ViewStyle;
   fontSize: number;
-    children: React.ReactNode
+}
-}> = ({ pitViewModel, context, onClick, style, fontSize, children }) => {
+
+const PitView: FunctionComponent<PitViewProps> = ({ pitViewModel, context, onClick, style, fontSize }) => {
   const textColor = getColorByBrightness(
     pitViewModel.pitColor,
     context.themeManager.theme.textColor,
     context.themeManager.theme.textLightColor
   );
 
+  const stones = [...Util.range(pitViewModel.stoneCount)].map((i, index) => (
+    <StoneView key={index} color={pitViewModel.stoneColor} style={{ width: style.width ? style.width / 10 : 10, height: style.width ? style.width / 10 : 10 }} />
+  ));
+
   return (
-        <View style={[style, {
+    <View style={[style, { backgroundColor: pitViewModel.pitColor, borderRadius: 100, position: "relative" }] }>
-            backgroundColor: pitViewModel.pitColor,
+      <Pressable onPress={onClick} style={{ width: "100%", height: "100%", padding: 5, display: "flex", alignItems: "center", alignContent: "center", justifyContent: "center", flexDirection: "row", flexWrap: "wrap" }}>
-            borderRadius: 100,
+        {stones}
-            position: 'relative'
-        }]}>
-            <Pressable onPress={onClick} style={{
-                width: "100%",
-                height: "100%",
-                padding: 5,
-                display: 'flex',
-                alignItems: 'center',
-                alignContent: 'center',
-                justifyContent: 'center',
-                flexDirection: "row",
-                flexWrap: "wrap"
-            }}>
-                {children}
       </Pressable>
       {pitViewModel.stoneCount > 0 && (
-                <Text style={{
+        <Text
+          style={{
             color: textColor,
-                    position: 'absolute',
+            position: "absolute",
             bottom: fontSize / 2,
-                    alignSelf: 'center',
+            alignSelf: "center",
-                    fontFamily: 'monospace',
+            fontFamily: "monospace",
-                    fontWeight: 'bold',
+            fontWeight: "bold",
-                    fontSize: fontSize
+            fontSize: fontSize,
-                }}>
+          }}
+        >
           {pitViewModel.stoneCount}
         </Text>
       )}