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

Jump to bottom

lines design profile background #241

Merged
merged 3 commits into from
Aug 27, 2024
Merged

lines design profile background #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46a35b4
fix: bottom sheet dialog shift on active keyboard
Niranjan-Dorage Aug 13, 2024
eb0b5f7
feat: lines added to profile background
Niranjan-Dorage Aug 26, 2024
56421fa
Merge branch 'development' into profieLinesDesign
psantosh16 Aug 27, 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
Binary file added assets/images/profile/lines.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 9 additions & 4 deletions lib/ui/views/profile/preferences/preferences_view_model.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,16 +302,20 @@ class PreferencesViewModel extends BaseViewModel {
context: context,
builder: (context) {
isProfileError = false;

return Container(
width: double.infinity,
height: 380.h,
padding: EdgeInsets.symmetric(vertical: 12.r, horizontal: 10.r),
padding: EdgeInsets.only(
bottom: MediaQuery.of(context).viewInsets.bottom,
top: 10.r,
left: 10.r,
right: 10.r),
decoration: BoxDecoration(
color: context.colorScheme.scaffold,
borderRadius: BorderRadius.circular(32).r,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisSize: MainAxisSize.min,
children: [
Center(
child: Text(
Expand Down Expand Up @@ -537,7 +541,7 @@ class PreferencesViewModel extends BaseViewModel {
vertical: 10,
).r,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15).r,
borderRadius: BorderRadius.circular(15),
color: context.colorScheme.black,
),
child: Center(
Expand All @@ -558,6 +562,7 @@ class PreferencesViewModel extends BaseViewModel {
duration: 700.ms,
),
),
20.verticalSpace,
],
),
);
Expand Down
12 changes: 10 additions & 2 deletions lib/ui/views/profile/profile_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,23 @@ class ProfileView extends StatelessWidget {
disposeViewModel: false,
builder: (context, model, child) {
return Scaffold(
backgroundColor: context.colorScheme.scaffold,
backgroundColor: Colors.transparent,
body: model.isBusy
? const CircularLoadingIndicator()
: SafeArea(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 33).r,
child: Column(
children: [
const ProfileImageWidget(),
Container(
width: double.infinity,
decoration: BoxDecoration(
color: context.colorScheme.scaffold,
image: const DecorationImage(
image: AssetImage(
AssetImagePath.profileBackLines),
fit: BoxFit.cover)),
child: const ProfileImageWidget()),

// Settings
const ProfileSectionText(title: 'Settings'),
Expand Down
1 change: 1 addition & 0 deletions lib/utils/assets_constants.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class AssetImagePath {
static const String events = 'assets/images/onboarding/events.png';

static const String darkMode = 'assets/images/profile/dark_mode.png';
static const String profileBackLines = 'assets/images/profile/lines.png';
static const String help = 'assets/images/profile/help.png';
static const String logout = 'assets/images/profile/logout.png';
static const String pass = 'assets/images/profile/pass.png';
Expand Down