cleanup: remove unused code blocks that were already commented out

README.md

@@ -1,17 +1,44 @@
 # oeffimaster
 
-A new Flutter project.
+Aggregating information to create your own routes in public transit effortlessly.
 
-## Getting Started
 
-This project is a starting point for a Flutter application.
+## Goal of this project
+Do you ever get a route from google maps and see a 13 minute switch time, for a train that comes every ten minutes? Do you then prompt another app with better results. What if you'd normally have to wait 9 minutes for your train, but the previous train is late, so in reality you can switch with only a minutes worth of waiting? Now you can get an earlier train for the next connection, and suddenly the 3rd-fastest connection in google's algorithm becomes the fastest, and you saved 10 minutes - or could have, if you knew.
+My app will not solve this issue.
+As someone who is familiar with good chunks of the cities public transport network, I often enough *think* I can get faster to my target than the routing served by commonplace apps, but I have a hard time of knowing that for sure. Other apps allow some degree of comparing routes to one another, but it's not a priority, and editing any part of it is not supported at all.
+Oeffimaster aims to make that type of information easily accessible and aggregate it in the most helpful way, allowing comparison and editing of routes.
 
-A few resources to get you started if this is your first Flutter project:
+## Usage
+I am currently providing artifacts for linux and android. To make your own builds, you will need an api key for your network.
 
-- [Learn Flutter](https://docs.flutter.dev/get-started/learn-flutter)
-- [Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
-- [Flutter learning resources](https://docs.flutter.dev/reference/learning-resources)
+## Build the project
 
-For help getting started with Flutter development, view the
-[online documentation](https://docs.flutter.dev/), which offers tutorials,
-samples, guidance on mobile development, and a full API reference.
+### Get the API key
+For the VBB network in Berlin/Brandenburg
+
+1. Installing flutter: https://docs.flutter.dev/install/quick
+2. Get an API key for VBB: https://unternehmen.vbb.de/digitale-services/api/
+    It will take some time, but they will send you an API key and the url to access it.
+    this should work for other public transit networks using the HAFAS api, but you will have to test this yourself
+
+### The build part
+Create a `.env` in the project root and add the following to it
+
+```env
+VBB_API_KEY={YOUR_API_KEY}
+VBB_API_URL={YOUR_API_URL}
+```
+
+For local builds and connected devices simply run `flutter run` in your terminal.
+
+To build for linux:
+```bash
+flutter build linux -DVBB_API_KEY={API_KEY} -DVBB_API_URL={API_URL}
+
+```
+
+To build for android:
+```
+flutter build apk -DVBB_API_KEY={API_KEY} -DVBB_API_URL={API_URL}
+```

android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+  <uses-permission android:name="android.permission.INTERNET"/>
     <application
         android:label="oeffimaster"
         android:name="${applicationName}"

doc/diagrams/ERDiagram.mmd

@@ -0,0 +1,64 @@
+erDiagram
+journey||--|{routesegments: "consists of"
+routesegments||--||segment: "sorts"
+segment||--|{departure: "consists of"
+departure}|--|{station: "originates from"
+departure}|--||vehicle: uses
+vehicle||..|{line: "shared data"
+segment}|--||vehicle: uses
+stationlines}|..||station: "general connections"
+stationlines}|..||line: groups
+
+
+journey {
+  int id PK
+  string startstation
+  string endstation
+}
+routesegments {
+  int id PK
+  int journey FK
+  int segment FK
+  int segmentorder
+}
+segment {
+  int id PK
+  string ref
+  int startid FK
+  int endid FK
+  string vehicleid FK
+}
+departure {
+  int id PK
+  string ref
+  string direction
+  string vehicle FK
+  string vehiclename
+  string station FK
+  string stationname
+  string arrivaltime
+  string departuretime
+}
+station {
+  string id PK
+  string name
+}
+stationlines {
+  int id PK
+  string stationid FK
+  string lineid FK
+}
+vehicle {
+  string vehicleid PK
+  string name
+  string line FK
+}
+line {
+  string lineid PK
+  string name
+  string mode
+  string destination
+  string direction
+  string fgcolor
+  string bgcolor
+}

doc/diagrams/flowchart_to_journey.mmd

@@ -0,0 +1,8 @@
+flowchart TD
+Start-->stat[Search Station]-->selstat[Select station]
+selstat-->seldep["`Select departure:
+vehicle, direction & time`"]
+seldep-->selarr["`Select arrival station:
+when & where to exit`"] --> sw{switch?} --yes-->seldep
+sw--"no"-->fin([journey details])
+

doc/diagrams/sequencediagram.mmd

@@ -0,0 +1,19 @@
+sequenceDiagram
+  participant api@{ "type": "entity"} as public transport API
+  participant ah as api_handler
+  participant ui as UI
+  participant th as transport_helper
+  participant db@{ "type":"database"} as database
+
+ui-->>ah: find Station
+ah-->>api: GET request w/ stationname
+api-->>ah: return json
+ah-->>th: provide json Map
+th-->>db: store object
+db-->>th: return id
+th-->>ah: return object
+ah-->>ui: display data
+
+
+
+

doc/project_and_design/requirements.md

@@ -1,10 +1,10 @@
-- running mobile app
-- users should be able to
-	- plan public transport in the VBB transit network
-	- create and customise routes quickly and on-the-fly
-	- edit routes from anywhere, where respective route information can be seen
-	- compare routes easily, especially between different endpoints
-- the app should offer up the information most relevant to current route planning
-	- between route steps, there should be no more than 3 taps required, optimally even just one(1), scrolling excluded
-	- e.g. only lines that connect to a station should be shown
-	- stations that a line goes through should be available as next node/ step for planning
+- [x] running mobile app
+- [ ] users should be able to
+	- [~] plan public transport in the VBB transit network
+	- [~] create and customise routes quickly and on-the-fly
+	- [ ] edit routes from anywhere, where respective route information can be seen
+	- [ ] compare routes easily, especially between different endpoints
+- [~] the app should offer up the information most relevant to current route planning
+	- [x] between route steps, there should be no more than 3 taps required, optimally even just one(1), scrolling excluded
+	- [x] e.g. only lines that connect to a station should be shown
+	- [x] stations that a line goes through should be available as next node/ step for planning

lib/api_handler.dart

@@ -5,20 +5,13 @@ import 'dart:core';
 import 'dart:convert';
 
 import 'transport_helper.dart';
+import 'utilities.dart';
 
 class ApiHandler {
   // TODO: Split next line for better Error Handling
   static final String baseUrl = dotenv.get("VBB_API_URL");
   static final String accessID = dotenv.get("VBB_API_KEY");
 
-  // TODO: function calls for the following API calls
-  //   - [x] location.name: findStations
-  //   - [ ] location.nearbystops
-  //   - [ ] location.details
-  //   - [ ] departureBoard
-  //   - [ ] multiDepartureBoard
-  //   - [ ] journeyDetails
-
   //static Future<Map<String, dynamic>> findStations(String locationName) async {
   static Future<List<Station>> findStations(
     String locationName, {
@@ -79,6 +72,7 @@ class ApiHandler {
   static Future<List<Departure>> departures(
     String stationId, {
     int? maxDepartures = -1,
+    DateTime? datetime,
     int? duration = 0,
   }) async {
     String urlPath = '/api/fahrinfo/latest/departureBoard';
@@ -87,7 +81,10 @@ class ApiHandler {
     Uri url = Uri.https(baseUrl, urlPath, {
       'accessId': accessID,
       'id': stationString,
-      ////'time': /current time //time from which departures will be shown
+      'date': dateOf(datetime ?? DateTime.now()),
+      'time': timeOf(
+        datetime ?? DateTime.now(),
+      ), //time from which departures will be shown
       'duration': duration.toString(), //interval time in minutes
       'maxJourneys': maxDepartures.toString(),
       //'type': 'S', // Station/Stops only

lib/main.dart

@@ -1,36 +1,53 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:dynamic_color/dynamic_color.dart';
+import 'package:sqflite_common_ffi/sqflite_ffi.dart'; //for testing on desktop
+
+import 'dart:async';
+import 'dart:io';
+
 import 'api_handler.dart';
 import 'transport_helper.dart';
-import 'dart:async';
-
-// import 'package:sqflite_common_ffi/sqflite_ffi.dart'; //for testing on desktop
+import 'utilities.dart';
 
 void main() async {
   await dotenv.load();
   const String dbName = "oeffimasterTransportDb";
-  // databaseFactory = databaseFactoryFfi; // for debugging and desktop test
+
+  if (Platform.isLinux) {
+    databaseFactory = databaseFactoryFfi; // for debugging and desktop test
+  }
   DbHelper.initDb(dbName);
   runApp(const MyApp());
 }
 
+final _defaultLightScheme = ColorScheme.fromSeed(seedColor: Colors.yellow);
+final _defaultDarkScheme = ColorScheme.fromSeed(
+  seedColor: Colors.yellow,
+  brightness: Brightness.dark,
+);
+
 class MyApp extends StatelessWidget {
   const MyApp({super.key});
 
-  // This widget is the root of your application.
   @override
   Widget build(BuildContext context) {
-    return MaterialApp(
-      title: 'Oeffimaster',
-      theme: ThemeData(
-        colorScheme: .fromSeed(seedColor: Colors.yellow),
-      ),
-      // home: const MyHomePage(title: 'Oeffimaster'), //this is what matters
-      home: const JourneyOverviewPage(),
-      // routes: {
-      //   //'/': (context) => const MyHomePage(title: 'Oeffimaster'),
-      //   '/stations': (context) => const ChooseStationPage(),
-      // },
+    return DynamicColorBuilder(
+      builder: (ColorScheme? lightDynamic, ColorScheme? darkDynamic) {
+        return MaterialApp(
+          theme: ThemeData(
+            useMaterial3: true,
+            colorScheme: lightDynamic ?? _defaultLightScheme,
+          ),
+          darkTheme: ThemeData(
+            useMaterial3: true,
+            colorScheme: darkDynamic ?? _defaultDarkScheme,
+          ),
+          themeMode: ThemeMode.system,
+          home: const JourneyOverviewPage(),
+          title: 'Oeffimaster',
+        );
+      },
     );
   }
 }
@@ -45,9 +62,7 @@ class MyHomePage extends StatefulWidget {
 
 class _MyHomePageState extends State<MyHomePage> {
   int _counter = 0;
-  //String API_KEY = ApiHandler.accessID;
   String API_KEY = "no telly";
-  //Future<Map<String, dynamic>> ?id;
   List<Station> stationList = [];
   String id = '';
 
@@ -60,37 +75,14 @@ class _MyHomePageState extends State<MyHomePage> {
 
   @override
   Widget build(BuildContext context) {
-    // This method is rerun every time setState is called, for instance as done
-    // by the _incrementCounter method above.
-    //
-    // The Flutter framework has been optimized to make rerunning build methods
-    // fast, so that you can just rebuild anything that needs updating rather
-    // than having to individually change instances of widgets.
     return Scaffold(
       appBar: AppBar(
-        //backgroundColor: Theme.of(context).colorScheme.inversePrimary,
-        //backgroundColor: Colors.amber,
-        // Here we take the value from the MyHomePage object that was created by
-        // the App.build method, and use it to set our appbar title.
         title: Text(widget.title),
       ),
       body: Center(
         child: Column(
           mainAxisAlignment: .center,
           children: [
-            // const Text('You have pushed the button this many times:'),
-            // Text(
-            //   '$_counter',
-            //   style: Theme.of(context).textTheme.headlineMedium,
-            // ),
-            // Text('API key from ENV is $API_KEY'),
-            // MaterialButton(
-            //   onPressed: () {
-            //     showResult(ApiHandler.findStations('S Biesdorf'));
-            //   },
-            //   child: Text('Search for \'S Biesdorf\''),
-            // ),
-            // Text(id),
             ElevatedButton(
               onPressed: () {
                 Navigator.push(
@@ -104,6 +96,8 @@ class _MyHomePageState extends State<MyHomePage> {
         ),
       ),
       floatingActionButton: FloatingActionButton(
+        backgroundColor: Theme.of(context).colorScheme.primaryContainer,
+        foregroundColor: Theme.of(context).colorScheme.onPrimaryContainer,
         onPressed: () {
           Navigator.push(
             context,
@@ -162,7 +156,6 @@ class _ChooseStationPageState extends State<ChooseStationPage> {
 
   void _search(String? query) {
     if (query?.isEmpty ?? true) return;
-    // do something with query
     setState(() {
       findStationsByName(query!);
     });
@@ -177,27 +170,18 @@ class _ChooseStationPageState extends State<ChooseStationPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(title: const Text('RoutePicker')),
+      appBar: AppBar(title: const Text('Start a Journey')),
       body: Center(
         child: Column(
           children: [
-            // ElevatedButton(
-            //   onPressed: () {
-            //     showResult(ApiHandler.findStations('S Biesdorf'));
-            //   },
-            //   child: Text('Search for \'S Biesdorf\''),
-            // ),
             SearchAnchor(
               builder: (BuildContext context, SearchController controller) {
                 return SearchBar(
                   controller: controller,
-                  hintText: 'Search for a Station',
+                  hintText: 'Search your start Station',
                   padding: const WidgetStatePropertyAll<EdgeInsets>(
                     EdgeInsets.symmetric(horizontal: 16.0),
                   ),
-                  // onTap: () {
-                  //   controller.openView();
-                  // },
                   onChanged: _onSearchChanged,
                   onSubmitted: _search,
                   leading: const Icon(Icons.search),
@@ -234,9 +218,6 @@ class _ChooseStationPageState extends State<ChooseStationPage> {
   }
 
   void _handleStationTapped(Station station) {
-    // setState(() {
-    //   _selectedStation = station;
-    // });
     Navigator.push(
       context,
       MaterialPageRoute(
@@ -273,9 +254,11 @@ class StationList extends StatelessWidget {
 class ChooseDeparturePage extends StatefulWidget {
   final Station startStation;
   final int? journeyId;
+  final Departure? arrival;
   const ChooseDeparturePage({
     super.key,
     this.journeyId,
+    this.arrival,
     required this.startStation,
   });
 
@@ -288,7 +271,10 @@ class _ChooseDeparturePageState extends State<ChooseDeparturePage> {
   Journey? singleJourney;
 
   void loadDepartures(Station startStation) async {
-    departureList = await ApiHandler.departures(startStation.id);
+    departureList = await ApiHandler.departures(
+      startStation.id,
+      datetime: widget.arrival?.arrivalTime ?? DateTime.now(),
+    );
     setState(() {});
   }
 
@@ -315,12 +301,27 @@ class _ChooseDeparturePageState extends State<ChooseDeparturePage> {
     return Scaffold(
       appBar: AppBar(
         title: Text(
-          'RoutePicker for ${widget.startStation.name} // ${widget.journeyId}',
+          'Departures for ${widget.startStation.name}',
         ),
       ),
       body: Center(
         child: Column(
           children: [
+            Builder(
+              builder: (context) {
+                if (widget.arrival != null) {
+                  return ListTile(
+                    title: Text(
+                      'arrive at ${widget.arrival?.arrivalTime}',
+                    ),
+                  );
+                } else {
+                  return ListTile(
+                    title: Text(''),
+                  );
+                }
+              },
+            ),
             Expanded(
               child: SizedBox(
                 height: 400,
@@ -330,24 +331,24 @@ class _ChooseDeparturePageState extends State<ChooseDeparturePage> {
                 ),
               ),
             ),
-            ElevatedButton(
-              onPressed: () {
-                if (widget.journeyId != null) {
-                  loadJourney(widget.journeyId as int);
-                }
-              },
-              child: const Text('Finish Route'),
-            ),
           ],
         ),
       ),
+      floatingActionButton: FloatingActionButton(
+        backgroundColor: Theme.of(context).colorScheme.primaryContainer,
+        foregroundColor: Theme.of(context).colorScheme.onPrimaryContainer,
+        onPressed: () {
+          if (widget.journeyId != null) {
+            loadJourney(widget.journeyId as int);
+          }
+        },
+        tooltip: 'Finish route',
+        child: const Icon(Icons.check),
+      ),
     );
   }
 
   void _handleDepartureTapped(Departure departure) {
-    // setState(() {
-    //   _selectedDeparture = departure;
-    // });
     Navigator.push(
       context,
       MaterialPageRoute(
@@ -422,7 +423,7 @@ class _ChooseArrivalPageState extends State<ChooseArrivalPage> {
     return Scaffold(
       appBar: AppBar(
         title: Text(
-          'Arrivals for ${widget.departure.vehicleName}// ${widget.journeyId}',
+          'Arrivals for ${widget.departure.vehicleName}',
         ),
       ),
       body: Center(
@@ -445,9 +446,6 @@ class _ChooseArrivalPageState extends State<ChooseArrivalPage> {
   }
 
   void _handleArrivalTapped(Departure departure, Departure arrival) async {
-    // setState(() {
-    //   _selectedDeparture = departure;
-    // });
     departure.dbInsert;
     arrival.dbInsert;
     Segment newSegment = await Segment.fromDepartures(departure, arrival);
@@ -470,6 +468,7 @@ class _ChooseArrivalPageState extends State<ChooseArrivalPage> {
         builder: (context) => ChooseDeparturePage(
           startStation: startStation,
           journeyId: journeyId,
+          arrival: arrival,
         ),
       ),
     );
@@ -526,9 +525,44 @@ class _JourneyDetailPageState extends State<JourneyDetailPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(title: Text('Connection Details \n$duration')),
+      appBar: AppBar(
+        title: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text('Connection Details'),
+            Text(
+              'Duration: ${widget.singleJourney.duration.toString().split(".")[0]}h',
+              textScaler: TextScaler.linear(0.7),
+            ),
+          ],
+        ),
+      ),
       body: Center(
-        child: SegmentList(journey: widget.singleJourney),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Expanded(
+              child: SizedBox(
+                height: 400,
+                child: SegmentList(journey: widget.singleJourney),
+              ),
+            ),
+            Container(
+              margin: const EdgeInsets.only(bottom: 60.0),
+              child: ElevatedButton(
+                onPressed: () {
+                  Navigator.push(
+                    context,
+                    MaterialPageRoute(
+                      builder: (context) => JourneyOverviewPage(),
+                    ),
+                  );
+                },
+                child: const Text('View all Journeys'),
+              ),
+            ),
+          ],
+        ),
       ),
     );
   }
@@ -547,9 +581,39 @@ class SegmentList extends StatelessWidget {
     return ListView(
       children: [
         for (Segment seg in journey.segments)
-          ListTile(
-            title: Text(seg.start.direction),
-            subtitle: Text(seg.start.departureTime.toString()),
+          Card(
+            child: Column(
+              mainAxisSize: .min,
+              children: [
+                Container(
+                  padding: EdgeInsets.only(left: 10, top: 10),
+                  child: Row(
+                    children: [
+                      Text(
+                        seg.vehicle.name,
+                        textScaler: TextScaler.linear(1.1),
+                      ),
+                      Icon(Icons.arrow_right_alt),
+                      Text('${seg.start.direction}'),
+                    ],
+                  ),
+                ),
+                ListTile(
+                  leading: Text(
+                    timeOf(seg.start.departureTime),
+                    textScaler: TextScaler.linear(1.4),
+                  ),
+                  title: Text(seg.start.stationName),
+                ),
+                ListTile(
+                  leading: Text(
+                    timeOf(seg.end.arrivalTime),
+                    textScaler: TextScaler.linear(1.4),
+                  ),
+                  title: Text(seg.end.stationName),
+                ),
+              ],
+            ),
           ),
       ],
     );
@@ -592,6 +656,9 @@ class _JourneyOverviewPageState extends State<JourneyOverviewPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      appBar: AppBar(
+        title: Text("Your Journeys"),
+      ),
       body: Center(
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
@@ -648,21 +715,12 @@ class _JourneyOverviewPageState extends State<JourneyOverviewPage> {
                 );
               },
             ),
-            ElevatedButton(
-              onPressed: () {
-                Navigator.push(
-                  context,
-                  MaterialPageRoute(
-                    builder: (context) => ChooseStationPage(),
-                  ),
-                );
-              },
-              child: const Text('Start a route'),
-            ),
           ],
         ),
       ),
       floatingActionButton: FloatingActionButton(
+        backgroundColor: Theme.of(context).colorScheme.primaryContainer,
+        foregroundColor: Theme.of(context).colorScheme.onPrimaryContainer,
         onPressed: () {
           Navigator.push(
             context,
@@ -700,9 +758,58 @@ class JourneyList extends StatelessWidget {
     return ListView(
       children: [
         for (Journey jour in journeys)
-          ListTile(
-            title: Text('${jour.startStation} to ${jour.endStation}'),
-            onTap: () => onTapped(jour),
+          Card(
+            margin: EdgeInsets.only(
+              left: 3.0,
+              top: 3.0,
+              bottom: 3.0,
+              right: 3.0,
+            ),
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.all(
+                Radius.circular(0.0),
+              ),
+            ),
+            elevation: 0.3,
+            clipBehavior: .hardEdge,
+            child: InkWell(
+              child: Column(
+                mainAxisSize: .min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Container(
+                    padding: EdgeInsets.only(
+                      left: 15.0,
+                      top: 7.0,
+                      bottom: 7.0,
+                      right: 10.0,
+                    ),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          '${jour.startStation}',
+                          textScaler: TextScaler.linear(1.2),
+                        ),
+                        Row(
+                          children: [
+                            Icon(
+                              Icons.arrow_right_alt,
+                              size: 25.0,
+                            ),
+                            Text(
+                              '${jour.endStation}',
+                              textScaler: TextScaler.linear(1.2),
+                            ),
+                          ],
+                        ),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+              onTap: () => onTapped(jour),
+            ),
           ),
       ],
     );

lib/transport_helper.dart

@@ -1,4 +1,5 @@
 import 'package:sqflite/sqflite.dart';
+import 'utilities.dart';
 // import './state_helper.dart';
 // import './db_helper.dart';
 
@@ -94,13 +95,15 @@ class Journey {
     Map<String, Object?> journeyMaps,
     List<Segment> segmentMaps,
   ) {
-    return Journey(
+    Journey journey = Journey(
       id: journeyMaps["id"] as int,
       startStation: journeyMaps["startstation"] as String?,
       endStation: journeyMaps["endstation"] as String?,
       segments: segmentMaps,
       duration: Duration(minutes: 0),
     );
+    journey.sync();
+    return journey;
   }
 
   // from trip API request
@@ -134,8 +137,8 @@ class Journey {
     if (segments.isNotEmpty) {
       startStation = segments.first.start.stationName;
       endStation = segments.last.end.stationName;
-      duration = segments.first.start.departureTime.difference(
-        segments.last.end.arrivalTime,
+      duration = segments.last.end.arrivalTime.difference(
+        segments.first.start.departureTime,
       );
     } else {
       // if the journey has no segments yet, at least the startStation should remain,
@@ -187,9 +190,7 @@ class Journey {
     database.execute("""CREATE TABLE IF NOT EXISTS '$tableName'(
     id            INTEGER PRIMARY KEY AUTOINCREMENT,
     startstation  TEXT,
-    endstation    TEXT,
-    FOREIGN KEY (startstation) REFERENCES station(name)
-    FOREIGN KEY (endstation) REFERENCES station(name)
+    endstation    TEXT
     );
     """);
   }
@@ -225,7 +226,6 @@ class Journey {
   static Future<Journey> fromMapWrapper(Map<String, Object?> journeyMap) async {
     Future<List<Segment>> segs = _dbGetJourneySegments(journeyMap["id"] as int);
     Journey res = Journey.fromMap(journeyMap, await segs);
-    res.sync();
     return res;
   }
 
@@ -236,7 +236,12 @@ class Journey {
   static Future<List<Journey>> dbGetAll({int num = 40, int offset = 0}) async {
     //final batch = DbHelper.db.batch; // later
     Database database = DbHelper.db;
-    var tmp = await database.query(tableName, limit: num, offset: offset);
+    var tmp = await database.query(
+      tableName,
+      limit: num,
+      offset: offset,
+      orderBy: 'id DESC',
+    );
     Future<List<Journey>> journeys = Future.wait(
       tmp.map((jour) => fromMapWrapper(jour)),
     );

lib/utilities.dart

@@ -0,0 +1,13 @@
+String timeOf(DateTime fullDT) {
+  // doing it this way so we always get two digits on the hour
+  String full = fullDT.toString();
+  List<String> splits = full.split(" ")[1].split(":");
+  String time = '${splits[0]}:${splits[1]}';
+  return time;
+}
+
+String dateOf(DateTime fullDT) {
+  String full = fullDT.toString();
+  String date = full.split(" ")[0];
+  return date;
+}

linux/flutter/generated_plugin_registrant.cc

@@ -6,6 +6,10 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <dynamic_color/dynamic_color_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
+  g_autoptr(FlPluginRegistrar) dynamic_color_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "DynamicColorPlugin");
+  dynamic_color_plugin_register_with_registrar(dynamic_color_registrar);
 }

linux/flutter/generated_plugins.cmake

@@ -3,6 +3,7 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  dynamic_color
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST

pubspec.lock

@@ -65,6 +65,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.9"
+  dynamic_color:
+    dependency: "direct main"
+    description:
+      name: dynamic_color
+      sha256: "4aeb76de323e8eb660bab5557d826ad7ebbf1434a598f0c6aa8a11a9696a6757"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.9.0"
   fake_async:
     dependency: transitive
     description:
@@ -215,10 +223,10 @@ packages:
     dependency: transitive
     description:
       name: native_toolchain_c
-      sha256: f59351d28f49520cd3a74eb1f41c5f19ae15e53c65a3231d14af672e46510a96
+      sha256: f9c168717100ae6d9fee9ffb0be379bf1f8b26b0f6bcbd4fdddcd931993a6a72
       url: "https://pub.dev"
     source: hosted
-    version: "0.19.1"
+    version: "0.19.2"
   path:
     dependency: transitive
     description:
@@ -292,26 +300,26 @@ packages:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: cce558075afe2a83f3fd7fc123acd6b090683e4f23910d44fbb31ecd7800b014
+      sha256: "5bf6a55c166e73bf651ba7ec3ed486e577620e3dc8f3a9c6a258a8031b624590"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.9"
+    version: "2.5.11"
   sqflite_common_ffi:
-    dependency: "direct dev"
+    dependency: "direct main"
     description:
       name: sqflite_common_ffi
-      sha256: "3ddad0ec96ad411d5fea45b4912c3cd5743436c9e1890c26a6e688a32d901cae"
+      sha256: "5ccd38136edb9beb3213f6927775d52db70dfdadcdb28dad1f625ca9f2b9824f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.4.2"
   sqflite_darwin:
     dependency: transitive
     description:
       name: sqflite_darwin
-      sha256: "164a5d73ab87a134566057219988bafde837029a64264e61f1f04376ef3cfcd2"
+      sha256: c86ca18b8f666bbf903924687fe21cc16fc385d086005067e26619ca530bef9f
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.3"
+    version: "2.4.3+1"
   sqflite_platform_interface:
     dependency: transitive
     description:
@@ -321,13 +329,13 @@ packages:
     source: hosted
     version: "2.4.1"
   sqlite3:
-    dependency: "direct dev"
+    dependency: "direct main"
     description:
       name: sqlite3
-      sha256: "9488c7d2cdb1091c91cacf7e207cff81b28bff8e366f042bad3afe7d34afe189"
+      sha256: "64b2c63c8232dd20d14b34105a81ebfd74320442e8451f836179ec89986aa478"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.2"
+    version: "3.5.1"
   stack_trace:
     dependency: transitive
     description:
@@ -356,10 +364,10 @@ packages:
     dependency: transitive
     description:
       name: synchronized
-      sha256: "93b153dcb6a26dcddee6ca087dd634b53e38c10b5aa163e8e49501a776456153"
+      sha256: "61894a1956de6b4fc1aefd0892e109514a1a706cbece3ac59decd90ff5a7a423"
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.1"
+    version: "3.4.1+1"
   term_glyph:
     dependency: transitive
     description:

pubspec.yaml

@@ -37,6 +37,9 @@ dependencies:
   flutter_dotenv: ^6.0.1
   http: ^1.6.0
   sqflite: ^2.4.2+1
+  sqlite3: ^3.3.0
+  sqflite_common_ffi: ^2.4.0+3
+  dynamic_color: ^1.9.0
 dev_dependencies:
   flutter_test:
     sdk: flutter