COS301-SE-2024 · MonikaTheiss · Oct 20, 2024 · Oct 16, 2024 · Oct 17, 2024 · Oct 17, 2024
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -45,6 +45,11 @@ jobs:
         echo "DEFAULT_IMAGE_URL=${{ secrets.DEFAULT_IMAGE_URL }}" >> .env
         echo "DEFAULT_BANNER_URL=${{ secrets.DEFAULT_BANNER_URL }}" >> .env
         echo "RAWG_API_KEY=${{ secrets.RAWG_API_KEY }}" >> .env
+        echo "RAWG_API_KEY2=${{ secrets.RAWG_API_KEY2 }}" >> .env
+        echo "RAWG_API_KEY3=${{ secrets.RAWG_API_KEY3 }}" >> .env
+        echo "RAWG_API_KEY4=${{ secrets.RAWG_API_KEY4 }}" >> .env
+        echo "RAWG_API_KEY5=${{ secrets.RAWG_API_KEY5 }}" >> .env
+        echo "RAWG_API_KEY6=${{ secrets.RAWG_API_KEY6 }}" >> .env
       shell: bash
 
     # Step 5: Create local.properties file

diff --git a/.github/workflows/flutter.yml b/.github/workflows/flutter.yml
@@ -41,6 +41,12 @@ jobs:
           echo "IOS_BUNDLE_ID=${{ secrets.IOS_BUNDLE_ID }}" >> .env
           echo "DEFAULT_IMAGE_URL=${{ secrets.DEFAULT_IMAGE_URL }}" >> .env
           echo "DEFAULT_BANNER_URL=${{ secrets.DEFAULT_BANNER_URL }}" >> .env
+          echo "RAWG_API_KEY=${{ secrets.RAWG_API_KEY }}" >> .env
+          echo "RAWG_API_KEY2=${{ secrets.RAWG_API_KEY2 }}" >> .env
+          echo "RAWG_API_KEY3=${{ secrets.RAWG_API_KEY3 }}" >> .env
+          echo "RAWG_API_KEY4=${{ secrets.RAWG_API_KEY4 }}" >> .env
+          echo "RAWG_API_KEY5=${{ secrets.RAWG_API_KEY5 }}" >> .env
+          echo "RAWG_API_KEY6=${{ secrets.RAWG_API_KEY6 }}" >> .env
         shell: bash
 
       # Step 4: Install all the dependencies

diff --git a/README.md b/README.md
diff --git a/assets/default_images/Frame 158.png b/assets/default_images/Frame 158.png
diff --git a/assets/default_images/Logo_dark.png b/assets/default_images/Logo_dark.png
diff --git a/assets/default_images/byte_squad_logo 2.png b/assets/default_images/byte_squad_logo 2.png
diff --git a/assets/images/stars_2.png b/assets/images/stars_2.png
diff --git a/assets/tiles/GameyCon.tiled-session b/assets/tiles/GameyCon.tiled-session
@@ -3,7 +3,7 @@
         "height": 4300,
         "width": 2
     },
-    "activeFile": "Level-5.tmx",
+    "activeFile": "Level-6.tmx",
     "expandedProjectPaths": [
         "."
     ],
@@ -21,25 +21,25 @@
             "selectedLayer": 1,
             "viewCenter": {
                 "x": 184.658956809063,
-                "y": 221.2886476280387
+                "y": 318.71607269294316
             }
         },
         "Level-2.tmx": {
             "expandedObjectLayers": [
-                3,
-                2
+                2,
+                3
             ],
             "scale": 1.3240625,
             "selectedLayer": 1,
             "viewCenter": {
                 "x": 183.90370545197072,
-                "y": 319.84894972858154
+                "y": 319.47132405003543
             }
         },
         "Level-3.tmx": {
             "expandedObjectLayers": [
-                3,
-                2
+                2,
+                3
             ],
             "scale": 1.3240625,
             "selectedLayer": 1,
@@ -50,8 +50,8 @@
         },
         "Level-4.tmx": {
             "expandedObjectLayers": [
-                3,
-                2
+                2,
+                3
             ],
             "scale": 1.3240625,
             "selectedLayer": 1,
@@ -62,19 +62,23 @@
         },
         "Level-5.tmx": {
             "expandedObjectLayers": [
-                3,
-                2
+                2,
+                3
             ],
             "scale": 1.3240625,
             "selectedLayer": 1,
             "viewCenter": {
-                "x": 175.5959405239556,
-                "y": 529.4312013216899
+                "x": 183.90370545197072,
+                "y": 319.84894972858154
             }
         },
         "Level-6.tmx": {
+            "expandedObjectLayers": [
+                2,
+                3
+            ],
             "scale": 1.3240625,
-            "selectedLayer": 0,
+            "selectedLayer": 1,
             "viewCenter": {
                 "x": 183.90370545197072,
                 "y": 320.2265754071277
@@ -92,7 +96,8 @@
         "Level-2.tmx",
         "Level-3.tmx",
         "Level-4.tmx",
-        "Level-5.tmx"
+        "Level-5.tmx",
+        "Level-6.tmx"
     ],
     "project": "GameyCon.tiled-project",
     "property.type": "string",
@@ -102,8 +107,8 @@
         "Level-3.tmx",
         "Level-4.tmx",
         "Level-5.tmx",
-        "GameyCon.tsx",
         "Level-6.tmx",
+        "GameyCon.tsx",
         "level-1.tmx",
         "level-2.tmx"
     ],

diff --git a/assets/tiles/Level-2.tmx b/assets/tiles/Level-2.tmx
@@ -90,7 +90,7 @@
     <property name="offPos" type="float" value="5"/>
    </properties>
   </object>
-  <object id="43" name="Player" type="Player" x="51.3571" y="572.481" width="33.2311" height="31.7206"/>
+  <object id="43" name="Player" type="Player" x="67.9726" y="570.97" width="33.2311" height="31.7206"/>
  </objectgroup>
  <objectgroup id="3" name="Collisions">
   <object id="9" x="0" y="0.755251" width="15.105" height="638.187"/>

diff --git a/assets/tiles/Level-6.tmx b/assets/tiles/Level-6.tmx
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="23" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="4" nextobjectid="28">
+ <tileset firstgid="1" source="GameyCon.tsx"/>
+ <layer id="1" name="Background" width="23" height="40">
+  <data encoding="csv">
+35,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,35,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,106,107,108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,106,107,108,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,106,107,108,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,106,107,108,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,106,107,108,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,106,107,108,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,106,107,108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,106,107,108,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,106,107,108,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,106,107,108,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,106,107,108,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,106,107,108,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,106,107,108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,
+35,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,35
+</data>
+ </layer>
+ <objectgroup id="2" name="Spawnpoints">
+  <object id="18" name="Player" type="Player" x="55.8886" y="544.536" width="31.7206" height="31.7206"/>
+  <object id="19" name="Chicken" type="Chicken" x="318.716" y="591.739" width="31.7206" height="30.9653">
+   <properties>
+    <property name="offNeg" type="float" value="18"/>
+    <property name="offPos" type="float" value="1"/>
+   </properties>
+  </object>
+  <object id="20" name="Melon" type="Fruit" x="152.561" y="80.8119" width="31.7206" height="30.2101"/>
+  <object id="21" type="Checkpoint" x="57.0215" y="18.5036" width="62.6859" height="62.6859"/>
+  <object id="22" name="Apple" type="Fruit" x="151.806" y="257.541" width="31.7206" height="30.2101"/>
+  <object id="24" type="Saw" x="239.415" y="288.128" width="31.7206" height="30.9653">
+   <properties>
+    <property name="isVertical" type="bool" value="true"/>
+    <property name="offNeg" type="float" value="2"/>
+    <property name="offPos" type="float" value="4"/>
+   </properties>
+  </object>
+  <object id="25" type="Saw" x="64.1963" y="429.36" width="31.7206" height="30.9653">
+   <properties>
+    <property name="isVertical" type="bool" value="true"/>
+    <property name="offNeg" type="float" value="2"/>
+    <property name="offPos" type="float" value="4"/>
+   </properties>
+  </object>
+  <object id="26" type="Saw" x="65.7068" y="162.001" width="31.7206" height="30.9653">
+   <properties>
+    <property name="isVertical" type="bool" value="true"/>
+    <property name="offNeg" type="float" value="2"/>
+    <property name="offPos" type="float" value="4"/>
+   </properties>
+  </object>
+  <object id="27" type="Saw" x="302.856" y="49.469" width="31.7206" height="30.9653">
+   <properties>
+    <property name="isVertical" type="bool" value="true"/>
+    <property name="offNeg" type="float" value="2"/>
+    <property name="offPos" type="float" value="4"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="3" name="Collisions">
+  <object id="1" x="0.755264" y="1.13281" width="13.5945" height="621.572"/>
+  <object id="2" x="353.458" y="1.13281" width="13.5945" height="621.572"/>
+  <object id="3" x="17.3714" y="0.755265" width="334.575" height="15.105"/>
+  <object id="4" x="0.755831" y="623.082" width="367.051" height="15.105"/>
+  <object id="5" x="63.8193" y="81.5672" width="47.5798" height="15.105"/>
+  <object id="6" x="144.631" y="113.288" width="47.5798" height="15.105"/>
+  <object id="7" x="224.688" y="145.008" width="47.5798" height="15.105"/>
+  <object id="8" x="288.129" y="192.589" width="47.5798" height="15.105"/>
+  <object id="9" x="224.688" y="240.17" width="47.5798" height="15.105"/>
+  <object id="10" x="143.876" y="287.751" width="47.5798" height="15.105"/>
+  <object id="11" x="63.8193" y="335.332" width="47.5798" height="15.105"/>
+  <object id="12" x="143.121" y="368.563" width="47.5798" height="15.105"/>
+  <object id="13" x="223.177" y="416.144" width="47.5798" height="15.105"/>
+  <object id="14" x="287.374" y="481.095" width="47.5798" height="15.105"/>
+  <object id="15" x="208.072" y="512.06" width="47.5798" height="15.105"/>
+  <object id="16" x="128.771" y="543.781" width="47.5798" height="15.105"/>
+  <object id="17" x="47.959" y="577.767" width="47.5798" height="15.105"/>
+ </objectgroup>
+</map>
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,5 +1,7 @@
 // ignore_for_file: prefer_const_constructors
 
+import 'dart:math';
+
 import 'package:flame/flame.dart';
 import 'package:flutter/material.dart';
 import 'package:firebase_core/firebase_core.dart';
@@ -32,7 +34,7 @@ void main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
   await dotenv.load();
-  globals.apiKey = dotenv.env['RAWG_API_KEY'];
+  _loadRandomApiKey();
   await Firebase.initializeApp(
     options: DefaultFirebaseOptions.currentPlatform,
   );
@@ -93,12 +95,30 @@ void main() async {
       ChangeNotifierProvider.value(value: themeProvider, child: const MyApp()));
 }
 
+void _loadRandomApiKey() {
+  final apiKeys = [
+    dotenv.env['RAWG_API_KEY'],
+    dotenv.env['RAWG_API_KEY2'],
+    dotenv.env['RAWG_API_KEY3'],
+    dotenv.env['RAWG_API_KEY4'],
+    dotenv.env['RAWG_API_KEY5'],
+    dotenv.env['RAWG_API_KEY6'],
+  ];
+
+  final random = Random(DateTime.now().millisecondsSinceEpoch);
+  final selectedApiKey = apiKeys[random.nextInt(apiKeys.length)];
+
+  globals.apiKey = selectedApiKey;
+}
+
 class MyApp extends StatelessWidget {
   // ignore: use_super_parameters
   const MyApp({Key? key}) : super(key: key);
+
 
   @override
   Widget build(BuildContext context) {
+    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp,DeviceOrientation.portraitDown]);
     return MaterialApp(
       title: 'GameOnConnect',
       theme: Provider.of<ThemeProvider>(context).themeData,

diff --git a/lib/services/profile_S/profile_service.dart b/lib/services/profile_S/profile_service.dart
@@ -101,21 +101,31 @@ class ProfileService {
 
   Future<String> getProfileName(String userId) async {
     FirebaseFirestore db = FirebaseFirestore.instance;
+    const int maxRetries = 5;
+    const Duration retryDelay = Duration(milliseconds: 500);
 
-    DocumentSnapshot profileSnapshot = await db
-        .collection("profile_data")
-        .doc(userId)
-        .get(); //get the document
-    Map<String, dynamic> data =
-        profileSnapshot.data() as Map<String, dynamic>; //map the overall data
-    Map<String, dynamic> userInfo =
-        data['username'] as Map<String, dynamic>; //map the username data
-    // Return profile name if exists otherwise give an empty string
-    if (profileSnapshot.exists) {
-      return userInfo['profile_name'];
-    } else {
-      return '';
+    for (int attempt = 0; attempt < maxRetries; attempt++) {
+      try {
+        DocumentSnapshot profileSnapshot = await db
+            .collection("profile_data")
+            .doc(userId)
+            .get(); //get the document
+        Map<String, dynamic> data = profileSnapshot.data()
+            as Map<String, dynamic>; //map the overall data
+        Map<String, dynamic> userInfo =
+            data['username'] as Map<String, dynamic>; //map the username data
+        // Return profile name if exists otherwise give an empty string
+        if (profileSnapshot.exists) {
+          return userInfo['profile_name'];
+        }
+      } catch (e) {
+        //print('Attempt $attempt failed: $e');
+      }
+      // Wait before retrying
+      await Future.delayed(retryDelay);
     }
+    //return empty string if the profile name is not found
+    return '';
   }
 
   Future<void> setCurrentlyPlaying(String gameId) async {

diff --git a/lib/view/components/GameyCon/gameycon_game.dart b/lib/view/components/GameyCon/gameycon_game.dart
@@ -23,7 +23,7 @@ class GameyCon extends FlameGame
   bool showControls = true;
   bool playSounds = true;
   double soundVolume = 1.0;
-  List<String> levelNames = ['Level-1', 'Level-2', 'Level-3', 'Level-4', 'Level-5'];
+  List<String> levelNames = ['Level-1', 'Level-2', 'Level-3', 'Level-4', 'Level-5', 'Level-6'];
   int currentLevelIndex = 0;
 
   GameyCon({required String selectedCharacter}) {

diff --git a/lib/view/components/home/start_timer.dart b/lib/view/components/home/start_timer.dart
@@ -110,7 +110,7 @@ class _GameTimer extends State<GameTimer> {
                                 return Text('Error: ${snapshot.error}');
                               } else if (!snapshot.hasData ||
                                   snapshot.data!.isEmpty) {
-                                return const Text('No data found');
+                                return const Text('Add a game to \'My Games\' to start');
                               } else {
                                 return FittedBox(
                                     child: DropdownMenu<String>(

diff --git a/lib/view/components/settings/edit_input_text.dart b/lib/view/components/settings/edit_input_text.dart
@@ -4,16 +4,18 @@ class EditInputText extends StatefulWidget {
   final String label;
   final void Function(String value) onChanged;
   final String input;
-  final int maxLines;
+  final int maxLength;
   final Key inputKey;
+  final bool validate;
 
   const EditInputText(
       {super.key,
-      required this.maxLines,
+      required this.maxLength,
       required this.label,
       required this.onChanged,
       required this.input,
-      required this.inputKey});
+      required this.inputKey,
+      required this.validate});
 
   @override
   State<EditInputText> createState() => _EditInputText();
@@ -56,7 +58,18 @@ class _EditInputText extends State<EditInputText> {
             ),
             initialValue: widget.input,
             style: TextStyle(color: Theme.of(context).colorScheme.secondary, fontSize: 12),
-            maxLines: widget.maxLines,
+            maxLength: widget.maxLength,
+            validator: widget.validate?(value) {
+              if (value == null || value.isEmpty) {
+                return 'Please enter a username';
+              }
+              if (!RegExp(r'^[a-zA-Z ]+$').hasMatch(value)) {
+                return 'Only alphabetical letters are permitted';
+              }
+              return null;
+            }: (value){
+              return null;
+            },
           ),
         ],
       ),