feat: implement ui of update details

aman-singh7 · aman-singh7 · commit f269bc3bbba0 · 2022-05-19T06:57:41.000+05:30
Signed-off-by: Aman &lt;aman2@me.iitr.ac.in&gt;
diff --git a/lib/data/config/config.dart b/lib/data/config/config.dart
@@ -2,7 +2,8 @@ class Environment {
   /// URL that is common to most outgoing requests.
   static const String baseUrl = String.fromEnvironment(
     'BASE_URL',
-    defaultValue: 'https://codephile-test.herokuapp.com/v1/',
+    // defaultValue: 'https://codephile-test.herokuapp.com/v1/',
+    defaultValue: 'https://codephile.mdg.iitr.ac.in/v1/',
   );
 
   /// Project identifier for Sentry error logging.
diff --git a/lib/data/constants/routes.dart b/lib/data/constants/routes.dart
@@ -11,4 +11,5 @@ class AppRoutes {
 
   // Post-Auth
   static const String home = '/home';
+  static const String updateProfile = '/updatePofile';
 }
diff --git a/lib/presentation/contests/widgets/contest_card.dart b/lib/presentation/contests/widgets/contest_card.dart
@@ -10,7 +10,7 @@ import '../../../data/constants/colors.dart';
 import '../../../data/constants/styles.dart';
 import '../../../data/services/remote/notification_service.dart';
 import '../../../domain/models/contest.dart';
-import '../../../utils/contest_util.dart';
+import '../../../utils/platform_util.dart';
 import '../bloc/contests_bloc.dart';
 
 class ContestCard extends StatelessWidget {
@@ -287,15 +287,15 @@ class ContestCard extends StatelessWidget {
 }
 
 extension on Ongoing {
-  String get platformName => ContestUtil.getPlatformName(platform);
-  String get icon => ContestUtil.getPlatformIcon(platform);
+  String get platformName => PlatformUtil.getName(platform);
+  String get icon => PlatformUtil.getIcon(platform);
   String get time =>
       'Ends on ${DateFormat('dd, MMMM yyyy hh:mm a').format(endTime)}';
 }
 
 extension on Upcoming {
-  String get platformName => ContestUtil.getPlatformName(platform);
-  String get icon => ContestUtil.getPlatformIcon(platform);
+  String get platformName => PlatformUtil.getName(platform);
+  String get icon => PlatformUtil.getIcon(platform);
   String get time =>
       'Starts on ${DateFormat('dd, MMMM yyyy hh:mm a').format(startTime)}';
 }
diff --git a/lib/presentation/contests/widgets/filter_sheet.dart b/lib/presentation/contests/widgets/filter_sheet.dart
@@ -8,7 +8,7 @@ import 'package:intl/intl.dart';
 import '../../../data/constants/assets.dart';
 import '../../../data/constants/colors.dart';
 import '../../../data/constants/styles.dart';
-import '../../../utils/contest_util.dart';
+import '../../../utils/platform_util.dart';
 import '../bloc/contests_bloc.dart';
 
 class FilterSheet extends StatelessWidget {
@@ -137,7 +137,7 @@ class FilterSheet extends StatelessWidget {
                   max: 6,
                   divisions: 6,
                   value: state.duration!.toDouble(),
-                  label: ContestUtil.getLabel(state.duration),
+                  label: PlatformUtil.getLabel(state.duration),
                   onChanged: (_value) {
                     context
                         .read<ContestsBloc>()
diff --git a/lib/presentation/core/main_app.dart b/lib/presentation/core/main_app.dart
@@ -28,7 +28,8 @@ class Codephile extends StatelessWidget {
             );
           },
           debugShowCheckedModeBanner: false,
-          initialRoute: AppRoutes.signUp,
+          // TODO(developers): Update this with the screen you're testing.
+          initialRoute: AppRoutes.home,
           navigatorObservers: <NavigatorObserver>[
             SentryNavigatorObserver(),
             AppNavigationObserver(),
diff --git a/lib/presentation/core/router.dart b/lib/presentation/core/router.dart
@@ -7,6 +7,7 @@ import '../login/login_screen.dart';
 import '../onboarding/onboarding_screen.dart';
 import '../signup/signup_screen.dart';
 import '../signup/verify_screen.dart';
+import '../update_profile/update_profile.dart';
 
 /// Wrapper for a single method to be passed to [GetMaterialApp.onGenerateRoute].
 class AppRouter {
@@ -42,6 +43,12 @@ class AppRouter {
           routeName: settings.name,
           settings: settings,
         );
+      case AppRoutes.updateProfile:
+        return GetPageRoute(
+          page: () => const UpdateProfile(),
+          routeName: settings.name,
+          settings: settings,
+        );
       default:
         return GetPageRoute(
           page: () => Scaffold(
diff --git a/lib/presentation/feed/widgets/feed_card.dart b/lib/presentation/feed/widgets/feed_card.dart
@@ -9,8 +9,8 @@ import 'package:intl/intl.dart';
 import '../../../data/constants/assets.dart';
 import '../../../data/constants/colors.dart';
 import '../../../domain/models/grouped_feed.dart';
-import '../../../utils/contest_util.dart';
 import '../../../utils/feed_util.dart';
+import '../../../utils/platform_util.dart';
 
 class FeedCard extends StatelessWidget {
   FeedCard({
@@ -105,8 +105,8 @@ class FeedCard extends StatelessWidget {
                       CircleAvatar(
                         backgroundColor: Colors.transparent,
                         backgroundImage: AssetImage(
-                          ContestUtil.getPlatformIcon(
-                            ContestUtil.getPlatformNamefromUrl(
+                          PlatformUtil.getIcon(
+                            PlatformUtil.getNamefromUrl(
                               feed.url,
                             ),
                           ),
@@ -117,7 +117,7 @@ class FeedCard extends StatelessWidget {
                         width: 150.w,
                         child: Text(
                           _makeNonBreaking(
-                            ' ${ContestUtil.getPlatformName(ContestUtil.getPlatformNamefromUrl(feed.url))} |'
+                            ' ${PlatformUtil.getName(PlatformUtil.getNamefromUrl(feed.url))} |'
                             ' ${feed.language}',
                           ),
                           style: Theme.of(context)
diff --git a/lib/presentation/profile/widgets/accuracy_display.dart b/lib/presentation/profile/widgets/accuracy_display.dart
@@ -4,7 +4,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 import '../../../data/constants/colors.dart';
 import '../../../data/constants/styles.dart';
-import '../../../utils/contest_util.dart';
+import '../../../utils/platform_util.dart';
 import '../bloc/profile_bloc.dart';
 
 class AccuracyDisplay extends StatelessWidget {
@@ -63,7 +63,7 @@ class AccuracyDisplay extends StatelessWidget {
             child: Padding(
               padding: EdgeInsets.all(5.r),
               child: Image.asset(
-                ContestUtil.getPlatformIcon(platform),
+                PlatformUtil.getIcon(platform),
                 width: 25.r,
                 height: 25.r,
               ),
diff --git a/lib/presentation/profile/widgets/following_view.dart b/lib/presentation/profile/widgets/following_view.dart
@@ -40,7 +40,7 @@ class FollowingView extends StatelessWidget {
             icon: Icon(
               Icons.clear,
               size: 24.r,
-              color: AppColors.primaryBlack,
+              color: AppColors.grey3,
             ),
           ),
         ],
diff --git a/lib/presentation/profile/widgets/profile_header.dart b/lib/presentation/profile/widgets/profile_header.dart
@@ -53,7 +53,7 @@ class ProfileHeader extends StatelessWidget {
                     const Spacer(flex: 2),
                     IconButton(
                       onPressed: () async {
-                        await showMenu<String?>(
+                        showMenu(
                           context: context,
                           position: RelativeRect.fromLTRB(100.w, 70.h, 0, 0),
                           items: [
@@ -64,12 +64,17 @@ class ProfileHeader extends StatelessWidget {
                                 vertical: 4.h,
                               ),
                               onTap: () {
-                                Get.back(result: AppRoutes.updateProfile);
+                                Future.delayed(
+                                  const Duration(seconds: 1),
+                                  () {
+                                    Get.toNamed(AppRoutes.updateProfile);
+                                  },
+                                );
                               },
                               child: Text(
                                 'Update Details',
                                 style: AppStyles.h6.copyWith(
-                                  color: AppColors.primaryBlack,
+                                  color: AppColors.grey3,
                                 ),
                                 textAlign: TextAlign.center,
                               ),
@@ -84,18 +89,14 @@ class ProfileHeader extends StatelessWidget {
                               child: Text(
                                 'Logout',
                                 style: AppStyles.h6.copyWith(
-                                  color: AppColors.primaryBlack,
+                                  color: AppColors.grey3,
                                 ),
                                 textAlign: TextAlign.center,
                               ),
                             )
                           ],
                           elevation: 8,
-                        ).then((route) {
-                          if (route == null) return;
-
-                          Get.toNamed(route);
-                        });
+                        );
                       },
                       icon: state.personalProfile
                           ? const Icon(
diff --git a/lib/presentation/profile/widgets/question_solved.dart b/lib/presentation/profile/widgets/question_solved.dart
@@ -36,8 +36,9 @@ class QuestionSolved extends StatelessWidget {
                       padding: EdgeInsets.symmetric(vertical: 16.r),
                       child: Text(
                         key,
-                        style: AppStyles.h6
-                            .copyWith(color: AppColors.primaryBlack),
+                        style: AppStyles.h6.copyWith(
+                          color: AppColors.grey3,
+                        ),
                         textAlign: TextAlign.center,
                       ),
                     ),
@@ -52,8 +53,9 @@ class QuestionSolved extends StatelessWidget {
                       child: Text(
                         state.user?.solvedProblemsCount?.codechef.toString() ??
                             '0',
-                        style: AppStyles.h6
-                            .copyWith(color: AppColors.primaryBlack),
+                        style: AppStyles.h6.copyWith(
+                          color: AppColors.grey3,
+                        ),
                         textAlign: TextAlign.center,
                       ),
                     ),
@@ -65,8 +67,9 @@ class QuestionSolved extends StatelessWidget {
                         state.user?.solvedProblemsCount?.codeforces
                                 .toString() ??
                             '0',
-                        style: AppStyles.h6
-                            .copyWith(color: AppColors.primaryBlack),
+                        style: AppStyles.h6.copyWith(
+                          color: AppColors.grey3,
+                        ),
                         textAlign: TextAlign.center,
                       ),
                     ),
@@ -78,8 +81,7 @@ class QuestionSolved extends StatelessWidget {
                         state.user?.solvedProblemsCount?.hackerrank
                                 .toString() ??
                             '0',
-                        style: AppStyles.h6
-                            .copyWith(color: AppColors.primaryBlack),
+                        style: AppStyles.h6.copyWith(color: AppColors.grey3),
                         textAlign: TextAlign.center,
                       ),
                     ),
@@ -89,8 +91,7 @@ class QuestionSolved extends StatelessWidget {
                       padding: EdgeInsets.symmetric(vertical: 16.r),
                       child: Text(
                         state.user?.solvedProblemsCount?.spoj.toString() ?? '0',
-                        style: AppStyles.h6
-                            .copyWith(color: AppColors.primaryBlack),
+                        style: AppStyles.h6.copyWith(color: AppColors.grey3),
                         textAlign: TextAlign.center,
                       ),
                     ),
diff --git a/lib/presentation/profile/widgets/submission_display.dart b/lib/presentation/profile/widgets/submission_display.dart
@@ -45,15 +45,15 @@ class SubmissionDisplay extends StatelessWidget {
                       decoration: BoxDecoration(
                         shape: BoxShape.circle,
                         border: Border.all(
-                          color: AppColors.primaryBlack,
+                          color: AppColors.grey3,
                           width: 1.55,
                         ),
                       ),
                       child: const Center(
                         child: Text(
                           'No Submissions',
                           style: TextStyle(
-                            color: AppColors.primaryBlack,
+                            color: AppColors.grey3,
                             fontSize: 18,
                             fontWeight: FontWeight.w500,
                           ),
@@ -114,7 +114,7 @@ class SubmissionDisplay extends StatelessWidget {
                         Text(
                           data.submissionType,
                           style: AppStyles.h6.copyWith(
-                            color: AppColors.primaryBlack,
+                            color: AppColors.grey3,
                             fontSize: 12.sp,
                           ),
                         ),
diff --git a/lib/presentation/update_profile/bloc/update_profile_bloc.dart b/lib/presentation/update_profile/bloc/update_profile_bloc.dart
@@ -0,0 +1,57 @@
+import 'dart:io';
+
+import 'package:equatable/equatable.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+import '../../../data/services/local/image_service.dart';
+import '../../../data/services/local/storage_service.dart';
+import '../../../domain/models/status.dart';
+import '../../../domain/models/user.dart';
+import '../../../domain/repositories/user_repository.dart';
+
+part 'update_profile_event.dart';
+part 'update_profile_state.dart';
+part 'update_profile_bloc.freezed.dart';
+
+class UpdateProfileBloc extends Bloc<UpdateProfileEvent, UpdateProfileState> {
+  UpdateProfileBloc() : super(const UpdateProfileState()) {
+    on<Initialize>(_onInitialize);
+    on<SelectImage>(_onSelectImage);
+    on<UpdateInstitute>(_onUpdateInstitute);
+  }
+
+  void _onInitialize(Initialize event, Emitter<UpdateProfileState> emit) async {
+    final _instituteList = await UserRepository.getInstituteList();
+    if (_instituteList.isEmpty) {
+      _instituteList.addAll([
+        'Indian Institute of Technology Roorkee',
+        'Indian Institute of Technology Delhi',
+        'Indian Institute of Technology Mandi',
+        'Indian Institute of Technology Indore',
+        'Indian Institute of Technology Bombay'
+      ]);
+    }
+
+    emit(state.copyWith(
+      status: const Status(),
+      instituteList: _instituteList,
+      user: _currentUser,
+    ));
+  }
+
+  void _onSelectImage(
+      SelectImage event, Emitter<UpdateProfileState> emit) async {
+    emit(state.copyWith(image: await ImageService.pickProfileImage()));
+  }
+
+  void _onUpdateInstitute(
+      UpdateInstitute event, Emitter<UpdateProfileState> emit) {
+    _updatedUser = _updatedUser.copyWith(institute: event.institute);
+
+    emit(state.copyWith(user: _updatedUser));
+  }
+
+  final User _currentUser = StorageService.user!;
+  User _updatedUser = StorageService.user!;
+}
diff --git a/lib/presentation/update_profile/bloc/update_profile_event.dart b/lib/presentation/update_profile/bloc/update_profile_event.dart
@@ -0,0 +1,28 @@
+part of 'update_profile_bloc.dart';
+
+abstract class UpdateProfileEvent extends Equatable {
+  const UpdateProfileEvent();
+}
+
+class Initialize extends UpdateProfileEvent {
+  const Initialize();
+
+  @override
+  List<Object?> get props => [];
+}
+
+class SelectImage extends UpdateProfileEvent {
+  const SelectImage();
+
+  @override
+  List<Object?> get props => [];
+}
+
+class UpdateInstitute extends UpdateProfileEvent {
+  const UpdateInstitute({required this.institute});
+
+  final String institute;
+
+  @override
+  List<Object?> get props => [institute];
+}
diff --git a/lib/presentation/update_profile/bloc/update_profile_state.dart b/lib/presentation/update_profile/bloc/update_profile_state.dart
@@ -0,0 +1,13 @@
+part of 'update_profile_bloc.dart';
+
+@freezed
+class UpdateProfileState with _$UpdateProfileState {
+  const factory UpdateProfileState({
+    @Default(Status.loading()) Status status,
+    File? image,
+    User? user,
+    List<String>? instituteList,
+  }) = _UpdateProfileState;
+
+  const UpdateProfileState._();
+}
diff --git a/lib/presentation/update_profile/update_profile.dart b/lib/presentation/update_profile/update_profile.dart
diff --git a/lib/presentation/update_profile/widgets/profile_details.dart b/lib/presentation/update_profile/widgets/profile_details.dart
diff --git a/lib/presentation/update_profile/widgets/update_handles.dart b/lib/presentation/update_profile/widgets/update_handles.dart
diff --git a/lib/utils/contest_util.dart b/lib/utils/contest_util.dart
diff --git a/lib/utils/platform_util.dart b/lib/utils/platform_util.dart
diff --git a/pubspec.lock b/pubspec.lock

Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,5 @@ class AppRoutes {`
`11`	`11`
`12`	`12`	`// Post-Auth`
`13`	`13`	`static const String home = '/home';`
	`14`	`+ static const String updateProfile = '/updatePofile';`
`14`	`15`	`}`