diff --git a/.env b/.env
index e6924f2..0e02e14 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
-API_URL=http://node.shoy.publicvm.com/
+API_URL=https://node.shoy.publicvm.com/
giphyApiKey=Ahjpgfo4LVqCACHRcwj0eoMlY5s7u1Uq
-Socket_Url=https://app-dbef67eb-9a2e-44fa-abff-3e8b83204d9c.cleverapps.io
+Socket_Url=https://node.shoy.publicvm.com
serverClientId=1096363232606-2fducjadk56bt4nsreqkj2jna7oiomga.apps.googleusercontent.com
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index ffafe51..1f09463 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,3 @@
{
- "cmake.sourceDirectory": "C:/Users/kerol/Cross_Platform/linux"
+ "cmake.sourceDirectory": "D:/ThirdYear/SWE/project/Cross_Platform/linux"
}
\ No newline at end of file
diff --git a/README.md b/README.md
index a7bc535..9378874 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,34 @@
+## Localization Setup
+
+- Added `flutter_localizations` and `intl` to `pubspec.yaml`.
+- Created `l10n.yaml` to configure Flutter's gen-l10n.
+- Added ARB files in `lib/l10n/`:
+ - `app_en.arb`
+ - `app_ar.arb`
+- Wired delegates and supported locales in `lib/main.dart`.
+
+### How to add strings
+- Edit ARB files under `lib/l10n/` and add new keys.
+- Keep the same keys across languages.
+
+### Generate localization code
+- Run:
+
+ ```powershell
+ flutter gen-l10n
+ ```
+
+- Import and use generated `AppLocalizations` in widgets:
+
+ ```dart
+ import 'package:lite_x/l10n/app_localizations.dart';
+
+ Text(AppLocalizations.of(context)!.trendsTitle)
+ ```
+
+### Switching locales
+- By default, the app supports `en` and `ar` and follows system locale.
+- You can set a specific locale on `MaterialApp.router` by providing `locale: const Locale('ar')`.
# lite_x
Lite X is a Flutter/Riverpod client for the X-like backend that exposes a complete Tweets API surface. The app now exercises every Tweets Interaction endpoint (create/update/delete, likes, retweets, bookmarks, replies, quotes, mentions, summaries, liked tweets, user timelines, and search) through dedicated repositories, view models, and screens.
diff --git a/firebase.json b/firebase.json
index f486d99..b684bcc 100644
--- a/firebase.json
+++ b/firebase.json
@@ -1 +1 @@
-{"flutter":{"platforms":{"android":{"default":{"projectId":"litex-3c6f1","appId":"1:123824690535:android:fc6ea2d45764d44a960bc2","fileOutput":"android/app/google-services.json"}},"dart":{"lib/firebase_options.dart":{"projectId":"litex-3c6f1","configurations":{"android":"1:123824690535:android:fc6ea2d45764d44a960bc2","ios":"1:123824690535:ios:7d4e4fe266a006fe960bc2","macos":"1:123824690535:ios:7d4e4fe266a006fe960bc2","web":"1:123824690535:web:5c24b3d2f16411d1960bc2","windows":"1:123824690535:web:70728cc3cfda8de2960bc2"}}}}}}
\ No newline at end of file
+{"flutter":{"platforms":{"android":{"default":{"projectId":"psychic-fin-474008-h8","appId":"1:112144721859:android:227c69fccfe2ec4c813f76","fileOutput":"android/app/google-services.json"}},"dart":{"lib/firebase_options.dart":{"projectId":"psychic-fin-474008-h8","configurations":{"android":"1:112144721859:android:227c69fccfe2ec4c813f76","ios":"1:112144721859:ios:990931c2c90bbd22813f76","macos":"1:112144721859:ios:990931c2c90bbd22813f76","web":"1:112144721859:web:cd55e199eb8ef04e813f76","windows":"1:112144721859:web:01d0e76c4bc65596813f76"}}}}}}
\ No newline at end of file
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 022c8d2..9d1a9ea 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -1,58 +1,70 @@
-
+
-
- CFBundleDevelopmentRegion
- $(DEVELOPMENT_LANGUAGE)
- CFBundleDisplayName
- Lite X
- CFBundleExecutable
- $(EXECUTABLE_NAME)
- CFBundleIdentifier
- $(PRODUCT_BUNDLE_IDENTIFIER)
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleName
- lite_x
- CFBundlePackageType
- APPL
- CFBundleShortVersionString
- $(FLUTTER_BUILD_NAME)
- CFBundleSignature
- ????
- CFBundleVersion
- $(FLUTTER_BUILD_NUMBER)
- LSRequiresIPhoneOS
-
-
- NSPhotoLibraryUsageDescription
- Allow access to your photo library to select and upload images.
- NSPhotoLibraryAddUsageDescription
- Allow the app to save photos to your photo library.
- NSCameraUsageDescription
- Allow access to the camera to take profile photos and capture media.
- NSMicrophoneUsageDescription
- Allow access to the microphone to record audio for media uploads.
- UILaunchStoryboardName
- LaunchScreen
- UIMainStoryboardFile
- Main
- UISupportedInterfaceOrientations
-
- UIInterfaceOrientationPortrait
- UIInterfaceOrientationLandscapeLeft
- UIInterfaceOrientationLandscapeRight
-
- UISupportedInterfaceOrientations~ipad
-
- UIInterfaceOrientationPortrait
- UIInterfaceOrientationPortraitUpsideDown
- UIInterfaceOrientationLandscapeLeft
- UIInterfaceOrientationLandscapeRight
-
- CADisableMinimumFrameDurationOnPhone
-
- UIApplicationSupportsIndirectInputEvents
-
-
+
+ CFBundleDevelopmentRegion
+ $(DEVELOPMENT_LANGUAGE)
+ CFBundleDisplayName
+ Lite X
+ CFBundleExecutable
+ $(EXECUTABLE_NAME)
+ CFBundleIdentifier
+ $(PRODUCT_BUNDLE_IDENTIFIER)
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleName
+ lite_x
+ CFBundlePackageType
+ APPL
+ CFBundleShortVersionString
+ $(FLUTTER_BUILD_NAME)
+ CFBundleSignature
+ ????
+ CFBundleVersion
+ $(FLUTTER_BUILD_NUMBER)
+ LSRequiresIPhoneOS
+
+ NSPhotoLibraryUsageDescription
+ Pick an image from gallery
+ NSCameraUsageDescription
+ Pick an image from Camera
+ NSMicrophoneUsageDescription
+ enable microphone
+ UILaunchStoryboardName
+ LaunchScreen
+ UIMainStoryboardFile
+ Main
+ UISupportedInterfaceOrientations
+
+ UIInterfaceOrientationPortrait
+ UIInterfaceOrientationLandscapeLeft
+ UIInterfaceOrientationLandscapeRight
+
+ UISupportedInterfaceOrientations~ipad
+
+ UIInterfaceOrientationPortrait
+ UIInterfaceOrientationPortraitUpsideDown
+ UIInterfaceOrientationLandscapeLeft
+ UIInterfaceOrientationLandscapeRight
+
+ CADisableMinimumFrameDurationOnPhone
+
+ UIApplicationSupportsIndirectInputEvents
+
+ CFBundleURLTypes
+
+
+ CFBundleTypeRole
+ Editor
+ CFBundleURLName
+ com.Artemsia.lite-x
+ CFBundleURLSchemes
+
+ myapp
+
+
+
+ FlutterDeepLinkingEnabled
+
+
\ No newline at end of file
diff --git a/l10n.yaml b/l10n.yaml
new file mode 100644
index 0000000..28e23bc
--- /dev/null
+++ b/l10n.yaml
@@ -0,0 +1,8 @@
+# Flutter localization configuration
+# See: https://docs.flutter.dev/ui/accessibility-and-internationalization/internationalization
+arb-dir: lib/l10n
+template-arb-file: app_en.arb
+output-localization-file: app_localizations.dart
+output-class: AppLocalizations
+nullable-getter: false
+untranslated-messages-file: build/untranslated_messages.txt
diff --git a/lib/core/classes/PickedImage.dart b/lib/core/classes/PickedImage.dart
index 49c98a2..3f2ba6a 100644
--- a/lib/core/classes/PickedImage.dart
+++ b/lib/core/classes/PickedImage.dart
@@ -42,3 +42,21 @@ Future> pickImages({int maxImages = 4}) async {
return [];
}
}
+
+Future pickVideo() async {
+ try {
+ final ImagePicker picker = ImagePicker();
+ final XFile? video = await picker.pickVideo(source: ImageSource.gallery);
+
+ if (video != null) {
+ return PickedImage(
+ file: File(video.path),
+ name: video.name,
+ path: video.path,
+ );
+ }
+ return null;
+ } catch (e) {
+ return null;
+ }
+}
diff --git a/lib/core/models/usermodel.dart b/lib/core/models/usermodel.dart
index 555fb80..7c7993e 100644
--- a/lib/core/models/usermodel.dart
+++ b/lib/core/models/usermodel.dart
@@ -20,7 +20,7 @@ class UserModel {
final String username;
@HiveField(4)
- final String? photo;
+ final String? photo; // media Id
@HiveField(5)
final String? bio;
@@ -40,7 +40,7 @@ class UserModel {
@HiveField(10)
final Set interests;
@HiveField(11)
- final String? localProfilePhotoPath;
+ final String? localProfilePhotoPath; // path of local profile photo
UserModel({
required this.name,
diff --git a/lib/core/providers/unseenChatsCountProvider.dart b/lib/core/providers/unseenChatsCountProvider.dart
new file mode 100644
index 0000000..31f764f
--- /dev/null
+++ b/lib/core/providers/unseenChatsCountProvider.dart
@@ -0,0 +1,3 @@
+import 'package:flutter_riverpod/legacy.dart';
+
+final unseenChatsCountProvider = StateProvider((ref) => 0);
diff --git a/lib/core/routes/AppRouter.dart b/lib/core/routes/AppRouter.dart
index d43296a..e0e63d4 100644
--- a/lib/core/routes/AppRouter.dart
+++ b/lib/core/routes/AppRouter.dart
@@ -19,11 +19,12 @@ import 'package:lite_x/features/auth/view/screens/Create_Account/Password_Screen
import 'package:lite_x/features/auth/view/screens/Create_Account/Upload_Profile_Photo_Screen.dart';
import 'package:lite_x/features/auth/view/screens/Create_Account/Verification_Screen.dart';
import 'package:lite_x/features/auth/view/screens/Log_In/VerificationForgot_Screen.dart';
-import 'package:lite_x/features/chat/view/screens/Search_Direct_messages.dart';
+import 'package:lite_x/features/auth/view/screens/Oauth/SetBirthdate.dart';
import 'package:lite_x/features/chat/view/screens/Search_User_Group.dart';
import 'package:lite_x/features/chat/view/screens/chat_Screen.dart';
import 'package:lite_x/features/chat/view/screens/conversations_screen.dart';
import 'package:lite_x/features/explore/view/explore_screen.dart';
+import 'package:lite_x/features/trends/view/screens/trends_screen.dart';
import 'package:lite_x/features/home/view/screens/tweet_screen.dart';
import 'package:lite_x/features/profile/models/profile_model.dart';
import 'package:lite_x/features/profile/models/shared.dart';
@@ -51,36 +52,12 @@ import 'package:lite_x/features/settings/screens/UserName_Screen.dart';
import 'package:lite_x/features/settings/screens/YourAccount_Screen.dart';
import 'package:lite_x/features/settings/screens/AccountInformation_Screen.dart';
import 'package:lite_x/features/settings/screens/ChangePassword_Screen.dart';
+import 'package:lite_x/features/notifications/view/screens/Notification_Screen.dart';
class Approuter {
static final GoRouter router = GoRouter(
- // initialLocation: "/appshell",
initialLocation: "/splash",
- // initialExtra: ProfileModel(
- // id: "",
- // username: "hazememam",
- // displayName: "Hazem Emam",
- // email: "hazem@gmail.com",
- // bio: "Hello from hazem emam ",
- // avatarUrl:
- // "https://images.pexels.com/photos/31510092/pexels-photo-31510092.jpeg",
- // bannerUrl:
- // "https://images.pexels.com/photos/1765033/pexels-photo-1765033.jpeg",
- // followersCount: 15,
- // followingCount: 20,
- // tweetsCount: 15,
- // isVerified: false,
- // joinedDate: formatDate(DateTime(2004, 8, 21), DateFormatType.fullDate),
- // website: "https://google.cof",
- // location: "cairo",
- // postCount: 2,
- // birthDate: formatDate(DateTime(2004, 8, 21), DateFormatType.fullDate),
- // isFollowing: false,
- // isFollower: false,
- // protectedAccount: false,
- // isBlockedByMe: true,
- // isMutedByMe: false,
- // ),
+ // initialLocation: "/trends",
routes: [
GoRoute(
name: RouteConstants.splash,
@@ -184,6 +161,14 @@ class Approuter {
transitionsBuilder: _slideRightTransitionBuilder,
),
),
+ GoRoute(
+ name: RouteConstants.setbirthdate,
+ path: "/setbirthdate",
+ pageBuilder: (context, state) => CustomTransitionPage(
+ child: const Setbirthdate(),
+ transitionsBuilder: _slideRightTransitionBuilder,
+ ),
+ ),
GoRoute(
name: RouteConstants.ForgotpasswordScreen,
path: "/ForgotpasswordScreen",
@@ -279,14 +264,6 @@ class Approuter {
),
),
- GoRoute(
- name: RouteConstants.SearchDirectMessages,
- path: "/SearchDirectMessages",
- pageBuilder: (context, state) => CustomTransitionPage(
- child: const SearchDirectMessages(),
- transitionsBuilder: _slideRightTransitionBuilder,
- ),
- ),
GoRoute(
name: RouteConstants.Interests,
path: "/Interests",
@@ -366,6 +343,8 @@ class Approuter {
subtitle: extraData['subtitle'],
profileImage: extraData['avatarUrl'],
isGroup: extraData['isGroup'] ?? false,
+ recipientFollowersCount:
+ extraData['recipientFollowersCount'] ?? 0,
),
transitionsBuilder: _slideRightTransitionBuilder,
);
@@ -385,7 +364,7 @@ class Approuter {
name: RouteConstants.SearchScreen,
path: "/searchScreen",
pageBuilder: (context, state) => CustomTransitionPage(
- child: SearchScreen(),
+ child: SearchScreen(extra: state.extra as Map?),
transitionsBuilder: _slideRightTransitionBuilder,
),
),
@@ -397,6 +376,14 @@ class Approuter {
transitionsBuilder: _slideRightTransitionBuilder,
),
),
+ GoRoute(
+ name: RouteConstants.TrendsScreen,
+ path: "/trends",
+ pageBuilder: (context, state) => CustomTransitionPage(
+ child: const TrendsScreen(),
+ transitionsBuilder: _slideRightTransitionBuilder,
+ ),
+ ),
GoRoute(
name: RouteConstants.ProfilePhotoScreen,
path: "/profilePhotoScreen",
@@ -453,6 +440,14 @@ class Approuter {
transitionsBuilder: _slideRightTransitionBuilder,
),
),
+ GoRoute(
+ name: RouteConstants.notifications,
+ path: "/notifications",
+ pageBuilder: (context, state) => CustomTransitionPage(
+ child: const NotificationScreen(),
+ transitionsBuilder: _slideRightTransitionBuilder,
+ ),
+ ),
],
redirect: (context, state) {
return null;
diff --git a/lib/core/routes/Route_Constants.dart b/lib/core/routes/Route_Constants.dart
index 7dc85b6..da1c993 100644
--- a/lib/core/routes/Route_Constants.dart
+++ b/lib/core/routes/Route_Constants.dart
@@ -19,6 +19,7 @@ class RouteConstants {
static String changePasswordScreen = "changePasswordScreen";
static String Interests = "Interests";
static String usernamesettings = "usernamesettings";
+ static String setbirthdate = "setbirthdate";
static String FollowingFollowersScreen = "FollowingFollowersScreen";
static String BirthDateScreen = "BirthDateScreen";
@@ -45,11 +46,17 @@ class RouteConstants {
"VerifyChangeEmailProfileScreen";
// search feature
- static String SearchScreen = "SearchScreen";
+ static String SearchScreen = "searchScreen";
// explore feature
static String ExploreScreen = "ExploreScreen";
static String ExploreProfileScreen = "ExploreProfileScreen";
+
+ // trends feature
+ static String TrendsScreen = "TrendsScreen";
+
+
static String TweetDetailsScreen = "TweetDetailsScreen";
+ static String notifications = "notifications";
}
diff --git a/lib/core/services/deep_link_service.dart b/lib/core/services/deep_link_service.dart
index 1ec4d1a..59ab16b 100644
--- a/lib/core/services/deep_link_service.dart
+++ b/lib/core/services/deep_link_service.dart
@@ -21,7 +21,6 @@ class DeepLinkService {
}
});
- // إضافة مراقب لحالة التطبيق
WidgetsBinding.instance.addObserver(_observer);
}
diff --git a/lib/core/utils.dart b/lib/core/utils.dart
index e3850cf..97525a2 100644
--- a/lib/core/utils.dart
+++ b/lib/core/utils.dart
@@ -72,31 +72,31 @@ String? passwordValidator(String? value) {
if (value == null || value.isEmpty) {
return 'Password is required';
}
- if (value.length < 8) {
- return 'Password must be at least 8 characters';
+ if (value.length < 9) {
+ return 'Password must be at least 9 characters';
}
if (value.length > 256) {
return 'Password must be less than 256 characters';
}
final capitalLetters = RegExp(r'[A-Z]');
- if (capitalLetters.allMatches(value).length < 3) {
- return 'Password must contain at least 3 uppercase letters';
+ if (capitalLetters.allMatches(value).length < 1) {
+ return 'Password must contain at least 1 uppercase letter';
}
final lowercaseLetters = RegExp(r'[a-z]');
- if (lowercaseLetters.allMatches(value).length < 3) {
- return 'Password must contain at least 3 lowercase letters';
+ if (lowercaseLetters.allMatches(value).length < 1) {
+ return 'Password must contain at least 1 lowercase letter';
}
final symbols = RegExp(r'[!@#\$%^&*(),.?":{}|<>_\-=+;]');
- if (symbols.allMatches(value).length < 3) {
- return 'Password must contain at least 3 symbols';
+ if (symbols.allMatches(value).length < 1) {
+ return 'Password must contain at least 1 symbol';
}
final numbers = RegExp(r'\d');
- if (numbers.allMatches(value).length < 3) {
- return 'Password must contain at least 3 numbers';
+ if (numbers.allMatches(value).length < 1) {
+ return 'Password must contain at least 1 number';
}
return null;
diff --git a/lib/core/view/screen/app_shell.dart b/lib/core/view/screen/app_shell.dart
index 86128f0..f7107c8 100644
--- a/lib/core/view/screen/app_shell.dart
+++ b/lib/core/view/screen/app_shell.dart
@@ -6,6 +6,7 @@ import 'package:lite_x/features/chat/view/screens/conversations_screen.dart';
import 'package:lite_x/features/home/view/screens/home_screen.dart';
import 'package:lite_x/features/profile/view/screens/explore_profile_screen.dart';
import 'package:lite_x/features/shared/widgets/bottom_navigation.dart';
+import 'package:lite_x/features/notifications/view/screens/Notification_Screen.dart';
// Provider for managing which tab is selected
final shellNavigationProvider = StateProvider((ref) => 0);
@@ -30,24 +31,9 @@ class AppShell extends ConsumerWidget {
// _buildSearchScreen(), // Index 1 - Search
ExploreProfileScreen(),
_buildCommunitiesScreen(), // Index 2 - Communities
- _buildNotificationsScreen(), // Index 3 - Notifications
+ NotificationScreen(), // Index 3 - Notifications
ConversationsScreen(),
- //// Index 4 - Messages
- // ListView(
- // children: [
- // Padding(
- // padding: const EdgeInsets.all(24),
- // child: Text(
- // "Nothing to see here -- yet.",
- // style: TextStyle(
- // color: Colors.white,
- // fontWeight: FontWeight.bold,
- // fontSize: 35,
- // ),
- // ),
- // ),
- // ],
- // ),
+
],
),
bottomNavigationBar: AnimatedContainer(
@@ -65,16 +51,6 @@ class AppShell extends ConsumerWidget {
);
}
- // Placeholder screens - you'll create these later
- Widget _buildSearchScreen() {
- return const Center(
- child: Text(
- 'Search Screen',
- style: TextStyle(color: Colors.white, fontSize: 24),
- ),
- );
- }
-
Widget _buildNotificationsScreen() {
return const Center(
child: Text(
diff --git a/lib/features/auth/repositories/auth_remote_repository.dart b/lib/features/auth/repositories/auth_remote_repository.dart
index 263e914..8474d8c 100644
--- a/lib/features/auth/repositories/auth_remote_repository.dart
+++ b/lib/features/auth/repositories/auth_remote_repository.dart
@@ -1,4 +1,3 @@
-// ignore_for_file: unused_catch_clause
import 'dart:convert';
import 'dart:io';
import 'package:flutter/foundation.dart';
@@ -32,10 +31,9 @@ class AuthRemoteRepository {
try {
final baseUrl = dotenv.env["API_URL"]!;
final authUrl = "${baseUrl}oauth2/authorize/github";
- final fullUrl = "$authUrl?redirect_uri=${baseUrl}login/success";
final opened = await launchUrl(
- Uri.parse(fullUrl),
+ Uri.parse(authUrl),
mode: LaunchMode.externalApplication,
);
@@ -50,7 +48,7 @@ class AuthRemoteRepository {
}
final token = uri.queryParameters["token"];
- final refresh = uri.queryParameters["refresh"];
+ final refresh = uri.queryParameters["refresh-token"];
final userRaw = uri.queryParameters["user"];
if (token == null || refresh == null || userRaw == null) {
@@ -76,7 +74,7 @@ class AuthRemoteRepository {
final _googleSignIn = signIn.GoogleSignIn(
serverClientId:
- "1096363232606-2fducjadk56bt4nsreqkj2jna7oiomga.apps.googleusercontent.com",
+ "https://1096363232606-2fducjadk56bt4nsreqkj2jna7oiomga.apps.googleusercontent.com",
scopes: ['email', 'https://www.googleapis.com/auth/userinfo.profile'],
);
@@ -134,7 +132,7 @@ class AuthRemoteRepository {
data: {'name': name, 'email': email, 'dateOfBirth': dateOfBirth},
);
return right(response.data['message'] ?? 'Verification email sent');
- } on DioException catch (e) {
+ } on DioException {
return left(AppFailure(message: 'Signup failed'));
} catch (e) {
return left(AppFailure(message: e.toString()));
@@ -154,7 +152,7 @@ class AuthRemoteRepository {
final message = response.data['message'] ?? 'Verified successfully';
return right(message);
- } on DioException catch (e) {
+ } on DioException {
return left(AppFailure(message: 'Email verification failed'));
} catch (e) {
return left(AppFailure(message: e.toString()));
@@ -171,11 +169,12 @@ class AuthRemoteRepository {
'api/auth/finalize_signup',
data: {'email': email, 'password': password},
);
-
+ print("asermohamed${response.data['tokens']}");
final user = UserModel.fromMap(response.data['user']);
final tokens = TokensModel.fromMap(response.data['tokens']);
+
return right((user, tokens));
- } on DioException catch (e) {
+ } on DioException {
return left(AppFailure(message: 'Signup failed'));
} catch (e) {
return left(AppFailure(message: e.toString()));
@@ -235,7 +234,7 @@ class AuthRemoteRepository {
print("MEDIA ID AFTER UPLOAD: $mediaId");
return right({'mediaId': mediaId, 'keyName': newMediaKey});
- } on DioException catch (e) {
+ } on DioException {
return left(AppFailure(message: 'Upload failed'));
} catch (e) {
return left(AppFailure(message: e.toString()));
@@ -269,6 +268,19 @@ class AuthRemoteRepository {
}
}
+ //-----------------------------------------------------------------------updateprofilephoto----------------------------------------------------------------------------------//
+ Future> updateProfilePhoto(
+ String userId,
+ String mediaId,
+ ) async {
+ try {
+ await _dio.patch("api/users/profile-picture/$userId/$mediaId");
+ return const Right(());
+ } catch (e) {
+ return Left(AppFailure(message: "couldn't update profile picture"));
+ }
+ }
+
//-------------------------------------------------------------------------------------------------------------------------------------------------------//
Future> updateUsername({
required UserModel currentUser,
@@ -283,14 +295,32 @@ class AuthRemoteRepository {
final updatedUser = currentUser.copyWith(username: newUsername);
final newtokens = TokensModel.fromMap_update(response.data['tokens']);
return right((updatedUser, newtokens));
- } on DioException catch (e) {
+ } on DioException {
return left(AppFailure(message: 'Failed to update username'));
} catch (e) {
return left(AppFailure(message: e.toString()));
}
}
- //---------------------------------------------------------google sign up--------------------------------------------------------------------------//
+ //---------------------------------------------------------setbirthdate-------------------------------------------------------------------------//
+ Future> setbirthdate({
+ required String day,
+ required String month,
+ required String year,
+ }) async {
+ try {
+ final response = await _dio.post(
+ 'api/auth/set-birthdate',
+ data: {'day': day, 'month': month, 'year': year},
+ );
+ final message = response.data['message'] as String;
+ return right(message);
+ } on DioException {
+ return left(AppFailure(message: 'Failed to set birthdate'));
+ } catch (e) {
+ return left(AppFailure(message: e.toString()));
+ }
+ }
//-------------------------------------------------FCM Token Registration-----------------------------------------------------------------------------------------//
Future> registerFcmToken({
@@ -339,15 +369,17 @@ class AuthRemoteRepository {
final user = UserModel.fromMap(response.data['user']);
final tokens = TokensModel.fromMap_login(response.data);
- // print(tokens);
+ print("asermohamed${user.id}");
+ print("asermohamed${tokens.accessToken}");
return right((user, tokens));
- } on DioException catch (e) {
+ } on DioException {
return left(AppFailure(message: 'Login failed'));
} catch (e) {
return left(AppFailure(message: "Wrong Password"));
}
}
+ //-----------------------------------------------check email-------------------------------------------------------------------------------------//
Future> check_email({required String email}) async {
try {
final response = await _dio.post(
@@ -355,13 +387,31 @@ class AuthRemoteRepository {
data: {'email': email},
);
return right(response.data['exists'] ?? false);
- } on DioException catch (e) {
+ } on DioException {
return left(AppFailure(message: 'Email check failed'));
} catch (e) {
return left(AppFailure(message: e.toString()));
}
}
+ //--------------------------------------suggest usernames--------------------------------------//
+ Future>> suggest_usernames({
+ required String username,
+ }) async {
+ try {
+ final response = await _dio.post(
+ 'api/auth/suggest-usernames',
+ data: {'name': username},
+ );
+ final suggestions = List.from(response.data['suggestions'] ?? []);
+ return right(suggestions);
+ } on DioException {
+ return left(AppFailure(message: 'Username suggestions failed'));
+ } catch (e) {
+ return left(AppFailure(message: e.toString()));
+ }
+ }
+
//--------------------------------------forgetpassword---------------------------------------------------------------//
Future> forget_password({
required String email,
@@ -373,7 +423,7 @@ class AuthRemoteRepository {
);
final message = response.data['message'] ?? 'Reset code sent';
return right(message);
- } on DioException catch (e) {
+ } on DioException {
return left(AppFailure(message: 'Forget password failed'));
} catch (e) {
return left(AppFailure(message: e.toString()));
@@ -391,7 +441,7 @@ class AuthRemoteRepository {
);
final message = response.data['message'] ?? 'Reset code verified';
return right(message);
- } on DioException catch (e) {
+ } on DioException {
return left(AppFailure(message: 'Verify reset code failed'));
} catch (e) {
return left(AppFailure(message: e.toString()));
@@ -410,7 +460,7 @@ class AuthRemoteRepository {
final user = UserModel.fromMap(response.data['user']);
final tokens = TokensModel.fromMap_reset_password(response.data);
return right((user, tokens));
- } on DioException catch (e) {
+ } on DioException {
return left(AppFailure(message: 'Reset password failed'));
} catch (e) {
return left(AppFailure(message: e.toString()));
@@ -437,7 +487,7 @@ class AuthRemoteRepository {
final message =
response.data['message'] ?? 'Password updated successfully';
return right(message);
- } on DioException catch (e) {
+ } on DioException {
return left(AppFailure(message: 'update password failed'));
} catch (e) {
return left(AppFailure(message: e.toString()));
@@ -455,7 +505,7 @@ class AuthRemoteRepository {
);
final message = response.data['message'] ?? 'Email updated successfully';
return right(message);
- } on DioException catch (e) {
+ } on DioException {
return left(AppFailure(message: 'update email failed'));
} catch (e) {
return left(AppFailure(message: e.toString()));
@@ -474,7 +524,7 @@ class AuthRemoteRepository {
final message = response.data['message'] ?? 'updated email successfully';
return right(message);
- } on DioException catch (e) {
+ } on DioException {
return left(AppFailure(message: 'Email update failed'));
} catch (e) {
return left(AppFailure(message: e.toString()));
diff --git a/lib/features/auth/view/screens/Create_Account/CreateAccount_Screen.dart b/lib/features/auth/view/screens/Create_Account/CreateAccount_Screen.dart
index ef94e27..329eeed 100644
--- a/lib/features/auth/view/screens/Create_Account/CreateAccount_Screen.dart
+++ b/lib/features/auth/view/screens/Create_Account/CreateAccount_Screen.dart
@@ -267,7 +267,7 @@ class _CreateAccountScreenState extends ConsumerState {
color: Palette.textWhite,
),
),
- const SizedBox(height: 150),
+ const SizedBox(height: 100),
CustomTextField(
controller: _nameController,
labelText: 'Name',
@@ -279,7 +279,7 @@ class _CreateAccountScreenState extends ConsumerState {
context,
).requestFocus(_emailFocus),
),
- const SizedBox(height: 10),
+ const SizedBox(height: 15),
CustomTextField(
controller: _emailController,
labelText: 'Email',
@@ -289,7 +289,7 @@ class _CreateAccountScreenState extends ConsumerState {
focusNode: _emailFocus,
validationState: _emailState,
),
- const SizedBox(height: 25),
+ const SizedBox(height: 15),
CustomTextField(
controller: _dobController,
labelText: 'Date of birth',
@@ -303,7 +303,7 @@ class _CreateAccountScreenState extends ConsumerState {
),
),
_buildNextButton(isLoading),
- const SizedBox(height: 15),
+ const SizedBox(height: 5),
],
),
),
@@ -322,7 +322,6 @@ class _CreateAccountScreenState extends ConsumerState {
padding: const EdgeInsets.all(10),
alignment: Alignment.centerRight,
child: SizedBox(
- width: 90,
child: ElevatedButton(
onPressed: (_isFormValid && !isLoading) ? _handleNext : null,
style: ElevatedButton.styleFrom(
@@ -330,7 +329,7 @@ class _CreateAccountScreenState extends ConsumerState {
disabledBackgroundColor: Palette.textWhite.withOpacity(0.5),
foregroundColor: Palette.background,
disabledForegroundColor: Palette.border,
- minimumSize: const Size(0, 40),
+ minimumSize: const Size(0, 50),
),
child: const Text(
'Next',
diff --git a/lib/features/auth/view/screens/Create_Account/Password_Screen.dart b/lib/features/auth/view/screens/Create_Account/Password_Screen.dart
index ed53692..0c785d9 100644
--- a/lib/features/auth/view/screens/Create_Account/Password_Screen.dart
+++ b/lib/features/auth/view/screens/Create_Account/Password_Screen.dart
@@ -177,7 +177,7 @@ class _PasswordScreenState extends ConsumerState {
valueListenable: _isFormValid,
builder: (context, isValid, child) {
return SizedBox(
- width: 120,
+ // width: 120,
child: ElevatedButton(
onPressed: (isValid && !isLoading) ? _handleSignUp : null,
style: ElevatedButton.styleFrom(
@@ -185,7 +185,7 @@ class _PasswordScreenState extends ConsumerState {
disabledBackgroundColor: Palette.textWhite.withOpacity(0.5),
foregroundColor: Palette.background,
disabledForegroundColor: Palette.border,
- minimumSize: const Size(0, 38),
+ minimumSize: const Size(0, 50),
),
child: isLoading
? const SizedBox(
diff --git a/lib/features/auth/view/screens/Create_Account/UserName_Screen.dart b/lib/features/auth/view/screens/Create_Account/UserName_Screen.dart
index 354c7ca..eb091d7 100644
--- a/lib/features/auth/view/screens/Create_Account/UserName_Screen.dart
+++ b/lib/features/auth/view/screens/Create_Account/UserName_Screen.dart
@@ -1,4 +1,4 @@
-import 'dart:math';
+import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart';
@@ -24,6 +24,8 @@ class _UsernameScreenState extends ConsumerState {
final _usernameController = TextEditingController();
final _isFormValid = ValueNotifier(false);
List suggestions = [];
+ Timer? _debounce;
+ bool _isSuggestionLoading = false;
@override
void initState() {
@@ -33,20 +35,43 @@ class _UsernameScreenState extends ConsumerState {
}
void _validateForm() {
- _isFormValid.value =
+ final isValid =
_usernameController.text.trim().isNotEmpty &&
- _usernameController.text.trim().length >= 3;
+ _usernameController.text.trim().length > 3;
+
+ _isFormValid.value = isValid;
+
+ if (_usernameController.text.trim().length > 3) {
+ _fetchSuggestions(_usernameController.text.trim());
+ } else {
+ if (suggestions.isNotEmpty || _isSuggestionLoading) {
+ setState(() {
+ suggestions = [];
+ _isSuggestionLoading = false;
+ });
+ }
+ }
}
- void generateSuggestions(String name) {
- final clean = name.replaceAll(" ", "").toLowerCase();
+ void _fetchSuggestions(String name) {
+ if (_debounce?.isActive ?? false) _debounce!.cancel();
+
setState(() {
- suggestions = [
- "${clean}${Random().nextInt(50)}",
- "${clean}_x",
- "${clean}_${DateTime.now().year}",
- "${clean}_${Random().nextInt(9999)}",
- ];
+ _isSuggestionLoading = true;
+ suggestions = [];
+ });
+
+ _debounce = Timer(const Duration(milliseconds: 500), () async {
+ final fetchedSuggestions = await ref
+ .read(authViewModelProvider.notifier)
+ .suggestUsernames(username: name);
+
+ if (mounted) {
+ setState(() {
+ suggestions = fetchedSuggestions.take(4).toList();
+ _isSuggestionLoading = false;
+ });
+ }
});
}
@@ -80,6 +105,8 @@ class _UsernameScreenState extends ConsumerState {
@override
void dispose() {
+ _debounce?.cancel();
+ _usernameController.removeListener(_validateForm);
_usernameController.dispose();
_isFormValid.dispose();
super.dispose();
@@ -101,12 +128,11 @@ class _UsernameScreenState extends ConsumerState {
backgroundColor: Palette.textPrimary,
),
);
- ref.read(authViewModelProvider.notifier).resetState();
}
});
final authState = ref.watch(authViewModelProvider);
- final isLoading = authState.isLoading;
+ final isFormSubmitting = authState.isLoading;
return Scaffold(
backgroundColor: Palette.background,
@@ -117,7 +143,7 @@ class _UsernameScreenState extends ConsumerState {
elevation: 0,
),
body: AbsorbPointer(
- absorbing: isLoading,
+ absorbing: isFormSubmitting,
child: Stack(
children: [
Center(
@@ -159,18 +185,10 @@ class _UsernameScreenState extends ConsumerState {
controller: _usernameController,
labelText: 'Username',
validator: usernameValidator,
- onChanged: (value) {
- if (value.isNotEmpty) {
- generateSuggestions(value);
- } else {
- setState(() {
- suggestions = [];
- });
- }
- },
),
- if (suggestions.isNotEmpty) ...[
- const SizedBox(height: 24),
+ if (suggestions.isNotEmpty &&
+ !_isSuggestionLoading) ...[
+ const SizedBox(height: 20),
Wrap(
spacing: 1,
children: suggestions.asMap().entries.map((
@@ -189,7 +207,7 @@ class _UsernameScreenState extends ConsumerState {
Container(
padding: const EdgeInsets.only(
left: 0,
- right: 10,
+ right: 8,
top: 5,
bottom: 5,
),
@@ -219,11 +237,11 @@ class _UsernameScreenState extends ConsumerState {
);
}).toList(),
),
- const SizedBox(height: 14),
+ const SizedBox(height: 4),
GestureDetector(
onTap: () {
- generateSuggestions(
- _usernameController.text,
+ _fetchSuggestions(
+ _usernameController.text.trim(),
);
},
child: const Text(
@@ -245,7 +263,7 @@ class _UsernameScreenState extends ConsumerState {
),
),
),
- if (isLoading)
+ if (isFormSubmitting)
Container(
color: Colors.black.withOpacity(0.5),
child: const Center(child: Loader()),
@@ -293,7 +311,6 @@ class _UsernameScreenState extends ConsumerState {
disabledBackgroundColor: Palette.textWhite.withOpacity(0.6),
foregroundColor: Palette.background,
disabledForegroundColor: Palette.border,
- minimumSize: const Size(0, 38),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(25),
),
diff --git a/lib/features/auth/view/screens/Create_Account/Verification_Screen.dart b/lib/features/auth/view/screens/Create_Account/Verification_Screen.dart
index 337efb1..27970df 100644
--- a/lib/features/auth/view/screens/Create_Account/Verification_Screen.dart
+++ b/lib/features/auth/view/screens/Create_Account/Verification_Screen.dart
@@ -45,12 +45,14 @@ class _VerificationScreenState extends ConsumerState {
if (!_formKey.currentState!.validate()) {
return;
}
+ FocusManager.instance.primaryFocus?.unfocus();
ref
.read(authViewModelProvider.notifier)
.verifySignupEmail(email: email, code: _codeController.text.trim());
}
void _resendCode() {
+ FocusManager.instance.primaryFocus?.unfocus();
ref
.read(authViewModelProvider.notifier)
.createAccount(name: name, email: email, dateOfBirth: dateOfBirth);
@@ -82,100 +84,105 @@ class _VerificationScreenState extends ConsumerState {
context.goNamed(RouteConstants.passwordscreen);
authViewModel.resetState();
} else if (next.type == AuthStateType.error) {
- ScaffoldMessenger.of(context).showSnackBar(
- SnackBar(
- content: Text(
- next.message ?? 'Invalid verification code',
- style: TextStyle(color: Palette.background),
+ FocusManager.instance.primaryFocus?.unfocus();
+ if (context.mounted) {
+ ScaffoldMessenger.of(context).showSnackBar(
+ SnackBar(
+ content: Text(
+ next.message ?? 'Invalid verification code',
+ style: const TextStyle(color: Palette.background),
+ ),
+ backgroundColor: Palette.textWhite,
),
- backgroundColor: Palette.textWhite,
- ),
- );
+ );
+ }
authViewModel.resetState();
}
});
final authState = ref.watch(authViewModelProvider);
final isLoading = authState.isLoading;
- return Scaffold(
- backgroundColor: Palette.background,
- appBar: AppBar(
- title: buildXLogo(size: 36),
- centerTitle: true,
+ return GestureDetector(
+ onTap: () => FocusManager.instance.primaryFocus?.unfocus(),
+ child: Scaffold(
backgroundColor: Palette.background,
- elevation: 0,
- ),
- body: AbsorbPointer(
- absorbing: isLoading,
-
- child: Stack(
- children: [
- Center(
- child: Container(
- width: double.infinity,
- height: double.infinity,
- decoration: BoxDecoration(color: Palette.background),
- child: Column(
- children: [
- Expanded(
- child: Form(
- key: _formKey,
- child: SingleChildScrollView(
- padding: const EdgeInsets.symmetric(
- horizontal: 32,
- vertical: 16,
- ),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- const Text(
- 'We sent you a code',
- style: TextStyle(
- fontSize: 28,
- fontWeight: FontWeight.w800,
- color: Palette.textWhite,
- ),
- ),
- const SizedBox(height: 12),
- Text(
- 'Enter it below to verify $email.',
- style: const TextStyle(
- fontSize: 15,
- color: Palette.textSecondary,
- ),
- ),
- const SizedBox(height: 32),
- CustomTextField(
- controller: _codeController,
- labelText: 'Verification code',
- keyboardType: TextInputType.number,
- validator: verificationCodeValidator,
- ),
- const SizedBox(height: 24),
- GestureDetector(
- onTap: _resendCode,
- child: const Text(
- 'Didn\'t receive an email?',
+ appBar: AppBar(
+ title: buildXLogo(size: 36),
+ centerTitle: true,
+ backgroundColor: Palette.background,
+ elevation: 0,
+ ),
+ body: AbsorbPointer(
+ absorbing: isLoading,
+ child: Stack(
+ children: [
+ Center(
+ child: Container(
+ width: double.infinity,
+ height: double.infinity,
+ decoration: BoxDecoration(color: Palette.background),
+ child: Column(
+ children: [
+ Expanded(
+ child: Form(
+ key: _formKey,
+ child: SingleChildScrollView(
+ padding: const EdgeInsets.symmetric(
+ horizontal: 32,
+ vertical: 16,
+ ),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ const Text(
+ 'We sent you a code',
style: TextStyle(
+ fontSize: 28,
+ fontWeight: FontWeight.w800,
+ color: Palette.textWhite,
+ ),
+ ),
+ const SizedBox(height: 12),
+ Text(
+ 'Enter it below to verify $email.',
+ style: const TextStyle(
fontSize: 15,
- color: Palette.primary,
+ color: Palette.textSecondary,
+ ),
+ ),
+ const SizedBox(height: 32),
+ CustomTextField(
+ controller: _codeController,
+ labelText: 'Verification code',
+ keyboardType: TextInputType.number,
+ validator: verificationCodeValidator,
+ ),
+ const SizedBox(height: 24),
+ GestureDetector(
+ onTap: _resendCode,
+ child: const Text(
+ 'Didn\'t receive an email?',
+ style: TextStyle(
+ fontSize: 15,
+ color: Palette.primary,
+ ),
),
),
- ),
- ],
+ ],
+ ),
),
),
),
- ),
- _buildNextButton(isLoading),
- const SizedBox(height: 15),
- ],
+ _buildNextButton(isLoading),
+ const SizedBox(height: 15),
+ ],
+ ),
),
),
- ),
- if (isLoading)
- Container(color: Colors.black, child: const Loader()),
- ],
+ if (isLoading)
+ Container(color: Colors.black, child: const Loader()),
+ ],
+ ),
),
),
);
diff --git a/lib/features/auth/view/screens/Intro_Screen.dart b/lib/features/auth/view/screens/Intro_Screen.dart
index ccee92a..cdf523a 100644
--- a/lib/features/auth/view/screens/Intro_Screen.dart
+++ b/lib/features/auth/view/screens/Intro_Screen.dart
@@ -1,17 +1,13 @@
-// ignore_for_file: unused_import
-
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart';
import 'package:lite_x/core/routes/Route_Constants.dart';
import 'package:lite_x/core/theme/palette.dart';
import 'package:lite_x/core/view/widgets/Loader.dart';
-import 'package:lite_x/features/auth/repositories/auth_remote_repository.dart';
import 'package:lite_x/features/auth/view/widgets/buildTermsText.dart';
import 'package:lite_x/features/auth/view/widgets/buildXLogo.dart';
import 'package:lite_x/features/auth/view_model/auth_state.dart';
import 'package:lite_x/features/auth/view_model/auth_view_model.dart';
-import 'package:google_sign_in/google_sign_in.dart';
class IntroScreen extends ConsumerWidget {
const IntroScreen({super.key});
@@ -41,14 +37,11 @@ class IntroScreen extends ConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final size = MediaQuery.of(context).size;
-
- // Listen to auth state changes
ref.listen(authViewModelProvider, (previous, next) {
final authViewModel = ref.read(authViewModelProvider.notifier);
if (next.type == AuthStateType.authenticated) {
- context.goNamed(RouteConstants.homescreen);
- authViewModel.resetState();
+ context.goNamed(RouteConstants.setbirthdate);
} else if (next.type == AuthStateType.error) {
_showErrorToast(
context,
@@ -109,7 +102,7 @@ class IntroScreen extends ConsumerWidget {
),
SizedBox(height: size.height * 0.15),
_buildAuthButtons(context, ref),
- const SizedBox(height: 25),
+ const SizedBox(height: 20),
buildTermsText(),
const SizedBox(height: 5),
_buildLoginSection(context),
diff --git a/lib/features/auth/view/screens/Oauth/SetBirthdate.dart b/lib/features/auth/view/screens/Oauth/SetBirthdate.dart
new file mode 100644
index 0000000..446b3e8
--- /dev/null
+++ b/lib/features/auth/view/screens/Oauth/SetBirthdate.dart
@@ -0,0 +1,227 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:go_router/go_router.dart';
+import 'package:intl/intl.dart';
+import 'package:lite_x/core/routes/Route_Constants.dart';
+import 'package:lite_x/core/theme/palette.dart';
+import 'package:lite_x/core/utils.dart';
+import 'package:lite_x/core/view/widgets/Loader.dart';
+import 'package:lite_x/features/auth/view/widgets/CustomTextField.dart';
+import 'package:lite_x/features/auth/view/widgets/buildXLogo.dart';
+import 'package:lite_x/features/auth/view_model/auth_view_model.dart';
+import 'package:lite_x/features/auth/view_model/auth_state.dart';
+
+class Setbirthdate extends ConsumerStatefulWidget {
+ const Setbirthdate({super.key});
+
+ @override
+ ConsumerState createState() => _SetbirthdateState();
+}
+
+class _SetbirthdateState extends ConsumerState {
+ final _dobController = TextEditingController();
+ final _isFormValid = ValueNotifier(false);
+ @override
+ void initState() {
+ super.initState();
+ _dobController.addListener(_validateForm);
+ }
+
+ @override
+ void dispose() {
+ _dobController.dispose();
+ _isFormValid.dispose();
+ super.dispose();
+ }
+
+ void _validateForm() {
+ final isValid = _dobController.text.trim().isNotEmpty;
+ _isFormValid.value = isValid;
+ }
+
+ Future _selectDate(BuildContext context) async {
+ FocusScope.of(context).unfocus();
+
+ final picked = await showDatePicker(
+ context: context,
+ initialDate: DateTime(DateTime.now().year - 18),
+ firstDate: DateTime(1950),
+ lastDate: DateTime.now(),
+ builder: (context, child) {
+ return Theme(
+ data: ThemeData.dark().copyWith(
+ colorScheme: const ColorScheme.dark(
+ primary: Palette.primary,
+ onPrimary: Palette.textWhite,
+ surface: Palette.background,
+ onSurface: Palette.textWhite,
+ ),
+ dialogBackgroundColor: Palette.background,
+ ),
+ child: child!,
+ );
+ },
+ );
+
+ if (picked != null && mounted) {
+ _dobController.text = DateFormat('MM/dd/yyyy').format(picked);
+ }
+ }
+
+ void _handleSignUp() {
+ if (_dobController.text.trim().isEmpty) return;
+
+ FocusScope.of(context).unfocus();
+ ref
+ .read(authViewModelProvider.notifier)
+ .Setbirthdate(birthDate: _dobController.text.trim());
+ }
+
+ void _showErrorToast(String message) {
+ if (!mounted) return;
+ ScaffoldMessenger.of(context).showSnackBar(
+ SnackBar(
+ content: Text(
+ message,
+ textAlign: TextAlign.center,
+ style: const TextStyle(
+ color: Palette.textWhite,
+ fontSize: 15,
+ fontWeight: FontWeight.w500,
+ ),
+ ),
+ backgroundColor: Palette.greycolor,
+ behavior: SnackBarBehavior.floating,
+ shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+ margin: EdgeInsets.symmetric(
+ horizontal: MediaQuery.of(context).size.width * 0.15,
+ vertical: MediaQuery.of(context).size.height * 0.4,
+ ),
+ duration: const Duration(seconds: 3),
+ ),
+ );
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ ref.listen(authViewModelProvider, (previous, next) async {
+ if (next.type == AuthStateType.success) {
+ context.goNamed(RouteConstants.UserNameScreen);
+ } else if (next.type == AuthStateType.error) {
+ _showErrorToast(next.message ?? 'An error occurred');
+ }
+ });
+
+ final authState = ref.watch(authViewModelProvider);
+ final isLoading = authState.isLoading;
+
+ return Stack(
+ children: [
+ Scaffold(
+ backgroundColor: Palette.background,
+ appBar: AppBar(
+ title: buildXLogo(size: 36),
+ centerTitle: true,
+ backgroundColor: Palette.background,
+ elevation: 0,
+ ),
+ body: AbsorbPointer(
+ absorbing: isLoading,
+ child: Column(
+ children: [
+ Expanded(
+ child: SingleChildScrollView(
+ padding: const EdgeInsets.symmetric(
+ horizontal: 32,
+ vertical: 16,
+ ),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ const Text(
+ "What's your birth date?",
+ style: TextStyle(
+ fontSize: 28,
+ fontWeight: FontWeight.w800,
+ color: Palette.textWhite,
+ ),
+ ),
+ const SizedBox(height: 12),
+ Text(
+ "This won't be public.",
+ style: TextStyle(
+ fontSize: 15,
+ fontWeight: FontWeight.w400,
+ color: Palette.textWhite.withOpacity(0.5),
+ ),
+ ),
+ const SizedBox(height: 32),
+ CustomTextField(
+ controller: _dobController,
+ labelText: 'Date of birth',
+ readOnly: true,
+ onTap: () => _selectDate(context),
+ validator: dobValidator,
+ ),
+ ],
+ ),
+ ),
+ ),
+ _buildSignUpButton(isLoading),
+ const SizedBox(height: 15),
+ ],
+ ),
+ ),
+ ),
+ if (isLoading)
+ Container(
+ color: Colors.black.withOpacity(0.5),
+ child: const Loader(),
+ ),
+ ],
+ );
+ }
+
+ Widget _buildSignUpButton(bool isLoading) {
+ return Container(
+ padding: const EdgeInsets.all(10),
+ alignment: Alignment.centerRight,
+ child: ValueListenableBuilder(
+ valueListenable: _isFormValid,
+ builder: (context, isValid, child) {
+ return SizedBox(
+ width: 120,
+ child: ElevatedButton(
+ onPressed: (isValid && !isLoading) ? _handleSignUp : null,
+ style: ElevatedButton.styleFrom(
+ backgroundColor: Palette.textWhite,
+ disabledBackgroundColor: Palette.textWhite.withOpacity(0.5),
+ foregroundColor: Palette.background,
+ disabledForegroundColor: Palette.border,
+ minimumSize: const Size(0, 38),
+ ),
+ child: isLoading
+ ? const SizedBox(
+ width: 20,
+ height: 20,
+ child: CircularProgressIndicator(
+ strokeWidth: 2,
+ valueColor: AlwaysStoppedAnimation(
+ Palette.background,
+ ),
+ ),
+ )
+ : const Text(
+ 'Sign up',
+ style: TextStyle(
+ fontSize: 19,
+ fontWeight: FontWeight.bold,
+ ),
+ ),
+ ),
+ );
+ },
+ ),
+ );
+ }
+}
diff --git a/lib/features/auth/view_model/auth_view_model.dart b/lib/features/auth/view_model/auth_view_model.dart
index e0286d8..8c49aa4 100644
--- a/lib/features/auth/view_model/auth_view_model.dart
+++ b/lib/features/auth/view_model/auth_view_model.dart
@@ -7,6 +7,7 @@ import 'package:lite_x/features/auth/repositories/auth_local_repository.dart';
import 'package:lite_x/features/auth/repositories/auth_remote_repository.dart';
import 'package:lite_x/features/auth/view_model/auth_state.dart';
import 'package:lite_x/core/providers/current_user_provider.dart';
+import 'package:lite_x/features/chat/repositories/chat_local_repository.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
part 'auth_view_model.g.dart';
@@ -14,11 +15,13 @@ part 'auth_view_model.g.dart';
class AuthViewModel extends _$AuthViewModel {
late AuthRemoteRepository _authRemoteRepository;
late AuthLocalRepository _authLocalRepository;
+ late ChatLocalRepository _chatLocalRepository;
@override
AuthState build() {
_authRemoteRepository = ref.read(authRemoteRepositoryProvider);
_authLocalRepository = ref.read(authLocalRepositoryProvider);
+ _chatLocalRepository = ref.read(chatLocalRepositoryProvider);
Future(() async {
await Future.delayed(const Duration(milliseconds: 300));
await _checkAuthStatus();
@@ -185,9 +188,7 @@ class AuthViewModel extends _$AuthViewModel {
result.fold(
(failure) =>
print("FCM: Failed to register token: ${failure.message}"),
- (message) => print(
- "FCM: Token registered successfully: $message",
- ), // change later
+ (message) => print("FCM: Token registered successfully: $message"),
);
} else {
print('User declined or has not accepted permission');
@@ -210,6 +211,7 @@ class AuthViewModel extends _$AuthViewModel {
email: email,
password: password,
);
+ print("login result:$result");
result.fold((failure) => state = AuthState.error(failure.message), (
data,
) async {
@@ -220,6 +222,10 @@ class AuthViewModel extends _$AuthViewModel {
]);
ref.read(currentUserProvider.notifier).adduser(user);
state = AuthState.authenticated('Login successful');
+ if (!Platform.environment.containsKey('FLUTTER_TEST')) {
+ _registerFcmToken();
+ _listenForFcmTokenRefresh();
+ }
});
}
@@ -228,6 +234,7 @@ class AuthViewModel extends _$AuthViewModel {
try {
await _authLocalRepository.clearTokens();
await _authLocalRepository.clearUser();
+ await _chatLocalRepository.clearAll();
ref.read(currentUserProvider.notifier).clearUser();
state = AuthState.unauthenticated();
} catch (e) {
@@ -377,6 +384,54 @@ class AuthViewModel extends _$AuthViewModel {
);
}
+ //------------------------------------------------suggest-usernames-------------------------------------------//
+ Future> suggestUsernames({required String username}) async {
+ final result = await _authRemoteRepository.suggest_usernames(
+ username: username,
+ );
+ return result.fold((failure) {
+ print("Username suggestion failed: ${failure.message}");
+ return [];
+ }, (suggestions) => suggestions);
+ }
+
+ //-----------------------------------------------------------setbirthdate-------------------------------------------------------------------------//
+ Future Setbirthdate({required String birthDate}) async {
+ final currentUser = ref.read(currentUserProvider);
+ if (currentUser == null) {
+ state = AuthState.error('User not found');
+ return;
+ }
+
+ final parts = birthDate.split('/');
+ if (parts.length != 3) {
+ state = AuthState.error('Invalid date format');
+ return;
+ }
+
+ final month = parts[0];
+ final day = parts[1];
+ final year = parts[2];
+
+ final result = await _authRemoteRepository.setbirthdate(
+ day: day,
+ month: month,
+ year: year,
+ );
+
+ await result.fold(
+ (failure) async {
+ state = AuthState.error(failure.message);
+ },
+ (message) async {
+ final updated = currentUser.copyWith(dob: '$month/$day/$year');
+ ref.read(currentUserProvider.notifier).state = updated;
+
+ state = AuthState.success('Birthdate set successfully');
+ },
+ );
+ }
+
//-------------------------------------------------Token Management--------------------------------------------------------------------------------------//
String? getAccessToken() {
final tokens = _authLocalRepository.getTokens();
@@ -436,16 +491,29 @@ class AuthViewModel extends _$AuthViewModel {
final localPath = file.path;
final currentUser = ref.read(currentUserProvider);
+
if (currentUser != null) {
- final updatedUser = currentUser.copyWith(
- photo: mediaId,
- localProfilePhotoPath: localPath,
+ final updateResult = await _authRemoteRepository
+ .updateProfilePhoto(currentUser.id, mediaId);
+
+ updateResult.fold(
+ (failure) async {
+ state = AuthState.error("Uploaded but backend update failed");
+ },
+ (_) async {
+ final updatedUser = currentUser.copyWith(
+ photo: mediaId,
+ localProfilePhotoPath: localPath,
+ );
+
+ await _authLocalRepository.saveUser(updatedUser);
+ ref.read(currentUserProvider.notifier).adduser(updatedUser);
+
+ state = AuthState.success(
+ "Profile photo updated successfully",
+ );
+ },
);
-
- await _authLocalRepository.saveUser(updatedUser);
- ref.read(currentUserProvider.notifier).adduser(updatedUser);
-
- state = AuthState.success("Profile photo uploaded and saved");
}
},
);
@@ -491,6 +559,8 @@ class AuthViewModel extends _$AuthViewModel {
ref.read(currentUserProvider.notifier).adduser(user);
state = AuthState.authenticated('Social login successful');
+ _registerFcmToken();
+ _listenForFcmTokenRefresh();
},
);
}
diff --git a/lib/features/auth/view_model/auth_view_model.g.dart b/lib/features/auth/view_model/auth_view_model.g.dart
index 1ed2ed1..1109c12 100644
--- a/lib/features/auth/view_model/auth_view_model.g.dart
+++ b/lib/features/auth/view_model/auth_view_model.g.dart
@@ -41,7 +41,7 @@ final class AuthViewModelProvider
}
}
-String _$authViewModelHash() => r'73a355ed6a76f0c11f190556b7e016a5df57704f';
+String _$authViewModelHash() => r'924e5a98fc7048caca4ebb4164728767ec8beae9';
abstract class _$AuthViewModel extends $Notifier {
AuthState build();
diff --git a/lib/features/chat/models/conversationmodel.dart b/lib/features/chat/models/conversationmodel.dart
index 9b3d537..988b39f 100644
--- a/lib/features/chat/models/conversationmodel.dart
+++ b/lib/features/chat/models/conversationmodel.dart
@@ -14,31 +14,26 @@ class ConversationModel extends HiveObject {
DateTime createdAt;
@HiveField(3)
DateTime updatedAt;
+
@HiveField(4)
- String? groupName;
- @HiveField(5)
- String? groupPhotoKey;
- @HiveField(6)
- String? groupDescription;
- @HiveField(7)
List participantIds;
- @HiveField(8)
+ @HiveField(5)
String? lastMessageContent;
- @HiveField(9)
+ @HiveField(6)
DateTime? lastMessageTime;
- @HiveField(10)
+ @HiveField(7)
String? lastMessageSenderId;
- @HiveField(11)
+ @HiveField(8)
int unseenCount;
- @HiveField(12)
+ @HiveField(9)
String? dmPartnerUserId;
- @HiveField(13)
+ @HiveField(10)
String? dmPartnerName;
- @HiveField(14)
+ @HiveField(11)
String? dmPartnerUsername;
- @HiveField(15)
+ @HiveField(12)
String? dmPartnerProfileKey;
- @HiveField(16)
+ @HiveField(13)
String? lastMessageType;
ConversationModel({
@@ -46,14 +41,11 @@ class ConversationModel extends HiveObject {
required this.isDMChat,
required this.createdAt,
required this.updatedAt,
- this.groupName,
- this.groupPhotoKey,
- this.groupDescription,
required this.participantIds,
this.lastMessageContent,
this.lastMessageTime,
this.lastMessageSenderId,
- this.unseenCount = 0,
+ this.unseenCount = 1, //
this.dmPartnerUserId,
this.dmPartnerName,
this.dmPartnerUsername,
@@ -90,19 +82,6 @@ class ConversationModel extends HiveObject {
}
final unseenCount = json['unseenMessagesCount'] as int? ?? 0;
- Map? chatGroup;
-
- if (json['chatGroup'] is List) {
- if ((json['chatGroup'] as List).isNotEmpty) {
- chatGroup = (json['chatGroup'] as List).first;
- } else {
- chatGroup = null;
- }
- } else if (json['chatGroup'] is Map) {
- chatGroup = json['chatGroup'] as Map;
- } else {
- chatGroup = null;
- }
final isDm = json['DMChat'] as bool;
String? dmPartnerUserId;
@@ -129,9 +108,6 @@ class ConversationModel extends HiveObject {
isDMChat: isDm,
createdAt: DateTime.parse(json['createdAt'] as String),
updatedAt: DateTime.parse(json['updatedAt'] as String),
- groupName: chatGroup?['name'] as String?,
- groupPhotoKey: chatGroup?['photo'] as String?,
- groupDescription: chatGroup?['description'] as String?,
participantIds: participantIds,
lastMessageContent: lastMessageContent,
lastMessageTime: lastMessageTime,
@@ -148,19 +124,11 @@ class ConversationModel extends HiveObject {
bool get isGroup => !isDMChat;
String getDisplayName() {
- if (isDMChat) {
- return dmPartnerName ?? dmPartnerUsername ?? "Unknown User";
- } else {
- return groupName ?? "Group Chat";
- }
+ return dmPartnerName ?? dmPartnerUsername ?? "Unknown User";
}
String? getDisplayImageKey() {
- if (isDMChat) {
- return dmPartnerProfileKey;
- } else {
- return groupPhotoKey;
- }
+ return dmPartnerProfileKey;
}
String? getOtherParticipantId(String currentUserId) {
@@ -173,7 +141,7 @@ class ConversationModel extends HiveObject {
@override
String toString() {
- return 'ConversationModel(id: $id, isDMChat: $isDMChat, createdAt: $createdAt, updatedAt: $updatedAt, groupName: $groupName, groupPhotoKey: $groupPhotoKey, groupDescription: $groupDescription, participantIds: $participantIds, lastMessageContent: $lastMessageContent, lastMessageTime: $lastMessageTime, lastMessageSenderId: $lastMessageSenderId, unseenCount: $unseenCount, dmPartnerUserId: $dmPartnerUserId, dmPartnerName: $dmPartnerName, dmPartnerUsername: $dmPartnerUsername, dmPartnerProfileKey: $dmPartnerProfileKey, lastMessageType: $lastMessageType)';
+ return 'ConversationModel(id: $id, isDMChat: $isDMChat, createdAt: $createdAt, updatedAt: $updatedAt, participantIds: $participantIds, lastMessageContent: $lastMessageContent, lastMessageTime: $lastMessageTime, lastMessageSenderId: $lastMessageSenderId, unseenCount: $unseenCount, dmPartnerUserId: $dmPartnerUserId, dmPartnerName: $dmPartnerName, dmPartnerUsername: $dmPartnerUsername, dmPartnerProfileKey: $dmPartnerProfileKey, lastMessageType: $lastMessageType)';
}
@override
@@ -185,9 +153,6 @@ class ConversationModel extends HiveObject {
other.isDMChat == isDMChat &&
other.createdAt == createdAt &&
other.updatedAt == updatedAt &&
- other.groupName == groupName &&
- other.groupPhotoKey == groupPhotoKey &&
- other.groupDescription == groupDescription &&
listEquals(other.participantIds, participantIds) &&
other.lastMessageContent == lastMessageContent &&
other.lastMessageTime == lastMessageTime &&
@@ -206,9 +171,6 @@ class ConversationModel extends HiveObject {
isDMChat.hashCode ^
createdAt.hashCode ^
updatedAt.hashCode ^
- groupName.hashCode ^
- groupPhotoKey.hashCode ^
- groupDescription.hashCode ^
participantIds.hashCode ^
lastMessageContent.hashCode ^
lastMessageTime.hashCode ^
@@ -245,9 +207,7 @@ class ConversationModel extends HiveObject {
isDMChat: isDMChat ?? this.isDMChat,
createdAt: createdAt ?? this.createdAt,
updatedAt: updatedAt ?? this.updatedAt,
- groupName: groupName ?? this.groupName,
- groupPhotoKey: groupPhotoKey ?? this.groupPhotoKey,
- groupDescription: groupDescription ?? this.groupDescription,
+
participantIds: participantIds ?? this.participantIds,
lastMessageContent: lastMessageContent ?? this.lastMessageContent,
lastMessageTime: lastMessageTime ?? this.lastMessageTime,
@@ -267,9 +227,7 @@ class ConversationModel extends HiveObject {
'isDMChat': isDMChat,
'createdAt': createdAt.toIso8601String(),
'updatedAt': updatedAt.toIso8601String(),
- 'groupName': groupName,
- 'groupPhotoKey': groupPhotoKey,
- 'groupDescription': groupDescription,
+
'participantIds': participantIds,
'lastMessageContent': lastMessageContent,
'lastMessageTime': lastMessageTime?.millisecondsSinceEpoch,
@@ -289,13 +247,7 @@ class ConversationModel extends HiveObject {
isDMChat: map['isDMChat'] as bool,
createdAt: DateTime.parse(map['createdAt'] as String),
updatedAt: DateTime.parse(map['updatedAt'] as String),
- groupName: map['groupName'] != null ? map['groupName'] as String : null,
- groupPhotoKey: map['groupPhotoKey'] != null
- ? map['groupPhotoKey'] as String
- : null,
- groupDescription: map['groupDescription'] != null
- ? map['groupDescription'] as String
- : null,
+
participantIds: List.from(map['participantIds'] as List),
lastMessageContent: map['lastMessageContent'] != null
? map['lastMessageContent'] as String
diff --git a/lib/features/chat/models/conversationmodel.g.dart b/lib/features/chat/models/conversationmodel.g.dart
index 98a785d..25c8420 100644
--- a/lib/features/chat/models/conversationmodel.g.dart
+++ b/lib/features/chat/models/conversationmodel.g.dart
@@ -21,26 +21,23 @@ class ConversationModelAdapter extends TypeAdapter {
isDMChat: fields[1] as bool,
createdAt: fields[2] as DateTime,
updatedAt: fields[3] as DateTime,
- groupName: fields[4] as String?,
- groupPhotoKey: fields[5] as String?,
- groupDescription: fields[6] as String?,
- participantIds: (fields[7] as List).cast(),
- lastMessageContent: fields[8] as String?,
- lastMessageTime: fields[9] as DateTime?,
- lastMessageSenderId: fields[10] as String?,
- unseenCount: fields[11] == null ? 0 : (fields[11] as num).toInt(),
- dmPartnerUserId: fields[12] as String?,
- dmPartnerName: fields[13] as String?,
- dmPartnerUsername: fields[14] as String?,
- dmPartnerProfileKey: fields[15] as String?,
- lastMessageType: fields[16] as String?,
+ participantIds: (fields[4] as List).cast(),
+ lastMessageContent: fields[5] as String?,
+ lastMessageTime: fields[6] as DateTime?,
+ lastMessageSenderId: fields[7] as String?,
+ unseenCount: fields[8] == null ? 1 : (fields[8] as num).toInt(),
+ dmPartnerUserId: fields[9] as String?,
+ dmPartnerName: fields[10] as String?,
+ dmPartnerUsername: fields[11] as String?,
+ dmPartnerProfileKey: fields[12] as String?,
+ lastMessageType: fields[13] as String?,
);
}
@override
void write(BinaryWriter writer, ConversationModel obj) {
writer
- ..writeByte(17)
+ ..writeByte(14)
..writeByte(0)
..write(obj.id)
..writeByte(1)
@@ -50,30 +47,24 @@ class ConversationModelAdapter extends TypeAdapter {
..writeByte(3)
..write(obj.updatedAt)
..writeByte(4)
- ..write(obj.groupName)
- ..writeByte(5)
- ..write(obj.groupPhotoKey)
- ..writeByte(6)
- ..write(obj.groupDescription)
- ..writeByte(7)
..write(obj.participantIds)
- ..writeByte(8)
+ ..writeByte(5)
..write(obj.lastMessageContent)
- ..writeByte(9)
+ ..writeByte(6)
..write(obj.lastMessageTime)
- ..writeByte(10)
+ ..writeByte(7)
..write(obj.lastMessageSenderId)
- ..writeByte(11)
+ ..writeByte(8)
..write(obj.unseenCount)
- ..writeByte(12)
+ ..writeByte(9)
..write(obj.dmPartnerUserId)
- ..writeByte(13)
+ ..writeByte(10)
..write(obj.dmPartnerName)
- ..writeByte(14)
+ ..writeByte(11)
..write(obj.dmPartnerUsername)
- ..writeByte(15)
+ ..writeByte(12)
..write(obj.dmPartnerProfileKey)
- ..writeByte(16)
+ ..writeByte(13)
..write(obj.lastMessageType);
}
diff --git a/lib/features/chat/models/messagemodel.dart b/lib/features/chat/models/messagemodel.dart
index 48f50e6..8b1580b 100644
--- a/lib/features/chat/models/messagemodel.dart
+++ b/lib/features/chat/models/messagemodel.dart
@@ -50,6 +50,7 @@ class MessageModel extends HiveObject {
Map toApiRequest({List? recipientIds}) {
return {
+ "createdAt": createdAt.toIso8601String() + "Z",
"chatId": chatId,
"data": {"content": content},
if (recipientIds != null) "recipientId": recipientIds,
@@ -57,6 +58,21 @@ class MessageModel extends HiveObject {
}
factory MessageModel.fromApiResponse(Map json) {
+ final user = json['createdMessage']['user'] as Map?;
+ return MessageModel(
+ id: json['createdMessage']['id'] as String,
+ chatId: json['createdMessage']['chatId'] as String,
+ userId: json['createdMessage']['userId'] as String,
+ content: json['createdMessage']['content'] as String?,
+ createdAt: DateTime.parse(json['createdMessage']['createdAt'] as String),
+ status: json['createdMessage']['status'] as String? ?? 'PENDING',
+ senderUsername: user?['username'] as String?,
+ senderName: user?['name'] as String?,
+ senderProfileMediaKey: user?['profileMediaId'] as String?,
+ messageType: 'text',
+ );
+ }
+ factory MessageModel.fromLoadMessages(Map json) {
final user = json['user'] as Map?;
return MessageModel(
id: json['id'] as String,
@@ -71,7 +87,6 @@ class MessageModel extends HiveObject {
messageType: 'text',
);
}
-
MessageModel copyWith({
String? id,
String? chatId,
@@ -83,7 +98,6 @@ class MessageModel extends HiveObject {
String? senderName,
String? senderProfileMediaKey,
String? messageType,
- String? localId,
}) {
return MessageModel(
id: id ?? this.id,
diff --git a/lib/features/chat/models/usersearchmodel.dart b/lib/features/chat/models/usersearchmodel.dart
index 2806ff3..15369fa 100644
--- a/lib/features/chat/models/usersearchmodel.dart
+++ b/lib/features/chat/models/usersearchmodel.dart
@@ -32,13 +32,24 @@ class UserSearchModel extends HiveObject {
});
factory UserSearchModel.fromMap(Map map) {
+ String? profileImage;
+ if (map["profileMedia"] != null) {
+ if (map["profileMedia"] is Map) {
+ profileImage = map["profileMedia"]["keyName"];
+ } else if (map["profileMedia"] is String) {
+ profileImage = map["profileMedia"];
+ }
+ }
+
return UserSearchModel(
id: map["id"] ?? "",
username: map["username"] ?? "",
name: map["name"] ?? "",
bio: map["bio"],
- profileMedia: map["profileMedia"],
- followers: map["_count"]?["followers"] ?? 0,
+ profileMedia: profileImage,
+ followers: (map["_count"] != null && map["_count"]["followers"] != null)
+ ? map["_count"]["followers"]
+ : 0,
);
}
}
diff --git a/lib/features/chat/providers/activeChatIdProvider.dart b/lib/features/chat/providers/activeChatIdProvider.dart
new file mode 100644
index 0000000..59ca0bc
--- /dev/null
+++ b/lib/features/chat/providers/activeChatIdProvider.dart
@@ -0,0 +1,11 @@
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+part 'activeChatIdProvider.g.dart';
+
+@riverpod
+class ActiveChat extends _$ActiveChat {
+ @override
+ String? build() => null;
+
+ void setActive(String? id) => state = id;
+}
diff --git a/lib/features/search/view_model/search_view_model.g.dart b/lib/features/chat/providers/activeChatIdProvider.g.dart
similarity index 50%
rename from lib/features/search/view_model/search_view_model.g.dart
rename to lib/features/chat/providers/activeChatIdProvider.g.dart
index 8f79ec9..0fd91eb 100644
--- a/lib/features/search/view_model/search_view_model.g.dart
+++ b/lib/features/chat/providers/activeChatIdProvider.g.dart
@@ -1,6 +1,6 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
-part of 'search_view_model.dart';
+part of 'activeChatIdProvider.dart';
// **************************************************************************
// RiverpodGenerator
@@ -9,52 +9,51 @@ part of 'search_view_model.dart';
// GENERATED CODE - DO NOT MODIFY BY HAND
// ignore_for_file: type=lint, type=warning
-@ProviderFor(SearchViewModel)
-const searchViewModelProvider = SearchViewModelProvider._();
+@ProviderFor(ActiveChat)
+const activeChatProvider = ActiveChatProvider._();
-final class SearchViewModelProvider
- extends $NotifierProvider {
- const SearchViewModelProvider._()
+final class ActiveChatProvider extends $NotifierProvider {
+ const ActiveChatProvider._()
: super(
from: null,
argument: null,
retry: null,
- name: r'searchViewModelProvider',
- isAutoDispose: false,
+ name: r'activeChatProvider',
+ isAutoDispose: true,
dependencies: null,
$allTransitiveDependencies: null,
);
@override
- String debugGetCreateSourceHash() => _$searchViewModelHash();
+ String debugGetCreateSourceHash() => _$activeChatHash();
@$internal
@override
- SearchViewModel create() => SearchViewModel();
+ ActiveChat create() => ActiveChat();
/// {@macro riverpod.override_with_value}
- Override overrideWithValue(SearchState value) {
+ Override overrideWithValue(String? value) {
return $ProviderOverride(
origin: this,
- providerOverride: $SyncValueProvider(value),
+ providerOverride: $SyncValueProvider(value),
);
}
}
-String _$searchViewModelHash() => r'3b9f4cb58d93e52298e4e42513a2cac8bee5cf50';
+String _$activeChatHash() => r'23f0395134ca4d8af5a88f7ad3482566e0783170';
-abstract class _$SearchViewModel extends $Notifier {
- SearchState build();
+abstract class _$ActiveChat extends $Notifier {
+ String? build();
@$mustCallSuper
@override
void runBuild() {
final created = build();
- final ref = this.ref as $Ref;
+ final ref = this.ref as $Ref;
final element =
ref.element
as $ClassProviderElement<
- AnyNotifier,
- SearchState,
+ AnyNotifier,
+ String?,
Object?,
Object?
>;
diff --git a/lib/features/chat/providers/audiorecordernotifier.dart b/lib/features/chat/providers/audiorecordernotifier.dart
deleted file mode 100644
index 0ce103e..0000000
--- a/lib/features/chat/providers/audiorecordernotifier.dart
+++ /dev/null
@@ -1,166 +0,0 @@
-import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:lite_x/core/classes/AudioRecorderUtil.dart';
-import 'dart:io';
-import 'package:flutter/foundation.dart';
-
-part 'audiorecordernotifier.g.dart';
-
-enum RecorderStatus { idle, recording, reviewing }
-
-@riverpod
-class AudioRecorderNotifier extends _$AudioRecorderNotifier {
- final _recorder = AudioRecorderUtil();
- DateTime? _recordingStartTime;
- Duration? _actualRecordingDuration;
- static const maxDuration = Duration(seconds: 140);
-
- @override
- AudioRecorderState build() => const AudioRecorderState();
-
- Future startRecording() async {
- final success = await _recorder.startRecording();
- if (success) {
- _recordingStartTime = DateTime.now();
- _actualRecordingDuration = null;
- state = state.copyWith(
- status: RecorderStatus.recording,
- remainingDuration: maxDuration, // 140 seconds
- );
- }
- return success;
- }
-
- Future stopRecording() async {
- if (state.status != RecorderStatus.recording) return;
-
- final path = await _recorder.stopRecording();
- if (path == null) {
- await _resetToIdle();
- return;
- }
- final elapsed = _recordingStartTime != null
- ? DateTime.now().difference(_recordingStartTime!)
- : Duration.zero;
-
- _actualRecordingDuration = elapsed;
-
- state = state.copyWith(
- status: RecorderStatus.reviewing,
- recordingPath: path,
- remainingDuration: elapsed,
- );
- _recordingStartTime = null;
- }
-
- Future cancelRecording() async {
- if (state.status != RecorderStatus.recording) return;
-
- await _recorder.cancelRecording();
- await _resetToIdle();
- _recordingStartTime = null;
- _actualRecordingDuration = null;
- }
-
- Future cancelReview() async {
- if (state.status != RecorderStatus.reviewing) return;
-
- await _deleteRecordingFile();
- await _resetToIdle();
- _actualRecordingDuration = null;
- }
-
- String? sendRecording() {
- if (state.status != RecorderStatus.reviewing) return null;
-
- final path = state.recordingPath;
- _resetToIdle();
- _actualRecordingDuration = null;
- return path;
- }
-
- void updateRecordingDuration() {
- if (_recordingStartTime == null ||
- state.status != RecorderStatus.recording) {
- return;
- }
-
- final elapsed = DateTime.now().difference(_recordingStartTime!);
- final remaining = maxDuration - elapsed;
- if (remaining == Duration.zero || remaining.isNegative) {
- stopRecording();
- } else {
- state = state.copyWith(remainingDuration: remaining);
- }
- }
-
- void updateReviewPosition(Duration currentPosition) {
- if (state.status != RecorderStatus.reviewing ||
- _actualRecordingDuration == null) {
- return;
- }
- final remaining = _actualRecordingDuration! - currentPosition;
-
- if (remaining == Duration.zero || remaining.isNegative) {
- state = state.copyWith(remainingDuration: _actualRecordingDuration!);
- } else {
- state = state.copyWith(remainingDuration: remaining);
- }
- }
-
- void resetReviewPosition() {
- if (state.status == RecorderStatus.reviewing &&
- _actualRecordingDuration != null) {
- state = state.copyWith(remainingDuration: _actualRecordingDuration!);
- }
- }
-
- Future _deleteRecordingFile() async {
- try {
- final path = state.recordingPath;
- if (path == null) return;
- final file = File(path);
- if (await file.exists()) {
- await file.delete();
- }
- } catch (e) {
- debugPrint('Error deleting recording file: $e');
- }
- }
-
- Future _resetToIdle() async {
- state = const AudioRecorderState(
- status: RecorderStatus.idle,
- remainingDuration: Duration.zero,
- recordingPath: null,
- );
- }
-
- void dispose() {
- _recorder.dispose();
- }
-}
-
-class AudioRecorderState {
- final RecorderStatus status;
- final Duration remainingDuration;
- final String? recordingPath;
-
- const AudioRecorderState({
- this.status = RecorderStatus.idle,
- this.remainingDuration = Duration.zero,
- this.recordingPath,
- });
-
- AudioRecorderState copyWith({
- RecorderStatus? status,
- Duration? remainingDuration,
- String? recordingPath,
- bool clearPath = false,
- }) {
- return AudioRecorderState(
- status: status ?? this.status,
- remainingDuration: remainingDuration ?? this.remainingDuration,
- recordingPath: clearPath ? null : (recordingPath ?? this.recordingPath),
- );
- }
-}
diff --git a/lib/features/chat/providers/audiorecordernotifier.g.dart b/lib/features/chat/providers/audiorecordernotifier.g.dart
deleted file mode 100644
index c2f8adb..0000000
--- a/lib/features/chat/providers/audiorecordernotifier.g.dart
+++ /dev/null
@@ -1,64 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'audiorecordernotifier.dart';
-
-// **************************************************************************
-// RiverpodGenerator
-// **************************************************************************
-
-// GENERATED CODE - DO NOT MODIFY BY HAND
-// ignore_for_file: type=lint, type=warning
-
-@ProviderFor(AudioRecorderNotifier)
-const audioRecorderProvider = AudioRecorderNotifierProvider._();
-
-final class AudioRecorderNotifierProvider
- extends $NotifierProvider {
- const AudioRecorderNotifierProvider._()
- : super(
- from: null,
- argument: null,
- retry: null,
- name: r'audioRecorderProvider',
- isAutoDispose: true,
- dependencies: null,
- $allTransitiveDependencies: null,
- );
-
- @override
- String debugGetCreateSourceHash() => _$audioRecorderNotifierHash();
-
- @$internal
- @override
- AudioRecorderNotifier create() => AudioRecorderNotifier();
-
- /// {@macro riverpod.override_with_value}
- Override overrideWithValue(AudioRecorderState value) {
- return $ProviderOverride(
- origin: this,
- providerOverride: $SyncValueProvider(value),
- );
- }
-}
-
-String _$audioRecorderNotifierHash() =>
- r'43443ac8096028f1f2cb633063bff97bb266e55c';
-
-abstract class _$AudioRecorderNotifier extends $Notifier {
- AudioRecorderState build();
- @$mustCallSuper
- @override
- void runBuild() {
- final created = build();
- final ref = this.ref as $Ref;
- final element =
- ref.element
- as $ClassProviderElement<
- AnyNotifier,
- AudioRecorderState,
- Object?,
- Object?
- >;
- element.handleValue(ref, created);
- }
-}
diff --git a/lib/features/chat/repositories/chat_local_repository.dart b/lib/features/chat/repositories/chat_local_repository.dart
index 66690af..5d5669e 100644
--- a/lib/features/chat/repositories/chat_local_repository.dart
+++ b/lib/features/chat/repositories/chat_local_repository.dart
@@ -1,10 +1,7 @@
-// ignore_for_file: unused_import
-
import 'package:hive_ce/hive.dart';
import 'package:lite_x/features/chat/models/conversationmodel.dart';
import 'package:lite_x/features/chat/models/messagemodel.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
-
part 'chat_local_repository.g.dart';
@Riverpod(keepAlive: true)
@@ -16,72 +13,117 @@ class ChatLocalRepository {
final Box _conversationsBox = Hive.box(
"conversationsBox",
);
-
final Box _messagesBox = Hive.box("messagesBox");
- // Save or update conversations
- Future upsertConversations(
- List conversations,
- ) async {
- for (ConversationModel conv in conversations) {
- await _conversationsBox.put(conv.id, conv);
- }
- }
-
- // Load all cached conversations
- List getAllConversations() {
- return _conversationsBox.values.toList();
- }
+ List getCachedMessages(String chatId) {
+ final messages = _messagesBox.values
+ .where((msg) => msg.chatId == chatId)
+ .toList();
+ messages.sort((a, b) => b.createdAt.compareTo(a.createdAt));
- //
- ConversationModel? getConversationById(String id) {
- return _conversationsBox.get(id);
+ return messages;
}
- // save Message
Future saveMessage(MessageModel message) async {
await _messagesBox.put(message.id, message);
+ if (message.status != "READ") {
+ await _enforceCacheLimit(message.chatId);
+ }
}
- // Save list of messages (when loading chat history)
- Future saveMessages(List messages) async {
- for (MessageModel msg in messages) {
- await _messagesBox.put(msg.id, msg);
+ Future saveInitialMessages(List messages) async {
+ final Map entries = {
+ for (var msg in messages) msg.id: msg,
+ };
+ await _messagesBox.putAll(entries);
+
+ if (messages.isNotEmpty) {
+ await _enforceCacheLimit(messages.first.chatId);
}
}
- // get messages by chat_id
- List getMessagesForChat(String chatId) {
- return _messagesBox.values.where((msg) => msg.chatId == chatId).toList();
+ Future replaceTempWithServerMessage({
+ required String tempId,
+ required MessageModel serverMessage,
+ }) async {
+ if (_messagesBox.containsKey(tempId)) {
+ await _messagesBox.delete(tempId);
+ }
+
+ await _messagesBox.put(serverMessage.id, serverMessage);
+ await _enforceCacheLimit(serverMessage.chatId);
}
- // update message status
Future markMessagesAsRead(String chatId, String myUserId) async {
- for (MessageModel msg in _messagesBox.values) {
- if (msg.chatId == chatId && msg.userId == myUserId) {
- msg.status = "READ";
- await msg.save();
- }
+ final messagesToUpdate = _messagesBox.values.where(
+ (msg) =>
+ msg.chatId == chatId &&
+ msg.userId == myUserId &&
+ msg.status != "READ",
+ );
+
+ for (var msg in messagesToUpdate) {
+ msg.status = "READ";
+ await msg.save();
}
}
- // When user sends a message -> mark as sent immediately
Future markMessageAsSent(String messageId) async {
final msg = _messagesBox.get(messageId);
- if (msg != null) {
+ if (msg != null && msg.status != "READ") {
msg.status = "SENT";
await msg.save();
}
}
- // DELETE MESSAGE
- Future deleteMessage(String messageId) async {
- await _messagesBox.delete(messageId);
+ Future _enforceCacheLimit(String chatId) async {
+ final chatMessages = _messagesBox.values
+ .where((msg) => msg.chatId == chatId)
+ .toList();
+
+ if (chatMessages.length <= 50) return;
+ chatMessages.sort((a, b) => b.createdAt.compareTo(a.createdAt));
+
+ final messagesToDelete = chatMessages.sublist(50);
+ final keysToDelete = messagesToDelete.map((e) => e.id).toList();
+
+ if (keysToDelete.isNotEmpty) {
+ await _messagesBox.deleteAll(keysToDelete);
+ }
+ }
+
+ List getPendingMessages(String chatId) {
+ return _messagesBox.values
+ .where((msg) => msg.chatId == chatId && msg.status == "SENDING")
+ .toList();
+ }
+
+ Future upsertConversations(
+ List conversations,
+ ) async {
+ for (ConversationModel conv in conversations) {
+ await _conversationsBox.put(conv.id, conv);
+ }
+ }
+
+ List getAllConversations() {
+ return _conversationsBox.values.toList();
+ }
+
+ ConversationModel? getConversationById(String id) {
+ return _conversationsBox.get(id);
}
- // CLEAR ALL cache
Future clearAll() async {
await _conversationsBox.clear();
await _messagesBox.clear();
}
+
+ Future deleteMessage(String messageId) async {
+ await _messagesBox.delete(messageId);
+ }
+
+ Future deleteConversation(String conversationId) async {
+ await _conversationsBox.delete(conversationId);
+ }
}
diff --git a/lib/features/chat/repositories/chat_remote_repository.dart b/lib/features/chat/repositories/chat_remote_repository.dart
index fbc88c6..3ad5120 100644
--- a/lib/features/chat/repositories/chat_remote_repository.dart
+++ b/lib/features/chat/repositories/chat_remote_repository.dart
@@ -17,39 +17,6 @@ ChatRemoteRepository chatRemoteRepository(Ref ref) {
class ChatRemoteRepository {
final Dio _dio;
ChatRemoteRepository({required Dio dio}) : _dio = dio;
- //--------------------------------------------------search users to choose to chat with him or them according to group or not ----------------------------------------//
- Future>> searchUsers(
- String query,
- ) async {
- try {
- final response = await _dio.get(
- "api/users/search",
- queryParameters: {"query": query},
- );
-
- final data = response.data as Map;
-
- final List list = data["users"] ?? [];
-
- final users = list
- .map((e) => UserSearchModel.fromMap(e as Map))
- .toList();
-
- return Right(users);
- } on DioException catch (e) {
- print("DIO RESPONSE DATA: ${e.response?.data}");
- final errorMessage =
- e.response?.data["message"] ??
- e.response?.data["error"] ??
- "Failed to search users";
-
- return Left(AppFailure(message: errorMessage));
- } catch (e) {
- print("GENERAL ERROR: ${e.toString()}");
- return Left(AppFailure(message: e.toString()));
- }
- }
-
//----------------------------------------------------------------create chat ---------------------------------------------------------------------//
Future> create_chat({
required List recipientIds,
@@ -68,7 +35,7 @@ class ChatRemoteRepository {
data,
Current_UserId,
);
-
+ print(conversation.id);
return Right(conversation);
} on DioException catch (e) {
final errorMessage =
@@ -81,8 +48,8 @@ class ChatRemoteRepository {
}
}
- //----------------------------------------------------get inital messages from getchatinfo without timestemp-------------------------------//
- Future>> getInitialChatMessages(
+ //----------------------------------------------------get last 50 messages from getchatinfo without timestemp-------------------------------//
+ Future>> getlastChatMessages(
String chatId,
) async {
try {
@@ -93,7 +60,7 @@ class ChatRemoteRepository {
final List messagesList = data['messages'] ?? [];
final messages = messagesList
- .map((msg) => MessageModel.fromApiResponse(msg))
+ .map((msg) => MessageModel.fromLoadMessages(msg))
.toList();
return Right(messages);
@@ -137,52 +104,17 @@ class ChatRemoteRepository {
}
}
- //---------------------------------------------------------------update group info -------------------------------------------------------------------------------------//
- Future> updateGroupInfo({
- required String chatId,
- required String currentUserId,
- String? groupName,
- String? groupDescription,
- String? groupPhotoKey,
- }) async {
- try {
- final response = await _dio.put(
- "api/dm/chat/$chatId/group",
- data: {
- if (groupName != null) "name": groupName,
- if (groupDescription != null) "description": groupDescription,
- if (groupPhotoKey != null) "photo": groupPhotoKey,
- },
- );
-
- final data = response.data as Map;
- final updatedConversation = ConversationModel.fromApiResponse(
- data,
- currentUserId,
- );
-
- return Right(updatedConversation);
- } on DioException catch (e) {
- final errorMessage =
- e.response?.data["message"] ??
- e.response?.data["error"] ??
- "Failed to update group info";
- return Left(AppFailure(message: errorMessage));
- } catch (e) {
- return Left(AppFailure(message: e.toString()));
- }
- }
-
//-----------------------------------------------------------get messages of the conversation-------------------------------------------------------------------------//
- Future>> getMessagesChat(
- String chatId, {
+ Future>> getOlderMessagesChat({
+ required String chatId,
required DateTime lastMessageTimestamp,
}) async {
try {
final response = await _dio.get(
"api/dm/chat/$chatId/messages",
queryParameters: {
- "lastMessageTimestamp": lastMessageTimestamp.toIso8601String(),
+ "lastMessageTimestamp": lastMessageTimestamp.toIso8601String() + "Z",
+ "chatId": chatId,
},
);
@@ -190,7 +122,7 @@ class ChatRemoteRepository {
final messages = messagesList
.map(
- (msg) => MessageModel.fromApiResponse(msg as Map),
+ (msg) => MessageModel.fromLoadMessages(msg as Map),
)
.toList();
@@ -206,44 +138,35 @@ class ChatRemoteRepository {
}
}
- //----------------------------------------------------------------------get unseen count of one chat------------------------------------------------------------------------//
- Future> getUnseenCountOfChat(String chatId) async {
+ //--------------------------------------------------search users to choose to chat with him or them ----------------------------------------//
+ Future>> searchUsers(
+ String query,
+ ) async {
try {
final response = await _dio.get(
- "api/dm/chat/$chatId/unseen-messages-count",
+ "api/users/search",
+ queryParameters: {"query": query},
);
final data = response.data as Map;
- final unseenCount = data["unseenMessagesCount"] as int? ?? 0;
- return Right(unseenCount);
- } on DioException catch (e) {
- final errorMessage =
- e.response?.data["message"] ??
- e.response?.data["error"] ??
- "Failed to get unseen count";
- return Left(AppFailure(message: errorMessage));
- } catch (e) {
- return Left(AppFailure(message: e.toString()));
- }
- }
-
- //-----------------------------------------------------------------get unseen count of all messages of all chats --------------------------------------------------------------------------//
- Future> getUnseenCountAllChats() async {
- try {
- final response = await _dio.get("api/dm/chat/all-unseen-messages-count");
+ final List list = data["users"] ?? [];
- final data = response.data as Map;
- final totalUnseenCount = data["totalUnseenMessages"] as int? ?? 0;
+ final users = list
+ .map((e) => UserSearchModel.fromMap(e as Map))
+ .toList();
- return Right(totalUnseenCount);
+ return Right(users);
} on DioException catch (e) {
+ print("DIO RESPONSE DATA: ${e.response?.data}");
final errorMessage =
e.response?.data["message"] ??
e.response?.data["error"] ??
- "Failed to get all unseen count";
+ "Failed to search users";
+
return Left(AppFailure(message: errorMessage));
} catch (e) {
+ print("GENERAL ERROR: ${e.toString()}");
return Left(AppFailure(message: e.toString()));
}
}
@@ -275,19 +198,42 @@ class ChatRemoteRepository {
}
//------------------------------------------------------------------delete chat from conversions---------------------------------------------------------------------------//
- Future> deleteChat(String chatId) async {
+ Future> deleteChat(String chatId) async {
try {
final response = await _dio.delete("api/dm/chat/$chatId");
- final data = response.data as Map;
- final success = data["success"] as bool? ?? true;
+ if (response.statusCode == 200) {
+ final data = response.data as Map;
+ return Right(data["message"] ?? "Chat deleted successfully");
+ }
- return Right(success);
+ return Left(AppFailure(message: "Unexpected error"));
} on DioException catch (e) {
final errorMessage =
e.response?.data["message"] ??
e.response?.data["error"] ??
"Failed to delete chat";
+
+ return Left(AppFailure(message: errorMessage));
+ } catch (e) {
+ return Left(AppFailure(message: e.toString()));
+ }
+ }
+
+ //-----------------------------------------------------------------get unseen count of all messages of all chats --------------------------------------------------------------------------//
+ Future> getUnseenCountAllChats() async {
+ try {
+ final response = await _dio.get("api/dm/chat/all-unseen-messages-count");
+
+ final data = response.data as Map;
+ final totalUnseenCount = data["totalUnseenMessages"] as int? ?? 0;
+
+ return Right(totalUnseenCount);
+ } on DioException catch (e) {
+ final errorMessage =
+ e.response?.data["message"] ??
+ e.response?.data["error"] ??
+ "Failed to get all unseen count";
return Left(AppFailure(message: errorMessage));
} catch (e) {
return Left(AppFailure(message: e.toString()));
diff --git a/lib/features/chat/repositories/socket_repository.dart b/lib/features/chat/repositories/socket_repository.dart
index 8ab23df..2133003 100644
--- a/lib/features/chat/repositories/socket_repository.dart
+++ b/lib/features/chat/repositories/socket_repository.dart
@@ -1,14 +1,10 @@
-// ignore_for_file: unused_import, unused_field
-
-import 'package:dio/dio.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:lite_x/core/constants/server_constants.dart';
-import 'package:lite_x/core/models/TokensModel.dart';
-import 'package:lite_x/core/providers/dio_interceptor.dart';
+import 'package:lite_x/core/providers/unseenChatsCountProvider.dart';
import 'package:lite_x/features/auth/repositories/auth_local_repository.dart';
import 'package:lite_x/features/chat/providers/tokenStream.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:socket_io_client/socket_io_client.dart' as io;
+import 'dart:async';
part 'socket_repository.g.dart';
@Riverpod(keepAlive: true)
@@ -17,12 +13,33 @@ SocketRepository socketRepository(Ref ref) {
}
class SocketRepository {
+ final _newMessageController =
+ StreamController>.broadcast();
+ final _messageAddedController =
+ StreamController>.broadcast();
+ final _typingController = StreamController>.broadcast();
+ final _messagesReadController =
+ StreamController>.broadcast();
+ final _unseenChatsController =
+ StreamController>.broadcast();
+ //-------------------------------------------------------------------------------//
+ Stream> get messagesReadStream =>
+ _messagesReadController.stream;
+ Stream> get newMessageStream =>
+ _newMessageController.stream;
+ Stream> get messageAddedStream =>
+ _messageAddedController.stream;
+ Stream> get typingStream => _typingController.stream;
+ Stream> get unseenChatsStream =>
+ _unseenChatsController.stream;
+
final Ref ref;
io.Socket? _socket;
final baseUrl = dotenv.env["API_URL"]!;
SocketRepository({required this.ref}) {
_initSocket();
_listenTokenChanges();
+ _listenToUnseenChats();
}
void _listenTokenChanges() {
ref.listen(tokenStreamProvider, (previous, next) {
@@ -57,6 +74,13 @@ class SocketRepository {
_socket?.connect();
}
+ void _listenToUnseenChats() {
+ unseenChatsStream.listen((data) {
+ int count = data['count'] ?? 0;
+ ref.read(unseenChatsCountProvider.notifier).state = count;
+ });
+ }
+
void _updateSocketToken(String newToken) {
if (_socket == null) return;
_socket?.io.options?['extraHeaders'] = {
@@ -69,36 +93,58 @@ class SocketRepository {
void _setupListeners() {
_socket?.onConnect((_) {
- print("SOCKET CONNECTED: ${_socket?.id}");
+ print("SOCKET CONNECTED: ${_socket?.id}\n");
});
_socket?.onConnectError((data) {
- print("Socket connect error: $data");
+ print("Socket connect error: $data\n");
});
_socket?.onDisconnect((_) {
- print("Socket disconnected");
+ print("Socket disconnected\n");
});
_socket?.on('authenticated', (data) {
- print("Authenticated: $data");
+ print("Authenticated: $data\n");
});
_socket?.on('auth-error', (data) {
- print(" Auth error: $data");
+ print(" Auth error: $data\n");
});
_socket?.on('new-message', (data) {
- print(" New message: $data");
+ if (data != null && !_newMessageController.isClosed) {
+ _newMessageController.add(Map.from(data));
+ }
});
_socket?.on("messages-read", (data) {
- print("Messages read event: $data");
+ if (data != null && !_messagesReadController.isClosed) {
+ _messagesReadController.add(Map.from(data));
+ }
});
- _socket?.on("message-added", (data) {
- print("Message added event: $data");
+ _socket?.on('message-added', (data) {
+ if (data != null && !_messageAddedController.isClosed) {
+ _messageAddedController.add(Map.from(data));
+ }
});
+ _socket?.on('user-typing', (data) {
+ if (data != null && !_typingController.isClosed) {
+ _typingController.add(Map.from(data));
+ }
+ });
+ _socket?.on('unseen-chats-count', (data) {
+ print("Unseen chats count: $data\n");
+ if (data != null && !_unseenChatsController.isClosed) {
+ _unseenChatsController.add(Map.from(data));
+ }
+ }); // New listener for unseen chats count
}
+ void sendOpenMessageTab() {
+ print("sending open-message-tab");
+ _socket?.emit('open-message-tab');
+ } // to be zero when user opens chat tab
+
void sendTyping(String chatId, bool isTyping) {
_socket?.emit('typing', {'chatId': chatId, 'isTyping': isTyping});
}
@@ -116,7 +162,7 @@ class SocketRepository {
void onNewMessage(Function(dynamic data) callback) {
_socket?.on("new-message", (data) {
callback(data);
- }); // receiver
+ });
}
// Mark chat opened (make all messages READ)
@@ -133,15 +179,13 @@ class SocketRepository {
_socket?.on("message-added", (data) => callback(data));
} //for sender
- void disposeListeners() {
- _socket?.off('new-message');
- _socket?.off('user-typing');
- _socket?.off('messages-read');
- _socket?.off('message-added');
- }
-
void dispose() {
_socket?.disconnect();
_socket?.dispose();
+ _newMessageController.close();
+ _messageAddedController.close();
+ _typingController.close();
+ _messagesReadController.close();
+ _unseenChatsController.close();
}
}
diff --git a/lib/features/chat/view/screens/Search_Direct_messages.dart b/lib/features/chat/view/screens/Search_Direct_messages.dart
deleted file mode 100644
index b110631..0000000
--- a/lib/features/chat/view/screens/Search_Direct_messages.dart
+++ /dev/null
@@ -1,167 +0,0 @@
-// ignore_for_file: dead_code
-
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:go_router/go_router.dart';
-import 'package:lite_x/core/theme/Palette.dart';
-
-class SearchDirectMessages extends ConsumerStatefulWidget {
- const SearchDirectMessages({super.key});
-
- @override
- ConsumerState createState() =>
- _SearchDirectMessagesState();
-}
-
-class _SearchDirectMessagesState extends ConsumerState {
- late final TextEditingController _searchController;
- String _searchQuery = '';
-
- @override
- void initState() {
- super.initState();
- _searchController = TextEditingController();
- _searchController.addListener(() {
- setState(() {
- _searchQuery = _searchController.text;
- });
- });
- }
-
- @override
- void dispose() {
- _searchController.dispose();
- super.dispose();
- }
-
- @override
- Widget build(BuildContext context) {
- final bool isQueryEmpty = _searchQuery.isEmpty;
- final searchBarHintColor = Colors.grey[400];
-
- return DefaultTabController(
- length: 4,
- child: Scaffold(
- backgroundColor: Palette.background,
- appBar: AppBar(
- backgroundColor: Palette.background,
- elevation: 0,
- leading: IconButton(
- icon: const Icon(Icons.arrow_back, color: Colors.white),
- onPressed: () => context.pop(),
- ),
- title: TextField(
- controller: _searchController,
- autofocus: true,
- style: const TextStyle(color: Palette.textWhite, fontSize: 16),
-
- decoration: InputDecoration(
- hintText: isQueryEmpty ? 'Search Direct Messages' : '',
- hintStyle: TextStyle(color: searchBarHintColor, fontSize: 16),
- filled: false,
- border: InputBorder.none,
- focusedBorder: InputBorder.none,
- enabledBorder: InputBorder.none,
- suffixIcon: isQueryEmpty
- ? null
- : IconButton(
- icon: Icon(
- Icons.clear,
- color: Palette.inputBorderFocused,
- ),
- onPressed: () => _searchController.clear(),
- ),
- ),
- ),
- ),
- body: Column(
- children: [
- const Divider(color: Color(0xFF38444D), height: 0.5),
- if (!isQueryEmpty)
- Column(
- children: [
- TabBar(
- tabAlignment: TabAlignment.start,
- isScrollable: true,
- dividerColor: Colors.transparent,
- indicatorWeight: 1,
- indicatorColor: Palette.inputBorderFocused,
- labelColor: Palette.textWhite,
- unselectedLabelColor: searchBarHintColor,
- labelStyle: const TextStyle(
- fontWeight: FontWeight.bold,
- fontSize: 16,
- ),
- unselectedLabelStyle: const TextStyle(
- fontWeight: FontWeight.normal,
- ),
- tabs: const [
- Tab(text: 'All'),
- Tab(text: 'People'),
- Tab(text: 'Groups'),
- Tab(text: 'Messages'),
- ],
- ),
- ],
- ),
- const Divider(color: Color(0xFF38444D), height: 0.5),
- Expanded(
- child: isQueryEmpty
- ? _buildUnsearched(searchBarHintColor!)
- : _buildSearchResults(_searchQuery),
- ),
- ],
- ),
- ),
- );
- }
-
- Widget _buildUnsearched(Color hintColor) {
- return Padding(
- padding: const EdgeInsets.symmetric(horizontal: 20.0, vertical: 17.0),
- child: Align(
- alignment: Alignment.topLeft,
- child: Text(
- 'Try searching for people, groups or messages',
- style: TextStyle(color: hintColor, fontSize: 16),
- ),
- ),
- );
- }
-
- Widget _buildSearchResults(String query) {
- return TabBarView(
- children: [
- _buildResultsList(query),
- _buildResultsList(query),
- _buildResultsList(query),
- _buildResultsList(query),
- ],
- );
- }
-
- Widget _buildResultsList(String query) {
- final bool hasResults = false;
-
- if (hasResults) {
- return ListView.builder(itemBuilder: (context, index) {});
- }
- return Center(
- child: Padding(
- padding: const EdgeInsets.all(16.0),
- child: Align(
- alignment: Alignment.bottomLeft,
- child: Text(
- 'No results for "$query"',
- textAlign: TextAlign.start,
- style: const TextStyle(
- color: Colors.white,
- fontSize: 30,
- fontWeight: FontWeight.bold,
- ),
- ),
- ),
- ),
- );
- }
-}
diff --git a/lib/features/chat/view/screens/Search_User_Group.dart b/lib/features/chat/view/screens/Search_User_Group.dart
index 79edd7e..4791cea 100644
--- a/lib/features/chat/view/screens/Search_User_Group.dart
+++ b/lib/features/chat/view/screens/Search_User_Group.dart
@@ -1,5 +1,6 @@
import 'dart:async';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:dio/dio.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart';
@@ -19,6 +20,7 @@ class SearchUserGroup extends ConsumerStatefulWidget {
class _SearchUserGroupState extends ConsumerState {
late final TextEditingController _searchController;
Timer? _debounce;
+ CancelToken? _cancelToken;
String _searchQuery = '';
bool _isGrouping = false;
@@ -35,24 +37,29 @@ class _SearchUserGroupState extends ConsumerState {
@override
void dispose() {
_debounce?.cancel();
+ _cancelToken?.cancel();
_searchController.dispose();
super.dispose();
}
void _onSearchChanged() {
- final query = _searchController.text;
-
- if (query == _searchQuery) return;
+ final rawQuery = _searchController.text;
+ final query = rawQuery.trim();
+ if (query == _searchQuery && rawQuery.isNotEmpty) return;
_searchQuery = query;
_debounce?.cancel();
- _debounce = Timer(const Duration(milliseconds: 200), () async {
+ if (_cancelToken != null && !_cancelToken!.isCancelled) {
+ _cancelToken!.cancel();
+ }
+
+ _debounce = Timer(const Duration(milliseconds: 600), () async {
if (!mounted) return;
if (query.isNotEmpty) {
final users = await ref
.read(conversationsViewModelProvider.notifier)
.searchUsers(query);
- // if (!mounted) return;
+
ref.read(searchResultsProvider.notifier).state = users;
} else {
ref.read(searchResultsProvider.notifier).state = [];
@@ -83,39 +90,13 @@ class _SearchUserGroupState extends ConsumerState {
'subtitle': "${user.username}",
'avatarUrl': user.profileMedia,
'isGroup': false,
+ 'recipientFollowersCount': user.followers,
},
);
});
}
}
- void _createGroup() async {
- if (_selectedUsers.isEmpty) return;
- final result = await ref
- .read(conversationsViewModelProvider.notifier)
- .createChat(
- isDMChat: false,
- recipientIds: _selectedUsers.map((u) => u.id).toList(),
- );
- result.fold(
- (failure) => ScaffoldMessenger.of(
- context,
- ).showSnackBar(SnackBar(content: Text(failure.message))),
- (chatModel) {
- context.pushNamed(
- RouteConstants.ChatScreen,
- pathParameters: {'chatId': chatModel.id},
- extra: {
- 'title': chatModel.groupName ?? "Group A",
- 'subtitle': "${_selectedUsers.length + 1} members",
- 'avatarUrl': chatModel.groupPhotoKey,
- 'isGroup': true,
- },
- );
- },
- );
- }
-
bool isValidHttpUrl(String? url) {
if (url == null) return false;
final uri = Uri.tryParse(url);
@@ -135,21 +116,7 @@ class _SearchUserGroupState extends ConsumerState {
icon: const Icon(Icons.arrow_back, color: Colors.white),
onPressed: () => context.pop(),
),
- actions: _isGrouping && _selectedUsers.isNotEmpty
- ? [
- TextButton(
- onPressed: _createGroup,
- child: Text(
- "Create",
- style: TextStyle(
- color: Palette.textWhite,
- fontSize: 16,
- fontWeight: FontWeight.w600,
- ),
- ),
- ),
- ]
- : null,
+ actions: null,
),
body: Column(
children: [
@@ -232,26 +199,7 @@ class _SearchUserGroupState extends ConsumerState {
),
),
const Divider(color: Color(0xFF38444D), height: 0.2),
- if (!_isGrouping)
- ListTile(
- leading: const Icon(
- Icons.groups_outlined,
- color: Palette.primary,
- ),
- title: Text(
- 'Create a group',
- style: TextStyle(
- color: Palette.primary,
- fontSize: 17,
- fontWeight: FontWeight.w600,
- ),
- ),
- onTap: () {
- setState(() {
- _isGrouping = true;
- });
- },
- ),
+
Expanded(
child: users.isEmpty
? Center(
@@ -303,9 +251,10 @@ class _SearchUserGroupState extends ConsumerState {
style: const TextStyle(color: Colors.grey),
),
trailing: _isGrouping
- ? (isSelected
- ? Icon(Icons.check, color: Colors.grey[600])
- : null)
+ ? Icon(
+ isSelected ? Icons.check : null,
+ color: Colors.grey[600],
+ )
: null,
onTap: () => _onUserTapped(user),
);
diff --git a/lib/features/chat/view/screens/chat_Screen.dart b/lib/features/chat/view/screens/chat_Screen.dart
index f01a3f5..ff1c6ef 100644
--- a/lib/features/chat/view/screens/chat_Screen.dart
+++ b/lib/features/chat/view/screens/chat_Screen.dart
@@ -2,8 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:lite_x/core/providers/current_user_provider.dart';
import 'package:lite_x/core/theme/Palette.dart';
-import 'package:lite_x/features/chat/models/messagemodel.dart';
-
+import 'package:lite_x/features/chat/providers/activeChatIdProvider.dart';
import 'package:lite_x/features/chat/view/widgets/chat/MessageAppBar.dart';
import 'package:lite_x/features/chat/view/widgets/chat/MessageBubble.dart';
import 'package:lite_x/features/chat/view/widgets/chat/MessageOptionsSheet.dart';
@@ -11,16 +10,14 @@ import 'package:lite_x/features/chat/view/widgets/chat/TypingIndicator.dart';
import 'package:lite_x/features/chat/view/widgets/chat/message_input_bar.dart';
import 'package:lite_x/features/chat/view_model/chat/Chat_view_model.dart';
import 'package:lite_x/features/chat/view_model/conversions/Conversations_view_model.dart';
-import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
class ChatScreen extends ConsumerStatefulWidget {
final String chatId;
- final String title; // name of user or group name
- final String? subtitle; // username or group count
+ final String title; // name of user
+ final String? subtitle; // username
final String? profileImage;
final bool isGroup;
final int? recipientFollowersCount;
-
const ChatScreen({
super.key,
required this.chatId,
@@ -37,32 +34,40 @@ class ChatScreen extends ConsumerStatefulWidget {
class _ChatScreenState extends ConsumerState {
late String _currentUserId;
- final ItemPositionsListener _itemPositionsListener =
- ItemPositionsListener.create();
bool _isExiting = false;
bool _showScrollToBottomButton = false;
final ScrollController _scrollController = ScrollController();
- late ChatViewModel notifier;
-
+ bool _isLoadingMore = false;
ProviderSubscription? _chatSub;
@override
void initState() {
super.initState();
_currentUserId = ref.read(currentUserProvider)!.id;
- notifier = ref.read(chatViewModelProvider.notifier);
+ _scrollController.addListener(_onScroll);
+ _scrollController.addListener(_onScroll);
+
WidgetsBinding.instance.addPostFrameCallback((_) {
if (!mounted) return;
_setupChatSubscription();
ref.read(chatViewModelProvider.notifier).loadChat(widget.chatId);
+ ref.read(activeChatProvider.notifier).setActive(widget.chatId);
ref
.read(conversationsViewModelProvider.notifier)
.markChatAsRead(widget.chatId);
});
+ }
- _itemPositionsListener.itemPositions.addListener(_scrollListener);
+ @override
+ void dispose() {
+ _chatSub?.close();
+ _chatSub = null;
+ _scrollController.removeListener(_onScroll);
+ _scrollController.dispose();
+
+ super.dispose();
}
void _setupChatSubscription() {
@@ -70,75 +75,92 @@ class _ChatScreenState extends ConsumerState {
previous,
next,
) {
- if (_isExiting || !mounted) return;
+ if (!mounted || _isExiting) return;
final notifier = ref.read(chatViewModelProvider.notifier);
if (!notifier.isActiveChat(widget.chatId)) return;
- final positions = _itemPositionsListener.itemPositions.value;
- final isAtBottom =
- positions.isEmpty ||
- positions.any((pos) => pos.index == 0 && pos.itemLeadingEdge < 0.1);
-
- final lastMsg = next.messages.lastOrNull;
+ final shouldAutoScroll = _shouldAutoScrollToBottom(previous, next);
- if (lastMsg != null && (lastMsg.userId == _currentUserId || isAtBottom)) {
+ if (shouldAutoScroll) {
WidgetsBinding.instance.addPostFrameCallback((_) {
if (_isExiting || !mounted) return;
- _scrollToBottom();
+ _scrollToBottom(animate: true);
});
}
}, fireImmediately: false);
}
- @override
- void dispose() {
- _isExiting = true;
+ bool _shouldAutoScrollToBottom(ChatState? previous, ChatState next) {
+ if (previous == null || previous.messages.isEmpty) return true;
- _chatSub?.close();
- _chatSub = null;
+ if (previous.messages.length == next.messages.length) return false;
- _itemPositionsListener.itemPositions.removeListener(_scrollListener);
+ final lastMsg = next.messages.lastOrNull;
+ if (lastMsg == null) return false;
- try {
- final savedNotifier = notifier;
+ final isMine = lastMsg.userId == _currentUserId;
+ final isNearBottom = _isScrolledToBottom();
- Future.microtask(() {
- savedNotifier.sendTyping(false);
- savedNotifier.exitChat();
- });
- } catch (e) {
- debugPrint("Error during dispose: $e");
- }
-
- super.dispose();
+ return isMine || isNearBottom;
}
- void _scrollListener() {
- if (_isExiting || !mounted) return;
+ bool _isScrolledToBottom() {
+ if (!_scrollController.hasClients) return true;
+
+ const threshold = 100.0;
+ final position = _scrollController.position;
- final positions = _itemPositionsListener.itemPositions.value;
- if (positions.isEmpty) return;
+ return position.pixels <= threshold;
+ }
- final isBottomVisible = positions.any((pos) => pos.index == 0);
- final shouldShowButton = !isBottomVisible;
+ void _onScroll() {
+ if (_isExiting || !mounted) return;
+ final shouldShowButton = !_isScrolledToBottom();
if (shouldShowButton != _showScrollToBottomButton) {
setState(() {
_showScrollToBottomButton = shouldShowButton;
});
}
+
+ if (_scrollController.position.pixels >=
+ _scrollController.position.maxScrollExtent - 200 &&
+ !_isLoadingMore) {
+ _loadMoreMessages();
+ }
}
- void _scrollToBottom() {
+ Future _loadMoreMessages() async {
+ if (_isLoadingMore) return;
+
+ final chatState = ref.read(chatViewModelProvider);
+ if (chatState.isLoadingHistory) return;
+
+ setState(() {
+ _isLoadingMore = true;
+ });
+
+ await ref.read(chatViewModelProvider.notifier).loadOlderMessages();
+
+ setState(() {
+ _isLoadingMore = false;
+ });
+ }
+
+ void _scrollToBottom({bool animate = true}) {
if (!mounted || _isExiting) return;
if (!_scrollController.hasClients) return;
- _scrollController.animateTo(
- 0,
- duration: const Duration(milliseconds: 200),
- curve: Curves.easeOut,
- );
+ if (animate) {
+ _scrollController.animateTo(
+ 0,
+ duration: const Duration(milliseconds: 300),
+ curve: Curves.easeOut,
+ );
+ } else {
+ _scrollController.jumpTo(0);
+ }
}
void _handleSendMessage(String text) {
@@ -147,35 +169,16 @@ class _ChatScreenState extends ConsumerState {
final currentUser = ref.read(currentUserProvider);
if (currentUser == null || text.trim().isEmpty) return;
- final tempId = DateTime.now().millisecondsSinceEpoch.toString();
- final message = MessageModel(
- id: tempId,
- chatId: widget.chatId,
- userId: currentUser.id,
- content: text.trim(),
- createdAt: DateTime.now(),
- status: 'PENDING',
- messageType: 'text',
- );
-
- ref.read(chatViewModelProvider.notifier).sendMessage(message);
+ ref
+ .read(chatViewModelProvider.notifier)
+ .sendMessage(content: text.trim(), messageType: 'text');
WidgetsBinding.instance.addPostFrameCallback((_) {
if (_isExiting || !mounted) return;
- _scrollToBottom();
+ _scrollToBottom(animate: true);
});
}
- void _handleDeleteMessage(MessageModel message, bool forEveryone) {
- print(
- 'Delete message ${message.id} for ${forEveryone ? "everyone" : "me"}',
- );
- }
-
- void _handleEditMessage(MessageModel message) {
- print('Edit message ${message.id}');
- }
-
@override
Widget build(BuildContext context) {
final chatState = ref.watch(chatViewModelProvider);
@@ -198,18 +201,33 @@ class _ChatScreenState extends ConsumerState {
Expanded(
child: Stack(
children: [
- if (chatState.isLoading)
+ if (chatState.isLoading && messages.isEmpty)
const Center(child: CircularProgressIndicator())
else
ListView.separated(
controller: _scrollController,
reverse: true,
- padding: const EdgeInsets.symmetric(vertical: 10),
- itemCount: messages.length + 1,
+ padding: const EdgeInsets.symmetric(
+ vertical: 10,
+ horizontal: 8,
+ ),
+ itemCount:
+ messages.length + (chatState.isLoadingHistory ? 2 : 1),
separatorBuilder: (_, __) => const SizedBox(height: 6),
itemBuilder: (context, index) {
- if (index == messages.length)
+ if (chatState.isLoadingHistory &&
+ index == messages.length + 1) {
+ return const Center(
+ child: Padding(
+ padding: EdgeInsets.all(16.0),
+ child: CircularProgressIndicator(),
+ ),
+ );
+ }
+
+ if (index == messages.length) {
return _buildProfileHeader();
+ }
final message = messages[messages.length - index - 1];
final isMe = message.userId == currentUser.id;
@@ -223,36 +241,42 @@ class _ChatScreenState extends ConsumerState {
context: context,
message: message,
isMe: isMe,
- onDeleteForMe: () =>
- _handleDeleteMessage(message, false),
- onDeleteForEveryone: () =>
- _handleDeleteMessage(message, true),
- onEdit: () => _handleEditMessage(message),
);
},
);
},
),
+
if (chatState.isRecipientTyping)
Positioned(
bottom: 0,
left: 0,
right: 0,
- child: TypingIndicator(userName: widget.title),
+ child: Container(
+ decoration: BoxDecoration(
+ gradient: LinearGradient(
+ begin: Alignment.topCenter,
+ end: Alignment.bottomCenter,
+ colors: [
+ Colors.transparent,
+ Theme.of(context).scaffoldBackgroundColor,
+ ],
+ ),
+ ),
+ child: TypingIndicator(userName: widget.title),
+ ),
),
_buildScrollToBottomButton(),
],
),
),
+
SafeArea(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
child: MessageInputBar(
onSendMessage: _handleSendMessage,
- onSendAudio: null,
- onSendImage: null,
- onSendGif: null,
onTypingChanged: (isTyping) {
ref.read(chatViewModelProvider.notifier).sendTyping(isTyping);
},
@@ -273,9 +297,9 @@ class _ChatScreenState extends ConsumerState {
CircleAvatar(
radius: 45,
backgroundColor: Theme.of(context).primaryColor.withOpacity(0.1),
- // backgroundImage: widget.profileImage != null
- // ? NetworkImage(widget.profileImage!)
- // : null,
+ backgroundImage: widget.profileImage != null
+ ? NetworkImage(widget.profileImage!)
+ : null,
child: widget.profileImage == null
? Text(
widget.title[0].toUpperCase(),
@@ -287,48 +311,50 @@ class _ChatScreenState extends ConsumerState {
)
: null,
),
- const SizedBox(height: 5),
+ const SizedBox(height: 8),
Text(
widget.title,
style: const TextStyle(
- fontSize: 16,
- fontWeight: FontWeight.w500,
+ fontSize: 18,
+ fontWeight: FontWeight.w600,
color: Palette.textPrimary,
),
),
- if (widget.subtitle != null)
+
+ if (widget.subtitle != null) ...[
+ const SizedBox(height: 2),
Text(
'@${widget.subtitle}',
- style: TextStyle(
- fontSize: 16,
- color: Color.fromARGB(255, 133, 139, 145),
- ),
+ style: const TextStyle(fontSize: 15, color: Color(0xFF858B91)),
),
- const SizedBox(height: 12),
+ ],
- if (widget.recipientFollowersCount != null)
+ if (widget.recipientFollowersCount != null) ...[
+ const SizedBox(height: 8),
Text(
'${widget.recipientFollowersCount} Followers',
- style: TextStyle(fontSize: 14, color: Colors.grey[500]),
+ style: TextStyle(fontSize: 14, color: Colors.grey[600]),
),
+ ],
const SizedBox(height: 20),
Divider(
- thickness: 0.2,
- color: Colors.grey[500],
- indent: 10,
- endIndent: 10,
+ thickness: 0.5,
+ color: Colors.grey[300],
+ indent: 20,
+ endIndent: 20,
),
- const SizedBox(height: 4),
+
+ const SizedBox(height: 8),
Text(
- 'Today',
+ _getConversationStartDate(),
style: TextStyle(
- fontSize: 14,
- fontWeight: FontWeight.bold,
- color: Palette.textPrimary,
+ fontSize: 13,
+ fontWeight: FontWeight.w500,
+ color: Colors.grey[600],
),
),
],
@@ -336,20 +362,51 @@ class _ChatScreenState extends ConsumerState {
);
}
+ String _getConversationStartDate() {
+ final chatState = ref.read(chatViewModelProvider);
+ if (chatState.messages.isEmpty) return 'Today';
+
+ final oldestMessage = chatState.messages.first;
+ final now = DateTime.now();
+ final messageDate = oldestMessage.createdAt;
+
+ final difference = now.difference(messageDate);
+
+ if (difference.inDays == 0) {
+ return 'Today';
+ } else if (difference.inDays == 1) {
+ return 'Yesterday';
+ } else if (difference.inDays < 7) {
+ return '${difference.inDays} days ago';
+ } else {
+ return '${messageDate.day}/${messageDate.month}/${messageDate.year}';
+ }
+ }
+
Widget _buildScrollToBottomButton() {
return Positioned(
- bottom: 10.0,
- right: 10.0,
- child: AnimatedOpacity(
- opacity: _showScrollToBottomButton ? 1.0 : 0.0,
- duration: const Duration(milliseconds: 300),
- child: IgnorePointer(
- ignoring: !_showScrollToBottomButton,
- child: FloatingActionButton.small(
- onPressed: _scrollToBottom,
- tooltip: 'Scroll to bottom',
- backgroundColor: Theme.of(context).primaryColor,
- child: const Icon(Icons.arrow_downward, color: Colors.white),
+ bottom: 16.0,
+ right: 16.0,
+ child: AnimatedScale(
+ scale: _showScrollToBottomButton ? 1.0 : 0.0,
+ duration: const Duration(milliseconds: 200),
+ curve: Curves.easeInOut,
+ child: AnimatedOpacity(
+ opacity: _showScrollToBottomButton ? 1.0 : 0.0,
+ duration: const Duration(milliseconds: 200),
+ child: IgnorePointer(
+ ignoring: !_showScrollToBottomButton,
+ child: FloatingActionButton.small(
+ onPressed: () => _scrollToBottom(animate: true),
+ tooltip: 'Scroll to bottom',
+ backgroundColor: Theme.of(context).primaryColor,
+ elevation: 4,
+ child: const Icon(
+ Icons.keyboard_arrow_down_rounded,
+ color: Colors.white,
+ size: 24,
+ ),
+ ),
),
),
),
diff --git a/lib/features/chat/view/widgets/chat/MessageAppBar.dart b/lib/features/chat/view/widgets/chat/MessageAppBar.dart
index 3ca0097..8c6de0f 100644
--- a/lib/features/chat/view/widgets/chat/MessageAppBar.dart
+++ b/lib/features/chat/view/widgets/chat/MessageAppBar.dart
@@ -1,14 +1,11 @@
import 'package:flutter/material.dart';
import 'package:lite_x/core/theme/palette.dart';
-import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
class MessageAppBar extends StatelessWidget implements PreferredSizeWidget {
final String title;
final String? profileImage;
final String subtitle;
final VoidCallback? onProfileTap;
- final VoidCallback? onVideoCallTap;
- final VoidCallback? onAudioCallTap;
const MessageAppBar({
super.key,
@@ -16,8 +13,6 @@ class MessageAppBar extends StatelessWidget implements PreferredSizeWidget {
required this.subtitle,
this.profileImage,
this.onProfileTap,
- this.onVideoCallTap,
- this.onAudioCallTap,
});
@override
@@ -60,17 +55,6 @@ class MessageAppBar extends StatelessWidget implements PreferredSizeWidget {
],
),
),
- actions: [
- IconButton(
- icon: Icon(MdiIcons.videoPlusOutline, size: 28, color: Colors.white),
- onPressed: onVideoCallTap,
- ),
- IconButton(
- icon: Icon(MdiIcons.phoneOutline, size: 25, color: Colors.white),
- onPressed: onAudioCallTap,
- ),
- const SizedBox(width: 4),
- ],
);
}
}
diff --git a/lib/features/chat/view/widgets/chat/MessageOptionsSheet.dart b/lib/features/chat/view/widgets/chat/MessageOptionsSheet.dart
index 90b7c74..585017b 100644
--- a/lib/features/chat/view/widgets/chat/MessageOptionsSheet.dart
+++ b/lib/features/chat/view/widgets/chat/MessageOptionsSheet.dart
@@ -6,11 +6,9 @@ import 'package:lite_x/features/chat/models/messagemodel.dart';
class MessageOptionsSheet extends StatelessWidget {
final MessageModel message;
final bool isMe;
-
final VoidCallback? onDeleteForMe;
final VoidCallback? onDeleteForEveryone;
final VoidCallback? onEdit;
-
const MessageOptionsSheet({
super.key,
required this.message,
diff --git a/lib/features/chat/view/widgets/chat/message_input_bar.dart b/lib/features/chat/view/widgets/chat/message_input_bar.dart
index 5456cf9..9f22514 100644
--- a/lib/features/chat/view/widgets/chat/message_input_bar.dart
+++ b/lib/features/chat/view/widgets/chat/message_input_bar.dart
@@ -1,25 +1,15 @@
import 'dart:async';
-import 'package:just_audio/just_audio.dart';
import 'package:flutter/material.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:lite_x/core/classes/PickedImage.dart';
-import 'package:lite_x/features/chat/providers/audiorecordernotifier.dart';
-import 'package:giphy_get/giphy_get.dart';
import 'package:lite_x/core/theme/palette.dart';
class MessageInputBar extends ConsumerStatefulWidget {
final Function(String text) onSendMessage;
- final Function(String)? onSendAudio;
- final Function(PickedImage)? onSendImage;
- final Function(String)? onSendGif;
final Function(bool isTyping)? onTypingChanged;
const MessageInputBar({
super.key,
required this.onSendMessage,
- this.onSendAudio,
- this.onSendImage,
- this.onSendGif,
+
this.onTypingChanged,
});
@@ -29,19 +19,12 @@ class MessageInputBar extends ConsumerStatefulWidget {
class _MessageInputBarState extends ConsumerState
with SingleTickerProviderStateMixin {
- final String _giphyApiKey = dotenv.env["giphyApiKey"] ?? "";
late AnimationController _colorController;
final TextEditingController _textController = TextEditingController();
Timer? _typingTimer;
bool _isTyping = false;
final FocusNode _focusNode = FocusNode();
- final AudioPlayer _audioPlayer = AudioPlayer();
-
- Timer? _recordingTimer;
- StreamSubscription? _playerStateSubscription;
- StreamSubscription? _positionSubscription;
- PickedImage? selectedImage;
@override
void initState() {
super.initState();
@@ -49,51 +32,17 @@ class _MessageInputBarState extends ConsumerState
vsync: this,
duration: const Duration(seconds: 1),
)..repeat(reverse: true);
- _setupAudioPlayer();
_textController.addListener(_onTextChanged);
}
- Future _stopPlayback() async {
- try {
- await _audioPlayer.stop();
- await _audioPlayer.seek(Duration.zero);
- ref.read(audioRecorderProvider.notifier).resetReviewPosition();
- } catch (e) {
- debugPrint("Error stopping playback: $e");
- }
- }
-
- void _setupAudioPlayer() {
- _playerStateSubscription = _audioPlayer.playerStateStream.listen((state) {
- if (!mounted) return;
-
- if (state.processingState == ProcessingState.completed) {
- _stopPlayback();
- }
- });
-
- _positionSubscription = _audioPlayer.positionStream.listen((position) {
- if (!mounted) return;
-
- final audioState = ref.read(audioRecorderProvider);
- if (audioState.status == RecorderStatus.reviewing &&
- _audioPlayer.playing) {
- ref.read(audioRecorderProvider.notifier).updateReviewPosition(position);
- }
- });
- }
-
@override
void dispose() {
- _recordingTimer?.cancel();
- _playerStateSubscription?.cancel();
- _positionSubscription?.cancel();
_typingTimer?.cancel();
_textController.removeListener(_onTextChanged);
_textController.dispose();
_colorController.dispose();
_focusNode.dispose();
- _audioPlayer.dispose();
+
super.dispose();
}
@@ -134,184 +83,22 @@ class _MessageInputBarState extends ConsumerState
_focusNode.requestFocus();
}
- Future _selectImage() async {
- selectedImage = await pickImage();
- if (selectedImage != null) {
- widget.onSendImage?.call(selectedImage!);
- }
- }
-
- Future _startRecording() async {
- try {
- final success = await ref
- .read(audioRecorderProvider.notifier)
- .startRecording();
- if (success) {
- _recordingTimer = Timer.periodic(const Duration(seconds: 1), (_) {
- if (mounted) {
- ref.read(audioRecorderProvider.notifier).updateRecordingDuration();
- }
- });
- } else {
- if (mounted) {
- ScaffoldMessenger.of(context).showSnackBar(
- const SnackBar(
- content: Text(
- 'Failed to start recording. Please check microphone permissions.',
- ),
- backgroundColor: Palette.border,
- ),
- );
- }
- }
- } catch (e) {
- debugPrint('Error starting recording: $e');
- if (mounted) {
- ScaffoldMessenger.of(context).showSnackBar(
- SnackBar(
- content: Text('Recording error: $e'),
- backgroundColor: Palette.border,
- ),
- );
- }
- }
- }
-
- Future _stopRecording() async {
- try {
- _recordingTimer?.cancel();
- await ref.read(audioRecorderProvider.notifier).stopRecording();
- } catch (e) {
- debugPrint('Error stopping recording: $e');
- if (mounted) {
- ScaffoldMessenger.of(context).showSnackBar(
- SnackBar(
- content: Text('Error stopping recording: $e'),
- backgroundColor: Palette.border,
- ),
- );
- }
- }
- }
-
- Future _cancelRecording() async {
- try {
- _recordingTimer?.cancel();
- await ref.read(audioRecorderProvider.notifier).cancelRecording();
- } catch (e) {
- debugPrint('Error canceling recording: $e');
- }
- }
-
- Future _togglePlayback() async {
- final path = ref.read(audioRecorderProvider).recordingPath;
- if (path == null) return;
-
- try {
- if (_audioPlayer.playing) {
- await _audioPlayer.pause();
- } else {
- if (_audioPlayer.processingState == ProcessingState.completed ||
- _audioPlayer.processingState == ProcessingState.idle) {
- await _audioPlayer.setFilePath(path);
- }
- await _audioPlayer.play();
- }
- } catch (e) {
- debugPrint("Error toggling playback: $e");
- if (mounted) {
- ScaffoldMessenger.of(context).showSnackBar(
- SnackBar(
- content: Text('Playback error: $e'),
- backgroundColor: Palette.border,
- ),
- );
- }
- }
- }
-
- Future _cancelReview() async {
- await _stopPlayback();
- await ref.read(audioRecorderProvider.notifier).cancelReview();
- }
-
- Future _sendRecording() async {
- await _stopPlayback();
- final path = ref.read(audioRecorderProvider.notifier).sendRecording();
- if (path != null) {
- widget.onSendAudio?.call(path);
- }
- }
-
- Future _toggleGifPicker() async {
- final gif = await GiphyGet.getGif(
- context: context,
- apiKey: _giphyApiKey,
- lang: GiphyLanguage.english,
- tabColor: Palette.kBrandBlue,
- );
- if (gif != null) {
- final gifUrl = gif.images?.original?.url;
- if (gifUrl != null && gifUrl.isNotEmpty) {
- widget.onSendGif?.call(gifUrl);
- }
- }
- }
-
- String _formatRecordingDuration(Duration duration) {
- return '${duration.inSeconds}s';
- }
-
- String _formatReviewDuration(Duration duration) {
- String twoDigits(int n) => n.toString().padLeft(2, '0');
- final minutes = duration.inMinutes.remainder(60);
- final seconds = twoDigits(duration.inSeconds.remainder(60));
- return '$minutes:$seconds';
- }
-
@override
Widget build(BuildContext context) {
- final audioState = ref.watch(audioRecorderProvider);
final theme = Theme.of(context);
return Container(
- padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 2),
+ padding: const EdgeInsets.symmetric(horizontal: 8),
decoration: BoxDecoration(
- color: audioState.status == RecorderStatus.idle
- ? Palette.container_message_color
- : Colors.black,
+ color: Palette.container_message_color,
borderRadius: BorderRadius.circular(26),
),
- child: switch (audioState.status) {
- RecorderStatus.idle => _buildIdleView(theme),
- RecorderStatus.recording => _buildRecordingView(audioState, theme),
- RecorderStatus.reviewing => _buildReviewView(audioState, theme),
- },
+ child: _buildIdleView(theme),
);
}
Widget _buildIdleView(ThemeData theme) {
return Row(
children: [
- IconButton(
- icon: const Icon(
- Icons.image_outlined,
- color: Palette.kDimIconwhite,
- size: 26,
- ),
- onPressed: _selectImage,
- tooltip: 'Send image',
- constraints: const BoxConstraints(minWidth: 40, minHeight: 40),
- ),
- IconButton(
- icon: const Icon(
- Icons.gif_box_outlined,
- color: Palette.kDimIconwhite,
- size: 26,
- ),
- onPressed: _toggleGifPicker,
- tooltip: 'Send GIF',
- constraints: const BoxConstraints(minWidth: 40, minHeight: 40),
- ),
Expanded(
child: TextField(
maxLines: null,
@@ -330,10 +117,9 @@ class _MessageInputBarState extends ConsumerState
enabledBorder: InputBorder.none,
disabledBorder: InputBorder.none,
- contentPadding: EdgeInsets.symmetric(horizontal: 2, vertical: 8),
+ contentPadding: EdgeInsets.symmetric(horizontal: 2, vertical: 4),
),
style: const TextStyle(color: Color(0xFFFFFFFF), fontSize: 16),
- // onSubmitted: (_) => _handleSend(),
),
),
ValueListenableBuilder(
@@ -341,200 +127,14 @@ class _MessageInputBarState extends ConsumerState
builder: (context, value, child) {
final hastext = value.text.trim().isNotEmpty;
return IconButton(
- icon: Icon(
- hastext ? Icons.send : Icons.graphic_eq,
- color: hastext ? Palette.kBrandBlue : Palette.kBrandPurple,
- size: 24,
- ),
- onPressed: hastext ? _handleSend : _startRecording,
- onLongPress: !hastext ? _startRecording : null,
- tooltip: hastext ? 'Send message' : 'Record audio',
- constraints: const BoxConstraints(minWidth: 40, minHeight: 40),
+ icon: Icon(Icons.send, color: Palette.kBrandBlue, size: 24),
+ onPressed: hastext ? _handleSend : null,
+ tooltip: hastext ? 'Send message' : null,
+ constraints: const BoxConstraints(minWidth: 35, minHeight: 35),
);
},
),
],
);
}
-
- Widget _buildRecordingView(AudioRecorderState audioState, ThemeData theme) {
- return Container(
- color: Colors.black,
- padding: const EdgeInsets.symmetric(horizontal: 20.0, vertical: 10.0),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: [
- InkWell(
- onTap: _cancelRecording,
- child: const Text(
- 'Cancel',
- style: TextStyle(color: Palette.kDimIconwhite, fontSize: 14),
- ),
- ),
- Expanded(
- child: Container(
- height: 33,
- margin: const EdgeInsets.symmetric(horizontal: 10),
- padding: const EdgeInsets.symmetric(horizontal: 10),
- decoration: BoxDecoration(
- gradient: const LinearGradient(
- begin: Alignment.centerLeft,
- end: Alignment.centerRight,
- colors: [Color(0xFFD1C4F8), Color(0xFFE0D7FF)],
- ),
- borderRadius: BorderRadius.circular(15),
- ),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: [
- Row(
- children: [
- AnimatedBuilder(
- animation: _colorController,
- builder: (context, child) {
- return Container(
- width: 10,
- height: 10,
- margin: const EdgeInsets.only(right: 5),
- decoration: BoxDecoration(
- color: Color.lerp(
- const Color(0xFFF04F78),
- const Color(0xFF8E24AA),
- _colorController.value,
- ),
- shape: BoxShape.circle,
- ),
- );
- },
- ),
- const Text(
- 'Recording',
- style: TextStyle(
- color: Color.fromARGB(255, 141, 108, 182),
- fontSize: 16,
- fontWeight: FontWeight.w600,
- ),
- ),
- ],
- ),
- Text(
- _formatRecordingDuration(audioState.remainingDuration),
- style: const TextStyle(
- color: Colors.white,
- fontSize: 14,
- fontWeight: FontWeight.w400,
- ),
- ),
- ],
- ),
- ),
- ),
- GestureDetector(
- onTap: _stopRecording,
- child: Container(
- width: 22,
- height: 22,
- decoration: BoxDecoration(
- shape: BoxShape.circle,
- border: Border.all(
- color: const Color.fromARGB(255, 239, 57, 103),
- width: 2.2,
- ),
- ),
- child: const Center(
- child: Icon(
- size: 14,
- Icons.stop_rounded,
- color: Color(0xFFF04F78),
- ),
- ),
- ),
- ),
- ],
- ),
- );
- }
-
- Widget _buildReviewView(AudioRecorderState audioState, ThemeData theme) {
- return Container(
- color: Colors.black,
- padding: const EdgeInsets.symmetric(horizontal: 20.0, vertical: 10.0),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: [
- InkWell(
- onTap: _cancelReview,
- child: const Text(
- 'Cancel',
- style: TextStyle(color: Palette.kDimIconwhite, fontSize: 14),
- ),
- ),
- Expanded(
- child: Container(
- height: 33,
- margin: const EdgeInsets.symmetric(horizontal: 10),
- padding: const EdgeInsets.symmetric(horizontal: 10),
- decoration: BoxDecoration(
- gradient: const LinearGradient(
- begin: Alignment.centerLeft,
- end: Alignment.centerRight,
- colors: [
- Color.fromARGB(255, 169, 145, 255),
- Color.fromARGB(255, 163, 141, 244),
- ],
- ),
- borderRadius: BorderRadius.circular(15),
- ),
- child: GestureDetector(
- onTap: _togglePlayback,
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: [
- Row(
- children: [
- Icon(
- _audioPlayer.playing ? Icons.pause : Icons.play_arrow,
- color: Colors.white,
- size: 25,
- ),
- const SizedBox(width: 5),
- Text(
- _audioPlayer.playing ? 'Playing' : 'Play audio',
- style: const TextStyle(
- color: Colors.white,
- fontSize: 16,
- fontWeight: FontWeight.w500,
- ),
- ),
- ],
- ),
- Text(
- _formatReviewDuration(audioState.remainingDuration),
- style: const TextStyle(
- color: Colors.white,
- fontSize: 14,
- fontWeight: FontWeight.w500,
- ),
- ),
- ],
- ),
- ),
- ),
- ),
- GestureDetector(
- onTap: _sendRecording,
- child: Container(
- width: 30,
- height: 30,
- decoration: const BoxDecoration(
- color: Color(0xFF8A6BFE),
- shape: BoxShape.circle,
- ),
- child: const Icon(Icons.send, color: Colors.black, size: 18),
- ),
- ),
- ],
- ),
- );
- }
}
diff --git a/lib/features/chat/view/widgets/conversation_tile.dart b/lib/features/chat/view/widgets/conversation_tile.dart
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/features/chat/view/widgets/conversion/SearchField.dart b/lib/features/chat/view/widgets/conversion/SearchField.dart
deleted file mode 100644
index 933bcd3..0000000
--- a/lib/features/chat/view/widgets/conversion/SearchField.dart
+++ /dev/null
@@ -1,38 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:lite_x/core/theme/Palette.dart';
-
-class SearchField extends StatelessWidget {
- final String hintText;
- final VoidCallback? onTap;
-
- const SearchField({super.key, required this.hintText, this.onTap});
-
- @override
- Widget build(BuildContext context) {
- return GestureDetector(
- onTap: onTap,
- child: Container(
- margin: const EdgeInsets.symmetric(horizontal: 11),
- height: 40,
- decoration: BoxDecoration(
- color: Palette.cardBackground,
- borderRadius: BorderRadius.circular(24),
- ),
- padding: const EdgeInsets.symmetric(horizontal: 15),
- child: Row(
- children: [
- Expanded(
- child: Text(
- hintText,
- style: const TextStyle(
- color: Color.fromARGB(255, 85, 88, 92),
- fontSize: 18,
- ),
- ),
- ),
- ],
- ),
- ),
- );
- }
-}
diff --git a/lib/features/chat/view/widgets/conversion/conversation_tile.dart b/lib/features/chat/view/widgets/conversion/conversation_tile.dart
index 6b059fe..6ca71ad 100644
--- a/lib/features/chat/view/widgets/conversion/conversation_tile.dart
+++ b/lib/features/chat/view/widgets/conversion/conversation_tile.dart
@@ -14,7 +14,8 @@ class ConversationTile extends StatelessWidget {
final bool isUnread;
final int unseenCount;
final bool isDMChat;
-
+ final int recipientFollowersCount;
+ final VoidCallback? onLongPress;
const ConversationTile({
super.key,
required this.name,
@@ -27,6 +28,8 @@ class ConversationTile extends StatelessWidget {
this.isUnread = false,
this.unseenCount = 0,
this.isDMChat = true,
+ this.recipientFollowersCount = 0,
+ this.onLongPress,
});
@override
@@ -41,9 +44,11 @@ class ConversationTile extends StatelessWidget {
'avatarUrl': avatarUrl,
'subtitle': username,
'isGroup': isDMChat,
+ 'recipientFollowersCount': recipientFollowersCount,
},
);
},
+ onLongPress: onLongPress,
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
decoration: const BoxDecoration(
@@ -134,21 +139,21 @@ class ConversationTile extends StatelessWidget {
const SizedBox(width: 8),
Container(
padding: const EdgeInsets.symmetric(
- horizontal: 8,
- vertical: 2,
+ horizontal: 4,
+ vertical: 4,
),
decoration: BoxDecoration(
color: Palette.primary,
- borderRadius: BorderRadius.circular(12),
- ),
- child: Text(
- unseenCount > 99 ? '99+' : unseenCount.toString(),
- style: const TextStyle(
- fontSize: 12,
- fontWeight: FontWeight.bold,
- color: Colors.white,
- ),
+ borderRadius: BorderRadius.circular(20),
),
+ // child: Text(
+ // unseenCount > 99 ? '99+' : unseenCount.toString(),
+ // style: const TextStyle(
+ // fontSize: 12,
+ // fontWeight: FontWeight.bold,
+ // color: Colors.white,
+ // ),
+ // ),
),
],
],
diff --git a/lib/features/chat/view/widgets/conversion/conversations_list.dart b/lib/features/chat/view/widgets/conversion/conversations_list.dart
index cdcd2ee..967bcd5 100644
--- a/lib/features/chat/view/widgets/conversion/conversations_list.dart
+++ b/lib/features/chat/view/widgets/conversion/conversations_list.dart
@@ -1,8 +1,5 @@
-// ignore_for_file: dead_code, unused_local_variable
-
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:lite_x/core/providers/current_user_provider.dart';
import 'package:lite_x/core/theme/Palette.dart';
import 'package:lite_x/features/chat/view/widgets/conversion/conversation_tile.dart';
import 'package:lite_x/features/chat/view/widgets/conversion/empty_inbox.dart';
@@ -32,6 +29,105 @@ class _ConversationsListState extends ConsumerState {
super.dispose();
}
+ void _showDeleteConfirmation(BuildContext context, String chatId) {
+ showDialog(
+ context: context,
+ builder: (ctx) => AlertDialog(
+ backgroundColor: Palette.textSecondary,
+ title: const Text(
+ "Delete conversation?",
+ style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold),
+ ),
+ content: const Text(
+ "This conversation will be deleted from everyone inbox",
+ style: TextStyle(color: Colors.white),
+ ),
+ actions: [
+ TextButton(
+ child: const Text(
+ "Delete",
+ style: TextStyle(
+ color: Colors.white,
+ fontWeight: FontWeight.bold,
+ ),
+ ),
+ onPressed: () async {
+ final messenger = ScaffoldMessenger.of(context);
+ Navigator.pop(ctx);
+ final result = await ref
+ .read(conversationsViewModelProvider.notifier)
+ .deleteChat(chatId);
+ if (mounted) {
+ result.fold(
+ (failure) => messenger.showSnackBar(
+ SnackBar(content: Text(failure.message)),
+ ),
+ (success) => messenger.showSnackBar(
+ SnackBar(
+ content: Text(
+ success,
+ style: const TextStyle(
+ color: Colors.white,
+ fontWeight: FontWeight.bold,
+ ),
+ ),
+ ),
+ ),
+ );
+ }
+ },
+ ),
+ TextButton(
+ child: const Text(
+ "Cancel",
+ style: TextStyle(
+ color: Colors.white,
+ fontWeight: FontWeight.bold,
+ ),
+ ),
+ onPressed: () => Navigator.pop(ctx),
+ ),
+ ],
+ ),
+ );
+ }
+
+ void _showOptionsMenu(BuildContext parentContext, String chatId) {
+ showDialog(
+ context: parentContext,
+ builder: (dialogContext) => SimpleDialog(
+ backgroundColor: Palette.textSecondary,
+ shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(4)),
+ contentPadding: const EdgeInsets.symmetric(vertical: 12),
+ children: [
+ _buildMenuOption("Delete conversation", () {
+ Navigator.pop(dialogContext);
+
+ _showDeleteConfirmation(parentContext, chatId);
+ }),
+ ],
+ ),
+ );
+ }
+
+ Widget _buildMenuOption(String text, VoidCallback onTap) {
+ return InkWell(
+ onTap: onTap,
+ child: Container(
+ padding: const EdgeInsets.symmetric(vertical: 16, horizontal: 24),
+ width: double.maxFinite,
+ child: Text(
+ text,
+ style: const TextStyle(
+ color: Colors.white,
+ fontSize: 16,
+ fontWeight: FontWeight.w500,
+ ),
+ ),
+ ),
+ );
+ }
+
String _getDisplayMessage(String? content, String? messageType) {
if (messageType == null || messageType == 'text') {
return content ?? '';
@@ -54,7 +150,6 @@ class _ConversationsListState extends ConsumerState {
@override
Widget build(BuildContext context) {
final conversationsAsync = ref.watch(conversationsViewModelProvider);
- final currentUser = ref.watch(currentUserProvider);
return conversationsAsync.when(
data: (conversations) {
@@ -64,12 +159,13 @@ class _ConversationsListState extends ConsumerState {
return RefreshIndicator(
onRefresh: () async {
- await ref
+ return ref
.read(conversationsViewModelProvider.notifier)
.loadConversations();
},
child: ListView.builder(
controller: _scrollController,
+ physics: const AlwaysScrollableScrollPhysics(),
itemCount: conversations.length,
itemBuilder: (context, index) {
final conversation = conversations[index];
@@ -105,6 +201,9 @@ class _ConversationsListState extends ConsumerState {
isUnread: isUnread,
unseenCount: conversation.unseenCount,
isDMChat: conversation.isDMChat,
+ onLongPress: () {
+ _showOptionsMenu(context, conversation.id);
+ },
);
},
),
diff --git a/lib/features/chat/view/widgets/conversion/conversion_app_bar.dart b/lib/features/chat/view/widgets/conversion/conversion_app_bar.dart
index 6902302..5750a48 100644
--- a/lib/features/chat/view/widgets/conversion/conversion_app_bar.dart
+++ b/lib/features/chat/view/widgets/conversion/conversion_app_bar.dart
@@ -1,12 +1,8 @@
import 'dart:io';
-
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:go_router/go_router.dart';
import 'package:lite_x/core/providers/current_user_provider.dart';
-import 'package:lite_x/core/routes/Route_Constants.dart';
import 'package:lite_x/core/theme/Palette.dart';
-import 'package:lite_x/features/chat/view/widgets/conversion/SearchField.dart';
class ConversationAppBar extends ConsumerWidget implements PreferredSizeWidget {
const ConversationAppBar({super.key});
@@ -48,21 +44,6 @@ class ConversationAppBar extends ConsumerWidget implements PreferredSizeWidget {
),
),
),
- Expanded(
- child: SearchField(
- hintText: 'Search Direct Messages',
- onTap: () {
- context.pushNamed(RouteConstants.SearchDirectMessages);
- },
- ),
- ),
- IconButton(
- icon: const Icon(
- Icons.settings_outlined,
- color: Color.fromARGB(174, 255, 255, 255),
- ),
- onPressed: () {},
- ),
],
),
),
diff --git a/lib/features/chat/view_model/chat/Chat_view_model.dart b/lib/features/chat/view_model/chat/Chat_view_model.dart
index 6e7409f..c05d631 100644
--- a/lib/features/chat/view_model/chat/Chat_view_model.dart
+++ b/lib/features/chat/view_model/chat/Chat_view_model.dart
@@ -1,37 +1,48 @@
+import 'dart:async';
import 'package:lite_x/core/models/usermodel.dart';
import 'package:lite_x/core/providers/current_user_provider.dart';
import 'package:lite_x/features/chat/models/messagemodel.dart';
import 'package:lite_x/features/chat/repositories/chat_local_repository.dart';
import 'package:lite_x/features/chat/repositories/chat_remote_repository.dart';
import 'package:lite_x/features/chat/repositories/socket_repository.dart';
+import 'package:lite_x/features/chat/view_model/conversions/Conversations_view_model.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:uuid/uuid.dart';
part 'Chat_view_model.g.dart';
class ChatState {
final List messages;
final bool isRecipientTyping;
final bool isLoading;
+ final bool isLoadingHistory;
+ final bool hasMoreHistory;
ChatState({
this.messages = const [],
this.isRecipientTyping = false,
this.isLoading = false,
+ this.isLoadingHistory = false,
+ this.hasMoreHistory = true,
});
ChatState copyWith({
List? messages,
bool? isRecipientTyping,
bool? isLoading,
+ bool? isLoadingHistory,
+ bool? hasMoreHistory,
}) {
return ChatState(
messages: messages ?? this.messages,
isRecipientTyping: isRecipientTyping ?? this.isRecipientTyping,
isLoading: isLoading ?? this.isLoading,
+ isLoadingHistory: isLoadingHistory ?? this.isLoadingHistory,
+ hasMoreHistory: hasMoreHistory ?? this.hasMoreHistory,
);
}
}
-@Riverpod(keepAlive: true)
+@riverpod
class ChatViewModel extends _$ChatViewModel {
late ChatRemoteRepository _chatRemoteRepository;
late ChatLocalRepository _chatLocalRepository;
@@ -39,7 +50,13 @@ class ChatViewModel extends _$ChatViewModel {
UserModel? _currentUser;
String? _activeChatId;
String? _myUserId;
-
+ bool _isDisposed = false; //
+ final List _historyBuffer = [];
+ final Set _loadedMessageIds = {};
+ StreamSubscription? _msgSub;
+ StreamSubscription? _ackSub;
+ StreamSubscription? _typingSub;
+ StreamSubscription? _readSub;
@override
ChatState build() {
_chatRemoteRepository = ref.watch(chatRemoteRepositoryProvider);
@@ -50,7 +67,12 @@ class ChatViewModel extends _$ChatViewModel {
_setupSocketListeners();
ref.onDispose(() {
- _socketRepository.disposeListeners();
+ print("Disposing ChatViewModel and cancelling subscriptions");
+ _isDisposed = true;
+ _msgSub?.cancel();
+ _ackSub?.cancel();
+ _typingSub?.cancel();
+ _readSub?.cancel();
});
return ChatState(isLoading: false);
}
@@ -58,67 +80,50 @@ class ChatViewModel extends _$ChatViewModel {
bool isActiveChat(String chatId) => _activeChatId == chatId;
void _setupSocketListeners() {
- print("Setting up Socket Listeners in ViewModel...");
- _socketRepository.onNewMessage((data) {
- print("ViewModel Received Message Event");
- if (_activeChatId == null) return;
- if (data['chatId'] == _activeChatId) {
- handleIncomingMessage(data);
- }
+ _msgSub = _socketRepository.newMessageStream.listen((data) {
+ if (_isDisposed) return;
+ print("New message received in ChatVM: $data");
+ _handleIncomingMessage(data);
});
- _socketRepository.onMessageAdded((data) {
- if (_activeChatId == null) return;
- handleMessageAdded(data);
+
+ _ackSub = _socketRepository.messageAddedStream.listen((data) {
+ if (_isDisposed) return;
+ _handleMessageAck(data);
});
- _socketRepository.onMessagesRead((data) {
- if (_activeChatId == null) return;
- handleMessagesRead(data);
+ _readSub = _socketRepository.messagesReadStream.listen((data) {
+ if (_isDisposed) return;
+ _handleMessagesRead(data);
});
- _socketRepository.onTyping((data) {
- if (_activeChatId == null) return;
- handleTypingEvent(data);
+ _typingSub = _socketRepository.typingStream.listen((data) {
+ if (_isDisposed) return;
+ _handleTypingEvent(data);
});
}
- void handleMessageAdded(Map data) async {
- final chatId = data["chatId"];
- final realMessageId = data["messageId"];
- if (_activeChatId != chatId) return;
-
- final index = state.messages.indexWhere(
- (m) => m.status == "PENDING" && m.chatId == chatId,
- );
-
- if (index == -1) return;
-
- final tempMsg = state.messages[index];
-
- final updatedMsg = tempMsg.copyWith(id: realMessageId, status: "SENT");
- final updated = [...state.messages];
- updated[index] = updatedMsg;
- state = state.copyWith(messages: updated);
-
- _chatLocalRepository.saveMessage(updatedMsg);
+ List _sortMessages(List messages) {
+ final sorted = [...messages];
+ sorted.sort((a, b) => a.createdAt.compareTo(b.createdAt));
+ return sorted;
}
- // load messages (offline first)
Future loadChat(String chatId) async {
- if (_currentUser == null) {
- print("Error: No current user found");
- return;
- }
-
- state = state.copyWith(isLoading: true);
+ if (_currentUser == null) return;
+ state = state.copyWith(isLoading: true, hasMoreHistory: true);
_activeChatId = chatId;
_myUserId = _currentUser!.id;
+ _historyBuffer.clear();
+ _loadedMessageIds.clear();
+
+ final cachedMessages = _chatLocalRepository.getCachedMessages(chatId);
+ _loadedMessageIds.addAll(cachedMessages.map((m) => m.id));
- final localCached = _chatLocalRepository.getMessagesForChat(chatId);
- state = state.copyWith(messages: localCached);
+ final sortedCache = _sortMessages(cachedMessages);
+ state = state.copyWith(messages: sortedCache);
- final result = await _chatRemoteRepository.getInitialChatMessages(chatId);
+ final result = await _chatRemoteRepository.getlastChatMessages(chatId);
if (_activeChatId != chatId) {
state = state.copyWith(isLoading: false);
@@ -127,159 +132,229 @@ class ChatViewModel extends _$ChatViewModel {
await result.fold(
(failure) async {
- print("Failed to fetch messages: ${failure.message}");
+ if (_isDisposed) return; //
state = state.copyWith(isLoading: false);
},
(serverMessages) async {
- final mergedMessages = await _mergeAndReconcileMessages(
- localCached,
- serverMessages,
- );
+ if (_isDisposed) return; //
+ await _chatLocalRepository.saveInitialMessages(serverMessages);
+ await _reconcilePendingMessages(chatId, serverMessages);
- await _chatLocalRepository.saveMessages(serverMessages);
+ final updatedCache = _chatLocalRepository.getCachedMessages(chatId);
+ _loadedMessageIds.clear();
+ _loadedMessageIds.addAll(updatedCache.map((m) => m.id));
if (_activeChatId != chatId) {
state = state.copyWith(isLoading: false);
return;
}
- state = state.copyWith(messages: mergedMessages, isLoading: false);
+ final sortedUpdated = _sortMessages(updatedCache);
+ if (_isDisposed) return; //
+ state = state.copyWith(messages: sortedUpdated, isLoading: false);
_socketRepository.openChat(chatId);
},
);
}
- //for matching messages not send while internet is off
- MessageModel? _findMatchingServerMessage(pending, serverMessages) {
- for (final srv in serverMessages) {
- if (srv.content == pending.content &&
- srv.chatId == pending.chatId &&
- srv.userId == pending.userId) {
- return srv;
- }
- }
- return null;
- }
-
- // reconcile the messages
- Future> _mergeAndReconcileMessages(
- List localMessages,
+ Future _reconcilePendingMessages(
+ String chatId,
List serverMessages,
) async {
- for (final srv in serverMessages) {
- await _chatLocalRepository.deleteMessage(srv.id);
- }
-
- final Map messageMap = {};
-
- for (final srv in serverMessages) {
- messageMap[srv.id] = srv;
- await _chatLocalRepository.saveMessage(srv);
- }
-
- for (final localMsg in localMessages) {
- if (localMsg.status != "PENDING") continue;
+ final pendingMessages = _chatLocalRepository.getPendingMessages(chatId);
+ if (pendingMessages.isEmpty) return;
- final match = _findMatchingServerMessage(localMsg, serverMessages);
+ for (final pending in pendingMessages) {
+ final match = _findMatchingServerMessage(pending, serverMessages);
if (match != null) {
- await _chatLocalRepository.deleteMessage(localMsg.id);
-
- messageMap[match.id] = match;
+ await _chatLocalRepository.replaceTempWithServerMessage(
+ tempId: pending.id,
+ serverMessage: match,
+ );
} else {
- messageMap[localMsg.id] = localMsg;
- await _chatLocalRepository.saveMessage(localMsg);
+ _socketRepository.sendMessage(pending.toApiRequest());
}
}
+ }
- final merged = messageMap.values.toList();
- merged.sort((a, b) => a.createdAt.compareTo(b.createdAt));
-
- return merged;
+ MessageModel? _findMatchingServerMessage(
+ MessageModel pending,
+ List serverMessages,
+ ) {
+ return serverMessages.cast().firstWhere(
+ (srv) =>
+ srv!.content == pending.content &&
+ srv.chatId == pending.chatId &&
+ srv.userId == pending.userId &&
+ srv.createdAt.difference(pending.createdAt).inSeconds.abs() < 60,
+ orElse: () => null,
+ );
}
- // handle for receivers
- void handleIncomingMessage(Map data) async {
- if (_activeChatId == null) return;
+ Future sendMessage({
+ required String content,
+ String messageType = 'text',
+ }) async {
+ if (_activeChatId == null || _myUserId == null) return;
+
+ final tempId = 'temp_${const Uuid().v4()}';
+ final timestamp = DateTime.now();
+
+ final localMessage = MessageModel(
+ id: tempId,
+ chatId: _activeChatId!,
+ userId: _myUserId!,
+ content: content,
+ messageType: messageType,
+ createdAt: timestamp,
+ status: 'SENDING',
+ );
- final msg = MessageModel.fromApiResponse(data);
- if (msg.userId == _myUserId) {
- return;
- }
+ await _chatLocalRepository.saveMessage(localMessage);
- final exists = state.messages.any((m) => m.id == msg.id);
- if (exists) {
- _updateLocalMessageWithServerId(msg);
- return;
- }
+ final updatedMessages = [...state.messages, localMessage];
+ state = state.copyWith(messages: updatedMessages);
+ _loadedMessageIds.add(tempId);
- final isActiveChat =
- (msg.userId != _myUserId && msg.chatId == _activeChatId);
+ ref
+ .read(conversationsViewModelProvider.notifier)
+ .updateConversationAfterSending(
+ chatId: _activeChatId!,
+ content: content,
+ messageType: messageType,
+ timestamp: timestamp,
+ );
- if (isActiveChat) {
- msg.status = "READ";
- }
+ _socketRepository.sendMessage(localMessage.toApiRequest());
+ }
- await _chatLocalRepository.saveMessage(msg);
+ void _handleMessageAck(Map data) async {
+ final chatId = data["chatId"] as String?;
+ final realMessageId = data["messageId"] as String?;
- final updated = [...state.messages, msg];
- state = state.copyWith(messages: updated);
- if (isActiveChat) {
- _socketRepository.openChat(_activeChatId!);
- }
- }
+ if (chatId == null || realMessageId == null) return;
+ if (_activeChatId != chatId) return;
- void _updateLocalMessageWithServerId(MessageModel serverMsg) {
- final index = state.messages.lastIndexWhere(
- (m) => m.status == "PENDING" && m.chatId == serverMsg.chatId,
+ final index = state.messages.indexWhere(
+ (m) => m.status == "SENDING" && m.chatId == chatId,
);
if (index == -1) return;
final tempMsg = state.messages[index];
- final updatedMsg = tempMsg.copyWith(
- id: serverMsg.id,
- status: serverMsg.status,
- );
+ final serverMessage = tempMsg.copyWith(id: realMessageId, status: "SENT");
- final updated = [...state.messages];
- updated[index] = updatedMsg;
+ await _chatLocalRepository.replaceTempWithServerMessage(
+ tempId: tempMsg.id,
+ serverMessage: serverMessage,
+ );
- _chatLocalRepository.saveMessage(updatedMsg);
+ _loadedMessageIds.remove(tempMsg.id);
+ _loadedMessageIds.add(realMessageId);
- state = state.copyWith(messages: updated);
+ final updatedMessages = [...state.messages];
+ updatedMessages[index] = serverMessage;
+ state = state.copyWith(messages: updatedMessages);
}
- // send message
- Future sendMessage(MessageModel localMessage) async {
- _chatLocalRepository.saveMessage(localMessage);
+ void _handleIncomingMessage(Map data) async {
+ final msg = MessageModel.fromApiResponse(data);
- final isAlreadyInState = state.messages.any((m) => m.id == localMessage.id);
+ if (msg.userId == _myUserId) return;
+ if (_loadedMessageIds.contains(msg.id)) return;
- if (!isAlreadyInState) {
- final updated = [...state.messages, localMessage];
- state = state.copyWith(messages: updated);
- }
+ final isActiveChat = (_activeChatId == msg.chatId);
+ final finalMsg = msg.copyWith(status: isActiveChat ? "READ" : msg.status);
- _socketRepository.sendMessage(localMessage.toApiRequest());
+ await _chatLocalRepository.saveMessage(finalMsg);
+
+ print("is in chat ${isActiveChat}");
+ if (isActiveChat) {
+ final updatedMessages = [...state.messages, finalMsg];
+ if (_isDisposed || _activeChatId != msg.chatId) return; //
+ state = state.copyWith(messages: updatedMessages);
+ _loadedMessageIds.add(msg.id);
+ _socketRepository.openChat(_activeChatId!); // to decrease unseen count
+ }
}
- // handle read status event
- void handleMessagesRead(Map data) {
- final chatId = data['chatId'];
+ void _handleMessagesRead(Map data) async {
+ final chatId = data['chatId'] as String?;
if (chatId == null || chatId != _activeChatId) return;
- _chatLocalRepository.markMessagesAsRead(chatId, _myUserId!);
- final updated = _chatLocalRepository.getMessagesForChat(chatId);
- state = state.copyWith(messages: updated);
+
+ final messagesBeforeUpdate = [...state.messages];
+
+ await _chatLocalRepository.markMessagesAsRead(chatId, _myUserId!);
+
+ final updatedMessages = messagesBeforeUpdate.map((msg) {
+ if (msg.chatId == chatId &&
+ msg.userId == _myUserId &&
+ msg.status != "READ") {
+ return msg.copyWith(status: "READ");
+ }
+ return msg;
+ }).toList();
+
+ state = state.copyWith(messages: updatedMessages);
+ }
+
+ Future loadOlderMessages() async {
+ if (_activeChatId == null ||
+ state.isLoadingHistory ||
+ !state.hasMoreHistory) {
+ return;
+ }
+
+ final allCurrentMessages = [...state.messages, ..._historyBuffer];
+ if (allCurrentMessages.isEmpty) return;
+
+ final sortedCurrent = _sortMessages(allCurrentMessages);
+ final oldestMessage = sortedCurrent.first;
+ final lastTimestamp = oldestMessage.createdAt;
+
+ state = state.copyWith(isLoadingHistory: true);
+
+ final result = await _chatRemoteRepository.getOlderMessagesChat(
+ chatId: _activeChatId!,
+ lastMessageTimestamp: lastTimestamp,
+ );
+
+ await result.fold(
+ (failure) async {
+ if (_isDisposed) return; //
+ state = state.copyWith(isLoadingHistory: false);
+ },
+ (olderMessages) async {
+ if (_isDisposed) return; //
+ if (olderMessages.isEmpty) {
+ state = state.copyWith(
+ isLoadingHistory: false,
+ hasMoreHistory: false,
+ );
+ return;
+ }
+
+ final newMessages = olderMessages
+ .where((msg) => !_loadedMessageIds.contains(msg.id))
+ .toList();
+
+ _historyBuffer.addAll(newMessages);
+ _loadedMessageIds.addAll(newMessages.map((m) => m.id));
+
+ final allMessages = [..._historyBuffer, ...state.messages];
+
+ state = state.copyWith(messages: allMessages, isLoadingHistory: false);
+ },
+ );
}
- // typing indicator
void sendTyping(bool isTyping) {
if (_activeChatId == null) return;
_socketRepository.sendTyping(_activeChatId!, isTyping);
}
- void handleTypingEvent(dynamic data) {
+ void _handleTypingEvent(dynamic data) {
if (_activeChatId == null) return;
final typingChatId = data['chatId'] as String?;
@@ -291,16 +366,11 @@ class ChatViewModel extends _$ChatViewModel {
state = state.copyWith(isRecipientTyping: isTyping);
}
- void exitChat() {
- final previousChatId = _activeChatId;
- _activeChatId = null;
-
- if (previousChatId != null) {
- state = ChatState(
- isRecipientTyping: false,
- messages: [],
- isLoading: false,
- );
- }
- }
+ // void exitChat() {
+ // if (_activeChatId == null) return;
+ // _activeChatId = null;
+ // _historyBuffer.clear();
+ // _loadedMessageIds.clear();
+ // state = ChatState(isRecipientTyping: false, messages: [], isLoading: false);
+ // }
}
diff --git a/lib/features/chat/view_model/chat/Chat_view_model.g.dart b/lib/features/chat/view_model/chat/Chat_view_model.g.dart
index 192dfbc..c02811f 100644
--- a/lib/features/chat/view_model/chat/Chat_view_model.g.dart
+++ b/lib/features/chat/view_model/chat/Chat_view_model.g.dart
@@ -20,7 +20,7 @@ final class ChatViewModelProvider
argument: null,
retry: null,
name: r'chatViewModelProvider',
- isAutoDispose: false,
+ isAutoDispose: true,
dependencies: null,
$allTransitiveDependencies: null,
);
@@ -41,7 +41,7 @@ final class ChatViewModelProvider
}
}
-String _$chatViewModelHash() => r'99961fd224f15c454600f531ebf8235255c288ec';
+String _$chatViewModelHash() => r'efd91655f15519eedbcdff93437fb216f0038fba';
abstract class _$ChatViewModel extends $Notifier {
ChatState build();
diff --git a/lib/features/chat/view_model/conversions/Conversations_view_model.dart b/lib/features/chat/view_model/conversions/Conversations_view_model.dart
index 2ce0683..b4f00ff 100644
--- a/lib/features/chat/view_model/conversions/Conversations_view_model.dart
+++ b/lib/features/chat/view_model/conversions/Conversations_view_model.dart
@@ -1,5 +1,4 @@
-// ignore_for_file: unused_field
-
+import 'dart:async';
import 'package:fpdart/fpdart.dart';
import 'package:lite_x/core/classes/AppFailure.dart';
import 'package:lite_x/core/models/usermodel.dart';
@@ -7,6 +6,7 @@ import 'package:lite_x/core/providers/current_user_provider.dart';
import 'package:lite_x/features/chat/models/conversationmodel.dart';
import 'package:lite_x/features/chat/models/messagemodel.dart';
import 'package:lite_x/features/chat/models/usersearchmodel.dart';
+import 'package:lite_x/features/chat/providers/activeChatIdProvider.dart';
import 'package:lite_x/features/chat/repositories/chat_local_repository.dart';
import 'package:lite_x/features/chat/repositories/chat_remote_repository.dart';
import 'package:lite_x/features/chat/repositories/socket_repository.dart';
@@ -20,7 +20,7 @@ class ConversationsViewModel extends _$ConversationsViewModel {
late final SocketRepository _socketRepository;
UserModel? _currentUser;
bool _listening = false;
-
+ StreamSubscription? _messageSub;
@override
AsyncValue> build() {
_chatRemoteRepository = ref.watch(chatRemoteRepositoryProvider);
@@ -32,7 +32,7 @@ class ConversationsViewModel extends _$ConversationsViewModel {
_listening = true;
ref.onDispose(() {
- _socketRepository.disposeListeners();
+ _messageSub?.cancel();
_listening = false;
});
}
@@ -40,10 +40,19 @@ class ConversationsViewModel extends _$ConversationsViewModel {
}
void _listenToNewMessages() {
- _socketRepository.onNewMessage((data) {
+ _messageSub = _socketRepository.newMessageStream.listen((data) {
try {
+ print("New message received: $data");
+
+ final serverUnseenCount = data["unseenMessagesCount"] as int? ?? 0;
+ print("new count $serverUnseenCount");
+
final newMsg = MessageModel.fromApiResponse(data);
+ final activeChatId = ref.read(activeChatProvider);
+ final bool isChatOpen = (activeChatId == newMsg.chatId);
+ final bool isMe = newMsg.userId == _currentUser?.id;
+
final currentConversations = state.maybeWhen(
data: (list) => List.from(list),
orElse: () => _chatLocalRepository.getAllConversations(),
@@ -51,26 +60,37 @@ class ConversationsViewModel extends _$ConversationsViewModel {
final idx = currentConversations.indexWhere(
(chat) => chat.id == newMsg.chatId,
- ); // check if conversation already exist or not
+ );
if (idx != -1) {
- // conversation exists
final chat = currentConversations[idx];
- final bool isMe = newMsg.userId == _currentUser?.id;
-
- final int newCount = isMe ? chat.unseenCount : (chat.unseenCount + 1);
+ int finalUnseenCount;
+ if (isMe) {
+ finalUnseenCount = chat.unseenCount;
+ } else if (isChatOpen) {
+ finalUnseenCount = 0;
+ _socketRepository.openChat(newMsg.chatId);
+ } else {
+ if (serverUnseenCount > 0) {
+ finalUnseenCount = serverUnseenCount;
+ } else {
+ finalUnseenCount = chat.unseenCount + 1;
+ }
+ }
final updatedChat = chat.copyWith(
lastMessageContent: newMsg.content,
lastMessageType: newMsg.messageType,
lastMessageTime: newMsg.createdAt,
- unseenCount: newCount,
+ unseenCount: finalUnseenCount,
lastMessageSenderId: newMsg.userId,
);
currentConversations[idx] = updatedChat;
} else {
- //handle dm only
+ int initialCount = (isMe || isChatOpen)
+ ? 0
+ : (serverUnseenCount > 0 ? serverUnseenCount : 1);
final created = ConversationModel(
id: newMsg.chatId,
isDMChat: true,
@@ -80,16 +100,14 @@ class ConversationsViewModel extends _$ConversationsViewModel {
newMsg.userId,
if (_currentUser != null) _currentUser!.id,
],
-
dmPartnerUserId: newMsg.userId,
dmPartnerName: newMsg.senderName ?? "Unknown",
dmPartnerUsername: newMsg.senderUsername,
dmPartnerProfileKey: newMsg.senderProfileMediaKey,
-
lastMessageContent: newMsg.content,
lastMessageType: newMsg.messageType,
lastMessageTime: newMsg.createdAt,
- unseenCount: (newMsg.userId == _currentUser?.id) ? 0 : 1,
+ unseenCount: initialCount,
lastMessageSenderId: newMsg.userId,
);
@@ -97,14 +115,22 @@ class ConversationsViewModel extends _$ConversationsViewModel {
_chatRemoteRepository
.getChatInfo(newMsg.chatId, _currentUser!.id)
.then((result) {
- result.fold((l) => null, (chat) async {
- await _chatLocalRepository.upsertConversations([chat]);
+ result.fold((l) => null, (serverChat) async {
+ final mergedChat = serverChat.copyWith(
+ unseenCount: initialCount,
+ lastMessageContent: newMsg.content,
+ lastMessageType: newMsg.messageType,
+ lastMessageTime: newMsg.createdAt,
+ lastMessageSenderId: newMsg.userId,
+ );
+
+ await _chatLocalRepository.upsertConversations([mergedChat]);
final currentList = state.value ?? [];
final refreshed = List.from(currentList)
- ..removeWhere((c) => c.id == chat.id)
- ..add(chat);
+ ..removeWhere((c) => c.id == mergedChat.id)
+ ..add(mergedChat);
refreshed.sort((a, b) {
final aTime = a.lastMessageTime ?? a.updatedAt;
@@ -112,18 +138,14 @@ class ConversationsViewModel extends _$ConversationsViewModel {
return bTime.compareTo(aTime);
});
- state = AsyncValue.data(refreshed);
+ state = AsyncValue.data([...refreshed]);
});
});
}
+ _sortConversations(currentConversations);
- currentConversations.sort((a, b) {
- final aTime = a.lastMessageTime ?? a.updatedAt;
- final bTime = b.lastMessageTime ?? b.updatedAt;
- return bTime.compareTo(aTime);
- });
+ state = AsyncValue.data([...currentConversations]);
- state = AsyncValue.data(currentConversations);
_chatLocalRepository.upsertConversations(currentConversations);
} catch (e) {
print("Error handling new-message socket: $e");
@@ -131,6 +153,42 @@ class ConversationsViewModel extends _$ConversationsViewModel {
});
}
+ void updateConversationAfterSending({
+ required String chatId,
+ required String content,
+ required String messageType,
+ required DateTime timestamp,
+ }) {
+ if (_currentUser == null) return;
+ final currentList = state.value ?? [];
+ final index = currentList.indexWhere((c) => c.id == chatId);
+
+ if (index != -1) {
+ final chat = currentList[index];
+
+ final updatedChat = chat.copyWith(
+ lastMessageContent: content,
+ lastMessageType: messageType,
+ lastMessageTime: timestamp,
+ lastMessageSenderId: _currentUser!.id,
+ );
+
+ final updatedList = List.from(currentList);
+ updatedList[index] = updatedChat;
+ _sortConversations(updatedList);
+ state = AsyncValue.data([...updatedList]);
+ _chatLocalRepository.upsertConversations([updatedChat]);
+ }
+ }
+
+ void _sortConversations(List list) {
+ list.sort((a, b) {
+ final aTime = a.lastMessageTime ?? a.updatedAt;
+ final bTime = b.lastMessageTime ?? b.updatedAt;
+ return bTime.compareTo(aTime);
+ });
+ }
+
void markChatAsRead(String chatId) {
state.whenData((currentList) {
final updatedList = currentList.map((chat) {
@@ -139,8 +197,8 @@ class ConversationsViewModel extends _$ConversationsViewModel {
}
return chat;
}).toList();
+ state = AsyncValue.data([...updatedList]);
- state = AsyncValue.data(updatedList);
final chat = updatedList.firstWhere((c) => c.id == chatId);
_chatLocalRepository.upsertConversations([chat]);
});
@@ -181,7 +239,7 @@ class ConversationsViewModel extends _$ConversationsViewModel {
return bTime.compareTo(aTime);
});
- state = AsyncValue.data(updatedList);
+ state = AsyncValue.data([...updatedList]);
return Right(serverChat);
});
@@ -210,28 +268,55 @@ class ConversationsViewModel extends _$ConversationsViewModel {
final cachedConversations = ref
.read(chatLocalRepositoryProvider)
.getAllConversations();
-
- state = AsyncValue.data(cachedConversations);
+ if (state.value == null || state.value!.isEmpty) {
+ state = AsyncValue.data([...cachedConversations]);
+ }
final result = await _chatRemoteRepository.getuserchats(_currentUser!.id);
- final conversations = result.fold((failure) {
- print("Error loading conversations: ${failure.message}");
- return cachedConversations;
- }, (convs) => convs);
- conversations.sort(
- (a, b) => (b.lastMessageTime ?? b.updatedAt).compareTo(
- a.lastMessageTime ?? a.updatedAt,
- ),
+ result.fold(
+ (failure) {
+ print("Error loading conversations: ${failure.message}");
+ },
+ (serverConversations) async {
+ final serverIds = serverConversations.map((c) => c.id).toSet();
+ final localConversations = _chatLocalRepository.getAllConversations();
+
+ for (var localConv in localConversations) {
+ if (!serverIds.contains(localConv.id)) {
+ await _chatLocalRepository.deleteConversation(localConv.id);
+ }
+ }
+ await _chatLocalRepository.upsertConversations(serverConversations);
+ _sortConversations(serverConversations);
+ state = AsyncValue.data([...serverConversations]);
+ },
);
- await ref
- .read(chatLocalRepositoryProvider)
- .upsertConversations(conversations);
-
- state = AsyncValue.data(conversations);
} catch (e, st) {
print("Conversation Load Failed: $e");
state = AsyncValue.error(e, st);
}
}
+
+ Future> deleteChat(String chatId) async {
+ if (_currentUser == null) {
+ return Left(AppFailure(message: "No current user found"));
+ }
+
+ final result = await _chatRemoteRepository.deleteChat(chatId);
+ print("Delete chat result: $result");
+ return result.fold(
+ (failure) {
+ return Left(failure);
+ },
+ (successMessage) async {
+ await _chatLocalRepository.deleteConversation(chatId);
+ final currentList = state.value ?? [];
+ final updatedList = List.from(currentList)
+ ..removeWhere((chat) => chat.id == chatId);
+ state = AsyncValue.data([...updatedList]);
+ return Right(successMessage);
+ },
+ );
+ }
}
diff --git a/lib/features/chat/view_model/conversions/Conversations_view_model.g.dart b/lib/features/chat/view_model/conversions/Conversations_view_model.g.dart
index 9ef92a7..f6fe94f 100644
--- a/lib/features/chat/view_model/conversions/Conversations_view_model.g.dart
+++ b/lib/features/chat/view_model/conversions/Conversations_view_model.g.dart
@@ -48,7 +48,7 @@ final class ConversationsViewModelProvider
}
String _$conversationsViewModelHash() =>
- r'02617aac71dc6741834e63d07ab48be13bb9fbd1';
+ r'bfee74aa41c86afff7fea22093b0cb68b113c1c2';
abstract class _$ConversationsViewModel
extends $Notifier>> {
diff --git a/lib/features/home/models/tweet_model.dart b/lib/features/home/models/tweet_model.dart
index dad9104..10d3711 100644
--- a/lib/features/home/models/tweet_model.dart
+++ b/lib/features/home/models/tweet_model.dart
@@ -178,14 +178,19 @@ class TweetModel extends HiveObject {
authorName:
user?['name']?.toString() ??
+ json['name']?.toString() ??
json['authorName']?.toString() ??
'Unknown User',
authorUsername:
user?['username']?.toString() ??
+ json['username']?.toString() ??
json['authorUsername']?.toString() ??
'unknown',
authorAvatar:
- _extractProfileMedia(user) ?? json['authorAvatar']?.toString() ?? '',
+ _extractProfileMedia(user) ??
+ json['profileMediaKey']?.toString() ??
+ json['authorAvatar']?.toString() ??
+ '',
createdAt: json['createdAt'] != null
? DateTime.parse(json['createdAt'])
: DateTime.now(),
diff --git a/lib/features/home/repositories/home_repository.dart b/lib/features/home/repositories/home_repository.dart
index 40048ff..c259815 100644
--- a/lib/features/home/repositories/home_repository.dart
+++ b/lib/features/home/repositories/home_repository.dart
@@ -28,10 +28,17 @@ class HomeRepository {
);
final List tweetsData;
- if (response.data is List) {
+ // Handle response format: { "user": {...}, "recommendations": [...] }
+ if (response.data is Map) {
+ if (response.data['recommendations'] != null) {
+ tweetsData = response.data['recommendations'] as List;
+ } else if (response.data['data'] != null) {
+ tweetsData = response.data['data'] as List;
+ } else {
+ return [];
+ }
+ } else if (response.data is List) {
tweetsData = response.data as List;
- } else if (response.data is Map && response.data['data'] != null) {
- tweetsData = response.data['data'] as List;
} else {
return [];
}
@@ -53,6 +60,8 @@ class HomeRepository {
int page = 1,
int limit = 20,
}) async {
+ // Return mock data if enabled
+
try {
final response = await _dio.get(
'api/home/timeline',
@@ -60,10 +69,15 @@ class HomeRepository {
);
final List tweetsData;
- if (response.data is List) {
+ // Handle response format: { "data": [...], "nextCursor": "..." }
+ if (response.data is Map) {
+ if (response.data['data'] != null) {
+ tweetsData = response.data['data'] as List;
+ } else {
+ return [];
+ }
+ } else if (response.data is List) {
tweetsData = response.data as List;
- } else if (response.data is Map && response.data['data'] != null) {
- tweetsData = response.data['data'] as List;
} else {
return [];
}
diff --git a/lib/features/home/repositories/mock_home_data.dart b/lib/features/home/repositories/mock_home_data.dart
new file mode 100644
index 0000000..ed9a25a
--- /dev/null
+++ b/lib/features/home/repositories/mock_home_data.dart
@@ -0,0 +1,60 @@
+import 'package:lite_x/features/home/models/tweet_model.dart';
+
+/// Mock data for testing when endpoints are offline
+class MockHomeData {
+ static const bool useMockData = false; // Set to true to use mock data
+
+ static List getMockForYouTweets() {
+ final now = DateTime.now();
+
+ return [
+ TweetModel(
+ id: 'mock-foryou-1',
+ content: ' Welcome to the For You feed! This is a mock tweet for testing purposes.',
+ authorName: 'Test User',
+ authorUsername: 'testuser',
+ authorAvatar: '',
+ userId: 'user-1',
+ createdAt: now.subtract(const Duration(hours: 2)),
+ likes: 42,
+ retweets: 15,
+ replies: 8,
+ quotes: 3,
+ bookmarks: 5,
+ isLiked: false,
+ isRetweeted: false,
+ isBookmarked: false,
+ tweetType: 'TWEET',
+ images: [],
+ replyIds: [],
+ ),
+ ];
+ }
+
+ static List getMockTimelineTweets() {
+ final now = DateTime.now();
+
+ return [
+ TweetModel(
+ id: 'mock-timeline-1',
+ content: ' This is your Following/Timeline feed! Here you see tweets from people you follow.',
+ authorName: 'Your Friend',
+ authorUsername: 'yourfriend',
+ authorAvatar: '',
+ userId: 'user-10',
+ createdAt: now.subtract(const Duration(minutes: 30)),
+ likes: 25,
+ retweets: 8,
+ replies: 4,
+ quotes: 1,
+ bookmarks: 2,
+ isLiked: false,
+ isRetweeted: false,
+ isBookmarked: false,
+ tweetType: 'TWEET',
+ images: [],
+ replyIds: [],
+ ),
+ ];
+ }
+}
diff --git a/lib/features/home/view/screens/create_post_screen.dart b/lib/features/home/view/screens/create_post_screen.dart
index 2338a41..91266cd 100644
--- a/lib/features/home/view/screens/create_post_screen.dart
+++ b/lib/features/home/view/screens/create_post_screen.dart
@@ -61,7 +61,8 @@ class _CreatePostScreenState extends ConsumerState {
final TextEditingController _textController = TextEditingController();
final FocusNode _focusNode = FocusNode();
bool _isPosting = false;
- final List _selectedImages = [];
+ final List _selectedMedia =
+ []; // Changed from _selectedImages to support both images and videos
PostPrivacy _selectedPrivacy = PostPrivacy.everyone;
@override
@@ -91,14 +92,14 @@ class _CreatePostScreenState extends ConsumerState {
try {
List mediaIds = [];
- if (_selectedImages.isNotEmpty) {
- final uploadedIds = await upload_media(_selectedImages);
+ if (_selectedMedia.isNotEmpty) {
+ final uploadedIds = await upload_media(_selectedMedia);
mediaIds = uploadedIds.where((id) => id.isNotEmpty).toList();
- if (mediaIds.length != _selectedImages.length && mounted) {
+ if (mediaIds.length != _selectedMedia.length && mounted) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
- content: Text('Some images failed to upload. Try again.'),
+ content: Text('Some media files failed to upload. Try again.'),
behavior: SnackBarBehavior.floating,
backgroundColor: Colors.orange,
),
@@ -106,7 +107,7 @@ class _CreatePostScreenState extends ConsumerState {
}
if (mediaIds.isEmpty) {
- throw Exception('Unable to upload selected images.');
+ throw Exception('Unable to upload selected media.');
}
}
@@ -122,7 +123,7 @@ class _CreatePostScreenState extends ConsumerState {
if (mounted) {
setState(() {
_textController.clear();
- _selectedImages.clear();
+ _selectedMedia.clear();
});
Navigator.pop(context, true);
ScaffoldMessenger.of(context).showSnackBar(
@@ -157,11 +158,11 @@ class _CreatePostScreenState extends ConsumerState {
}
Future _pickImage() async {
- final remainingSlots = 4 - _selectedImages.length;
+ final remainingSlots = 4 - _selectedMedia.length;
if (remainingSlots <= 0) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
- content: Text('Maximum 4 images allowed per post.'),
+ content: Text('Maximum 4 media files allowed per post.'),
behavior: SnackBarBehavior.floating,
),
);
@@ -174,29 +175,110 @@ class _CreatePostScreenState extends ConsumerState {
setState(() {
for (final picked in pickedList) {
if (picked.file != null) {
- _selectedImages.add(picked.file!);
+ _selectedMedia.add(picked.file!);
}
}
});
}
- void _removeImage(int index) {
- if (index < 0 || index >= _selectedImages.length) return;
+ Future _pickVideo() async {
+ final remainingSlots = 4 - _selectedMedia.length;
+ if (remainingSlots <= 0) {
+ ScaffoldMessenger.of(context).showSnackBar(
+ const SnackBar(
+ content: Text('Maximum 4 media files allowed per post.'),
+ behavior: SnackBarBehavior.floating,
+ ),
+ );
+ return;
+ }
+
+ final picked = await pickVideo();
+ if (picked == null || picked.file == null) return;
+
+ setState(() {
+ _selectedMedia.add(picked.file!);
+ });
+ }
+
+ void _showMediaPicker() {
+ showModalBottomSheet(
+ context: context,
+ backgroundColor: const Color(0xFF1E1E1E),
+ shape: const RoundedRectangleBorder(
+ borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
+ ),
+ builder: (context) => SafeArea(
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ const SizedBox(height: 12),
+ Container(
+ width: 40,
+ height: 4,
+ decoration: BoxDecoration(
+ color: Colors.grey[600],
+ borderRadius: BorderRadius.circular(2),
+ ),
+ ),
+ const SizedBox(height: 20),
+ ListTile(
+ leading: const Icon(Icons.image, color: Color(0xFF1D9BF0)),
+ title: const Text('Photo', style: TextStyle(color: Colors.white)),
+ onTap: () {
+ Navigator.pop(context);
+ _pickImage();
+ },
+ ),
+ ListTile(
+ leading: const Icon(Icons.videocam, color: Color(0xFF1D9BF0)),
+ title: const Text('Video', style: TextStyle(color: Colors.white)),
+ onTap: () {
+ Navigator.pop(context);
+ _pickVideo();
+ },
+ ),
+ const SizedBox(height: 16),
+ ],
+ ),
+ ),
+ );
+ }
+
+ void _removeMedia(int index) {
+ if (index < 0 || index >= _selectedMedia.length) return;
setState(() {
- _selectedImages.removeAt(index);
+ _selectedMedia.removeAt(index);
});
}
- Widget _buildSelectedImagesPreview() {
- if (_selectedImages.isEmpty) return const SizedBox.shrink();
- final crossAxisCount = _selectedImages.length == 1 ? 1 : 2;
- final double aspectRatio = _selectedImages.length == 1 ? 16 / 9 : 1;
+ bool _isVideoFile(File file) {
+ final extension = file.path.split('.').last.toLowerCase();
+ return [
+ 'mp4',
+ 'mov',
+ 'avi',
+ 'webm',
+ 'mkv',
+ 'flv',
+ 'wmv',
+ 'mpeg',
+ 'mpg',
+ '3gp',
+ 'm4v',
+ ].contains(extension);
+ }
+
+ Widget _buildSelectedMediaPreview() {
+ if (_selectedMedia.isEmpty) return const SizedBox.shrink();
+ final crossAxisCount = _selectedMedia.length == 1 ? 1 : 2;
+ final double aspectRatio = _selectedMedia.length == 1 ? 16 / 9 : 1;
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
- '${_selectedImages.length} / 4 photos',
+ '${_selectedMedia.length} / 4 media files',
style: TextStyle(color: Colors.grey[500], fontSize: 13),
),
const SizedBox(height: 8),
@@ -209,22 +291,65 @@ class _CreatePostScreenState extends ConsumerState {
mainAxisSpacing: 8,
childAspectRatio: aspectRatio,
),
- itemCount: _selectedImages.length,
+ itemCount: _selectedMedia.length,
itemBuilder: (context, index) {
- final file = _selectedImages[index];
+ final file = _selectedMedia[index];
+ final isVideo = _isVideoFile(file);
+
return Stack(
children: [
Positioned.fill(
child: ClipRRect(
borderRadius: BorderRadius.circular(12),
- child: Image.file(file, fit: BoxFit.cover),
+ child: isVideo
+ ? Container(
+ color: Colors.grey[900],
+ child: const Center(
+ child: Icon(
+ Icons.play_circle_outline,
+ color: Colors.white,
+ size: 64,
+ ),
+ ),
+ )
+ : Image.file(file, fit: BoxFit.cover),
),
),
+ if (isVideo)
+ Positioned(
+ bottom: 8,
+ left: 8,
+ child: Container(
+ padding: const EdgeInsets.symmetric(
+ horizontal: 6,
+ vertical: 2,
+ ),
+ decoration: BoxDecoration(
+ color: Colors.black87,
+ borderRadius: BorderRadius.circular(4),
+ ),
+ child: const Row(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ Icon(Icons.videocam, color: Colors.white, size: 12),
+ SizedBox(width: 4),
+ Text(
+ 'Video',
+ style: TextStyle(
+ color: Colors.white,
+ fontSize: 11,
+ fontWeight: FontWeight.w500,
+ ),
+ ),
+ ],
+ ),
+ ),
+ ),
Positioned(
top: 8,
right: 8,
child: InkWell(
- onTap: () => _removeImage(index),
+ onTap: () => _removeMedia(index),
child: Container(
decoration: const BoxDecoration(
color: Colors.black54,
@@ -485,11 +610,11 @@ class _CreatePostScreenState extends ConsumerState {
),
],
),
- if (_selectedImages.isNotEmpty) ...[
+ if (_selectedMedia.isNotEmpty) ...[
const SizedBox(height: 12),
Padding(
padding: const EdgeInsets.only(left: 52),
- child: _buildSelectedImagesPreview(),
+ child: _buildSelectedMediaPreview(),
),
],
const SizedBox(height: 12),
@@ -539,10 +664,10 @@ class _CreatePostScreenState extends ConsumerState {
children: [
IconButton(
icon: const Icon(
- Icons.image_outlined,
+ Icons.perm_media_outlined,
color: Color(0xFF1D9BF0),
),
- onPressed: _isPosting ? null : _pickImage,
+ onPressed: _isPosting ? null : _showMediaPicker,
iconSize: 20,
padding: const EdgeInsets.all(8),
constraints: const BoxConstraints(),
diff --git a/lib/features/home/view/screens/home_screen.dart b/lib/features/home/view/screens/home_screen.dart
index 3e8a3d8..ba84b2e 100644
--- a/lib/features/home/view/screens/home_screen.dart
+++ b/lib/features/home/view/screens/home_screen.dart
@@ -13,10 +13,7 @@ import 'package:lite_x/features/home/view/screens/create_post_screen.dart';
import 'package:lite_x/features/home/view/screens/quote_composer_screen.dart';
import 'package:lite_x/features/home/view/widgets/profile_side_drawer.dart';
import 'package:lite_x/features/home/view/widgets/expandable_fab.dart';
-import 'package:lite_x/features/profile/models/shared.dart';
import 'package:lite_x/features/profile/view/screens/profile_screen.dart';
-import 'package:lite_x/features/profile/view/widgets/profile_tweets/profile_posts_list.dart';
-import 'package:lite_x/features/profile/view_model/providers.dart';
class HomeScreen extends ConsumerStatefulWidget {
const HomeScreen({super.key});
@@ -114,22 +111,17 @@ class _HomeScreenState extends ConsumerState
super.build(context);
final homeState = ref.watch(homeViewModelProvider);
final currentFeed = homeState.currentFeed;
- final tweets = currentFeed == FeedType.forYou
- ? homeState.forYouTweets
- : homeState.followingTweets;
+ final tweets =
+ homeState.tweets; // Use the tweets field that switches correctly
final feedName = currentFeed == FeedType.forYou ? "For You" : "Following";
- final currentUserName = ref.watch(currentUserProvider)?.username ?? "";
- final profileData = ref.watch(profileDataProvider(currentUserName));
return Scaffold(
key: _scaffoldKey,
backgroundColor: Colors.black,
drawer: const ProfileSideDrawer(),
body: RefreshIndicator(
onRefresh: () async {
- ref.read(homeViewModelProvider.notifier).refreshTweets();
- // ignore: unused_result
- await ref.refresh(profilePostsProvider(currentUserName));
+ await ref.read(homeViewModelProvider.notifier).refreshTweets();
},
backgroundColor: Colors.grey[900],
color: Colors.white,
@@ -152,57 +144,11 @@ class _HomeScreenState extends ConsumerState
collapseMode: CollapseMode.pin,
),
),
-
- // _buildSliverTweetList(
- // context,
- // tweets,
- // homeState.isLoading,
- // feedName,
- // ),
- SliverFillRemaining(
- child: profileData.when(
- data: (res) {
- return res.fold(
- (l) {
- return RefreshIndicator(
- onRefresh: () async {
- // ignore: unused_result
- await ref.refresh(
- profileDataProvider(currentUserName),
- );
- },
- child: ListView(
- children: [Center(child: Text(l.message))],
- ),
- );
- },
- (data) {
- return ProfilePostsList(
- profile: data,
- tabType: ProfileTabType.Posts,
- );
- },
- );
- },
- error: (err, _) {
- return RefreshIndicator(
- onRefresh: () async {
- // ignore: unused_result
- await ref.refresh(profileDataProvider(currentUserName));
- },
- child: ListView(
- children: [
- Center(child: Text("Can't get profile posts")),
- ],
- ),
- );
- },
- loading: () {
- return ListView(
- children: [Center(child: CircularProgressIndicator())],
- );
- },
- ),
+ _buildSliverTweetList(
+ context,
+ tweets,
+ homeState.isLoading,
+ feedName,
),
],
),
@@ -257,6 +203,48 @@ class _HomeScreenState extends ConsumerState
bool isLoading,
String feedType,
) {
+ // Show error if present
+ final homeState = ref.watch(homeViewModelProvider);
+ if (homeState.error != null && tweets.isEmpty) {
+ return SliverToBoxAdapter(
+ child: Padding(
+ padding: const EdgeInsets.only(top: 50.0),
+ child: Center(
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ Icon(Icons.error_outline, size: 64, color: Colors.red[400]),
+ const SizedBox(height: 16),
+ Text(
+ 'Error loading tweets',
+ style: TextStyle(color: Colors.grey[400], fontSize: 18),
+ ),
+ const SizedBox(height: 8),
+ Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 32.0),
+ child: Text(
+ homeState.error!,
+ textAlign: TextAlign.center,
+ style: TextStyle(color: Colors.grey[500], fontSize: 14),
+ ),
+ ),
+ const SizedBox(height: 16),
+ ElevatedButton(
+ onPressed: () {
+ ref.read(homeViewModelProvider.notifier).refreshTweets();
+ },
+ style: ElevatedButton.styleFrom(
+ backgroundColor: const Color(0xFF1DA1F2),
+ ),
+ child: const Text('Retry'),
+ ),
+ ],
+ ),
+ ),
+ ),
+ );
+ }
+
if (isLoading && tweets.isEmpty) {
return const SliverToBoxAdapter(
child: Padding(
diff --git a/lib/features/home/view/screens/quote_composer_screen.dart b/lib/features/home/view/screens/quote_composer_screen.dart
index cb7d418..72c9cfc 100644
--- a/lib/features/home/view/screens/quote_composer_screen.dart
+++ b/lib/features/home/view/screens/quote_composer_screen.dart
@@ -24,7 +24,7 @@ class _QuoteComposerScreenState extends ConsumerState {
final TextEditingController _textController = TextEditingController();
final FocusNode _focusNode = FocusNode();
bool _isPosting = false;
- final List _selectedImages = [];
+ final List _selectedMedia = [];
String? _getPhotoUrl(String? photo) {
if (photo == null || photo.isEmpty) return null;
@@ -70,7 +70,7 @@ class _QuoteComposerScreenState extends ConsumerState {
if (mounted) {
setState(() {
- _selectedImages.clear();
+ _selectedMedia.clear();
_textController.clear();
});
ScaffoldMessenger.of(context).showSnackBar(
@@ -100,14 +100,14 @@ class _QuoteComposerScreenState extends ConsumerState {
}
Future> _uploadSelectedImages() async {
- if (_selectedImages.isEmpty) return [];
- final uploadedIds = await upload_media(_selectedImages);
+ if (_selectedMedia.isEmpty) return [];
+ final uploadedIds = await upload_media(_selectedMedia);
final mediaIds = uploadedIds.where((id) => id.isNotEmpty).toList();
- if (mediaIds.length != _selectedImages.length && mounted) {
+ if (mediaIds.length != _selectedMedia.length && mounted) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
- content: Text('Some images failed to upload. Try again.'),
+ content: Text('Some media files failed to upload. Try again.'),
backgroundColor: Colors.orange,
behavior: SnackBarBehavior.floating,
),
@@ -115,17 +115,61 @@ class _QuoteComposerScreenState extends ConsumerState {
}
if (mediaIds.isEmpty) {
- throw Exception('Unable to upload selected images.');
+ throw Exception('Unable to upload selected media.');
}
return mediaIds;
}
+ void _showMediaPicker() {
+ showModalBottomSheet(
+ context: context,
+ backgroundColor: const Color(0xFF1E1E1E),
+ shape: const RoundedRectangleBorder(
+ borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
+ ),
+ builder: (context) => SafeArea(
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ const SizedBox(height: 12),
+ Container(
+ width: 40,
+ height: 4,
+ decoration: BoxDecoration(
+ color: Colors.grey[600],
+ borderRadius: BorderRadius.circular(2),
+ ),
+ ),
+ const SizedBox(height: 20),
+ ListTile(
+ leading: const Icon(Icons.image, color: Color(0xFF1D9BF0)),
+ title: const Text('Photo', style: TextStyle(color: Colors.white)),
+ onTap: () {
+ Navigator.pop(context);
+ _pickImage();
+ },
+ ),
+ ListTile(
+ leading: const Icon(Icons.videocam, color: Color(0xFF1D9BF0)),
+ title: const Text('Video', style: TextStyle(color: Colors.white)),
+ onTap: () {
+ Navigator.pop(context);
+ _pickVideo();
+ },
+ ),
+ const SizedBox(height: 16),
+ ],
+ ),
+ ),
+ );
+ }
+
Future _pickImage() async {
- final remainingSlots = 4 - _selectedImages.length;
+ final remainingSlots = 4 - _selectedMedia.length;
if (remainingSlots <= 0) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
- content: Text('Maximum 4 images allowed per quote.'),
+ content: Text('Maximum 4 media files allowed per quote.'),
behavior: SnackBarBehavior.floating,
),
);
@@ -138,22 +182,59 @@ class _QuoteComposerScreenState extends ConsumerState {
setState(() {
for (final picked in pickedList) {
if (picked.file != null) {
- _selectedImages.add(picked.file!);
+ _selectedMedia.add(picked.file!);
}
}
});
}
- void _removeImage(int index) {
- if (index < 0 || index >= _selectedImages.length) return;
+ Future _pickVideo() async {
+ final remainingSlots = 4 - _selectedMedia.length;
+ if (remainingSlots <= 0) {
+ ScaffoldMessenger.of(context).showSnackBar(
+ const SnackBar(
+ content: Text('Maximum 4 media files allowed per quote.'),
+ behavior: SnackBarBehavior.floating,
+ ),
+ );
+ return;
+ }
+
+ final picked = await pickVideo();
+ if (picked == null || picked.file == null) return;
+
+ setState(() {
+ _selectedMedia.add(picked.file!);
+ });
+ }
+
+ void _removeMedia(int index) {
+ if (index < 0 || index >= _selectedMedia.length) return;
setState(() {
- _selectedImages.removeAt(index);
+ _selectedMedia.removeAt(index);
});
}
+ bool _isVideoFile(File file) {
+ final extension = file.path.split('.').last.toLowerCase();
+ return [
+ 'mp4',
+ 'mov',
+ 'avi',
+ 'webm',
+ 'mkv',
+ 'flv',
+ 'wmv',
+ 'mpeg',
+ 'mpg',
+ '3gp',
+ 'm4v',
+ ].contains(extension);
+ }
+
Widget _buildSelectedImagesPreview() {
- if (_selectedImages.isEmpty) return const SizedBox.shrink();
- final crossAxisCount = _selectedImages.length == 1 ? 1 : 2;
+ if (_selectedMedia.isEmpty) return const SizedBox.shrink();
+ final crossAxisCount = _selectedMedia.length == 1 ? 1 : 2;
return GridView.builder(
shrinkWrap: true,
@@ -162,23 +243,52 @@ class _QuoteComposerScreenState extends ConsumerState {
crossAxisCount: crossAxisCount,
crossAxisSpacing: 8,
mainAxisSpacing: 8,
- childAspectRatio: _selectedImages.length == 1 ? 16 / 9 : 1.0,
+ childAspectRatio: _selectedMedia.length == 1 ? 16 / 9 : 1.0,
),
- itemCount: _selectedImages.length,
+ itemCount: _selectedMedia.length,
itemBuilder: (context, index) {
+ final file = _selectedMedia[index];
+ final isVideo = _isVideoFile(file);
+
return Stack(
children: [
Positioned.fill(
child: ClipRRect(
borderRadius: BorderRadius.circular(12),
- child: Image.file(_selectedImages[index], fit: BoxFit.cover),
+ child: Image.file(file, fit: BoxFit.cover),
),
),
+ if (isVideo)
+ Positioned.fill(
+ child: Container(
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.circular(12),
+ color: Colors.black26,
+ ),
+ child: const Center(
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ Icon(
+ Icons.play_circle_outline,
+ color: Colors.white,
+ size: 48,
+ ),
+ SizedBox(height: 4),
+ Text(
+ 'Video',
+ style: TextStyle(color: Colors.white, fontSize: 12),
+ ),
+ ],
+ ),
+ ),
+ ),
+ ),
Positioned(
top: 8,
right: 8,
child: InkWell(
- onTap: () => _removeImage(index),
+ onTap: () => _removeMedia(index),
child: Container(
decoration: const BoxDecoration(
color: Colors.black54,
@@ -318,7 +428,7 @@ class _QuoteComposerScreenState extends ConsumerState {
),
],
),
- if (_selectedImages.isNotEmpty) ...[
+ if (_selectedMedia.isNotEmpty) ...[
const SizedBox(height: 12),
_buildSelectedImagesPreview(),
],
@@ -326,12 +436,12 @@ class _QuoteComposerScreenState extends ConsumerState