diff --git a/lib/views/screens/email_verification_screen.dart b/lib/views/screens/email_verification_screen.dart index 422d41b8..fd49654d 100644 --- a/lib/views/screens/email_verification_screen.dart +++ b/lib/views/screens/email_verification_screen.dart @@ -33,7 +33,7 @@ class EmailVerificationScreen extends StatelessWidget { child: Column( children: [ SizedBox( - height: UiSizes.height_60, + height: UiSizes.height_10, ), MergeSemantics( child: Column( @@ -46,7 +46,7 @@ class EmailVerificationScreen extends StatelessWidget { ), ), SizedBox( - height: UiSizes.height_40, + height: UiSizes.height_20, ), Align( alignment: Alignment.centerLeft, @@ -77,11 +77,8 @@ class EmailVerificationScreen extends StatelessWidget { ], ), ), - Expanded( - flex: 1, - child: SizedBox( - height: UiSizes.height_60, - ), + SizedBox( + height: UiSizes.height_60, ), OtpTextField( autoFocus: true, diff --git a/lib/views/screens/profile_screen.dart b/lib/views/screens/profile_screen.dart index b8f7e8be..2ae4ecdc 100644 --- a/lib/views/screens/profile_screen.dart +++ b/lib/views/screens/profile_screen.dart @@ -66,6 +66,7 @@ class ProfileScreen extends StatelessWidget { ) { return Row( children: [ + SizedBox(width: UiSizes.width_20), GetBuilder( builder: (themeController) => CircleAvatar( backgroundColor: Theme.of(Get.context!).colorScheme.secondary, @@ -84,8 +85,20 @@ class ProfileScreen extends StatelessWidget { Expanded( child: MergeSemantics( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, children: [ + if (isCreatorProfile == null && controller.isEmailVerified!) + const Padding( + padding: EdgeInsets.only(top: 10), + child: Row( + children: [ + Icon(Icons.verified_user_outlined, color: Colors.green), + SizedBox(width: 5), + Text("Verified", + style: TextStyle(color: Colors.green)), + ], + ), + ), Text( isCreatorProfile != null ? creatorName ?? '' @@ -96,29 +109,30 @@ class ProfileScreen extends StatelessWidget { overflow: TextOverflow.ellipsis, ), ), - Text( + Chip(label: Text( "@${isCreatorProfile != null ? '' : controller.userName}", style: TextStyle( fontSize: UiSizes.size_14, overflow: TextOverflow.ellipsis, ), ), - if (isCreatorProfile == null && controller.isEmailVerified!) - const Padding( - padding: EdgeInsets.only(top: 10), - child: Row( - children: [ - Icon(Icons.verified_user_outlined, color: Colors.green), - SizedBox(width: 5), - Text("Verified user", - style: TextStyle(color: Colors.green)), - ], - ), - ), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16), + side: BorderSide(color: Colors.grey.shade300), + ), + ), + // Text( + // "@${isCreatorProfile != null ? '' : controller.userName}", + // style: TextStyle( + // fontSize: UiSizes.size_14, + // overflow: TextOverflow.ellipsis, + // ), + // ), ], ), ), ), + SizedBox(width: UiSizes.width_20), ], ); } @@ -178,20 +192,11 @@ class ProfileScreen extends StatelessWidget { ), const SizedBox(width: 10), if (isCreatorProfile == null) - Expanded( - child: ElevatedButton( - onPressed: () { - Get.toNamed(AppRoutes.settings); - }, - child: const Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon(Icons.settings), - SizedBox(width: 10), - Text("Settings"), - ], - ), - ), + ElevatedButton( + onPressed: () { + Get.toNamed(AppRoutes.settings); + }, + child: Icon(Icons.settings), ), ], ); diff --git a/pubspec.yaml b/pubspec.yaml index f32c2736..ff946e39 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -21,6 +21,7 @@ version: 1.0.0+1 environment: sdk: '>=2.18.6 <3.0.0' + # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions @@ -41,10 +42,12 @@ dependencies: file_picker: ^8.0.7 firebase_analytics: ^10.6.3 firebase_core: ^2.20.0 - firebase_messaging: 14.7.3 + # firebase_messaging: 14.7.3 + firebase_messaging: ^14.9.4 flutter: sdk: flutter - flutter_local_notifications: ^16.1.0 + flutter_local_notifications: ^18.0.0 + # flutter_local_notifications: ^16.1.0 flutter_media_metadata: ^1.0.0+1 flutter_native_splash: ^2.2.19 flutter_onboarding_slider: ^1.0.10 @@ -58,7 +61,8 @@ dependencies: get: ^4.6.5 get_storage: ^2.1.1 google_fonts: ^4.0.3 - http: null + # http: null + http: ^0.13.6 image_cropper: ^4.0.1 image_picker: ^0.8.7+4 internet_connection_checker_plus: 1.0.1