Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI Improvements in profile_screen & email_verification_screen Fixes #409 #412

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
+41 −38
Open

UI Improvements in profile_screen & email_verification_screen Fixes #409 #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f729b6c
UI Improvements in `profile_screen` & `email_verification_screen`
xkaper001 Dec 11, 2024
21fb6d7
Update pubspec.yaml
xkaper001 Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions lib/views/screens/email_verification_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class EmailVerificationScreen extends StatelessWidget {
child: Column(
children: [
SizedBox(
height: UiSizes.height_60,
height: UiSizes.height_10,
),
MergeSemantics(
child: Column(
Expand All @@ -46,7 +46,7 @@ class EmailVerificationScreen extends StatelessWidget {
),
),
SizedBox(
height: UiSizes.height_40,
height: UiSizes.height_20,
),
Align(
alignment: Alignment.centerLeft,
Expand Down Expand Up @@ -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,
Expand Down
61 changes: 33 additions & 28 deletions lib/views/screens/profile_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ class ProfileScreen extends StatelessWidget {
) {
return Row(
children: [
SizedBox(width: UiSizes.width_20),
GetBuilder<ThemeController>(
builder: (themeController) => CircleAvatar(
backgroundColor: Theme.of(Get.context!).colorScheme.secondary,
Expand All @@ -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 ?? ''
Expand All @@ -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),
],
);
}
Expand Down Expand Up @@ -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),
),
],
);
Expand Down
7 changes: 4 additions & 3 deletions pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -41,10 +42,10 @@ dependencies:
file_picker: ^8.0.7
firebase_analytics: ^10.6.3
firebase_core: ^2.20.0
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_media_metadata: ^1.0.0+1
flutter_native_splash: ^2.2.19
flutter_onboarding_slider: ^1.0.10
Expand All @@ -58,7 +59,7 @@ dependencies:
get: ^4.6.5
get_storage: ^2.1.1
google_fonts: ^4.0.3
http: null
http: ^0.13.6
image_cropper: ^4.0.1
image_picker: ^0.8.7+4
internet_connection_checker_plus: 1.0.1
Expand Down