diff --git a/assets/images/choo.png b/assets/images/choo.png new file mode 100644 index 0000000..fce2733 Binary files /dev/null and b/assets/images/choo.png differ 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