Merge pull request #495 from M4dhav/dev

Author: Aarush-Acharya

analysis_options.yaml

@@ -9,7 +9,11 @@
 # packages, and plugins designed to encourage good coding practices.
 include: package:flutter_lints/flutter.yaml
 
+analyzer:
+    errors:
+      invalid_annotation_target: ignore
 linter:
+  
   # The lint rules applied to this project can be customized in the
   # section below to disable rules from the `package:flutter_lints/flutter.yaml`
   # included above or to enable additional rules. A list of all available lints

lib/controllers/auth_state_controller.dart

@@ -31,6 +31,8 @@ class AuthStateController extends GetxController {
   late String? userName;
   late bool? isUserProfileComplete;
   late bool? isEmailVerified;
+  late double ratingTotal;
+  late int ratingCount;
   late User appwriteUser;
 
   FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
@@ -145,6 +147,8 @@ class AuthStateController extends GetxController {
         profileImageUrl = userDataDoc.data["profileImageUrl"];
         profileImageID = userDataDoc.data["profileImageID"];
         userName = userDataDoc.data["username"] ?? "unavailable";
+        ratingTotal = userDataDoc.data["ratingTotal"].toDouble() ?? 5;
+        ratingCount = userDataDoc.data["ratingCount"] ?? 1;
       }
 
       update();

lib/controllers/pair_chat_controller.dart

@@ -1,14 +1,17 @@
+import 'dart:async';
 import 'dart:developer';
 
 import 'package:appwrite/appwrite.dart';
 import 'package:appwrite/models.dart';
 import 'package:get/get.dart';
 import 'package:livekit_client/livekit_client.dart';
 import 'package:resonate/controllers/auth_state_controller.dart';
+import 'package:resonate/models/resonate_user.dart';
 import 'package:resonate/routes/app_routes.dart';
 import 'package:resonate/services/appwrite_service.dart';
 import 'package:resonate/services/room_service.dart';
 import 'package:resonate/utils/constants.dart';
+import 'package:resonate/views/widgets/rating_sheet.dart';
 
 import 'livekit_controller.dart';
 
@@ -25,23 +28,30 @@ class PairChatController extends GetxController {
 
   String? pairUsername;
   String? pairProfileImageUrl;
+  RxDouble pairRating = 2.5.obs;
 
   Client client = AppwriteService.getClient();
   final Realtime realtime = AppwriteService.getRealtime();
   final Databases databases = AppwriteService.getDatabases();
   late RealtimeSubscription? subscription;
+  late RealtimeSubscription? userAddedSubscription;
+  AuthStateController authController = Get.find<AuthStateController>();
+
+  RxList<ResonateUser> usersList = <ResonateUser>[].obs;
+  final RxBool isUserListLoading = true.obs;
 
   void quickMatch() async {
-    String uid = Get.find<AuthStateController>().uid!;
-    String userName = Get.find<AuthStateController>().userName!;
+    String uid = authController.uid!;
+    String userName = authController.userName!;
 
     // Open realtime stream to check whether the request is paired
     getRealtimeStream();
 
     Map<String, dynamic> requestData = {
       "languageIso": languageIso,
       "isAnonymous": isAnonymous.value,
-      "uid": uid
+      "uid": uid,
+      "isRandom": true,
     };
     requestData.addIf(!isAnonymous.value, "userName", userName);
 
@@ -57,8 +67,46 @@ class PairChatController extends GetxController {
     Get.toNamed(AppRoutes.pairing);
   }
 
+  void choosePartner() async {
+    checkForNewUsers();
+    getRealtimeStream();
+    isAnonymous.value = false;
+    Map<String, dynamic> requestData = {
+      "languageIso": languageIso,
+      "isAnonymous": false,
+      "uid": authController.uid,
+      "isRandom": false,
+      "profileImageUrl": authController.profileImageUrl,
+      "userName": authController.userName,
+      "name": authController.displayName,
+      "userRating": authController.ratingTotal / authController.ratingCount,
+    };
+
+    // Add request to pair-request collection
+    Document requestDoc = await databases.createDocument(
+        databaseId: masterDatabaseId,
+        collectionId: pairRequestCollectionId,
+        documentId: ID.unique(),
+        data: requestData);
+    requestDocId = requestDoc.$id;
+    Get.toNamed(AppRoutes.pairChatUsers);
+  }
+
+  Future<void> convertToRandom() async {
+    userAddedSubscription?.close();
+    getRealtimeStream();
+    await databases.updateDocument(
+        databaseId: masterDatabaseId,
+        collectionId: pairRequestCollectionId,
+        documentId: requestDocId!,
+        data: {
+          'isRandom': true,
+        });
+    Get.toNamed(AppRoutes.pairing);
+  }
+
   void getRealtimeStream() {
-    String uid = Get.find<AuthStateController>().uid!;
+    String uid = authController.uid!;
     String channel =
         'databases.$masterDatabaseId.collections.$activePairsCollectionId.documents';
     subscription = realtime.subscribe([channel]);
@@ -99,15 +147,84 @@ class PairChatController extends GetxController {
               }
             case 'delete':
               {
-                subscription?.close;
-                Get.offNamedUntil(AppRoutes.tabview, (route) => false);
+                endChat();
               }
           }
         }
       }
     });
   }
 
+  Future<void> pairWithSelectedUser(ResonateUser user) async {
+    log('pairing');
+    await databases.createDocument(
+        databaseId: masterDatabaseId,
+        collectionId: activePairsCollectionId,
+        documentId: ID.unique(),
+        data: {
+          'uid1': authController.uid,
+          'uid2': user.uid,
+          'userName1': authController.userName,
+          'userName2': user.userName,
+          'userDocId1': requestDocId,
+          'userDocId2': user.docId,
+        });
+  }
+
+  void checkForNewUsers() {
+    log('listening for new users');
+    String channel =
+        'databases.$masterDatabaseId.collections.$pairRequestCollectionId.documents';
+    userAddedSubscription = realtime.subscribe([channel]);
+    userAddedSubscription?.stream.listen((data) async {
+      final event = data.events.first;
+      if (data.payload.isNotEmpty) {
+        if (event.endsWith('.create')) {
+          log('adding new user');
+          // If a new user is added to the pair request collection
+          final userData = data.payload;
+          final eventSplit = event.split('.');
+          final docId =
+              eventSplit[eventSplit.length - 2]; // Get the second last
+          userData['docId'] = docId; // Add docId to the user
+          ResonateUser newUser = ResonateUser.fromJson(userData);
+
+          usersList.add(newUser);
+        } else if (event.endsWith('.delete')) {
+          ResonateUser removedUser = ResonateUser.fromJson(data.payload);
+          usersList.removeWhere((user) => user.uid == removedUser.uid);
+        }
+      }
+    });
+  }
+
+  Future<void> loadUsers() async {
+    isUserListLoading.value = true;
+    log("Loading users");
+    usersList.clear();
+    final result = await databases.listDocuments(
+        databaseId: masterDatabaseId,
+        collectionId: pairRequestCollectionId,
+        queries: [
+          Query.notEqual('uid', authController.uid!),
+          Query.notEqual('isAnonymous', true),
+          Query.limit(100)
+        ]);
+    if (result.documents.isEmpty) {
+      isUserListLoading.value = false;
+      return;
+    } else {
+      usersList.addAll(result.documents.map((doc) {
+        final userData = doc.data;
+        userData['docId'] = doc.$id; // Add docId to the user data
+        ResonateUser user = ResonateUser.fromJson(userData);
+
+        return user;
+      }).toList());
+    }
+    isUserListLoading.value = false;
+  }
+
   Future<void> joinPairChat(roomId, userId) async {
     await RoomService.joinLivekitPairChat(roomId: roomId, userId: userId);
     Get.toNamed(AppRoutes.pairChat);
@@ -119,6 +236,7 @@ class PairChatController extends GetxController {
         collectionId: pairRequestCollectionId,
         documentId: requestDocId!);
     subscription?.close();
+    userAddedSubscription?.close();
     Get.offNamedUntil(AppRoutes.tabview, (route) => false);
   }
 
@@ -136,12 +254,22 @@ class PairChatController extends GetxController {
   }
 
   Future<void> endChat() async {
-    subscription?.close;
-    await databases.deleteDocument(
-        databaseId: masterDatabaseId,
-        collectionId: activePairsCollectionId,
-        documentId: activePairDocId!);
+    subscription?.close();
+    try {
+      await databases.deleteDocument(
+          databaseId: masterDatabaseId,
+          collectionId: activePairsCollectionId,
+          documentId: activePairDocId!);
+    } catch (e) {
+      if (!(e is AppwriteException && e.type == 'document_not_found')) {
+        rethrow;
+      }
+    }
     await Get.delete<LiveKitController>(force: true);
+
+    await Get.bottomSheet(
+      RatingSheetWidget(),
+    );
     Get.offNamedUntil(AppRoutes.tabview, (route) => false);
   }
 }

lib/l10n/app_en.arb

@@ -519,5 +519,9 @@
     "lengthMinutes": "min",
     "requiredField": "Required field",
     "clickPictureUsingCamera": "Click picture using camera",
-    "pickImageFromGallery": "Pick image from gallery"
+    "pickImageFromGallery": "Pick image from gallery",
+    "onlineUsers": "Online Users",
+    "noOnlineUsers": "No users currently online",
+    "chooseUser": "Choose User to chat with",
+    "quickMatch": "Quick Match"
 }

lib/l10n/app_hi.arb

@@ -520,5 +520,9 @@
     "lengthMinutes": "मिनट",
     "requiredField": "आवश्यक फील्ड",
     "clickPictureUsingCamera": "कैमरा से फोटो लें",
-    "pickImageFromGallery": "गैलरी से फोटो चुनें"
+    "pickImageFromGallery": "गैलरी से फोटो चुनें",
+    "onlineUsers": "ऑनलाइन यूज़र्स",
+    "noOnlineUsers": "कोई यूज़र अभी ऑनलाइन नहीं है",
+    "chooseUser": "चैट करने के लिए यूज़र चुनें",
+    "quickMatch": "झटपट मैच"
 }

lib/l10n/app_localizations.dart

@@ -1946,6 +1946,30 @@ abstract class AppLocalizations {
   /// In en, this message translates to:
   /// **'Pick image from gallery'**
   String get pickImageFromGallery;
+
+  /// No description provided for @onlineUsers.
+  ///
+  /// In en, this message translates to:
+  /// **'Online Users'**
+  String get onlineUsers;
+
+  /// No description provided for @noOnlineUsers.
+  ///
+  /// In en, this message translates to:
+  /// **'No users currently online'**
+  String get noOnlineUsers;
+
+  /// No description provided for @chooseUser.
+  ///
+  /// In en, this message translates to:
+  /// **'Choose User to chat with'**
+  String get chooseUser;
+
+  /// No description provided for @quickMatch.
+  ///
+  /// In en, this message translates to:
+  /// **'Quick Match'**
+  String get quickMatch;
 }
 
 class _AppLocalizationsDelegate

lib/l10n/app_localizations_en.dart

@@ -1053,4 +1053,16 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get pickImageFromGallery => 'Pick image from gallery';
+
+  @override
+  String get onlineUsers => 'Online Users';
+
+  @override
+  String get noOnlineUsers => 'No users currently online';
+
+  @override
+  String get chooseUser => 'Choose User to chat with';
+
+  @override
+  String get quickMatch => 'Quick Match';
 }

lib/l10n/app_localizations_hi.dart

@@ -1058,4 +1058,16 @@ class AppLocalizationsHi extends AppLocalizations {
 
   @override
   String get pickImageFromGallery => 'गैलरी से फोटो चुनें';
+
+  @override
+  String get onlineUsers => 'ऑनलाइन यूज़र्स';
+
+  @override
+  String get noOnlineUsers => 'कोई यूज़र अभी ऑनलाइन नहीं है';
+
+  @override
+  String get chooseUser => 'चैट करने के लिए यूज़र चुनें';
+
+  @override
+  String get quickMatch => 'झटपट मैच';
 }

lib/models/resonate_user.dart

@@ -1,17 +1,27 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
+
 part 'resonate_user.freezed.dart';
 part 'resonate_user.g.dart';
 
 @freezed
-class ResonateUser with _$ResonateUser {
+abstract class ResonateUser with _$ResonateUser {
   const factory ResonateUser({
     String? uid,
-    String? userName,
+    @JsonKey(name: 'userName') String? userName,
     String? profileImageUrl,
-    String? gender,
-    String? dateOfBirth,
+    String? name,
+    String? email,
+    @JsonKey(name: 'dob') String? dateOfBirth,
+    String? docId,
+    @JsonKey(fromJson: _toDouble) double? userRating,
   }) = _ResonateUser;
 
   factory ResonateUser.fromJson(Map<String, dynamic> json) =>
       _$ResonateUserFromJson(json);
 }
+
+double? _toDouble(dynamic value) {
+  if (value == null) return null;
+  if (value is int) return value.toDouble();
+  return null;
+}