Skip to content

Commit

Permalink
Merge branch 'dev' into flutter
Browse files Browse the repository at this point in the history
  • Loading branch information
@urmilshroff
urmilshroff committed Jun 29, 2019
2 parents b526b3f + 27ce7ff commit be70aef
Show file tree
Hide file tree
Showing 5 changed files with 289 additions and 281 deletions.
27 changes: 14 additions & 13 deletions lib/main.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,19 @@ class MyApp extends StatelessWidget {
@override
Widget build(BuildContext context) {
return DynamicTheme(
defaultBrightness: Brightness.light,
data: (brightness) => new ThemeData(
primaryColor: MyColors.primaryColor,
accentColor: MyColors.accentColor,
brightness: brightness,
),
themedWidgetBuilder: (context, theme) {
return MaterialApp(
title: "Goalkeeper",
theme: theme,
home: GoalsPage(),
);
});
defaultBrightness: Brightness.light,
data: (brightness) => new ThemeData(
primaryColor: MyColors.primaryColor,
accentColor: MyColors.accentColor,
brightness: brightness,
),
themedWidgetBuilder: (context, theme) {
return MaterialApp(
title: "Goalkeeper",
theme: theme,
home: GoalsPage(),
);
},
);
}
}
334 changes: 169 additions & 165 deletions lib/pages/about_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,195 +14,199 @@ Widget buildAboutPage(BuildContext context) {
Padding(
padding: const EdgeInsets.all(10.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Container(
width: 75.0,
height: 75.0,
decoration: BoxDecoration(
shape: BoxShape.circle,
image: DecorationImage(
image: AssetImage("assets/urmil-vector.png")))),
SizedBox(
height: 10,
),
Center(
child: Text("</> by",
style: TextStyle(
color: invertColors(context),
fontWeight: FontWeight.w500)),
),
SizedBox(
height: 5,
),
Center(
child: Text("Urmil Shroff",
style: TextStyle(
color: invertColors(context),
fontWeight: FontWeight.w600,
fontSize: 20.0)),
),
]),
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Container(
width: 75.0,
height: 75.0,
decoration: BoxDecoration(
shape: BoxShape.circle,
image: DecorationImage(
image: AssetImage("assets/urmil-vector.png")))),
SizedBox(
height: 10,
),
Center(
child: Text("</> by",
style: TextStyle(
color: invertColors(context),
fontWeight: FontWeight.w500)),
),
SizedBox(
height: 5,
),
Center(
child: Text("Urmil Shroff",
style: TextStyle(
color: invertColors(context),
fontWeight: FontWeight.w600,
fontSize: 20.0)),
),
],
),
),
),
buildTile(
Padding(
padding: const EdgeInsets.all(10.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Center(
child: Text("Connect",
style: TextStyle(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Center(
child: Text("Connect",
style: TextStyle(
color: invertColors(context),
fontWeight: FontWeight.w500)),
),
SizedBox(
height: 5,
),
Center(
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
GestureDetector(
child: IconButton(
icon: Icon(EvaIcons.person),
color: invertColors(context),
fontWeight: FontWeight.w500)),
),
SizedBox(
height: 5,
),
Center(
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
GestureDetector(
child: IconButton(
icon: Icon(EvaIcons.person),
color: invertColors(context),
onPressed: () =>
launchURL('https://urmilshroff.tech/')),
),
GestureDetector(
child: IconButton(
icon: Icon(EvaIcons.twitter),
color: invertColors(context),
onPressed: () =>
launchURL('https://twitter.com/urmilshroff')),
),
GestureDetector(
child: IconButton(
icon: Icon(EvaIcons.github),
color: invertColors(context),
onPressed: () =>
launchURL('https://github.com/urmilshroff')),
),
],
),
onPressed: () =>
launchURL('https://urmilshroff.tech/')),
),
GestureDetector(
child: IconButton(
icon: Icon(EvaIcons.twitter),
color: invertColors(context),
onPressed: () =>
launchURL('https://twitter.com/urmilshroff')),
),
GestureDetector(
child: IconButton(
icon: Icon(EvaIcons.github),
color: invertColors(context),
onPressed: () =>
launchURL('https://github.com/urmilshroff')),
),
],
),
]),
),
],
),
),
),
buildTile(
Padding(
padding: const EdgeInsets.all(10.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Center(
child: Text("Support",
style: TextStyle(
color: invertColors(context),
fontWeight: FontWeight.w500)),
),
SizedBox(
height: 5,
),
Center(
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Container(
width: _width,
child: Column(
children: <Widget>[
Text(
"Like the app? Show your support by writing"
" a review on the Play Store, starring it on"
" GitHub and sharing it with your "
"friends!",
style: TextStyle(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Center(
child: Text("Support",
style: TextStyle(
color: invertColors(context),
fontWeight: FontWeight.w500)),
),
SizedBox(
height: 5,
),
Center(
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Container(
width: _width,
child: Column(
children: <Widget>[
Text(
"Like the app? Show your support by writing"
" a review on the Play Store, starring it on"
" GitHub and sharing it with your "
"friends!",
style: TextStyle(
color: invertColors(context),
fontSize: 16.0)),
Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
GestureDetector(
child: IconButton(
icon: Icon(EvaIcons.edit),
color: invertColors(context),
onPressed: () => launchURL(
'https://play.google.com/store/apps/details?id=tech.urmilshroff.goalkeeper')),
),
GestureDetector(
child: IconButton(
icon: Icon(EvaIcons.star),
color: invertColors(context),
fontSize: 16.0)),
Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
GestureDetector(
child: IconButton(
icon: Icon(EvaIcons.edit),
color: invertColors(context),
onPressed: () => launchURL(
'https://play.google.com/store/apps/details?id=tech.urmilshroff.goalkeeper')),
),
GestureDetector(
child: IconButton(
icon: Icon(EvaIcons.star),
color: invertColors(context),
onPressed: () => launchURL(
'https://github.com/urmilshroff/goalkeeper')),
),
],
)
],
),
)
],
),
onPressed: () => launchURL(
'https://github.com/urmilshroff/goalkeeper')),
),
],
)
],
),
)
],
),
]),
),
],
),
),
),
buildTile(
Padding(
padding: const EdgeInsets.all(10.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Center(
child: Text("Feedback",
style: TextStyle(
color: invertColors(context),
fontWeight: FontWeight.w500)),
),
SizedBox(
height: 5,
),
Center(
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Container(
width: _width,
child: Column(
children: <Widget>[
Text(
"Bugs found? Feature suggestions? Create a "
"new issue on GitHub to let me know, or"
" contribute by forking and sending a "
"PR!",
style: TextStyle(
color: invertColors(context),
fontSize: 16.0)),
GestureDetector(
child: IconButton(
icon: Icon(EvaIcons.github),
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Center(
child: Text("Feedback",
style: TextStyle(
color: invertColors(context),
fontWeight: FontWeight.w500)),
),
SizedBox(
height: 5,
),
Center(
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Container(
width: _width,
child: Column(
children: <Widget>[
Text(
"Bugs found? Feature suggestions? Create a "
"new issue on GitHub to let me know, or"
" contribute by forking and sending a "
"PR!",
style: TextStyle(
color: invertColors(context),
onPressed: () => launchURL(
'https://github.com/urmilshroff/goalkeeper')),
),
],
),
)
],
),
fontSize: 16.0)),
GestureDetector(
child: IconButton(
icon: Icon(EvaIcons.github),
color: invertColors(context),
onPressed: () => launchURL(
'https://github.com/urmilshroff/goalkeeper')),
),
],
),
)
],
),
]),
),
],
),
),
),
SizedBox(
Expand Down
Loading

0 comments on commit be70aef

Please sign in to comment.