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 62 #55

Merged
merged 11 commits into from
Oct 12, 2023
Merged

Mobile screen 62 #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ed293f8
add screenshot to page 55, 56, 57, 58
easy-Coder Oct 10, 2023
bd1d15e
update README
easy-Coder Oct 10, 2023
b86bc48
implement screen 61
easy-Coder Oct 11, 2023
36a063e
add screen to route
easy-Coder Oct 11, 2023
3cf528e
add screenshot
easy-Coder Oct 11, 2023
7103357
update README
easy-Coder Oct 11, 2023
43289e8
implement page 62
easy-Coder Oct 11, 2023
861615d
add screen to route
easy-Coder Oct 11, 2023
9d37672
add screenshot
easy-Coder Oct 11, 2023
640fba0
update README
easy-Coder Oct 11, 2023
d4d7f89
Merge branch 'main' into feature/m62
easy-Coder Oct 12, 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
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ flutter build apk
| ---------------------------------------------------- | ---------------------------------------------------- | ---------------------------------------------------- | ---------------------------------------------------- |
| <img src="art/screenshots/page_57.png" width="200"/> | <img src="art/screenshots/page_58.png" width="200"/> | <img src="art/screenshots/page_59.png" width="200"/> | <img src="art/screenshots/page_60.png" width="200"/> |

| Page 61 | Page 62 | Page 63 | Page 64 |
| ---------------------------------------------------- | ------- | ------- | ------- |
| <img src="art/screenshots/page_60.png" width="200"/> | | | |
| Page 61 | Page 62 | Page 63 | Page 64 |
| ---------------------------------------------------- | ---------------------------------------------------- | ------- | ------- |
| <img src="art/screenshots/page_61.png" width="200"/> | <img src="art/screenshots/page_62.png" width="200"/> | | |

| Page 65 | Page 66 | Page 67 | Page 68 |
| ------- | ------- | ------- | ------- |
Expand Down
Binary file added art/screenshots/page_62.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.
211 changes: 211 additions & 0 deletions lib/src/mobile_ui/62/page_62.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,211 @@
import 'package:flutter/material.dart';

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

@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
backgroundColor: Colors.white,
foregroundColor: Colors.black,
centerTitle: false,
elevation: 0,
title: Container(
width: 122,
height: 15,
decoration: ShapeDecoration(
color: Color(0xFFA8A8A8),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(50),
),
),
),
actions: [
Container(
width: 30,
height: 30,
margin: EdgeInsets.only(
right: 24,
),
decoration: BoxDecoration(
color: Color(0xFFC4C4C4),
shape: BoxShape.circle,
),
),
],
),
body: Padding(
padding: EdgeInsets.symmetric(
horizontal: 8,
vertical: 12,
),
child: Column(
children: [
Container(
height: 60,
decoration: ShapeDecoration(
color: Color(0xFFD0D0D0),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(50),
),
),
child: TextField(
decoration: InputDecoration(
border: OutlineInputBorder(
borderSide: BorderSide.none,
),
prefixIcon: Padding(
padding: EdgeInsets.symmetric(horizontal: 16),
child: Icon(Icons.search),
),
),
),
),
SizedBox(
height: 4,
),
Expanded(
child: GridView.builder(
padding: EdgeInsets.only(
top: 30,
),
itemCount: 4,
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2,
crossAxisSpacing: 43,
mainAxisSpacing: 22,
mainAxisExtent: 250,
),
itemBuilder: (context, index) => Container(
// width: 150,
// height: 248,
padding: EdgeInsets.symmetric(
horizontal: 15,
vertical: 23,
),
decoration: ShapeDecoration(
color: Color(0xFF525252),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(24),
),
),
child: Column(
children: [
Container(
width: 80,
height: 80,
decoration: BoxDecoration(
color: Color(0xFFC4C4C4),
shape: BoxShape.circle,
),
),
SizedBox(
height: 16,
),
Container(
// width: 120,
height: 15,
decoration: ShapeDecoration(
color: Color(0xFFA8A8A8),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(50),
),
),
),
SizedBox(
height: 16,
),
Row(
children: [
Container(
width: 30,
height: 30,
decoration: BoxDecoration(
color: Color(0xFFC4C4C4),
shape: BoxShape.circle,
),
),
SizedBox(
width: 8,
),
Expanded(
child: Container(
height: 15,
decoration: ShapeDecoration(
color: Color(0xFFA8A8A8),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(50),
),
),
),
),
],
),
SizedBox(
height: 16,
),
Row(
children: [
Container(
width: 30,
height: 30,
decoration: BoxDecoration(
color: Color(0xFFC4C4C4),
shape: BoxShape.circle,
),
),
SizedBox(
width: 8,
),
Expanded(
child: Container(
height: 15,
decoration: ShapeDecoration(
color: Color(0xFFA8A8A8),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(50),
),
),
),
),
],
),
],
),
),
),
),
],
),
),
bottomNavigationBar: Container(
// height: 81,
padding: EdgeInsets.symmetric(
horizontal: 28,
vertical: 24,
),
decoration: ShapeDecoration(
color: Color(0xFF525252),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(24)),
),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: List.generate(
4,
(index) => Container(
width: 40,
height: 40,
decoration: BoxDecoration(
color: Color(0xFFC4C4C4),
shape: BoxShape.circle,
),
),
),
),
),
);
}
}
23 changes: 15 additions & 8 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 @@ -352,7 +352,7 @@ class RootWidget extends StatelessWidget {
context.push("/${MobileRoutes.pg52}");
},
),

PageButtonWidget(
page: 53,
onPressed: () {
Expand Down Expand Up @@ -398,15 +398,22 @@ class RootWidget extends StatelessWidget {
context.push("/${MobileRoutes.pg59}");
},
),

PageButtonWidget(
page: 60,
onPressed: () {
context.push("/${MobileRoutes.pg60}");}),
page: 60,
onPressed: () {
context.push("/${MobileRoutes.pg60}");
}),
PageButtonWidget(
page: 61,
onPressed: () {
context.push("/${MobileRoutes.pg61}");}),
page: 61,
onPressed: () {
context.push("/${MobileRoutes.pg61}");
}),
PageButtonWidget(
page: 62,
onPressed: () {
context.push("/${MobileRoutes.pg62}");
}),

_RangeHeader(text: "101 -150"),

Expand Down
1 change: 1 addition & 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 @@ -70,6 +70,7 @@ class MobileRoutes {

/// 61 - 80
static const pg61 = "pg61";
static const pg62 = "pag62";

/// 81 - 100

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 @@ -42,6 +42,7 @@ import 'package:flutter_ui_kit_obkm/src/mobile_ui/59/page_59.dart';
import 'package:flutter_ui_kit_obkm/src/mobile_ui/6/page6.dart';
import 'package:flutter_ui_kit_obkm/src/mobile_ui/60/page_60.dart';
import 'package:flutter_ui_kit_obkm/src/mobile_ui/61/page_61.dart';
import 'package:flutter_ui_kit_obkm/src/mobile_ui/62/page_62.dart';
import 'package:flutter_ui_kit_obkm/src/mobile_ui/7/page7.dart';
import 'package:flutter_ui_kit_obkm/src/mobile_ui/8/page8.dart';
import 'package:flutter_ui_kit_obkm/src/mobile_ui/9/page9.dart';
Expand Down Expand Up @@ -393,6 +394,11 @@ var newRoutesConfig = GoRouter(
builder: (BuildContext context, GoRouterState state) =>
const Page61(),
),
GoRoute(
path: MobileRoutes.pg62,
builder: (BuildContext context, GoRouterState state) =>
const Page62(),
),

/// 141 - 160
GoRoute(
Expand Down