Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
acfdfe73b8 | ||
| e16431f30b | |||
| 100645fa20 | |||
| a8b8c2af7a | |||
| dca0c067cb | |||
| 6a2df6938e | |||
| 49508758b5 | |||
| 7a0bd79e37 | |||
| 23218c22d7 | |||
| d39a000fb7 | |||
| 75e21261dc | |||
| fedc5df0c7 | |||
| 9ab300b6b8 |
@@ -1,9 +1,9 @@
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<uses-permission android:name="android.permission.INTERNET"/>
|
||||
<application
|
||||
android:label="witl"
|
||||
android:label="WITL"
|
||||
android:name="${applicationName}"
|
||||
android:icon="@mipmap/ic_launcher">
|
||||
android:icon="@mipmap/launcher_icon">
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:exported="true"
|
||||
|
||||
BIN
android/app/src/main/res/mipmap-hdpi/launcher_icon.png
Normal file
|
After Width: | Height: | Size: 3.5 KiB |
BIN
android/app/src/main/res/mipmap-mdpi/launcher_icon.png
Normal file
|
After Width: | Height: | Size: 2.3 KiB |
BIN
android/app/src/main/res/mipmap-xhdpi/launcher_icon.png
Normal file
|
After Width: | Height: | Size: 4.3 KiB |
BIN
android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png
Normal file
|
After Width: | Height: | Size: 10 KiB |
BIN
android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png
Normal file
|
After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 104 KiB |
|
Before Width: | Height: | Size: 295 B After Width: | Height: | Size: 868 B |
|
Before Width: | Height: | Size: 406 B After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 450 B After Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 282 B After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 462 B After Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 704 B After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 406 B After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 586 B After Width: | Height: | Size: 3.8 KiB |
|
Before Width: | Height: | Size: 862 B After Width: | Height: | Size: 4.3 KiB |
|
After Width: | Height: | Size: 2.4 KiB |
|
After Width: | Height: | Size: 4.4 KiB |
|
After Width: | Height: | Size: 2.8 KiB |
|
After Width: | Height: | Size: 4.4 KiB |
|
Before Width: | Height: | Size: 862 B After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 14 KiB |
|
After Width: | Height: | Size: 3.5 KiB |
|
After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 762 B After Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 13 KiB |
@@ -5,7 +5,7 @@
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>$(DEVELOPMENT_LANGUAGE)</string>
|
||||
<key>CFBundleDisplayName</key>
|
||||
<string>Witl</string>
|
||||
<string>WITL</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>$(EXECUTABLE_NAME)</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
@@ -13,7 +13,7 @@
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>witl</string>
|
||||
<string>WITL</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
|
||||
50
lib/app_settings.dart
Normal file
@@ -0,0 +1,50 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:witl/main.dart';
|
||||
|
||||
class Settings extends StatefulWidget {
|
||||
const Settings({super.key});
|
||||
|
||||
@override
|
||||
State<Settings> createState() => _Settings();
|
||||
}
|
||||
|
||||
class _Settings extends State<Settings> {
|
||||
late String selectedTheme = 'System Default'; // Default app theme
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: const Text("Settings"),
|
||||
),
|
||||
|
||||
body: ListView(
|
||||
children:[
|
||||
// List of Tiles in the Settings Screen
|
||||
// Starting with App Theme
|
||||
ListTile(
|
||||
title: const Text("App Theme"),
|
||||
subtitle: const Text("Sets the theme of the app between: Dark, Light, System Default."),
|
||||
// User Selection
|
||||
trailing: DropdownButton<String> (
|
||||
value: selectedTheme,
|
||||
items: <String>["Light", "Dark", "System Default"].map((String value) {
|
||||
return DropdownMenuItem<String>(
|
||||
value: value,
|
||||
child: Text(value),
|
||||
);
|
||||
}).toList(),
|
||||
// Updating Selection
|
||||
onChanged: (String? updatedTheme) {
|
||||
setState(() {
|
||||
selectedTheme = updatedTheme ?? selectedTheme;
|
||||
MyApp.of(context).changeTheme(selectedTheme);
|
||||
});
|
||||
},
|
||||
),
|
||||
)
|
||||
],
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -13,9 +13,18 @@ class Arrival {
|
||||
|
||||
factory Arrival.fromJson(Map<String, dynamic> json) {
|
||||
return Arrival(
|
||||
// Key value
|
||||
// <field>: json['<field_name_in_json>'] as <data_type>
|
||||
// Arrival Time
|
||||
timeOfDay: json['time_of_day'] as String,
|
||||
|
||||
// Day 1 -> 7 !! Starting from Monday !!
|
||||
weekDay: json['week_day'] as int,
|
||||
|
||||
// Line 1 or 2
|
||||
tramLine: json['tram_line'] as int,
|
||||
|
||||
// True -> Raml, False -> Victoria
|
||||
direction: json['direction'] as bool,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -6,18 +6,16 @@ import 'package:witl/arrival.dart';
|
||||
|
||||
Future<List<Arrival>> fetchArrivals() async {
|
||||
try {
|
||||
// Grabbing http reponse
|
||||
final response = await http.get(Uri.parse('http://141.144.238.26:48502/arrivals/all'));
|
||||
|
||||
if (response.statusCode == 200) {
|
||||
// List<dynamic> data = jsonDecode(response.body);
|
||||
// List<Arrival> arrivals = List<Arrival>.from(data.map((dynamic arrivalJson) {
|
||||
// return Arrival.fromJson(arrivalJson);
|
||||
// }));
|
||||
// Some JSON fuckery xd
|
||||
Iterable I = json.decode(response.body);
|
||||
List<Arrival> arrivals = List<Arrival>.from(I.map((model)=>Arrival.fromJson(model)));
|
||||
return arrivals.reversed.toList();
|
||||
} else {
|
||||
throw Exception('Failed to load Arrival');
|
||||
throw Exception('Failed to load Arrivals list');
|
||||
}
|
||||
} catch (error) {
|
||||
throw Exception('Failed to fetch data: $error');
|
||||
|
||||
@@ -4,22 +4,33 @@ import 'package:http/http.dart' as http;
|
||||
import 'package:witl/arrival.dart';
|
||||
|
||||
Future<Arrival> insertArrival(String date, int weekday, int line, bool direction) async {
|
||||
final response = await http.post(
|
||||
final client = http.Client();
|
||||
|
||||
try {
|
||||
// POST response as JSON
|
||||
final response = await client.post(
|
||||
Uri.parse('http://141.144.238.26:48502/arrivals/insert'),
|
||||
headers: <String, String> {
|
||||
// Headers used
|
||||
'Content-Type': 'application/json; charset=UTF-8',
|
||||
},
|
||||
// Encoding a singular json entry
|
||||
body: jsonEncode(<String, dynamic> {
|
||||
'time_of_day': date,
|
||||
'week_day': weekday,
|
||||
'tram_line': line,
|
||||
'direction': direction,
|
||||
})
|
||||
);
|
||||
).timeout(const Duration(seconds: 10));
|
||||
|
||||
if (response.statusCode == 201) {
|
||||
return Arrival.fromJson(jsonDecode(response.body) as Map<String, dynamic>);
|
||||
} else {
|
||||
throw Exception('Insertion Failure.');
|
||||
}
|
||||
} catch (error) {
|
||||
throw Exception("Error Posting: $error");
|
||||
} finally {
|
||||
client.close();
|
||||
}
|
||||
}
|
||||
@@ -16,8 +16,9 @@ class _FetchAPIState extends State<FetchAPI> {
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: const Text("Fetching API"),
|
||||
title: const Text("Fetched Arrivals"),
|
||||
actions: [
|
||||
// Refresh fetched list
|
||||
IconButton(
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
@@ -26,10 +27,12 @@ class _FetchAPIState extends State<FetchAPI> {
|
||||
},
|
||||
icon: const Icon(Icons.refresh_sharp),
|
||||
),
|
||||
const SizedBox(width: 30,),
|
||||
],
|
||||
),
|
||||
// RefreshIndicator is used so that user can pull down
|
||||
// in order to update instead of pressing the refresh button
|
||||
body: RefreshIndicator(
|
||||
// Method to Use no argument parenthesis
|
||||
onRefresh: _refreshData,
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
@@ -40,17 +43,40 @@ class _FetchAPIState extends State<FetchAPI> {
|
||||
future: fetchedArrivals,
|
||||
builder: (context, snapshot) {
|
||||
if (snapshot.connectionState == ConnectionState.waiting) {
|
||||
return const CircularProgressIndicator();
|
||||
return Center(
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
SizedBox(
|
||||
height: MediaQuery. of(context). size. height / 2,
|
||||
width: MediaQuery. of(context). size. width / 3,
|
||||
|
||||
child: const CircularProgressIndicator(),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
} else if (snapshot.hasError) {
|
||||
return Text('Failed to fetch data.\nError: ${snapshot.error}');
|
||||
} else {
|
||||
return ListView.builder(
|
||||
// List items to display
|
||||
itemCount: snapshot.data!.length,
|
||||
// Building them
|
||||
itemBuilder: (context, index) {
|
||||
return ListTile(
|
||||
// Really should be more informative about what's displayed
|
||||
title: Text("Arrival Time: ${snapshot.data![index].timeOfDay}"),
|
||||
titleAlignment: ListTileTitleAlignment.center,
|
||||
subtitle: Text("Week Day: ${weekNumToString(snapshot.data![index].weekDay)}"),
|
||||
onTap: () => {
|
||||
showArrivalInfo(context, snapshot.data![index])
|
||||
},
|
||||
);
|
||||
},
|
||||
);
|
||||
@@ -59,10 +85,16 @@ class _FetchAPIState extends State<FetchAPI> {
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
const SizedBox(height: 30,),
|
||||
|
||||
InkWell(
|
||||
// Navigating Home
|
||||
onTap: () {
|
||||
Navigator.pushNamedAndRemoveUntil(context, '/', (route) => false);
|
||||
Navigator.pushNamedAndRemoveUntil(
|
||||
context,
|
||||
'/home',
|
||||
(route) => false);
|
||||
},
|
||||
child: Container(
|
||||
padding: const EdgeInsets.all(20.0),
|
||||
@@ -78,6 +110,7 @@ class _FetchAPIState extends State<FetchAPI> {
|
||||
|
||||
Future<void> _refreshData() async {
|
||||
setState(() {
|
||||
// Refresh arrivals list by invoking the fetch method
|
||||
fetchedArrivals = fetchArrivals();
|
||||
});
|
||||
}
|
||||
@@ -89,6 +122,33 @@ class _FetchAPIState extends State<FetchAPI> {
|
||||
}
|
||||
}
|
||||
|
||||
showArrivalInfo(BuildContext context, Arrival data) {
|
||||
// set up the button
|
||||
Widget okButton = TextButton(
|
||||
child: const Text("Back"),
|
||||
onPressed: () {
|
||||
Navigator.pop(context);
|
||||
},
|
||||
);
|
||||
|
||||
// set up the AlertDialog
|
||||
AlertDialog alert = AlertDialog(
|
||||
title: const Text("Selected Arrival Info"),
|
||||
content: Text("Tram Colour: JSON DOESN'T HAVE COLOUR\n\nChosen Line: ${lineShift(data.tramLine)}\n\nDirection: ${directionParse(data.direction)}\n\nSubmitted On: ${data.timeOfDay} (Needs to include date)"),
|
||||
actions: [
|
||||
okButton,
|
||||
],
|
||||
);
|
||||
|
||||
// show the dialogue
|
||||
showDialog(
|
||||
context: context,
|
||||
builder: (BuildContext context) {
|
||||
return alert;
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
String weekNumToString(int weekday) {
|
||||
switch (weekday) {
|
||||
case 1:
|
||||
@@ -107,5 +167,25 @@ String weekNumToString(int weekday) {
|
||||
return "Sunday";
|
||||
}
|
||||
|
||||
throw "AAAAAAAAA";
|
||||
throw "Week Day Parse Error";
|
||||
}
|
||||
|
||||
String directionParse(bool direction) {
|
||||
switch (direction) {
|
||||
case true:
|
||||
return "Raml";
|
||||
case false:
|
||||
return "Victoria";
|
||||
}
|
||||
}
|
||||
|
||||
int lineShift(int line) {
|
||||
switch (line) {
|
||||
case 3:
|
||||
return 1;
|
||||
case 4:
|
||||
return 2;
|
||||
default:
|
||||
return line;
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:witl/fetcher.dart';
|
||||
import 'package:witl/input_data.dart';
|
||||
import 'package:witl/app_settings.dart';
|
||||
|
||||
class HomeScreen extends StatelessWidget {
|
||||
const HomeScreen({super.key});
|
||||
@@ -12,12 +13,44 @@ class HomeScreen extends StatelessWidget {
|
||||
title: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Image.asset('assets/images/choo.png',
|
||||
fit: BoxFit.contain,
|
||||
height: 64,
|
||||
// Hamburbur menu
|
||||
IconButton(
|
||||
onPressed: () {
|
||||
|
||||
},
|
||||
icon: const Icon(Icons.menu_sharp)
|
||||
),
|
||||
const SizedBox(width: 10,),
|
||||
|
||||
// Space
|
||||
// const SizedBox(width: 30,),
|
||||
|
||||
// Our Amazing Logo
|
||||
// Image.asset('assets/images/choo.png',
|
||||
// fit: BoxFit.contain,
|
||||
// height: 64,
|
||||
// ),
|
||||
|
||||
// Spacing
|
||||
// const SizedBox(width: 10,),
|
||||
|
||||
const Expanded(child: SizedBox()),
|
||||
|
||||
// App Title
|
||||
const Text("WITL"),
|
||||
|
||||
// Fill out the area blankly
|
||||
// So that the icon can be shoved far right
|
||||
const Expanded(child: SizedBox(),),
|
||||
|
||||
// Navigate to Settings
|
||||
IconButton(
|
||||
onPressed: () {
|
||||
Navigator.push(
|
||||
context,
|
||||
MaterialPageRoute(builder: (context) => const Settings())
|
||||
);
|
||||
},
|
||||
icon: const Icon(Icons.settings)),
|
||||
]
|
||||
),
|
||||
),
|
||||
@@ -27,12 +60,15 @@ class HomeScreen extends StatelessWidget {
|
||||
const Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children:[
|
||||
// Our Motto (?)
|
||||
Text("We may not be able to tell you why.\nBut surely are able to predict when."),
|
||||
],
|
||||
),
|
||||
|
||||
// Spacing
|
||||
const SizedBox(height: 80),
|
||||
|
||||
// To the fetching screen
|
||||
InkWell(
|
||||
onTap:() {
|
||||
Navigator.push(
|
||||
@@ -48,6 +84,7 @@ class HomeScreen extends StatelessWidget {
|
||||
|
||||
const SizedBox(height: 30),
|
||||
|
||||
// To Data Input
|
||||
InkWell(
|
||||
onTap:() {
|
||||
Navigator.push(
|
||||
|
||||
@@ -24,7 +24,8 @@ class _InputDataState extends State<InputData> {
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: const Text("Data Input"),
|
||||
// Naming the screen
|
||||
title: const Text("Arrivals Input"),
|
||||
),
|
||||
body: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
@@ -33,42 +34,53 @@ class _InputDataState extends State<InputData> {
|
||||
|
||||
const SizedBox(height: 15),
|
||||
|
||||
// Prompt Row
|
||||
const Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Text("Line:"),
|
||||
|
||||
SizedBox(width: 35),
|
||||
|
||||
Text("Colour:"),
|
||||
|
||||
SizedBox(width: 25),
|
||||
],
|
||||
),
|
||||
|
||||
// Checkbox Row
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
DropdownButton<int>(
|
||||
value: selectedLine,
|
||||
|
||||
items: <int>[1, 2].map((int value) {
|
||||
return DropdownMenuItem<int>(
|
||||
value: value,
|
||||
child: Text(value.toString()),
|
||||
);
|
||||
}).toList(),
|
||||
|
||||
onChanged: (int? newLine) {
|
||||
setState(() {
|
||||
selectedLine = newLine ?? 1; // Set a default value if newLine is null
|
||||
});
|
||||
},
|
||||
),
|
||||
|
||||
const SizedBox(width: 30),
|
||||
|
||||
DropdownButton<String>(
|
||||
value: selectedColor,
|
||||
|
||||
items: <String>['Blue', 'Yellow'].map((String value) {
|
||||
return DropdownMenuItem<String>(
|
||||
value: value,
|
||||
child: Text(value),
|
||||
);
|
||||
}).toList(),
|
||||
|
||||
onChanged: (String? newCol) {
|
||||
setState(() {
|
||||
selectedColor = newCol ?? 'Blue'; // Set a default value if newCol is null
|
||||
@@ -82,6 +94,7 @@ class _InputDataState extends State<InputData> {
|
||||
|
||||
const Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
|
||||
children: [
|
||||
Text("Direction:"),
|
||||
SizedBox(width: 20),
|
||||
@@ -90,18 +103,21 @@ class _InputDataState extends State<InputData> {
|
||||
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
|
||||
children: [
|
||||
DropdownButton<String>(
|
||||
value: selectedDirection,
|
||||
|
||||
items: <String>['Raml', 'Victoria'].map((String value) {
|
||||
return DropdownMenuItem<String>(
|
||||
value: value,
|
||||
child: Text(value),
|
||||
);
|
||||
}).toList(),
|
||||
|
||||
onChanged: (String? newEnd) {
|
||||
setState(() {
|
||||
selectedDirection = newEnd ?? 'Victoria'; // Set a default value if newLine is null
|
||||
selectedDirection = newEnd ?? selectedDirection; // Set a default value if newLine is null
|
||||
});
|
||||
},
|
||||
),
|
||||
@@ -111,6 +127,10 @@ class _InputDataState extends State<InputData> {
|
||||
const SizedBox(height: 30),
|
||||
|
||||
InkWell(
|
||||
hoverDuration: const Duration(milliseconds: 450),
|
||||
hoverColor: (selectedColor == "Blue") ? Colors.blue[500] : Colors.yellow[700],
|
||||
borderRadius: BorderRadius.circular(30),
|
||||
splashColor: (selectedColor == "Blue") ? Colors.blue[800] : Colors.yellow[700],
|
||||
onTap: () {
|
||||
// Grab Data from Dropdowns
|
||||
selectedColor; //
|
||||
@@ -139,8 +159,9 @@ class _InputDataState extends State<InputData> {
|
||||
insertArrival('${now.hour}:${now.minute}:${now.second}', now.weekday, selectedLine, payloadDirection);
|
||||
|
||||
//prompting of submission
|
||||
showAlertDialog(context, selectedLine, selectedColor, selectedDirection, userFormattedString);
|
||||
showSubmissionSuccess(context, selectedLine, selectedColor, selectedDirection, userFormattedString);
|
||||
},
|
||||
|
||||
child: Container(
|
||||
padding: const EdgeInsets.all(20.0),
|
||||
child: const Text("Submit Arrival"),
|
||||
@@ -157,6 +178,7 @@ class _InputDataState extends State<InputData> {
|
||||
(route) => false
|
||||
);
|
||||
},
|
||||
|
||||
child: Container(
|
||||
padding: const EdgeInsets.all(20.0),
|
||||
child: const Text("Homescreen")),
|
||||
@@ -172,6 +194,7 @@ class _InputDataState extends State<InputData> {
|
||||
(route) => false
|
||||
);
|
||||
},
|
||||
|
||||
child: Container(
|
||||
padding: const EdgeInsets.all(20.0),
|
||||
child: const Text("Fetch Data")),
|
||||
@@ -182,7 +205,10 @@ class _InputDataState extends State<InputData> {
|
||||
}
|
||||
}
|
||||
|
||||
showAlertDialog(BuildContext context, int chosenLine, String chosenColour, String chosenDir, String submissionDate) {
|
||||
showSubmissionSuccess(BuildContext context, int chosenLine, String chosenColour, String chosenDir, String submissionDate) {
|
||||
|
||||
// Delay (I want the splash to show)
|
||||
//Future.delayed(const Duration(milliseconds: 200));
|
||||
|
||||
// set up the button
|
||||
Widget okButton = TextButton(
|
||||
@@ -190,7 +216,7 @@ showAlertDialog(BuildContext context, int chosenLine, String chosenColour, Strin
|
||||
onPressed: () {
|
||||
Navigator.pushNamedAndRemoveUntil(
|
||||
context,
|
||||
'/',
|
||||
'/home',
|
||||
(route) => false);
|
||||
},
|
||||
);
|
||||
|
||||
@@ -1,39 +1,86 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:witl/app_settings.dart';
|
||||
import 'package:witl/fetcher.dart';
|
||||
import 'package:witl/home_screen.dart';
|
||||
import 'package:witl/input_data.dart';
|
||||
|
||||
void main() => runApp(const MyApp());
|
||||
|
||||
class MyApp extends StatelessWidget {
|
||||
class MyApp extends StatefulWidget {
|
||||
const MyApp({super.key});
|
||||
|
||||
@override
|
||||
State<MyApp> createState() => MyAppState();
|
||||
|
||||
static MyAppState of(BuildContext context) =>
|
||||
context.findAncestorStateOfType<MyAppState>()!;
|
||||
}
|
||||
|
||||
class MyAppState extends State<MyApp> {
|
||||
ThemeMode _theme = ThemeMode.system;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return MaterialApp(
|
||||
title: "Entry Point",
|
||||
title: "WITL App",
|
||||
theme: ThemeData(
|
||||
primarySwatch: Colors.blue,
|
||||
appBarTheme: AppBarTheme(
|
||||
color: Colors.amber[100],
|
||||
primaryColor: Colors.white,
|
||||
brightness: Brightness.light,
|
||||
dividerColor: Colors.white54,
|
||||
scaffoldBackgroundColor: Colors.white,
|
||||
),
|
||||
|
||||
darkTheme: ThemeData(
|
||||
primarySwatch: Colors.blue,
|
||||
primaryColor: Colors.black,
|
||||
brightness: Brightness.dark,
|
||||
dividerColor: Colors.white38,
|
||||
scaffoldBackgroundColor: const Color(0xFF131313),
|
||||
),
|
||||
|
||||
themeMode: _theme,
|
||||
|
||||
// Navigashun with Routes
|
||||
// Base "Home" Route
|
||||
initialRoute: '/',
|
||||
initialRoute: '/home',
|
||||
|
||||
// Possible Routes
|
||||
routes: {
|
||||
// Login (Eventually)
|
||||
//'/login': (context) => const LogIn(),
|
||||
|
||||
// Signup (Also eventually xd)
|
||||
//'/login/signup': (context) => const SignUp(),
|
||||
|
||||
// Homescreen
|
||||
'/': (context) => const HomeScreen(),
|
||||
'/home': (context) => const HomeScreen(),
|
||||
|
||||
// Fetching API Data
|
||||
'/fetch': (context) => const FetchAPI(),
|
||||
|
||||
// User Input
|
||||
'/input': (context) => const InputData(),
|
||||
|
||||
// Settings
|
||||
'/settings': (context) => const Settings(),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
void changeTheme(String newTheme) {
|
||||
setState(() {
|
||||
switch(newTheme) {
|
||||
case "Light":
|
||||
_theme = ThemeMode.light;
|
||||
break;
|
||||
case "Dark":
|
||||
_theme = ThemeMode.dark;
|
||||
break;
|
||||
case "System Default":
|
||||
_theme = ThemeMode.system;
|
||||
break;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
class TramStation {
|
||||
final String name;
|
||||
final String city;
|
||||
final double latitude;
|
||||
final double longitude;
|
||||
|
||||
TramStation({
|
||||
required this.name,
|
||||
required this.city,
|
||||
required this.latitude,
|
||||
required this.longitude,
|
||||
});
|
||||
|
||||
factory TramStation.fromJson(Map<String, dynamic> json) {
|
||||
return TramStation(
|
||||
name: json['name'] as String,
|
||||
city: json['city'] as String,
|
||||
latitude: json['latitude'] as double,
|
||||
longitude: json['longitude'] as double,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -4,7 +4,7 @@ project(runner LANGUAGES CXX)
|
||||
|
||||
# The name of the executable created for the application. Change this to change
|
||||
# the on-disk name of your application.
|
||||
set(BINARY_NAME "witl")
|
||||
set(BINARY_NAME "WITL")
|
||||
# The unique GTK application identifier for this application. See:
|
||||
# https://wiki.gnome.org/HowDoI/ChooseApplicationID
|
||||
set(APPLICATION_ID "com.example.witl")
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
{
|
||||
"info": {
|
||||
"version": 1,
|
||||
"author": "xcode"
|
||||
},
|
||||
"images": [
|
||||
{
|
||||
"size": "16x16",
|
||||
@@ -60,9 +64,5 @@
|
||||
"filename": "app_icon_1024.png",
|
||||
"scale": "2x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
Before Width: | Height: | Size: 101 KiB After Width: | Height: | Size: 104 KiB |
|
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 3.8 KiB |
|
Before Width: | Height: | Size: 520 B After Width: | Height: | Size: 665 B |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 34 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 3.0 KiB |
@@ -5,7 +5,7 @@
|
||||
// 'flutter create' template.
|
||||
|
||||
// The application's name. By default this is also the title of the Flutter window.
|
||||
PRODUCT_NAME = witl
|
||||
PRODUCT_NAME = WITL
|
||||
|
||||
// The application's bundle identifier
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.example.witl
|
||||
|
||||
32
pubspec.lock
@@ -41,6 +41,22 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.3.0"
|
||||
checked_yaml:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: checked_yaml
|
||||
sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.0.3"
|
||||
cli_util:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: cli_util
|
||||
sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.4.1"
|
||||
clock:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -98,10 +114,10 @@ packages:
|
||||
dependency: "direct dev"
|
||||
description:
|
||||
name: flutter_launcher_icons
|
||||
sha256: "559c600f056e7c704bd843723c21e01b5fba47e8824bd02422165bcc02a5de1d"
|
||||
sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.9.3"
|
||||
version: "0.13.1"
|
||||
flutter_lints:
|
||||
dependency: "direct dev"
|
||||
description:
|
||||
@@ -135,10 +151,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: image
|
||||
sha256: "8e9d133755c3e84c73288363e6343157c383a0c6c56fc51afcc5d4d7180306d6"
|
||||
sha256: "028f61960d56f26414eb616b48b04eb37d700cbe477b7fb09bf1d7ce57fd9271"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.3.0"
|
||||
version: "4.1.3"
|
||||
intl:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@@ -155,6 +171,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.6.7"
|
||||
json_annotation:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: json_annotation
|
||||
sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.8.1"
|
||||
lints:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
||||
21
pubspec.yaml
@@ -42,7 +42,7 @@ dev_dependencies:
|
||||
flutter_test:
|
||||
sdk: flutter
|
||||
|
||||
flutter_launcher_icons: "^0.9.3"
|
||||
flutter_launcher_icons: ^0.13.1
|
||||
|
||||
# The "flutter_lints" package below contains a set of recommended lints to
|
||||
# encourage good coding practices. The lint set provided by the package is
|
||||
@@ -51,10 +51,23 @@ dev_dependencies:
|
||||
# rules and activating additional ones.
|
||||
flutter_lints: ^3.0.1
|
||||
|
||||
flutter_icons:
|
||||
image_path: "assets/images/choo.png"
|
||||
android: true
|
||||
flutter_launcher_icons:
|
||||
android: "launcher_icon"
|
||||
ios: true
|
||||
image_path: "assets/images/choo.png"
|
||||
min_sdk_android: 21 # android min sdk min:16, default 21
|
||||
web:
|
||||
generate: true
|
||||
image_path: "assets/images/choo.png"
|
||||
background_color: "#FFFFFF"
|
||||
theme_color: "#FFFFFF"
|
||||
windows:
|
||||
generate: true
|
||||
image_path: "assets/images/choo.png"
|
||||
icon_size: 48 # min:48, max:256, default: 48
|
||||
macos:
|
||||
generate: true
|
||||
image_path: "assets/images/choo.png"
|
||||
|
||||
|
||||
# For information on the generic Dart part of this file, see the
|
||||
|
||||
BIN
web/favicon.png
|
Before Width: | Height: | Size: 917 B After Width: | Height: | Size: 665 B |
|
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 8.1 KiB After Width: | Height: | Size: 34 KiB |
|
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 34 KiB |
@@ -29,7 +29,7 @@
|
||||
<!-- Favicon -->
|
||||
<link rel="icon" type="image/png" href="favicon.png"/>
|
||||
|
||||
<title>witl</title>
|
||||
<title>WITL</title>
|
||||
<link rel="manifest" href="manifest.json">
|
||||
|
||||
<script>
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
"short_name": "witl",
|
||||
"start_url": ".",
|
||||
"display": "standalone",
|
||||
"background_color": "#0175C2",
|
||||
"theme_color": "#0175C2",
|
||||
"background_color": "#FFFFFF",
|
||||
"theme_color": "#FFFFFF",
|
||||
"description": "A new Flutter project.",
|
||||
"orientation": "portrait-primary",
|
||||
"prefer_related_applications": false,
|
||||
|
||||
@@ -27,7 +27,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
|
||||
FlutterWindow window(project);
|
||||
Win32Window::Point origin(10, 10);
|
||||
Win32Window::Size size(1280, 720);
|
||||
if (!window.Create(L"witl", origin, size)) {
|
||||
if (!window.Create(L"WITL", origin, size)) {
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
window.SetQuitOnClose(true);
|
||||
|
||||
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 2.3 KiB |