Update app.py

app.py

@@ -8,10 +8,18 @@ CANDY_TYPES = ["🍬", "🍫", "🍭", "🍪", "🍓"]
 def initialize_grid(rows, cols):
     return [[random.choice(CANDY_TYPES) for _ in range(cols)] for _ in range(rows)]
 
-# Display the grid
-def display_grid(grid):
+# Display the grid as buttons
+def display_grid(grid, selected):
     for r, row in enumerate(grid):
-        st.write(" ".join([f"{c}({r},{col})" for col, c in enumerate(row)]))
+        cols = st.columns(len(row))
+        for c, candy in enumerate(row):
+            if (r, c) == selected:
+                button_label = f"**{candy}**"  # Highlight selected candy
+            else:
+                button_label = candy
+            if cols[c].button(button_label):
+                return (r, c)  # Return the coordinates of the clicked candy
+    return None
 
 # Check for matches (horizontal and vertical)
 def check_matches(grid):
@@ -51,15 +59,18 @@ def remove_matches(grid, matches):
     return grid
 
 # Swap candies in the grid
-def swap_candies(grid, r1, c1, r2, c2):
-    if (
-        0 <= r1 < len(grid)
-        and 0 <= c1 < len(grid[0])
-        and 0 <= r2 < len(grid)
-        and 0 <= c2 < len(grid[0])
-    ):
-        grid[r1][c1], grid[r2][c2] = grid[r2][c2], grid[r1][c1]
-        return True
+def swap_candies(grid, first, second):
+    if first and second:
+        r1, c1 = first
+        r2, c2 = second
+        if (
+            0 <= r1 < len(grid)
+            and 0 <= c1 < len(grid[0])
+            and 0 <= r2 < len(grid)
+            and 0 <= c2 < len(grid[0])
+        ):
+            grid[r1][c1], grid[r2][c2] = grid[r2][c2], grid[r1][c1]
+            return True
     return False
 
 # Main Streamlit app
@@ -72,38 +83,36 @@ def main():
     # Initialize or reset the grid
     if "grid" not in st.session_state:
         st.session_state.grid = initialize_grid(rows, cols)
+        st.session_state.selected_candy = None
 
-    # Display the current grid
+    # Display the current grid as buttons
     st.write("### Current Grid")
-    display_grid(st.session_state.grid)
-
-    # Input to select candies to swap
-    st.write("### Swap Candies")
-    r1 = st.number_input("Row of first candy (0-5):", min_value=0, max_value=rows - 1, step=1)
-    c1 = st.number_input("Column of first candy (0-5):", min_value=0, max_value=cols - 1, step=1)
-    r2 = st.number_input("Row of second candy (0-5):", min_value=0, max_value=rows - 1, step=1)
-    c2 = st.number_input("Column of second candy (0-5):", min_value=0, max_value=cols - 1, step=1)
-
-    if st.button("Swap Candies"):
-        if swap_candies(st.session_state.grid, r1, c1, r2, c2):
-            matches = check_matches(st.session_state.grid)
-            if matches:
-                st.success("Valid move! Candies matched!")
-                st.session_state.grid = remove_matches(st.session_state.grid, matches)
-            else:
-                st.warning("No match found. Swap reverted!")
-                swap_candies(st.session_state.grid, r1, c1, r2, c2)  # Undo the swap
-        else:
-            st.error("Invalid swap! Please select valid coordinates.")
+    selected_candy = display_grid(st.session_state.grid, st.session_state.selected_candy)
 
-        st.write("### Updated Grid")
-        display_grid(st.session_state.grid)
+    # Handle candy selection
+    if selected_candy:
+        if st.session_state.selected_candy is None:
+            st.session_state.selected_candy = selected_candy
+            st.info(f"Selected candy at {selected_candy}")
+        else:
+            # Attempt to swap the two candies
+            if swap_candies(st.session_state.grid, st.session_state.selected_candy, selected_candy):
+                matches = check_matches(st.session_state.grid)
+                if matches:
+                    st.success("Valid move! Candies matched!")
+                    st.session_state.grid = remove_matches(st.session_state.grid, matches)
+                else:
+                    st.warning("No match found. Swap reverted!")
+                    swap_candies(st.session_state.grid, st.session_state.selected_candy, selected_candy)  # Undo the swap
+            else:
+                st.error("Invalid swap!")
+            st.session_state.selected_candy = None  # Reset selection
 
     # Reset the game
     if st.button("Reset Game"):
         st.session_state.grid = initialize_grid(rows, cols)
+        st.session_state.selected_candy = None
         st.write("Game reset!")
-        display_grid(st.session_state.grid)
 
 if __name__ == "__main__":
     main()