Fix/username

.github/workflows/build.yml

@@ -44,6 +44,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 5: Create local.properties file

.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

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,6 +95,22 @@ 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);

lib/services/profile_S/profile_service.dart

@@ -101,21 +101,31 @@
 
   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 {

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>(

lib/view/pages/badges/badge_page.dart

@@ -104,7 +104,7 @@ class _BadgePageState extends State<BadgePage> {
               } else if (snapshot.hasError) {
                 return Text('Error: ${snapshot.error}');
               } else if (!snapshot.hasData || snapshot.data!.isEmpty) {
-                return const Text('No users with the unlocked badge');
+                return const Text('No connections with the unlocked badge');
               } else {
                 List<String> profilePictures = snapshot.data!;