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

Mobile Screen 94 #76

Merged
merged 5 commits into from
Nov 8, 2023
Merged

Mobile Screen 94 #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9a615dd
implement screen 94
easy-Coder Nov 3, 2023
a3cbd6f
add screen to page
easy-Coder Nov 3, 2023
67a2522
add screenshot
easy-Coder Nov 3, 2023
69a680a
update README
easy-Coder Nov 3, 2023
2efda6f
Merge branch 'main' into feature/m94
easy-Coder Nov 4, 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
8 changes: 5 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,12 @@ 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 |
| ---------------------------------------------------- | ------- | ------- | ------- |
| <img src="art/screenshots/page_93.png" width="200"/> | | | |

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


| Page 97 | Page 98 | Page 99 | Page 100 |
| ------- | ------- | ------- | -------- |
| | | | |
Expand Down
Binary file added art/screenshots/page_94.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.
229 changes: 229 additions & 0 deletions lib/src/mobile_ui/94/page_94.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,229 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';

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

@override
Widget build(BuildContext context) {
return DefaultTabController(
length: 5,
child: Scaffold(
appBar: AppBar(
backgroundColor: Colors.white,
foregroundColor: Colors.black,
centerTitle: false,
title: Text("Workouts"),
bottom: TabBar(
isScrollable: true,
indicatorColor: Colors.black,
labelColor: Colors.black,
tabs: [
Tab(
text: "For You",
),
Tab(
text: "Browse",
),
Tab(
text: "Expert Tips",
),
Tab(
text: "Collections",
),
Tab(
text: "Trainer",
),
],
),
),
body: ListView(
padding: EdgeInsets.symmetric(vertical: 31.h),
children: [
Padding(
padding: EdgeInsets.symmetric(horizontal: 13.w),
child: Text(
'Perfect For Home',
style: TextStyle(
color: Colors.black,
fontSize: 18,
fontFamily: 'Work Sans',
fontWeight: FontWeight.w500,
),
),
),
17.verticalSpace,
SizedBox(
height: 300.h,
child: ListView.builder(
itemCount: 2,
scrollDirection: Axis.horizontal,
itemBuilder: (context, index) => Container(
width: 220.w,
height: 300.h,
margin: EdgeInsets.only(
right: 13.w,
left: index == 0 ? 13.w : 0,
),
decoration: BoxDecoration(color: Color(0xFFE4E4E4)),
padding:
EdgeInsets.symmetric(vertical: 12.h, horizontal: 11.w),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Container(
width: 32.w,
height: 32.w,
decoration: ShapeDecoration(
color: Color(0xFF525252),
shape: OvalBorder(),
),
child: Icon(
Icons.bookmark_border,
color: Colors.white,
),
),
],
),
SizedBox(
child: Column(
children: [
Text(
'5-min bodyweight burn: core wake-up call',
style: TextStyle(
color: Colors.black,
fontSize: 14.sp,
fontFamily: 'Work Sans',
fontWeight: FontWeight.w400,
),
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'6 min - Beginner',
style: TextStyle(
color: Color(0xFFA8A8A8),
fontSize: 12.sp,
fontFamily: 'Work Sans',
fontWeight: FontWeight.w400,
),
),
Container(
width: 32.w,
height: 32.w,
decoration: ShapeDecoration(
color: Color(0xFF525252),
shape: OvalBorder(),
),
)
],
)
],
),
)
],
),
),
),
),
41.verticalSpace,
Padding(
padding: EdgeInsets.symmetric(horizontal: 13.w),
child: Text(
'New Workouts',
style: TextStyle(
color: Colors.black,
fontSize: 18,
fontFamily: 'Work Sans',
fontWeight: FontWeight.w500,
),
),
),
17.verticalSpace,
SizedBox(
height: 300.h,
child: ListView.builder(
itemCount: 2,
scrollDirection: Axis.horizontal,
itemBuilder: (context, index) => Container(
width: 220.w,
height: 300.h,
margin: EdgeInsets.only(
right: 13.w,
left: index == 0 ? 13.w : 0,
),
decoration: BoxDecoration(color: Color(0xFFE4E4E4)),
padding:
EdgeInsets.symmetric(vertical: 12.h, horizontal: 11.w),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Container(
width: 32.w,
height: 32.w,
decoration: ShapeDecoration(
color: Color(0xFF525252),
shape: OvalBorder(),
),
child: Icon(
Icons.bookmark_border,
color: Colors.white,
),
),
],
),
SizedBox(
child: Column(
children: [
Text(
'5-min bodyweight burn: core wake-up call',
style: TextStyle(
color: Colors.black,
fontSize: 14.sp,
fontFamily: 'Work Sans',
fontWeight: FontWeight.w400,
),
),
Row(
children: [
Text(
'6 min - Beginner',
style: TextStyle(
color: Color(0xFFA8A8A8),
fontSize: 12.sp,
fontFamily: 'Work Sans',
fontWeight: FontWeight.w400,
),
),
Container(
width: 32.w,
height: 32.w,
decoration: ShapeDecoration(
color: Color(0xFF525252),
shape: OvalBorder(),
),
)
],
)
],
),
)
],
),
),
),
),
],
),
drawer: Drawer(),
),
);
}
}
6 changes: 6 additions & 0 deletions lib/src/mobile_ui/root/root.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,12 @@ class RootWidget extends StatelessWidget {
onPressed: () {
context.push("/${MobileRoutes.pg90}");
}),

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


PageButtonWidget(
Expand Down
2 changes: 2 additions & 0 deletions lib/src/mobile_ui/routes/routes.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,12 @@ class MobileRoutes {
static const pg88 = 'pg88';
static const pg90 = 'pg90';
static const pg89 = 'pg89';
static const pg94 = 'pg94';
static const pg93 = "pg93";
static const pg92 = "pg92";



/// 81 - 100

/// 111 - 120
Expand Down
6 changes: 6 additions & 0 deletions lib/src/navigation/new_routes.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,10 @@ 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/94/page_94.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';
import 'package:go_router/go_router.dart';
Expand Down Expand Up @@ -557,6 +559,10 @@ var newRoutesConfig = GoRouter(
builder: (BuildContext context, GoRouterState state) => Page89(),
),

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