Revert "build(mobile): deactivate sqlite debugging lib used for desktop"

keep development branch in a state to run on desktop

This reverts commit 5ead82b9c6.

lib/api_handler.dart

@@ -5,7 +5,14 @@ import 'dart:core';
 import 'dart:convert';
 
 import 'transport_helper.dart';
-import 'utilities.dart';
+
+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;
+}
 
 class ApiHandler {
   // TODO: Split next line for better Error Handling
@@ -72,7 +79,7 @@ class ApiHandler {
   static Future<List<Departure>> departures(
     String stationId, {
     int? maxDepartures = -1,
-    DateTime? datetime,
+    DateTime? time,
     int? duration = 0,
   }) async {
     String urlPath = '/api/fahrinfo/latest/departureBoard';
@@ -81,9 +88,8 @@ class ApiHandler {
     Uri url = Uri.https(baseUrl, urlPath, {
       'accessId': accessID,
       'id': stationString,
-      'date': dateOf(datetime ?? DateTime.now()),
       'time': timeOf(
-        datetime ?? DateTime.now(),
+        time ?? DateTime.now(),
       ), //time from which departures will be shown
       'duration': duration.toString(), //interval time in minutes
       'maxJourneys': maxDepartures.toString(),

lib/main.dart

@@ -1,53 +1,36 @@
 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 'utilities.dart';
+import 'dart:async';
+
+import 'package:sqflite_common_ffi/sqflite_ffi.dart'; //for testing on desktop
 
 void main() async {
   await dotenv.load();
   const String dbName = "oeffimasterTransportDb";
-
-  if (Platform.isLinux) {
-    databaseFactory = databaseFactoryFfi; // for debugging and desktop test
-  }
+  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 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',
-        );
-      },
+    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(),
+      // },
     );
   }
 }
@@ -62,7 +45,9 @@ 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 = '';
 
@@ -75,14 +60,37 @@ 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(
@@ -96,8 +104,6 @@ class _MyHomePageState extends State<MyHomePage> {
         ),
       ),
       floatingActionButton: FloatingActionButton(
-        backgroundColor: Theme.of(context).colorScheme.primaryContainer,
-        foregroundColor: Theme.of(context).colorScheme.onPrimaryContainer,
         onPressed: () {
           Navigator.push(
             context,
@@ -156,6 +162,7 @@ class _ChooseStationPageState extends State<ChooseStationPage> {
 
   void _search(String? query) {
     if (query?.isEmpty ?? true) return;
+    // do something with query
     setState(() {
       findStationsByName(query!);
     });
@@ -170,18 +177,27 @@ class _ChooseStationPageState extends State<ChooseStationPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(title: const Text('Start a Journey')),
+      appBar: AppBar(title: const Text('RoutePicker')),
       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 your start Station',
+                  hintText: 'Search for a Station',
                   padding: const WidgetStatePropertyAll<EdgeInsets>(
                     EdgeInsets.symmetric(horizontal: 16.0),
                   ),
+                  // onTap: () {
+                  //   controller.openView();
+                  // },
                   onChanged: _onSearchChanged,
                   onSubmitted: _search,
                   leading: const Icon(Icons.search),
@@ -218,6 +234,9 @@ class _ChooseStationPageState extends State<ChooseStationPage> {
   }
 
   void _handleStationTapped(Station station) {
+    // setState(() {
+    //   _selectedStation = station;
+    // });
     Navigator.push(
       context,
       MaterialPageRoute(
@@ -273,7 +292,7 @@ class _ChooseDeparturePageState extends State<ChooseDeparturePage> {
   void loadDepartures(Station startStation) async {
     departureList = await ApiHandler.departures(
       startStation.id,
-      datetime: widget.arrival?.arrivalTime ?? DateTime.now(),
+      time: widget.arrival?.arrivalTime ?? DateTime.now(),
     );
     setState(() {});
   }
@@ -301,27 +320,12 @@ class _ChooseDeparturePageState extends State<ChooseDeparturePage> {
     return Scaffold(
       appBar: AppBar(
         title: Text(
-          'Departures for ${widget.startStation.name}',
+          'RoutePicker for ${widget.startStation.name} // ${widget.journeyId}',
         ),
       ),
       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,
@@ -331,12 +335,18 @@ 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);
@@ -349,6 +359,9 @@ class _ChooseDeparturePageState extends State<ChooseDeparturePage> {
   }
 
   void _handleDepartureTapped(Departure departure) {
+    // setState(() {
+    //   _selectedDeparture = departure;
+    // });
     Navigator.push(
       context,
       MaterialPageRoute(
@@ -423,7 +436,7 @@ class _ChooseArrivalPageState extends State<ChooseArrivalPage> {
     return Scaffold(
       appBar: AppBar(
         title: Text(
-          'Arrivals for ${widget.departure.vehicleName}',
+          'Arrivals for ${widget.departure.vehicleName}// ${widget.journeyId}',
         ),
       ),
       body: Center(
@@ -446,6 +459,9 @@ 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);
@@ -525,18 +541,7 @@ class _JourneyDetailPageState extends State<JourneyDetailPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      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),
-            ),
-          ],
-        ),
-      ),
+      appBar: AppBar(title: Text('Connection Details \n$duration')),
       body: Center(
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
@@ -551,7 +556,7 @@ class _JourneyDetailPageState extends State<JourneyDetailPage> {
               margin: const EdgeInsets.only(bottom: 60.0),
               child: ElevatedButton(
                 onPressed: () {
-                  Navigator.push(
+                  Navigator.pop(
                     context,
                     MaterialPageRoute(
                       builder: (context) => JourneyOverviewPage(),
@@ -581,39 +586,9 @@ class SegmentList extends StatelessWidget {
     return ListView(
       children: [
         for (Segment seg in journey.segments)
-          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),
-                ),
-              ],
-            ),
+          ListTile(
+            title: Text(seg.start.direction),
+            subtitle: Text(seg.start.departureTime.toString()),
           ),
       ],
     );
@@ -656,13 +631,20 @@ 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,
           children: [
+            Container(
+              padding: EdgeInsets.only(left: 30, top: 50),
+              width: 500.0,
+              height: 100.0,
+              child: FittedBox(
+                fit: BoxFit.contain,
+                alignment: Alignment.centerLeft,
+                child: Text("Your Journeys"),
+              ),
+            ),
             FutureBuilder(
               future: loadJourneys(),
               builder: (context, snapshot) {
@@ -715,12 +697,21 @@ 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,
@@ -758,58 +749,9 @@ class JourneyList extends StatelessWidget {
     return ListView(
       children: [
         for (Journey jour in journeys)
-          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),
-            ),
+          ListTile(
+            title: Text('${jour.startStation} to ${jour.endStation}'),
+            onTap: () => onTapped(jour),
           ),
       ],
     );

lib/transport_helper.dart

@@ -1,5 +1,4 @@
 import 'package:sqflite/sqflite.dart';
-import 'utilities.dart';
 // import './state_helper.dart';
 // import './db_helper.dart';
 
@@ -95,15 +94,13 @@ class Journey {
     Map<String, Object?> journeyMaps,
     List<Segment> segmentMaps,
   ) {
-    Journey journey = Journey(
+    return 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
@@ -137,8 +134,8 @@ class Journey {
     if (segments.isNotEmpty) {
       startStation = segments.first.start.stationName;
       endStation = segments.last.end.stationName;
-      duration = segments.last.end.arrivalTime.difference(
-        segments.first.start.departureTime,
+      duration = segments.first.start.departureTime.difference(
+        segments.last.end.arrivalTime,
       );
     } else {
       // if the journey has no segments yet, at least the startStation should remain,
@@ -226,6 +223,7 @@ 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,12 +234,7 @@ 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,
-      orderBy: 'id DESC',
-    );
+    var tmp = await database.query(tableName, limit: num, offset: offset);
     Future<List<Journey>> journeys = Future.wait(
       tmp.map((jour) => fromMapWrapper(jour)),
     );

lib/utilities.dart

@@ -1,13 +0,0 @@
-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,10 +6,6 @@
 
 #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,7 +3,6 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  dynamic_color
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST

pubspec.lock

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

pubspec.yaml

@@ -37,9 +37,6 @@ 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