fix(settings): Improved Settings UI (#153)

Author: mohamed-yasser23

lam7a/analysis_options.yaml

@@ -21,7 +21,7 @@ linter:
   # `// ignore_for_file: name_of_lint` syntax on the line or in the file
   # producing the lint.
   rules:
-    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    avoid_print: false  # Uncomment to disable the `avoid_print` rule
     # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
 
 # Additional information about this file can be found at

lam7a/lib/core/constants/server_constant.dart

@@ -16,4 +16,6 @@ class ServerConstant {
   static String me = "/auth/me";
   static String apiPrefix = "/api/v1.0";
   static String serverURL = "https://api.hankers.tech";
+  static String mutedUsers = "/users/mutes/me";
+  static String blockedUsers = "/users/blocks/me";
 }

lam7a/lib/core/providers/authentication.dart

@@ -1,5 +1,3 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:lam7a/core/constants/server_constant.dart';
 import 'package:lam7a/core/models/auth_state.dart';
 import 'package:lam7a/core/models/user_model.dart';
@@ -12,7 +10,7 @@ part 'authentication.g.dart';
 // this is under developing not finished yet
 @Riverpod(keepAlive: true)
 class Authentication extends _$Authentication {
- late ApiService _apiService;
+  late ApiService _apiService;
   @override
   AuthState build() {
     _apiService = ref.read(apiServiceProvider);
@@ -44,8 +42,7 @@ class Authentication extends _$Authentication {
       if (response['message'] == 'Logout successful') {
         prefs.remove('token');
         state = state.copyWith(user: null, isAuthenticated: false);
-      }
-      else {
+      } else {
         print("Logout failed");
       }
     } catch (e) {

lam7a/lib/features/authentication/repository/authentication_impl_repository.dart

@@ -1,14 +1,11 @@
-import 'dart:convert';
-
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:lam7a/core/models/user_model.dart';
-import 'package:lam7a/core/services/api_service.dart';
 import 'package:lam7a/features/authentication/model/authentication_user_credentials_model.dart';
 import 'package:lam7a/features/authentication/model/authentication_user_data_model.dart';
 import 'package:lam7a/features/authentication/service/authentication_api_service.dart';
 import 'package:lam7a/features/authentication/utils/authentication_constants.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 part 'authentication_impl_repository.g.dart';
+
 @riverpod
 AuthenticationRepositoryImpl authenticationImplRepository(Ref ref) {
   return AuthenticationRepositoryImpl(
@@ -23,17 +20,20 @@ class AuthenticationRepositoryImpl {
     Map<String, dynamic> body;
     body = await apiService.checkEmail(email);
     print(body);
-    return (body[AuthenticationConstants.message].toString() == AuthenticationConstants.emailExist);
+    return (body[AuthenticationConstants.message].toString() ==
+        AuthenticationConstants.emailExist);
   }
 
   Future<bool> verificationOTP(String email) async {
     final message = await apiService.verificationOTP(email);
-    return (message[AuthenticationConstants.status].toString() == AuthenticationConstants.success);
+    return (message[AuthenticationConstants.status].toString() ==
+        AuthenticationConstants.success);
   }
 
   Future<bool> resendOTP(String email) async {
     final message = await apiService.resendOTP(email);
-    return (message[AuthenticationConstants.status].toString() == AuthenticationConstants.success);
+    return (message[AuthenticationConstants.status].toString() ==
+        AuthenticationConstants.success);
   }
 
   Future<UserModel?> register(AuthenticationUserDataModel user) async {
@@ -44,7 +44,8 @@ class AuthenticationRepositoryImpl {
 
   Future<bool> verifyOTP(String email, String OTP) async {
     final message = await apiService.verifyOTP(email, OTP);
-    return (message[AuthenticationConstants.status].toString() == AuthenticationConstants.success);
+    return (message[AuthenticationConstants.status].toString() ==
+        AuthenticationConstants.success);
   }
 
   Future<UserModel> login(

lam7a/lib/features/authentication/ui/view/screens/login_screen/authentication_login_screen.dart

@@ -94,27 +94,40 @@ class _loginFlowtate extends State<LogInScreen> {
                                 child: AuthenticationStepButton(
                                   key: ValueKey("loginNextButton"),
                                   enable: viewmodel.shouldEnableNextLogin(),
-                                  label: AuthenticationConstants.loginButtonLabels[currentIndex],
-                                  bgColor: Theme.of(context).colorScheme.onSurface,
-                                  textColor: Theme.of(context).colorScheme.surface,
-                                  onPressedEffect: () async{
-                                    if (currentIndex == AuthenticationConstants.finishLogin) {
+                                  label: AuthenticationConstants
+                                      .loginButtonLabels[currentIndex],
+                                  bgColor: Theme.of(
+                                    context,
+                                  ).colorScheme.onSurface,
+                                  textColor: Theme.of(
+                                    context,
+                                  ).colorScheme.surface,
+                                  onPressedEffect: () async {
+                                    if (currentIndex ==
+                                        AuthenticationConstants.finishLogin) {
                                       await viewmodel.login();
-                                      String? message = ref.read(authenticationViewmodelProvider).toastMessageLogin;
-                                      if (message != null)
-                                      {
-                                        AuthenticationConstants.flushMessage(message, context, "loginMessage");
+                                      String? message = ref
+                                          .read(authenticationViewmodelProvider)
+                                          .toastMessageLogin;
+                                      if (message != null) {
+                                        AuthenticationConstants.flushMessage(
+                                          message,
+                                          context,
+                                          "loginMessage",
+                                        );
                                       }
                                       if (authenticationState.isAuthenticated) {
                                         Navigator.pop(context);
                                         // Navigate to transmission screen (after auth page)
                                         Navigator.pushNamedAndRemoveUntil(
                                           context,
-                                          AuthenticationTransmissionScreen.routeName,
+                                          AuthenticationTransmissionScreen
+                                              .routeName,
                                           (route) => false,
                                         );
                                       }
-                                    } else if (viewmodel.shouldEnableNextLogin()){
+                                    } else if (viewmodel
+                                        .shouldEnableNextLogin()) {
                                       viewmodel.gotoNextLoginStep();
                                     }
                                   },
@@ -126,9 +139,7 @@ class _loginFlowtate extends State<LogInScreen> {
                       ),
                     ],
                   )
-                : Center(
-                    child: LoadingCircle(),
-                  ),
+                : Center(child: LoadingCircle()),
           ),
         );
       },

lam7a/lib/features/authentication/ui/view/screens/login_screen/steps/password_login_step.dart

@@ -3,7 +3,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:lam7a/core/theme/app_pallete.dart';
 import 'package:lam7a/features/authentication/ui/viewmodel/authentication_viewmodel.dart';
-import 'package:lam7a/features/authentication/ui/widgets/authentication_step_button.dart';
 import 'package:lam7a/features/authentication/ui/widgets/authentication_text_input_field.dart';
 
 class PasswordLogin extends StatelessWidget {

lam7a/lib/features/common/dtos/api_response.dart

@@ -1,5 +1,4 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:lam7a/features/messaging/dtos/conversation_dto.dart';
 
 part 'api_response.freezed.dart';
 part 'api_response.g.dart';
@@ -18,7 +17,6 @@ abstract class ApiResponse<T> with _$ApiResponse<T> {
   ) => _$ApiResponseFromJson(json, fromJsonT);
 }
 
-
 class Metadata {
   final int totalItems;
   final int page;
@@ -33,16 +31,16 @@ class Metadata {
   });
 
   factory Metadata.fromJson(Map<String, dynamic> json) => Metadata(
-        totalItems: json['totalItems'],
-        page: json['page'],
-        limit: json['limit'],
-        totalPages: json['totalPages'],
-      );
+    totalItems: json['totalItems'],
+    page: json['page'],
+    limit: json['limit'],
+    totalPages: json['totalPages'],
+  );
 
   Map<String, dynamic> toJson() => {
-        'totalItems': totalItems,
-        'page': page,
-        'limit': limit,
-        'totalPages': totalPages,
-      };
+    'totalItems': totalItems,
+    'page': page,
+    'limit': limit,
+    'totalPages': totalPages,
+  };
 }

lam7a/lib/features/messaging/repository/conversations_repositories.dart

@@ -26,7 +26,7 @@ class ConversationsRepository {
 
     var conversationsDto = await _apiService.getConversations();
 
-    var conversations = conversationsDto.data!.map((x) {
+    var conversations = conversationsDto.data.map((x) {
       return Conversation(
         id: x.id,
         userId: x.user.id,
@@ -41,11 +41,15 @@ class ConversationsRepository {
     return conversations;
   }
 
-  Future<int> getConversationIdByUserId(int userId) async{
+  Future<int> getConversationIdByUserId(int userId) async {
     return await _apiService.createConversation(userId);
   }
 
-  Future<List<Contact>> searchForContacts(String query, int page, [int limit = 20]) async {
+  Future<List<Contact>> searchForContacts(
+    String query,
+    int page, [
+    int limit = 20,
+  ]) async {
     return await _apiService.searchForContacts(query, page, limit);
   }
 

lam7a/lib/features/navigation/ui/view/navigation_home_screen.dart

@@ -21,6 +21,8 @@ import 'package:lam7a/features/tweet/ui/view/pages/tweet_home_screen.dart';
 class NavigationHomeScreen extends StatefulWidget {
   static const String routeName = "navigation";
 
+  const NavigationHomeScreen({super.key});
+
   @override
   State<NavigationHomeScreen> createState() => _NavigationHomeScreenState();
 }
@@ -30,7 +32,7 @@ class _NavigationHomeScreenState extends State<NavigationHomeScreen> {
   int valueFromDropdown = 0;
   bool _isVisible = true;
   double _lastOffset = 0;
-    String? themeMode;
+  String? themeMode;
 
   @override
   Widget build(BuildContext context) {
@@ -374,12 +376,8 @@ class _NavigationHomeScreenState extends State<NavigationHomeScreen> {
                     RadioGroup<String>(
                       groupValue: themeMode, // Your state variable
                       onChanged: (value) {
-                        modalSetState(
-                          () => themeMode = value,
-                        );
-                        setState(
-                          () {},
-                        ); 
+                        modalSetState(() => themeMode = value);
+                        setState(() {});
                       },
                       child: Column(
                         children: [
@@ -414,7 +412,8 @@ class _NavigationHomeScreenState extends State<NavigationHomeScreen> {
                         ],
                       ),
                     ),
-                    const SizedBox(height: 16),]
+                    const SizedBox(height: 16),
+                  ],
                 ),
               ),
             );

lam7a/lib/features/settings/repository/user_releations_repository.dart

@@ -6,6 +6,7 @@ part 'user_releations_repository.g.dart';
 
 @riverpod
 UserRelationsRepository userRelationsRepository(Ref ref) {
+  // return UserRelationsRepository(ref.read(usersApiServiceImplProvider));
   return UserRelationsRepository(ref.read(usersApiServiceProvider));
 }