Merge pull request #452 from tusharlock10/449-push-new-player-pages-i…

…n-a-stack-instead-of-replacing-the-old-page

449 push new player pages in a stack instead of replacing the old page

.github/workflows/build-test.yaml

@@ -11,7 +11,7 @@ on:
       - develop
 
 env:
-  flutter_version: "3.19.1"
+  flutter_version: "3.19.3"
 
 jobs:
   build-test-apk:
@@ -30,7 +30,6 @@ jobs:
 
       - name: Download credential files
         run: |
-          aws s3 cp s3://${{ secrets.PE_PRIVATE_AWS_S3_BUCKET_NAME }}/credentials/client/paladins-edge-stage.env ./paladins-edge.env
           aws s3 cp s3://${{ secrets.PE_PRIVATE_AWS_S3_BUCKET_NAME }}/credentials/client/google-services.json ./android/app/
           aws s3 cp s3://${{ secrets.PE_PRIVATE_AWS_S3_BUCKET_NAME }}/credentials/client/upload-keystore.jks ./android/app/
           aws s3 cp s3://${{ secrets.PE_PRIVATE_AWS_S3_BUCKET_NAME }}/credentials/client/key.properties ./android/

.github/workflows/prod-workflow.yaml

@@ -9,7 +9,7 @@ on:
       - main
 
 env:
-  flutter_version: "3.19.1"
+  flutter_version: "3.19.3"
 
 jobs:
   build-apk:
@@ -28,7 +28,6 @@ jobs:
 
       - name: Download credential files
         run: |
-          aws s3 cp s3://${{ secrets.PE_PRIVATE_AWS_S3_BUCKET_NAME }}/credentials/client/paladins-edge-prod.env ./paladins-edge.env
           aws s3 cp s3://${{ secrets.PE_PRIVATE_AWS_S3_BUCKET_NAME }}/credentials/client/google-services.json ./android/app/
           aws s3 cp s3://${{ secrets.PE_PRIVATE_AWS_S3_BUCKET_NAME }}/credentials/client/upload-keystore.jks ./android/app/
           aws s3 cp s3://${{ secrets.PE_PRIVATE_AWS_S3_BUCKET_NAME }}/credentials/client/key.properties ./android/
@@ -95,7 +94,6 @@ jobs:
 
       - name: Download credential files
         run: |
-          aws s3 cp s3://${{ secrets.PE_PRIVATE_AWS_S3_BUCKET_NAME }}/credentials/client/paladins-edge-prod.env ./paladins-edge.env
           aws s3 cp s3://${{ secrets.PE_PRIVATE_AWS_S3_BUCKET_NAME }}/credentials/client/google-services.json ./android/app/
           aws s3 cp s3://${{ secrets.PE_PRIVATE_AWS_S3_BUCKET_NAME }}/credentials/client/upload-keystore.jks ./android/app/
           aws s3 cp s3://${{ secrets.PE_PRIVATE_AWS_S3_BUCKET_NAME }}/credentials/client/key.properties ./android/

.github/workflows/staging-workflow.yaml

@@ -9,7 +9,7 @@ on:
       - develop
 
 env:
-  flutter_version: "3.19.1"
+  flutter_version: "3.19.3"
 
 jobs:
   build-bundle:
@@ -28,7 +28,6 @@ jobs:
 
       - name: Download credential files
         run: |
-          aws s3 cp s3://${{ secrets.PE_PRIVATE_AWS_S3_BUCKET_NAME }}/credentials/client/paladins-edge-stage.env ./paladins-edge.env
           aws s3 cp s3://${{ secrets.PE_PRIVATE_AWS_S3_BUCKET_NAME }}/credentials/client/google-services.json ./android/app/
           aws s3 cp s3://${{ secrets.PE_PRIVATE_AWS_S3_BUCKET_NAME }}/credentials/client/upload-keystore.jks ./android/app/
           aws s3 cp s3://${{ secrets.PE_PRIVATE_AWS_S3_BUCKET_NAME }}/credentials/client/key.properties ./android/

lib/api/players/requests.dart

@@ -102,21 +102,6 @@ abstract class PlayersRequests {
     }
   }
 
-  static Future<responses.FavouriteFriendsResponse?> favouriteFriends() async {
-    try {
-      final response = await utilities.api.get<Map<String, dynamic>>(
-        constants.Urls.favouriteFriends,
-      );
-      if (response.data != null) {
-        return responses.FavouriteFriendsResponse.fromJson(response.data!);
-      }
-
-      return null;
-    } catch (_) {
-      return null;
-    }
-  }
-
   static Future<responses.UpdateFavouriteFriendResponse?>
       updateFavouriteFriend({
     required String playerId,

lib/api/players/responses.dart

@@ -104,17 +104,6 @@ class FriendsResponse {
   Map<String, dynamic> toJson() => _$FriendsResponseToJson(this);
 }
 
-@JsonSerializable()
-class FavouriteFriendsResponse {
-  final List<Player> favouriteFriends;
-
-  FavouriteFriendsResponse({required this.favouriteFriends});
-
-  factory FavouriteFriendsResponse.fromJson(Map<String, dynamic> json) =>
-      _$FavouriteFriendsResponseFromJson(json);
-  Map<String, dynamic> toJson() => _$FavouriteFriendsResponseToJson(this);
-}
-
 @JsonSerializable()
 class UpdateFavouriteFriendResponse {
   final List<String> favouriteFriends;

lib/constants/app_type.dart

@@ -0,0 +1,14 @@
+import "package:paladinsedge/constants/constants.dart";
+
+abstract class AppType {
+  static const development = "development";
+  static const production = "production";
+
+  static const developmentShort = "dev";
+  static const productionShort = "prod";
+
+  static String get shortAppType =>
+      isDebug ? developmentShort : productionShort;
+
+  static String get appType => isDebug ? development : production;
+}

lib/constants/constants.dart

@@ -1,9 +1,10 @@
 import "package:flutter/foundation.dart";
 import "package:flutter/material.dart";
+import "package:paladinsedge/constants/platforms.dart";
 
 const isDebug = kDebugMode;
 const apiTimeout = isDebug ? 10 * 1000 : 20 * 1000;
-const releaseTag = "stable";
+final releaseTag = isWindows ? "alpha" : "stable";
 
 abstract class NotificationChannels {
   static const friends = "friends";
@@ -82,3 +83,7 @@ const themeNames = {
   ThemeMode.light: "light",
   ThemeMode.system: "system",
 };
+
+const baseUrl = "https://api.paladinsedge.app";
+const githubLink = "https://github.com/tusharlock10/paladins-edge-client";
+const sponsorLink = "https://github.com/sponsors/tusharlock10";

lib/constants/index.dart

@@ -1,8 +1,8 @@
 export "./analytics.dart";
+export "./app_type.dart";
 export "./champions.dart";
 export "./constants.dart";
 export "./database.dart";
-export "./environment.dart";
 export "./login_cta.dart";
 export "./match.dart";
 export "./platforms.dart";

lib/providers/auth.dart

@@ -37,7 +37,7 @@ class _AuthNotifier extends ChangeNotifier {
   bool isGuest = true;
   String? token;
   models.User? user;
-  models.Player? player;
+  models.Player? userPlayer;
   List<models.FAQ>? faqs;
   List<models.Sponsor>? sponsors;
   List<data_classes.CombinedMatch>? savedMatches;
@@ -77,24 +77,17 @@ class _AuthNotifier extends ChangeNotifier {
 
   /// Loads and the `essentials` from local db and syncs it with server
   Future<void> loadEssentials() async {
-    // gets the essential data for the app
-
-    // getting the essential data from local until the api call is completed
+    // get the essentials from local db
     final savedEssentials = utilities.Database.getEssentials();
+    final future = _getEssentials();
 
-    api.EssentialsResponse? response;
-    while (true) {
-      response = await api.AuthRequests.essentials();
-      if (response == null && savedEssentials != null) {
-        utilities.Global.essentials = savedEssentials;
-
-        return;
-      }
-      if (response != null) break;
+    if (savedEssentials != null) {
+      // if saved essentials are found, don't wait for future
+      utilities.Global.essentials = savedEssentials;
+    } else {
+      // wait for future, if essentials are not found
+      await future;
     }
-
-    utilities.Database.saveEssentials(response.essentials);
-    utilities.Global.essentials = response.essentials;
   }
 
   /// Checks whether the paladins API is in working state
@@ -109,9 +102,9 @@ class _AuthNotifier extends ChangeNotifier {
   bool checkLogin() {
     token = utilities.Database.getToken();
     user = utilities.Database.getUser();
-    player = utilities.Database.getPlayer();
+    userPlayer = utilities.Database.getPlayer();
 
-    utilities.Global.isPlayerConnected = player != null;
+    utilities.Global.isPlayerConnected = userPlayer != null;
 
     if (token != null) {
       isGuest = false;
@@ -157,12 +150,12 @@ class _AuthNotifier extends ChangeNotifier {
 
     user = response.user;
     token = response.token;
-    player = response.player;
+    userPlayer = response.player;
 
     utilities.api.options.headers["authorization"] = "Bearer $token";
     utilities.Global.isAuthenticated = true;
     isGuest = false;
-    if (player != null) utilities.Global.isPlayerConnected = true;
+    if (userPlayer != null) utilities.Global.isPlayerConnected = true;
 
     _recordLoginAnalytics();
     // upon successful login, send FCM token and deviceDetail to server
@@ -212,17 +205,16 @@ class _AuthNotifier extends ChangeNotifier {
     clearData();
     ref.read(providers.champions).clearData();
     ref.read(providers.loadout).clearData();
-    ref.read(providers.matches).clearData();
-    ref.read(providers.players).clearData();
     ref.read(providers.appState).clearData();
+    ref.read(providers.search).clearData();
 
     // clear values from the database and utilities
     utilities.Database.clear();
 
     utilities.api.options.headers["authorization"] = null;
     utilities.Global.isAuthenticated = false;
     isGuest = true;
-    if (player != null) utilities.Global.isPlayerConnected = false;
+    if (userPlayer != null) utilities.Global.isPlayerConnected = false;
 
     notifyListeners();
 
@@ -234,11 +226,11 @@ class _AuthNotifier extends ChangeNotifier {
     final response = await api.AuthRequests.connectPlayer(playerId: playerId);
     if (response == null) return null;
 
-    player = response.player;
     user = response.user;
+    userPlayer = response.player;
 
     utilities.Database.saveUser(response.user);
-    utilities.Database.savePlayer(player!);
+    utilities.Database.savePlayer(userPlayer!);
 
     utilities.Global.isPlayerConnected = true;
     utilities.Analytics.logEvent(constants.AnalyticsEvent.connectPlayer);
@@ -311,7 +303,7 @@ class _AuthNotifier extends ChangeNotifier {
       (_) => _.match.matchId == matchId,
     );
     if (combinedMatch == null) {
-      final matchDetails = ref.read(providers.matches).matchDetails;
+      final matchDetails = ref.read(providers.matches(matchId)).matchDetails;
       if (matchDetails != null && matchDetails.match.matchId == matchId) {
         combinedMatch = data_classes.CombinedMatch(
           match: matchDetails.match,
@@ -422,13 +414,32 @@ class _AuthNotifier extends ChangeNotifier {
   }
 
   void clearData() {
-    player = null;
+    userPlayer = null;
     token = null;
     isGuest = false;
     user = null;
   }
 
+  Future<void> _getEssentials() async {
+    while (true) {
+      final response = await api.AuthRequests.essentials();
+      if (response != null) {
+        utilities.Global.essentials = response.essentials;
+        utilities.Database.saveEssentials(response.essentials);
+
+        return;
+      }
+
+      await Future.delayed(const Duration(seconds: 1));
+    }
+  }
+
   Future<_GetFirebaseAuthResponse> _getFirebaseAuthCredentials() async {
+    // NOTE: for development login in windows
+    if (constants.isWindows && constants.isDebug) {
+      return _GetFirebaseAuthResponse(idToken: "testUser");
+    }
+
     final GoogleSignInAccount? googleUser;
     try {
       googleUser = await GoogleSignIn().signIn();
@@ -503,7 +514,7 @@ class _AuthNotifier extends ChangeNotifier {
       );
     }
     if (user != null) utilities.Analytics.setUserId(user!.uid);
-    if (player != null) {
+    if (userPlayer != null) {
       utilities.Analytics.logEvent(constants.AnalyticsEvent.existingUserLogin);
     } else {
       utilities.Analytics.logEvent(constants.AnalyticsEvent.newUserLogin);