From a8df7ed7538f010341022de44455cf0d1ca4d65b Mon Sep 17 00:00:00 2001 From: Supermjork Date: Tue, 26 Dec 2023 23:00:21 +0200 Subject: [PATCH] CHOO CHOO --- assets/images/choo.png | Bin 0 -> 3542 bytes lib/home_screen.dart | 27 +++++++++++-- lib/input_data.dart | 2 +- pubspec.lock | 88 +++++++++++++++++++++++++++++++++++++---- pubspec.yaml | 10 ++++- 5 files changed, 114 insertions(+), 13 deletions(-) create mode 100644 assets/images/choo.png diff --git a/assets/images/choo.png b/assets/images/choo.png new file mode 100644 index 0000000000000000000000000000000000000000..fce2733a68cb5961568fcf517f3058657fc415d2 GIT binary patch literal 3542 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 QlK=n!07*qoM6N<$g7VL*G5`Po literal 0 HcmV?d00001 diff --git a/lib/home_screen.dart b/lib/home_screen.dart index e688b93..72feed7 100644 --- a/lib/home_screen.dart +++ b/lib/home_screen.dart @@ -9,11 +9,30 @@ class HomeScreen extends StatelessWidget { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - title: const Text("Placeholder for Home Screen"), + title: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Image.asset('assets/images/choo.png', + fit: BoxFit.contain, + height: 64, + ), + const SizedBox(width: 10,), + const Text("WITL"), + ] + ), ), body: Column( - mainAxisAlignment: MainAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.center, children: [ + Row( + mainAxisAlignment: MainAxisAlignment.center, + children:[ + Text("We may not be able to tell you why.\nBut surely are able to predict when."), + ], + ), + + const SizedBox(height: 80), + InkWell( onTap:() { Navigator.push( @@ -26,7 +45,9 @@ class HomeScreen extends StatelessWidget { child: const Text("To Fetch Data") ), ), - const SizedBox(height: 20), + + const SizedBox(height: 30), + InkWell( onTap:() { Navigator.push( diff --git a/lib/input_data.dart b/lib/input_data.dart index 9b30783..ded0e39 100644 --- a/lib/input_data.dart +++ b/lib/input_data.dart @@ -197,7 +197,7 @@ showAlertDialog(BuildContext context, int chosenLine, String chosenColour, Strin // set up the AlertDialog AlertDialog alert = AlertDialog( - title: const Text("Submitted (Cached?) Info"), + title: const Text("Submitted Info"), content: Text("Tram Colour: $chosenColour\n\nChosen Line: $chosenLine\n\nDirection: $chosenDir\n\nSubmitted On: $submissionDate"), actions: [ okButton, diff --git a/pubspec.lock b/pubspec.lock index 33a66a3..1e43364 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,6 +1,22 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + archive: + dependency: transitive + description: + name: archive + sha256: "7b875fd4a20b165a3084bd2d210439b22ebc653f21cea4842729c0c30c82596b" + url: "https://pub.dev" + source: hosted + version: "3.4.9" + args: + dependency: transitive + description: + name: args + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + url: "https://pub.dev" + source: hosted + version: "2.4.2" async: dependency: transitive description: @@ -41,6 +57,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.18.0" + convert: + dependency: transitive + description: + name: convert + sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + url: "https://pub.dev" + source: hosted + version: "3.1.1" + crypto: + dependency: transitive + description: + name: crypto + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + url: "https://pub.dev" + source: hosted + version: "3.0.3" cupertino_icons: dependency: "direct main" description: @@ -62,14 +94,14 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_lints: + flutter_launcher_icons: dependency: "direct dev" description: - name: flutter_lints - sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7 + name: flutter_launcher_icons + sha256: "559c600f056e7c704bd843723c21e01b5fba47e8824bd02422165bcc02a5de1d" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "0.9.3" flutter_test: dependency: "direct dev" description: flutter @@ -91,6 +123,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.2" + image: + dependency: transitive + description: + name: image + sha256: "8e9d133755c3e84c73288363e6343157c383a0c6c56fc51afcc5d4d7180306d6" + url: "https://pub.dev" + source: hosted + version: "3.3.0" intl: dependency: "direct main" description: @@ -99,14 +139,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.19.0" - lints: + js: dependency: transitive description: - name: lints - sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 + name: js + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "0.6.7" matcher: dependency: transitive description: @@ -139,6 +179,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.8.3" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 + url: "https://pub.dev" + source: hosted + version: "6.0.2" + pointycastle: + dependency: transitive + description: + name: pointycastle + sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c" + url: "https://pub.dev" + source: hosted + version: "3.7.3" sky_engine: dependency: transitive description: flutter @@ -216,5 +272,21 @@ packages: url: "https://pub.dev" source: hosted version: "0.3.0" + xml: + dependency: transitive + description: + name: xml + sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 + url: "https://pub.dev" + source: hosted + version: "6.5.0" + yaml: + dependency: transitive + description: + name: yaml + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + url: "https://pub.dev" + source: hosted + version: "3.1.2" sdks: dart: ">=3.2.3 <4.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index ef6d96f..cf0d915 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -42,6 +42,13 @@ dev_dependencies: flutter_test: sdk: flutter + flutter_launcher_icons: "^0.9.3" + +flutter_icons: + image_path: "assets/images/choo.png" + android: true + ios: true + # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is # activated in the `analysis_options.yaml` file located at the root of your @@ -61,7 +68,8 @@ flutter: uses-material-design: true # To add assets to your application, add an assets section, like this: - # assets: + assets: + - assets/images/choo.png # - images/a_dot_burr.jpeg # - images/a_dot_ham.jpeg