Skip to content

#Issue/33 #34

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

Open
AlvaroVasconcelos wants to merge 4 commits into
base: master
Choose a base branch
from
Open

#Issue/33 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2dfb3e1
Refatorando responsividade e pequenos ajustes.
AlvaroVasconcelos Jun 6, 2019
d81a04b
ADD ANIMAÇÕES E MELHORANDO RESPONSIVIDADE
AlvaroVasconcelos Jun 6, 2019
2820bee
Fix mobile responsive & Clean up
AlvaroVasconcelos Jun 8, 2019
29bf3ce
minimal fixs
AlvaroVasconcelos Jun 8, 2019
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
1 change: 0 additions & 1 deletion build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# See https://github.com/dart-lang/build/tree/master/build_web_compilers#configuration
targets:
$default:
builders:
Expand Down
161 changes: 120 additions & 41 deletions lib/screens/about/about_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import 'package:animated_card/animated_card.dart';
import 'package:flutter_web/cupertino.dart';
import 'package:flutter_web/material.dart';
import 'package:flutter_web/widgets.dart';
import 'package:flutterando_web/shared/model/about_model.dart';
import 'package:flutterando_web/shared/widgets/about_card/about_card.dart';

class AboutPage extends StatefulWidget {
Expand All @@ -9,6 +12,20 @@ class AboutPage extends StatefulWidget {
}

class _AboutPageState extends State<AboutPage> {
List<AboutModel> aboutModel = <AboutModel>[
AboutModel(
title: 'test 1',
description: 'Testando descrinção',
image: 'icons/user.png'),
AboutModel(
title: 'test 1',
description: 'Testando descrinção',
image: 'icons/user.png'),
AboutModel(
title: 'test 1',
description: 'Testando descrinção',
image: 'icons/user.png'),
];
@override
Widget build(BuildContext context) {
var size = MediaQuery.of(context).size;
Expand All @@ -24,52 +41,114 @@ class _AboutPageState extends State<AboutPage> {
Color.fromRGBO(85, 200, 245, 1),
]),
),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: <Widget>[
Text(
'Title',
style: TextStyle(color: Colors.white, fontSize: size.width * .05),
),
Container(
width: size.width * .3,
child: Text(
'''SubTitle a,sdnasdkjnaskdjnaskdjnasldadk asdas das d sadmas dasmd saldasdasd adasd sad sakdj sakjds akdjs adjas dlsakdas md sadmasdasldasjdlakwqwea lsd sads ad sa ''',
style: TextStyle(
color: Colors.white,
fontSize: size.width * .01,
),
child: LayoutBuilder(builder: (context, boxConstraints) {
if (boxConstraints.maxWidth < 720) {
return Container(
child: Column(
children: <Widget>[
SizedBox(height: 20),
Text(
'Title',
style: TextStyle(color: Colors.white, fontSize: 35),
),
SizedBox(height: 10),
Container(
padding: EdgeInsets.all(10),
width: size.width * .5,
child: Text(
'''SubTitle a,sdnasdkjnaskdjnaskdjnasldadk asdas das d sadmas dasmd saldasdasd adasd sad sakdj sakjds akdjs adjas dlsakdas md sadmasdasldasjdlakwqwea lsd sads ad sa ''',
style: TextStyle(
color: Colors.white,
fontSize: 14,
),
),
),
Expanded(
child: PageView.builder(
controller: PageController(
viewportFraction: 0.85,
initialPage: 1,
keepPage: true,
),
itemCount: aboutModel.length,
itemBuilder: (context, index) {
return AboutCard(
title: aboutModel[index].title,
subTitle: aboutModel[index].description,
image: aboutModel[index].image,
);
},
),
),
SizedBox(height: 10)
],
),
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
);
} else {
return Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: <Widget>[
Spacer(flex: 2),
AboutCard(
title: 'Testando Title',
subTitle:
'ALSKMD ALKSMDALK SDMALS DMAL SKD MAS LKDMA L SDKMA SLKD MASLKDMASL KDMASLKDMAL SDMALSKD MALSDM AS LDMASLKDMASLKDMAS LDKMSALDKAM SLD KASMD',
image: 'icons/users.png',
),
Spacer(flex: 1),
AboutCard(
title: 'Testando Title',
subTitle:
'ALSKMD ALKSMDALK SDMALS DMAL SKD MAS LKDMA L SDKMA SLKD MASLKDMASL KDMASLKDMAL SDMALSKD MALSDM AS LDMASLKDMASLKDMAS LDKMSALDKAM SLD KASMD',
image: 'icons/users.png',
Text(
'Title',
style:
TextStyle(color: Colors.white, fontSize: size.width * .05),
),
Spacer(flex: 1),
AboutCard(
title: 'Testando Title',
subTitle:
'ALSKMD ALKSMDALK SDMALS DMAL SKD MAS LKDMA L SDKMA SLKD MASLKDMASL KDMASLKDMAL SDMALSKD MALSDM AS LDMASLKDMASLKDMAS LDKMSALDKAM SLD KASMD',
image: 'icons/users.png',
Container(
width: size.width * .4,
child: Text(
'''SubTitle a,sdnasdkjnaskdjnaskdjnasldadk asdas das d sadmas dasmd saldasdasd adasd sad sakdj sakjds akdjs adjas dlsakdas md sadmasdasldasjdlakwqwea lsd sads ad sa ''',
style: TextStyle(
color: Colors.white,
fontSize: size.width * .01,
),
),
),
Spacer(flex: 2),
Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: <Widget>[
Spacer(flex: 2),
AnimatedCard(
initDelay: Duration(seconds: 1),
direction: AnimatedCardDirection.left,
duration: Duration(seconds: 1),
child: AboutCard(
title: 'Testando Title',
subTitle:
'ALSKMD ALKSMDALK SDMALS DMAL SKD MAS LKDMA L SDKMA SLKD MASLKDMASL KDMASLKDMAL SDMALSKD MALSDM AS LDMASLKDMASLKDMAS LDKMSALDKAM SLD KASMD',
image: 'icons/user.png',
),
),
Spacer(flex: 1),
AnimatedCard(
initDelay: Duration(milliseconds: 500),
direction: AnimatedCardDirection.bottom,
duration: Duration(seconds: 1),
child: AboutCard(
title: 'Testando Title',
subTitle:
'ALSKMD ALKSMDALK SDMALS DMAL SKD MAS LKDMA L SDKMA SLKD MASLKDMASL KDMASLKDMAL SDMALSKD MALSDM AS LDMASLKDMASLKDMAS LDKMSALDKAM SLD KASMD',
image: 'icons/user.png',
),
),
Spacer(flex: 1),
AnimatedCard(
initDelay: Duration(seconds: 1),
direction: AnimatedCardDirection.right,
duration: Duration(seconds: 1),
child: AboutCard(
title: 'Testando Title',
subTitle:
'ALSKMD ALKSMDALK SDMALS DMAL SKD MAS LKDMA L SDKMA SLKD MASLKDMASL KDMASLKDMAL SDMALSKD MALSDM AS LDMASLKDMASLKDMAS LDKMSALDKAM SLD KASMD',
image: 'icons/user.png',
),
),
Spacer(flex: 2),
],
)
],
)
],
),
);
}
}),
);
}
}
126 changes: 68 additions & 58 deletions lib/screens/contact/components/Contact_Container.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,66 +14,76 @@ class _ContactContainerState extends State<ContactContainer> {
Widget build(BuildContext context) {
final Size size = MediaQuery.of(context).size;

return Container(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
ContactTextTile(
title: Text(
"Contact with us",
style: Theme.of(context)
.textTheme
.title
.copyWith(fontWeight: FontWeight.bold),
),
subtitle: Text(
"aaaaaaaaaa aaaaaaaaaaaaa aaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaa"
"aaaaaaaaaa aaaaaaaaaaaaa aaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaa"
"aaaaaaaaaa aaaaaaaaaaaaa aaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaa",
style: Theme.of(context)
.textTheme
.body1
.copyWith(color: Colors.grey),
),
),
ContactTextTile(
padding: const EdgeInsets.only(bottom: 8),
margin: const EdgeInsets.only(top: 15, bottom: 5),
title: Text(
"Head Office",
style: TextStyle(
fontSize: size.width * 0.012,
fontWeight: FontWeight.bold,
return LayoutBuilder(builder: (context, boxConstraints) {
if (boxConstraints.maxWidth >= 720) {
return Container(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
ContactTextTile(
title: Text(
"Contact with us",
style: Theme.of(context)
.textTheme
.title
.copyWith(fontWeight: FontWeight.bold),
),
subtitle: Text(
"aaaaaaaaaa aaaaaaaaaaaaa aaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaa",
style: Theme.of(context)
.textTheme
.body1
.copyWith(color: Colors.grey),
),
),
),
subtitle: Text(
"aaaaaaaaaa aaaaaaaaaaaaa aaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaa"
"aaaaaaaaaa aaaaaaaaaaaaa aaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaa"
"aaaaaaaaaa aaaaaaaaaaaaa aaaaaaaaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaa",
style:
TextStyle(color: Colors.grey, fontWeight: FontWeight.normal),
),
),
ContactTile(
icon: Icon(Icons.phone),
text: Text(
"Phone: +61 2 8376 6284",
softWrap: true,
style:
TextStyle(color: Colors.grey, fontWeight: FontWeight.normal),
),
ContactTile(
icon: Icon(Icons.phone),
text: Text(
"Phone: +61 2 8376 6284",
softWrap: true,
style: TextStyle(
color: Colors.grey, fontWeight: FontWeight.normal),
),
),
ContactTile(
icon: Icon(Icons.email),
text: Text(
"Email: [email protected]",
softWrap: true,
style: TextStyle(
color: Colors.grey, fontWeight: FontWeight.normal),
),
),
],
),
ContactTile(
icon: Icon(Icons.email),
text: Text(
"Email: [email protected]",
softWrap: true,
style:
TextStyle(color: Colors.grey, fontWeight: FontWeight.normal),
),
);
} else {
return Container(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
ContactTile(
icon: Icon(Icons.phone),
text: Text(
"Phone: +61 2 8376 6284",
softWrap: true,
style: TextStyle(
color: Colors.grey, fontWeight: FontWeight.normal),
),
),
ContactTile(
icon: Icon(Icons.email),
text: Text(
"Email: [email protected]",
softWrap: true,
style: TextStyle(
color: Colors.grey, fontWeight: FontWeight.normal),
),
),
],
),
],
),
);
);
}
});
}
}
Loading