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 93 #75

Merged
merged 5 commits into from
Nov 4, 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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,9 @@ flutter build apk
| ---------------------------------------------------- | ---------------------------------------------------- | ------- | ---------------------------------------------------- |
| <img src="art/screenshots/page_89.png" width="200"/> | <img src="art/screenshots/page_90.png" width="200"/> | | <img src="art/screenshots/page_92.png" width="200"/> |

| Page 93 | Page 94 | Page 95 | Page 96 |
| ------- | ------- | ------- | ------- |
| | | | |
| Page 93 | Page 94 | Page 95 | Page 96 |
| ---------------------------------------------------- | ------- | ------- | ------- |
| <img src="art/screenshots/page_93.png" width="200"/> | | | |

| Page 97 | Page 98 | Page 99 | Page 100 |
| ------- | ------- | ------- | -------- |
Expand Down
Binary file added art/screenshots/page_93.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
119 changes: 119 additions & 0 deletions lib/src/mobile_ui/93/page_93.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';

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

@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
backgroundColor: Colors.white,
foregroundColor: Colors.black,
centerTitle: true,
title: Text(
'1/1',
style: TextStyle(
color: Colors.black,
fontSize: 20.sp,
fontFamily: 'Work Sans',
fontWeight: FontWeight.w600,
),
),
),
body: SingleChildScrollView(
padding: EdgeInsets.only(top: 173.h, left: 24.w, right: 24.w),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'How many times do you workout per week?',
style: TextStyle(
color: Colors.black,
fontSize: 24.sp,
fontFamily: 'Work Sans',
fontWeight: FontWeight.w500,
),
),
7.verticalSpace,
Text(
'We’ll use this to recommend workouts for you to try. ',
style: TextStyle(
color: Colors.black,
fontSize: 14.sp,
fontFamily: 'Work Sans',
fontWeight: FontWeight.w400,
),
),
65.verticalSpace,
WorkOutChoiceButton(
title: '0 - 1 Workouts',
caption: 'I’m a little rusty',
),
24.verticalSpace,
WorkOutChoiceButton(
title: '2 - 4 Workouts',
caption: 'I’m a regular',
),
24.verticalSpace,
WorkOutChoiceButton(
title: '5+ Workouts',
caption: 'I’m ready for anything',
),
24.verticalSpace,
],
),
),
);
}
}

class WorkOutChoiceButton extends StatelessWidget {
const WorkOutChoiceButton({
super.key,
required this.title,
required this.caption,
});

final String title;
final String caption;

@override
Widget build(BuildContext context) {
return Container(
width: double.infinity,
height: 85.h,
padding: EdgeInsets.only(left: 32.w),
decoration: ShapeDecoration(
shape: RoundedRectangleBorder(
side: BorderSide(width: 1, color: Color(0xFF262626)),
borderRadius: BorderRadius.circular(64),
),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
title,
style: TextStyle(
color: Colors.black,
fontSize: 16,
fontFamily: 'Work Sans',
fontWeight: FontWeight.w500,
),
),
Text(
caption,
style: TextStyle(
color: Color(0xFFA8A8A8),
fontSize: 14,
fontFamily: 'Work Sans',
fontWeight: FontWeight.w500,
),
)
],
),
);
}
}
9 changes: 9 additions & 0 deletions lib/src/mobile_ui/root/root.dart
Original file line number Diff line number Diff line change
Expand Up @@ -554,10 +554,19 @@ class RootWidget extends StatelessWidget {
onPressed: () {
context.push("/${MobileRoutes.pg90}");
}),


PageButtonWidget(
page: 93,
onPressed: () {
context.push("/${MobileRoutes.pg93}");
}),

PageButtonWidget(
page: 92,
onPressed: () {
context.push("/${MobileRoutes.pg92}");

}),

_RangeHeader(text: "101 -150"),
Expand Down
3 changes: 2 additions & 1 deletion lib/src/mobile_ui/routes/routes.dart
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,10 @@ class MobileRoutes {
static const pg88 = 'pg88';
static const pg90 = 'pg90';
static const pg89 = 'pg89';
static const pg93 = "pg93";
static const pg92 = "pg92";


/// 81 - 100

/// 111 - 120
Expand All @@ -111,5 +113,4 @@ class MobileRoutes {

/// 161 - 180
static const pg175 = "pg175";

}
5 changes: 5 additions & 0 deletions lib/src/navigation/new_routes.dart
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ import 'package:flutter_ui_kit_obkm/src/mobile_ui/88/page_88.dart';
import 'package:flutter_ui_kit_obkm/src/mobile_ui/89/page_89.dart';
import 'package:flutter_ui_kit_obkm/src/mobile_ui/9/page9.dart';
import 'package:flutter_ui_kit_obkm/src/mobile_ui/90/page_90.dart';
import 'package:flutter_ui_kit_obkm/src/mobile_ui/93/page_93.dart';
import 'package:flutter_ui_kit_obkm/src/mobile_ui/92/page_92.dart';
import 'package:flutter_ui_kit_obkm/src/mobile_ui/root/root.dart';
import 'package:flutter_ui_kit_obkm/src/mobile_ui/routes/routes.dart';
Expand Down Expand Up @@ -556,6 +557,10 @@ var newRoutesConfig = GoRouter(
builder: (BuildContext context, GoRouterState state) => Page89(),
),

GoRoute(
path: MobileRoutes.pg93,
builder: (BuildContext context, GoRouterState state) => Page93(),
),
GoRoute(
path: MobileRoutes.pg92,
builder: (BuildContext context, GoRouterState state) => Page92(),
Expand Down