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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mobile30 #36

Merged
merged 3 commits into from Jun 13, 2022
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -59,7 +59,7 @@ flutter build apk

| Page 29 | Page 30 | Page 31 | Page 32 |
| ------------- | ------------- | ------------- | ------------- |
| <img src="art/screenshots/page_29.png" width="200"/> | | | <img src="art/screenshots/page_32.png" width="200"/> |
| <img src="art/screenshots/page_29.png" width="200"/> |<img src="art/screenshots/page_30.png" width="200"/> | | <img src="art/screenshots/page_32.png" width="200"/> |

| Page 33 | Page 34 | Page 35 | Page 36 |
| ------------- | ------------- | ------------- | ------------- |
Expand Down
Binary file added art/screenshots/page_30.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/png/29/add.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/png/29/chinese.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/png/29/delivery.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/png/29/food.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/png/29/food2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/png/29/fries.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/png/29/more.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/png/29/sushi.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/png/30/banana.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions lib/src/mobile_ui/12/page_12.dart
Expand Up @@ -17,6 +17,18 @@ class _Page12State extends State<Page12> {
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: const Color(0xFFFCFCFC),
appBar: AppBar(
centerTitle: true,
backgroundColor: const Color(0xFFFCFCFC),
title: Text(
'SMART ROOM',
style: TextStyle(
fontWeight: FontWeight.w900,
color: Colors.black,
),
),
elevation: 0.0,
),
body: SafeArea(
child: Padding(
padding: EdgeInsets.fromLTRB(23.w, 30.h, 23.w, 0),
Expand Down Expand Up @@ -61,6 +73,9 @@ class _Page12State extends State<Page12> {
CircleAvatar(
radius: 31.w,
backgroundColor: const Color(0xFFC4C4C4),
backgroundImage: NetworkImage(
'https://source.unsplash.com/random/education',
),
),
Positioned(
right: 2.w,
Expand Down
33 changes: 18 additions & 15 deletions lib/src/mobile_ui/29/page_29.dart
Expand Up @@ -174,22 +174,25 @@ class _Page29State extends State<Page29> {
bottomNavigationBar: _bottomNavBar(),
floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked,
extendBody: true,
floatingActionButton: Container(
width: 76.w,
height: 76.w,
decoration: BoxDecoration(
color: Color(0xffF4F4F4).withOpacity(1.0),
borderRadius: BorderRadius.circular(76.w),
boxShadow: [
BoxShadow(
color: Colors.white.withOpacity(1.0),
spreadRadius: 2,
blurRadius: 1,
offset: const Offset(1, 1),
),
],
floatingActionButton: InkWell(
onTap: () => Navigator.pop(context),
child: Container(
width: 76.w,
height: 76.w,
decoration: BoxDecoration(
color: Color(0xffF4F4F4).withOpacity(1.0),
borderRadius: BorderRadius.circular(76.w),
boxShadow: [
BoxShadow(
color: Colors.white.withOpacity(1.0),
spreadRadius: 2,
blurRadius: 1,
offset: const Offset(1, 1),
),
],
),
child: Center(child: Icon(Icons.add)),
),
child: Center(child: Icon(Icons.add)),
),
);
}
Expand Down