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 54 #47

Merged
merged 2 commits into from
Jun 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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ flutter build apk
| | | <img src="art/screenshots/page_51.png" width="200"/> | <img src="art/screenshots/page_52.png" width="200"/> |

| Page 53 | Page 54 | Page 55 | Page 56 |
| ------------- | ------------- | ------------- | ------------- |
| | | | |
| ------------- |------------------------------------------------------| ------------- | ------------- |
| | <img src="art/screenshots/page_54.png" width="200"/> | | |

| Page 57 | Page 58 | Page 59 | Page 60 |
| ------------- | ------------- | ------------- | ------------- |
Expand Down
Binary file added art/screenshots/page_54.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
81 changes: 81 additions & 0 deletions lib/src/mobile_ui/54/page_54.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:go_router/go_router.dart';

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

@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Colors.white,
body: SafeArea(
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
GestureDetector(
onTap: () {
context.pop();
},
child: Container(
width: 146.w,
height: 146.w,
margin: EdgeInsets.only(bottom: 29.h, top: 117.h),
decoration: BoxDecoration(color: Color(0xffC4C4C4), shape: BoxShape.circle),
),
),
Center(
child: Container(
width: 146.w,
height: 20.h,
margin: EdgeInsets.only(bottom: 94.h),
decoration: BoxDecoration(
color: Color(0xffC4C4C4),
borderRadius: BorderRadius.circular(50.r),
shape: BoxShape.rectangle),
),
),
Center(
child: Container(
width: 342.w,
height: 51.h,
margin: EdgeInsets.only(bottom: 20.h),
decoration: BoxDecoration(
color: Color(0xffC4C4C4),
borderRadius: BorderRadius.circular(50.r),
shape: BoxShape.rectangle),
),
),
Center(
child: Container(
width: 342.w,
height: 51.h,
decoration: BoxDecoration(
color: Color(0xffC4C4C4),
borderRadius: BorderRadius.circular(50.r),
shape: BoxShape.rectangle),
),
),
Spacer(),
GestureDetector(
onTap: () {
context.pop();
},
child: Center(
child: Container(
width: 342.w,
height: 51.h,
margin: EdgeInsets.only(bottom: 20.h),
decoration: BoxDecoration(
color: Color(0xffA8A8A8),
borderRadius: BorderRadius.circular(50.r),
shape: BoxShape.rectangle),
),
),
),
],
),
),
);
}
}
7 changes: 7 additions & 0 deletions lib/src/mobile_ui/root/root.dart
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,13 @@ class RootWidget extends StatelessWidget {
},
),

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

_RangeHeader(text: "101 -150"),

_RangeHeader(text: "151 -160"),
Expand Down
8 changes: 8 additions & 0 deletions lib/src/mobile_ui/routes/routes.dart
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,14 @@ class MobileRoutes {
static const pg51 = "pg51";
static const pg52 = "pg52";

static const pg54 = "pg54";
static const pg55 = "pg55";
static const pg56 = "pg56";
static const pg57 = "pg57";
static const pg58 = "pg58";
static const pg59 = "pg59";
static const pg60 = "pg60";

/// 61 - 80

/// 81 - 100
Expand Down
29 changes: 29 additions & 0 deletions lib/src/navigation/new_routes.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import 'package:flutter_ui_kit_obkm/src/mobile_ui/35/page_35.dart';
import 'package:flutter_ui_kit_obkm/src/mobile_ui/4/page4.dart';
import 'package:flutter_ui_kit_obkm/src/mobile_ui/49/page_49.dart';
import 'package:flutter_ui_kit_obkm/src/mobile_ui/5/page5.dart';
import 'package:flutter_ui_kit_obkm/src/mobile_ui/54/page_54.dart';
import 'package:flutter_ui_kit_obkm/src/mobile_ui/6/page6.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';
Expand Down Expand Up @@ -252,6 +253,34 @@ var newRoutesConfig = GoRouter(
path: MobileRoutes.pg52,
builder: (BuildContext context, GoRouterState state) => const Page52(),
),
GoRoute(
path: MobileRoutes.pg54,
builder: (BuildContext context, GoRouterState state) => const Page54(),
),
GoRoute(
path: MobileRoutes.pg55,
builder: (BuildContext context, GoRouterState state) => const SizedBox(),
),
GoRoute(
path: MobileRoutes.pg56,
builder: (BuildContext context, GoRouterState state) => const SizedBox(),
),
GoRoute(
path: MobileRoutes.pg57,
builder: (BuildContext context, GoRouterState state) => const SizedBox(),
),
GoRoute(
path: MobileRoutes.pg58,
builder: (BuildContext context, GoRouterState state) => const SizedBox(),
),
GoRoute(
path: MobileRoutes.pg59,
builder: (BuildContext context, GoRouterState state) => const SizedBox(),
),
GoRoute(
path: MobileRoutes.pg60,
builder: (BuildContext context, GoRouterState state) => const SizedBox(),
),

/// 141 - 160
GoRoute(
Expand Down