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 67 #60

Merged
merged 36 commits into from
Oct 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 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
a3f0165
implement page 65
easy-Coder Oct 12, 2023
9a022ef
add page to route
easy-Coder Oct 12, 2023
7bc30fb
add screenshot
easy-Coder Oct 12, 2023
84ff47e
update README
easy-Coder Oct 12, 2023
2828604
Merge branch 'main' into feature/m65
easy-Coder Oct 12, 2023
d4d7f89
Merge branch 'main' into feature/m62
easy-Coder Oct 12, 2023
6fd4068
Merge branch 'feature/m62' into feature/m65
easy-Coder Oct 12, 2023
69e1794
Merge branch 'main' into feature/m65
easy-Coder Oct 12, 2023
77f059c
implemented page 63
easy-Coder Oct 12, 2023
cbc676f
add page to route
easy-Coder Oct 12, 2023
6ef91d8
add screenshot
easy-Coder Oct 12, 2023
63b97fc
update README
easy-Coder Oct 12, 2023
76c26bd
add assets
easy-Coder Oct 13, 2023
f79c910
implement page 64
easy-Coder Oct 13, 2023
2934a73
add page to route
easy-Coder Oct 13, 2023
73aa8d2
remove comment
easy-Coder Oct 13, 2023
f2921dc
implemented page 66
easy-Coder Oct 14, 2023
1d84a66
add screen 66 to route
easy-Coder Oct 14, 2023
dc9cfa5
add screenshot
easy-Coder Oct 14, 2023
693e224
update README
easy-Coder Oct 14, 2023
e9f4e48
implement page 67
easy-Coder Oct 15, 2023
52c967e
add screen to route
easy-Coder Oct 15, 2023
b5ec0c8
add screenshot
easy-Coder Oct 15, 2023
6a069b0
update README
easy-Coder Oct 15, 2023
ab06feb
Merge branch 'main' into feature/m67
easy-Coder Oct 18, 2023
e826bc7
Merge branch 'main' into feature/m67
easy-Coder Oct 21, 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
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,9 @@ flutter build apk
| ---------------------------------------------------- | ---------------------------------------------------- | ---------------------------------------------------- | ------- |
| <img src="art/screenshots/page_61.png" width="200"/> | <img src="art/screenshots/page_62.png" width="200"/> | <img src="art/screenshots/page_63.png" width="200"/> | |

| Page 65 | Page 66 | Page 67 | Page 68 |
| ---------------------------------------------------- | ------- | ------- | ------- |
| <img src="art/screenshots/page_65.png" width="200"/> | <img src="art/screenshots/page_66.png" width="200"/> | | |

| Page 65 | Page 66 | Page 67 | Page 68 |
| ---------------------------------------------------- | ---------------------------------------------------- | ---------------------------------------------------- | ------- |
| <img src="art/screenshots/page_65.png" width="200"/> | <img src="art/screenshots/page_66.png" width="200"/> | <img src="art/screenshots/page_67.png" width="200"/> | |

| Page 69 | Page 70 | Page 71 | Page 72 |
| ------- | ------- | ------- | ------- |
Expand Down
Binary file added art/screenshots/page_67.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
87 changes: 87 additions & 0 deletions lib/src/mobile_ui/67/page_67.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
import 'package:flutter/material.dart';

class Page67 extends StatefulWidget {
const Page67({super.key});

@override
State<Page67> createState() => _Page67State();
}

class _Page67State extends State<Page67> {
final options = ["Male", "Female", "Non-binary", "Rather not say"];

String currentOption = '';

@override
Widget build(BuildContext context) {
return Scaffold(
body: SafeArea(
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 24, vertical: 26),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LinearProgressIndicator(
value: 0.4,
backgroundColor: Color(0xffD0D0D0),
color: Colors.black,
),
SizedBox(
height: 40,
),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'What is your gender?',
style: TextStyle(
color: Colors.black,
fontSize: 24,
fontFamily: 'Work Sans',
fontWeight: FontWeight.w600,
),
),
Text(
'This helps us personalize your journey to you. ',
style: TextStyle(
color: Colors.black,
fontSize: 14,
fontFamily: 'Work Sans',
fontWeight: FontWeight.w400,
),
)
],
),
SizedBox(
height: 67,
),
...List.generate(
options.length,
(index) => RadioListTile(
value: options[index],
groupValue: currentOption,
onChanged: (value) {
setState(() {
currentOption = value!;
});
},
contentPadding: EdgeInsets.symmetric(horizontal: 0),
title: Text(
options[index],
style: TextStyle(
color: Colors.black,
fontSize: 16,
fontFamily: 'Work Sans',
fontWeight: FontWeight.w600,
),
),
activeColor: Colors.black,
),
),
],
),
),
),
);
}
}
5 changes: 5 additions & 0 deletions lib/src/mobile_ui/root/root.dart
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,11 @@ class RootWidget extends StatelessWidget {
onPressed: () {
context.push("/${MobileRoutes.pg66}");
}),
PageButtonWidget(
page: 67,
onPressed: () {
context.push("/${MobileRoutes.pg67}");
}),

_RangeHeader(text: "101 -150"),

Expand Down
2 changes: 2 additions & 0 deletions lib/src/mobile_ui/routes/routes.dart
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ class MobileRoutes {
static const pg63 = "pg63";
static const pg64 = "pg64";
static const pg66 = "pg66";
static const pg67 = "pg67";

/// 81 - 100

Expand All @@ -87,4 +88,5 @@ class MobileRoutes {

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

}
7 changes: 3 additions & 4 deletions lib/src/navigation/new_routes.dart
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import 'package:flutter_ui_kit_obkm/src/mobile_ui/63/page_63.dart';
import 'package:flutter_ui_kit_obkm/src/mobile_ui/64/page_64.dart';
import 'package:flutter_ui_kit_obkm/src/mobile_ui/65/page_65.dart';
import 'package:flutter_ui_kit_obkm/src/mobile_ui/66/page_66.dart';

import 'package:flutter_ui_kit_obkm/src/mobile_ui/67/page_67.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 @@ -425,11 +425,10 @@ var newRoutesConfig = GoRouter(
builder: (BuildContext context, GoRouterState state) =>
const Page66(),
),

GoRoute(
path: MobileRoutes.pg65,
path: MobileRoutes.pg67,
builder: (BuildContext context, GoRouterState state) =>
const Page65(),
const Page67(),
),


Expand Down