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.

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

User profile screen #19

Open
wants to merge 23 commits into
base: feat-user-profile
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
1e06cf9
Added green themed background for the second onboarding screen
JohnEdrickGador Mar 9, 2023
0cce779
Modified main text for second onboarding screen
JohnEdrickGador Mar 9, 2023
48abaac
Modified Main Text of second onboarding screen and added engineering_…
JohnEdrickGador Mar 9, 2023
9dc0f69
Modified the description text of the second onboarding screen
JohnEdrickGador Mar 9, 2023
3bc4805
modified the image for the second onboarding screen and adjusted the …
JohnEdrickGador Mar 9, 2023
b48c092
Modified text color of onboarding screen texts from red[100] to white
JohnEdrickGador Mar 9, 2023
c0f7c47
Changed a text from the second onboarding screen
JohnEdrickGador Mar 24, 2023
c33e6f2
Edited Second Entry Description
JohnEdrickGador Mar 24, 2023
8634027
New signed commit test
JohnEdrickGador Mar 24, 2023
0d1331a
Added the user profile screen files to the repository
JohnEdrickGador Apr 3, 2023
717eb70
Modularized the widgets for the user profile screen
JohnEdrickGador Apr 3, 2023
227f11a
Added flutter_settings_screen to dependencies for building settings s…
JohnEdrickGador Apr 3, 2023
fae7900
Created the backbone of the user profile settings page
JohnEdrickGador Apr 3, 2023
50f9a33
Started construction of the Personal Details settings screen
JohnEdrickGador Apr 3, 2023
1832353
Removed third party library for settings screen
JohnEdrickGador Apr 10, 2023
1cae88d
Created card for the top part of Profile Settings
JohnEdrickGador Apr 10, 2023
76f05e3
Started the profile settings page and created a settings text field w…
JohnEdrickGador Apr 10, 2023
6f501af
Finished Profile Settings Screen and added Choice Chips for easier se…
JohnEdrickGador Apr 10, 2023
9998403
Started the change password view/screen
JohnEdrickGador Apr 11, 2023
3c28fc0
Added route for change password screen
JohnEdrickGador Apr 11, 2023
bb92e7f
Finished first pass of the Profile Settings and Security Settings screen
JohnEdrickGador Apr 11, 2023
7824092
Finished first pass on the Privacy settings screen
JohnEdrickGador Apr 11, 2023
b3c83ab
Fixed the logic for obscureText in change password fields
JohnEdrickGador Apr 11, 2023
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
Binary file added assets/images/avatars/cover_image.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ class OnboardingScreen extends StatefulWidget {
final firstEntryDescriptionText =
'UP-Orgs is a platform that aims to connect people together.';

final secondEntryImage = '<modify this>';
final secondEntryMainText = '<modify this>';
final secondEntryDescriptionText = '<modify this>';
final secondEntryImage =
'assets/images/visual_elements/undraw_engineering_team_a7n2.svg';
final secondEntryMainText = 'Join Orgs of your interest';
final secondEntryDescriptionText =
'Develop your skills and share them with other people.';

final thirdEntryImage = '<modify this>';
final thirdEntryMainText = '<modify this>';
Expand Down Expand Up @@ -50,9 +52,9 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
),
OnboardingSecondEntry(
boxConstraints: constraints,
assetPath: widget.firstEntryImage,
mainText: widget.firstEntryMainText,
descriptionText: widget.firstEntryDescriptionText,
assetPath: widget.secondEntryImage,
mainText: widget.secondEntryMainText,
descriptionText: widget.secondEntryDescriptionText,
),
OnboardingThirdEntry(
boxConstraints: constraints,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';

import '../widgets/entry_image_and_text.dart';
import '../widgets/green_themed_background.dart';
import '../widgets/header.dart';
import '../widgets/maroon_themed_background.dart';
import '../widgets/navigation_buttons.dart';

class OnboardingSecondEntry extends StatelessWidget {
Expand All @@ -27,7 +27,7 @@ class OnboardingSecondEntry extends StatelessWidget {
alignment: Alignment.center,
children: <Widget>[
// Maroon themed background.
MaroonThemedBackground(boxConstraints: _boxConstraints),
GreenThemedBackground(boxConstraints: _boxConstraints),

// Skip button and page entry indicator.
const Header(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'dart:ui';
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:rive/rive.dart';
import 'package:up_orgs/features/user_profile/screens/user_profile.dart';

import '../../../../core/features/auth/presentation/screens/login_screen.dart';

Expand Down Expand Up @@ -80,7 +81,7 @@ class _PersistentOnboardingScreenState
width: 200.0,
child: ElevatedButton(
onPressed: () {
GoRouter.of(context).push(LoginScreen.routeName);
GoRouter.of(context).push(UserProfile.routeName);
},
style: ElevatedButton.styleFrom(elevation: 0.0),
child: const Text('Let\'s Go'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class EntryTextBody extends StatelessWidget {
mainText,
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.headlineLarge?.copyWith(
color: Colors.red[100],
color: Colors.white,
fontWeight: FontWeight.bold,
),
),
Expand All @@ -30,7 +30,7 @@ class EntryTextBody extends StatelessWidget {
descriptionText,
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.labelLarge?.copyWith(
color: Colors.red[100],
color: Colors.white,
height: 1.75,
),
),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import 'package:flutter/material.dart';

import '../../../../constants/colors/app_colors.dart';

class GreenThemedBackground extends StatelessWidget {
const GreenThemedBackground({
super.key,
required BoxConstraints boxConstraints,
}) : _boxConstraints = boxConstraints;

final BoxConstraints _boxConstraints;

@override
Widget build(BuildContext context) {
return Container(
width: _boxConstraints.maxWidth,
height: _boxConstraints.maxHeight,
decoration: const BoxDecoration(
// color: AppColors.maroon,
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
stops: [0.2, 0.4, 0.6, 0.8, 0.9],
colors: <Color>[
Color.fromARGB(255, 86, 192, 150),
Color.fromARGB(255, 66, 146, 114),
Color.fromARGB(255, 41, 119, 88),
Color.fromARGB(255, 34, 90, 68),
AppColors.green,
],
),
),
);
}
}
34 changes: 34 additions & 0 deletions lib/features/user_profile/screens/user_profile.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import 'package:flutter/material.dart';
import '../widgets/tab_bar_user_profile.dart';
import '../widgets/top_part_user_profile.dart';

class UserProfile extends StatefulWidget {
const UserProfile({super.key});

@override
State<UserProfile> createState() => _UserProfileState();

static const routeName = "/profile";
}

class _UserProfileState extends State<UserProfile> {
@override
Widget build(BuildContext context) {
return Scaffold(
body: Column(
children: const [
TopPartUserProfile(),
SizedBox(
height: 20,
),
Expanded(
child: SizedBox(
height: 150,
child: TabBarUserProfile(),
),
)
],
),
);
}
}
Loading