Commit 98afc6e7 authored by Administrator's avatar Administrator

color scheme work

parent 11f38083
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_secure_storage","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_secure_storage-3.3.3/","dependencies":[]},{"name":"path_provider","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.8/","dependencies":[]},{"name":"shared_preferences","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.7+2/","dependencies":[]},{"name":"sqflite","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.0+1/","dependencies":[]},{"name":"uni_links","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/uni_links-0.4.0/","dependencies":[]},{"name":"url_launcher","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.4.7/","dependencies":[]}],"android":[{"name":"flutter_secure_storage","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_secure_storage-3.3.3/","dependencies":[]},{"name":"path_provider","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.8/","dependencies":[]},{"name":"shared_preferences","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.7+2/","dependencies":[]},{"name":"sqflite","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.0+1/","dependencies":[]},{"name":"uni_links","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/uni_links-0.4.0/","dependencies":[]},{"name":"url_launcher","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.4.7/","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-0.0.4+2/","dependencies":[]},{"name":"shared_preferences_macos","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+8/","dependencies":[]},{"name":"sqflite","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.0+1/","dependencies":[]},{"name":"url_launcher_macos","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_macos-0.0.1+5/","dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"shared_preferences_web","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+5/","dependencies":[]},{"name":"url_launcher_web","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_web-0.1.1+5/","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_secure_storage","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos"]},{"name":"path_provider_macos","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]},{"name":"uni_links","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_macos"]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]}],"date_created":"2020-05-15 09:44:10.542642","version":"1.17.1"} {"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_secure_storage","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_secure_storage-3.3.3/","dependencies":[]},{"name":"path_provider","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.8/","dependencies":[]},{"name":"shared_preferences","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.7+2/","dependencies":[]},{"name":"sqflite","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.0+1/","dependencies":[]},{"name":"uni_links","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/uni_links-0.4.0/","dependencies":[]},{"name":"url_launcher","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.4.7/","dependencies":[]}],"android":[{"name":"flutter_secure_storage","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_secure_storage-3.3.3/","dependencies":[]},{"name":"path_provider","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.8/","dependencies":[]},{"name":"shared_preferences","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.7+2/","dependencies":[]},{"name":"sqflite","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.0+1/","dependencies":[]},{"name":"uni_links","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/uni_links-0.4.0/","dependencies":[]},{"name":"url_launcher","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.4.7/","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-0.0.4+2/","dependencies":[]},{"name":"shared_preferences_macos","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+8/","dependencies":[]},{"name":"sqflite","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.0+1/","dependencies":[]},{"name":"url_launcher_macos","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_macos-0.0.1+5/","dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"shared_preferences_web","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+5/","dependencies":[]},{"name":"url_launcher_web","path":"/home/stefan/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_web-0.1.1+5/","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_secure_storage","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos"]},{"name":"path_provider_macos","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]},{"name":"uni_links","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_macos"]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]}],"date_created":"2020-05-15 10:00:46.952193","version":"1.17.1"}
\ No newline at end of file \ No newline at end of file
...@@ -211,6 +211,16 @@ class ShowActivityScreen extends StatelessWidget { ...@@ -211,6 +211,16 @@ class ShowActivityScreen extends StatelessWidget {
athlete: athlete, athlete: athlete,
), ),
), ),
navigationButton(
title: "Tags",
color: MyColor.tag,
icon: MyIcon.tag,
context: context,
nextWidget: ActivityMetadataWidget(
activity: activity,
athlete: athlete,
),
),
], ],
); );
}), }),
...@@ -224,11 +234,13 @@ class ShowActivityScreen extends StatelessWidget { ...@@ -224,11 +234,13 @@ class ShowActivityScreen extends StatelessWidget {
@required String title, @required String title,
@required Color color, @required Color color,
Color backgroundColor, Color backgroundColor,
Color textColor,
}) { }) {
return RaisedButton.icon( return RaisedButton.icon(
color: color ?? MyColor.primary, color: color,
textColor: textColor ?? MyColor.black, textColor:
(ThemeData.estimateBrightnessForColor(color) == Brightness.light)
? MyColor.black
: MyColor.white,
icon: icon, icon: icon,
label: Text(title), label: Text(title),
onPressed: () => Navigator.push( onPressed: () => Navigator.push(
......
...@@ -147,7 +147,7 @@ class _ShowAthleteScreenState extends State<ShowAthleteScreen> { ...@@ -147,7 +147,7 @@ class _ShowAthleteScreenState extends State<ShowAthleteScreen> {
AthleteHeartRateZoneSchemaWidget(athlete: widget.athlete), AthleteHeartRateZoneSchemaWidget(athlete: widget.athlete),
), ),
navigationButton( navigationButton(
color: MyColor.settings, color: MyColor.tag,
title: "Tags", title: "Tags",
icon: MyIcon.tag, icon: MyIcon.tag,
nextWidget: AthleteTagGroupWidget(athlete: widget.athlete), nextWidget: AthleteTagGroupWidget(athlete: widget.athlete),
...@@ -183,11 +183,13 @@ class _ShowAthleteScreenState extends State<ShowAthleteScreen> { ...@@ -183,11 +183,13 @@ class _ShowAthleteScreenState extends State<ShowAthleteScreen> {
@required String title, @required String title,
@required Color color, @required Color color,
Color backgroundColor, Color backgroundColor,
Color textColor,
}) { }) {
return RaisedButton.icon( return RaisedButton.icon(
color: color ?? MyColor.primary, color: color ?? MyColor.primary,
textColor: textColor ?? MyColor.black, textColor:
(ThemeData.estimateBrightnessForColor(color) == Brightness.light)
? MyColor.black
: MyColor.white,
icon: icon, icon: icon,
label: Text(title), label: Text(title),
onPressed: () => Navigator.push( onPressed: () => Navigator.push(
......
...@@ -138,11 +138,13 @@ class ShowLapScreen extends StatelessWidget { ...@@ -138,11 +138,13 @@ class ShowLapScreen extends StatelessWidget {
@required Widget icon, @required Widget icon,
@required String title, @required String title,
@required Color color, @required Color color,
Color textColor,
}) { }) {
return RaisedButton.icon( return RaisedButton.icon(
color: color ?? MyColor.primary, color: color ?? MyColor.primary,
textColor: textColor ?? MyColor.black, textColor:
(ThemeData.estimateBrightnessForColor(color) == Brightness.light)
? MyColor.black
: MyColor.white,
icon: icon, icon: icon,
label: Text(title), label: Text(title),
onPressed: () => Navigator.push( onPressed: () => Navigator.push(
......
...@@ -61,4 +61,5 @@ class MyColor { ...@@ -61,4 +61,5 @@ class MyColor {
static Color athlete = brightGoldenYellow; static Color athlete = brightGoldenYellow;
static Color activity = aquaAccent; static Color activity = aquaAccent;
static Color lap = grassAccent; static Color lap = grassAccent;
static Color tag = lavender;
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment