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

Mobile Screen 36 #41

Merged
merged 2 commits into from
Jan 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ flutter build apk

| Page 33 | Page 34 | Page 35 | Page 36 |
| ------------- | ------------- | ------------- | ------------- |
| <img src="art/screenshots/page_33.png" width="200"/> | <img src="art/screenshots/page_34.png" width="200"/> | | |
| <img src="art/screenshots/page_33.png" width="200"/> | <img src="art/screenshots/page_34.png" width="200"/> | | <img src="art/screenshots/page_36.png" width="200"/> |

| Page 37 | Page 38 | Page 39 | Page 40 |
| ------------- | ------------- | ------------- | ------------- |
Expand Down
Binary file added art/screenshots/page_36.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
64 changes: 64 additions & 0 deletions lib/src/mobile_ui/36/page_36.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_ui_kit_obkm/src/mobile_ui/36/permanent_bottom_sheet.dart';

class Page36 extends StatelessWidget {
const Page36({Key? key}) : super(key: key);

@override
Widget build(BuildContext context) {
return Scaffold(
body: SafeArea(
child: SingleChildScrollView(
child: Column(
children: [
// appBar
Padding(
padding: EdgeInsets.symmetric(
horizontal: 12.w,
vertical: 6.w,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
// the left chevron
IconButton(
iconSize: 24.w,
icon: Icon(Icons.chevron_left_rounded),
onPressed: () => Navigator.pop(context),
),
// the title
Text(
"Share",
style: TextStyle(
fontSize: 16.sp,
fontWeight: FontWeight.w600,
),
),
// the open menu
IconButton(
iconSize: 24.w,
onPressed: () => Navigator.pop(context),
icon: Icon(Icons.calendar_today_rounded),
),
]),
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 44.w, vertical: 71.w),
child: Container(
height: 365.w,
width: 302.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(24.w),
color: Color(0xffC4C4C4)
),
),
),
],
),
),
),
bottomSheet: PermanentBottomSheetWidget(),
);
}
}
189 changes: 189 additions & 0 deletions lib/src/mobile_ui/36/permanent_bottom_sheet.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';

class PermanentBottomSheetWidget extends StatelessWidget {
const PermanentBottomSheetWidget({super.key});

@override
Widget build(BuildContext context) {
return Container(
padding: EdgeInsets.symmetric(vertical: 36.w),
decoration: BoxDecoration(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(24.w),
topRight: Radius.circular(24.w),
),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.25),
offset: Offset(0, 4.0),
blurRadius: 16.0,
),
],
color: Color(0xfff4f4f4),
),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 24.0),
child: Text(
"Change Card",
style: TextStyle(
fontSize: 12.w,
fontWeight: FontWeight.w600,
),
),
),
_buildSpaceH(),
SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: Row(
children: [
_buildSpaceW(),
Container(
width: 65.w,
height: 65.w,
decoration: BoxDecoration(
color: Color(0xffc4c4c4),
borderRadius: BorderRadius.circular(16.w),
),
child: Center(
child: Icon(
Icons.camera_enhance_rounded,
size: 24.w,
),
),
),
_buildSpaceW(),
Container(
width: 65.w,
height: 65.w,
decoration: BoxDecoration(
color: Color(0xffc4c4c4),
borderRadius: BorderRadius.circular(16.w),
),
child: Stack(
children: [
SizedBox.expand(),
Positioned(
right: 12,
top: 10,
child: Icon(
Icons.radio_button_checked_rounded,
size: 14.w,
),
),
],
),
),
_buildSpaceW(),
Container(
width: 65.w,
height: 65.w,
decoration: BoxDecoration(
color: Color(0xffc4c4c4),
borderRadius: BorderRadius.circular(16.w),
),
child: Stack(
children: [
SizedBox.expand(),
Positioned(
right: 12,
top: 10,
child: Icon(
Icons.radio_button_checked_rounded,
size: 14.w,
),
),
],
),
),
_buildSpaceW(),
Container(
width: 65.w,
height: 65.w,
decoration: BoxDecoration(
color: Color(0xffc4c4c4),
borderRadius: BorderRadius.circular(16.w),
),
child: Stack(
children: [
SizedBox.expand(),
Positioned(
right: 12,
top: 10,
child: Icon(
Icons.radio_button_checked_rounded,
size: 14.w,
),
),
],
),
),
_buildSpaceW(),
Container(
width: 65.w,
height: 65.w,
decoration: BoxDecoration(
color: Color(0xffc4c4c4),
borderRadius: BorderRadius.circular(16.w),
),
child: Stack(
children: [
SizedBox.expand(),
Positioned(
right: 12,
top: 10,
child: Icon(
Icons.radio_button_checked_rounded,
size: 14.w,
),
),
],
),
),
_buildSpaceW(),
],
),
),
_buildSpaceH(),
Padding(
padding: EdgeInsets.symmetric(horizontal: 24.w),
child: GestureDetector(
child: Container(
height: 48.w,
decoration: BoxDecoration(
color: Color(0xffc4c4c4),
borderRadius: BorderRadius.circular(16.w),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(Icons.share),
Text(
"Share",
style: TextStyle(
fontSize: 14.w,
fontWeight: FontWeight.w500,
),
),
],
),
),
),
)
],
),
);
}

SizedBox _buildSpaceH() => SizedBox(height: 24.w);

SizedBox _buildSpaceW() {
return SizedBox(
width: 24.w,
);
}
}
6 changes: 6 additions & 0 deletions lib/src/mobile_ui/root/root.dart
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,12 @@ class RootWidget extends StatelessWidget {
context.push("/${MobileRoutes.pg34}");
},
),
PageButtonWidget(
page: 36,
onPressed: () {
context.push("/${MobileRoutes.pg36}");
},
),

/// 41 - 60
///
Expand Down
1 change: 1 addition & 0 deletions lib/src/mobile_ui/routes/routes.dart
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class MobileRoutes {
static const pg33 = "pg33";
static const pg32 = "pg32";
static const pg34 = "pg34";
static const pg36 = "pg36";

/// 41 - 60
static const pg42 = "pg42";
Expand Down
5 changes: 5 additions & 0 deletions lib/src/navigation/new_routes.dart
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import '../mobile_ui/27/page_27.dart';
import '../mobile_ui/32/page_32.dart';
import '../mobile_ui/33/page_33.dart';
import '../mobile_ui/34/page_34.dart';
import '../mobile_ui/36/page_36.dart';
import '../mobile_ui/42/page_42.dart';
import '../mobile_ui/44/page_44.dart';
import '../mobile_ui/45/page_45.dart';
Expand Down Expand Up @@ -188,6 +189,10 @@ var newRoutesConfig = GoRouter(
path: MobileRoutes.pg34,
builder: (BuildContext context, GoRouterState state) => const Page34(),
),
GoRoute(
path: MobileRoutes.pg36,
builder: (BuildContext context, GoRouterState state) => const Page36(),
),

/// Mobile 41 - 60
GoRoute(
Expand Down