+ level onTap, + llm refactor

Author: mich2k

lib/screens/dashboard/new_roadmap_screen.dart

@@ -8,17 +8,19 @@ enum LevelStatus {
 }
 
 class LevelButton extends StatelessWidget {
+  final int levelNumber;
+  final LevelStatus status;
+  final int stars;
+  final bool isActive;
+  final Function()? onTap;
 
-  const LevelButton({super.key, 
+  LevelButton({
     required this.levelNumber,
     required this.status,
     this.stars = 0,
     this.isActive = false,
+    this.onTap,
   });
-  final int levelNumber;
-  final LevelStatus status;
-  final int stars;
-  final bool isActive;
 
   Color _getColor() {
     switch (status) {
@@ -35,55 +37,62 @@ class LevelButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Container(
-      width: 100,
-      height: 100,
-      margin: const EdgeInsets.all(10),
-      decoration: BoxDecoration(
-        shape: BoxShape.circle,
-        color: _getColor(),
-      ),
-      child: Column(
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: <Widget>[
-          Text(
-            levelNumber.toString(),
-            style: const TextStyle(
-              color: Colors.white,
-              fontSize: 28,
-              fontWeight: FontWeight.bold,
+    return GestureDetector(
+      onTap: () {
+        if (onTap != null) {
+          onTap!();
+        }
+      },
+      child: Container(
+        width: 100,
+        height: 100,
+        margin: const EdgeInsets.all(10),
+        decoration: BoxDecoration(
+          shape: BoxShape.circle,
+          color: _getColor(),
+        ),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: <Widget>[
+            Text(
+              levelNumber.toString(),
+              style: const TextStyle(
+                color: Colors.white,
+                fontSize: 28,
+                fontWeight: FontWeight.bold,
+              ),
             ),
-          ),
-          if (stars > 0)
-            Row(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: List.generate(
-                stars,
-                (int index) => const Icon(
-                  Icons.star,
-                  color: Colors.white,
-                  size: 20,
+            if (stars > 0)
+              Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: List.generate(
+                  stars,
+                  (index) => const Icon(
+                    Icons.star,
+                    color: Colors.white,
+                    size: 20,
+                  ),
                 ),
               ),
-            ),
-        ],
+          ],
+        ),
       ),
     );
   }
 }
 
 class DashedLinePainter extends CustomPainter {
+  final Color color;
+  final double strokeWidth;
+  final double gap;
+  final double dashLength;
 
   DashedLinePainter({
     required this.color,
     this.strokeWidth = 2.0,
     this.gap = 3.0,
     this.dashLength = 5.0,
   });
-  final Color color;
-  final double strokeWidth;
-  final double gap;
-  final double dashLength;
 
   @override
   void paint(Canvas canvas, Size size) {
@@ -93,8 +102,8 @@ class DashedLinePainter extends CustomPainter {
       ..style = PaintingStyle.stroke;
 
     double startX = 0;
-    final double startY = size.height / 2;
-    final double endX = size.width;
+    double startY = size.height / 2;
+    double endX = size.width;
 
     while (startX <= endX) {
       canvas.drawLine(
@@ -114,12 +123,11 @@ class DashedLinePainter extends CustomPainter {
 
 class Roadmap extends StatelessWidget {
   const Roadmap({super.key});
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: const Text('Roadmap'),
+        title: const Text('Candy Crush Levels'),
       ),
       body: Stack(
         children: <Widget>[
@@ -153,18 +161,18 @@ class Roadmap extends StatelessWidget {
   }
 
   Widget _buildLevelPath(int startLevel, int endLevel) {
-    final Random random = Random();
-    final int numRows = (endLevel - startLevel + 1) ~/ 4 + 1; // Calculate number of rows
-    final List<Widget> rows = <Widget>[];
+    final random = Random();
+    int numRows = (endLevel - startLevel + 1) ~/ 4 + 1; // Calculate number of rows
+    List<Widget> rows = [];
 
     for (int i = startLevel; i <= endLevel; i += 4) {
-      final int levelsInRow = min(4, endLevel - i + 1); // Calculate levels in this row
-      final List<Widget> rowChildren = <Widget>[];
+      int levelsInRow = min(4, endLevel - i + 1); // Calculate levels in this row
+      List<Widget> rowChildren = [];
 
       for (int j = i; j < i + levelsInRow; j++) {
-        final int currentLevel = j;
-        final int nextLevel = currentLevel + 1;
-        const bool isActive = true; // Replace with your logic for active levels
+        int currentLevel = j;
+        int nextLevel = currentLevel + 1;
+        bool isActive = true; // Replace with your logic for active levels
         rowChildren.add(
           Expanded(
             child: Column(
@@ -174,14 +182,20 @@ class Roadmap extends StatelessWidget {
                   status: LevelStatus.completed, // Example status, modify as needed
                   stars: 3, // Example stars, modify as needed
                   isActive: isActive,
+                  onTap: () {
+                    print('Level $currentLevel clicked');
+                    // You can perform additional actions here based on the button click
+                  },
                 ),
-                if (currentLevel < endLevel && j < i + levelsInRow - 1) //                 if (currentLevel < endLevel && j < i + levelsInRow - 1)
+                if (currentLevel < endLevel && j < i + levelsInRow - 1)
                   SizedBox(
                     width: 60,
                     child: CustomPaint(
                       painter: DashedLinePainter(
                         color: Colors.white,
-                        dashLength: 10.0,
+                        strokeWidth: 2.0,
+                        gap: 3.0,
+                        dashLength: 5.0,
                       ),
                     ),
                   ),

lib/screens/main/components/others.dart lib/screens/main/components/llmchat.dart

@@ -14,13 +14,13 @@ class LLMChatApp extends StatelessWidget {
         primarySwatch: Colors.teal,
         visualDensity: VisualDensity.adaptivePlatformDensity,
       ),
-      home: const HomePage(),
+      home: const LLMChat(),
     );
   }
 }
 
-class HomePage extends StatelessWidget {
-  const HomePage({super.key});
+class LLMChat extends StatelessWidget {
+  const LLMChat({super.key});
 
   @override
   Widget build(BuildContext context) {

lib/screens/main/main_screen.dart

@@ -12,7 +12,7 @@ import '../games/select_the_area/select_the_area_screen.dart';
 import '../profile/profile_screen.dart';
 import '../settings/settings_screen.dart';
 import 'components/leaderboard.dart';
-import 'components/others.dart';
+import 'components/llmchat.dart';
 import 'components/side_menu.dart';
 
 class MainScreen extends StatefulWidget {
@@ -43,7 +43,7 @@ class _MainScreenState extends State<MainScreen> {
     Widget page;
     switch (_selectedPage) {
       case 0:
-      page = const Roadmap();
+      page = Roadmap();
         // page = RoadmapScreen(onNavButtonPressed: upNavBarId);
         break;
       case 1:

lib/utils.dart

@@ -73,7 +73,6 @@ Future<User> checkIfUserOnDisk(String email, String country) async {
       level: level,
       country: country,
     );
-    print(user);
     return user;
   }
 }
@@ -94,4 +93,4 @@ Future<Map<String, dynamic>> jwtDecode(String token) async {
         jsonDecode(response.body) as Map<String, dynamic>;
     return ret;
   }
-}
+}