Move delete radlnetz to settings #56

MunichWays · Jun 11, 2022 · ff22ffa · ff22ffa
1 parent df02ba5
commit ff22ffa
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 13 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:munich_ways/nav_routes.dart';
 import 'package:munich_ways/ui/about/imprint_screen.dart';
 import 'package:munich_ways/ui/about/info_screen.dart';
+import 'package:munich_ways/ui/about/settings_screen.dart';
 import 'package:munich_ways/ui/map/map_screen.dart';
 import 'package:munich_ways/ui/theme.dart';
 
@@ -31,6 +32,8 @@ class _MunichWaysAppState extends State<MunichWaysApp> {
                 builder: (context) => InfoScreen());
           case NavRoutes.imprint:
             return MaterialPageRoute(builder: (context) => ImprintScreen());
+          case NavRoutes.settings:
+            return MaterialPageRoute(builder: (context) => SettingsScreen());
           default:
             throw Exception("unknown route ${settings.name}");
         }

diff --git a/lib/nav_routes.dart b/lib/nav_routes.dart
@@ -3,4 +3,5 @@ class NavRoutes {
   static const String map = "/map";
   static const String info = "/info";
   static const String imprint = "/info/imprint";
+  static const String settings = "/settings";
 }
diff --git a/lib/ui/about/info_screen.dart b/lib/ui/about/info_screen.dart
@@ -3,7 +3,6 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:munich_ways/common/logger_setup.dart';
 import 'package:munich_ways/nav_routes.dart';
-import 'package:munich_ways/ui/map/munichways_api.dart';
 import 'package:munich_ways/ui/side_drawer.dart';
 import 'package:package_info/package_info.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -105,15 +104,6 @@ class _InfoScreenState extends State<InfoScreen> {
                   Navigator.of(context).pushNamed(NavRoutes.imprint);
                 },
               ),
-              ListTile(
-                title: Text('Radlnetz löschen'),
-                subtitle:
-                    Text('Das Radlnetz wird beim Karte öffnen erneut geladen.'),
-                trailing: Icon(Icons.delete),
-                onTap: () {
-                  MunichwaysApi().emptyCache();
-                },
-              ),
             ],
           ).toList(),
         ),

diff --git a/lib/ui/about/settings_screen.dart b/lib/ui/about/settings_screen.dart
@@ -0,0 +1,43 @@
+
+import 'package:flutter/material.dart';
+import 'package:munich_ways/ui/map/munichways_api.dart';
+import 'package:munich_ways/ui/side_drawer.dart';
+
+class SettingsScreen extends StatefulWidget {
+  @override
+  _SettingsScreenState createState() => _SettingsScreenState();
+}
+
+class _SettingsScreenState extends State<SettingsScreen> {
+  GlobalKey<ScaffoldMessengerState> scaffoldMessengerKey =
+  GlobalKey<ScaffoldMessengerState>();
+
+  @override
+  Widget build(BuildContext context) {
+    return ScaffoldMessenger(
+      key: scaffoldMessengerKey,
+      child: Scaffold(
+        drawer: SideDrawer(),
+        appBar: AppBar(
+          title: Text("Einstellungen"),
+        ),
+        body: ListView(
+          children: ListTile.divideTiles(
+            context: context,
+            tiles: [
+              ListTile(
+                contentPadding: EdgeInsets.symmetric(horizontal: 16.0, vertical: 16.0),
+                title: Text('Radnetz neu laden'),
+                subtitle: Text('Das Radlnetz wird beim Karte öffnen erneut geladen.'),
+                trailing: Icon(Icons.delete),
+                onTap: () {
+                  MunichwaysApi().emptyCache();
+                },
+              ),
+            ],
+          ).toList(),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/ui/map/munichways_api.dart b/lib/ui/map/munichways_api.dart
@@ -13,9 +13,11 @@ class MunichwaysApi {
   GeojsonConverter _converter = GeojsonConverter();
 
   Future<Set<MPolyline>> getRadlvorrangnetz() async {
-    if (await DefaultCacheManager().getFileFromCache(_radlvorrangnetzUrl) !=
-        null) {
-      log.d("cached");
+    FileInfo geoJsonFileInfo =
+        await DefaultCacheManager().getFileFromCache(_radlvorrangnetzUrl);
+
+    if (geoJsonFileInfo != null) {
+      log.d("cached till ${geoJsonFileInfo.validTill.toIso8601String()}");
     } else {
       log.d("not cached");
     }

diff --git a/lib/ui/side_drawer.dart b/lib/ui/side_drawer.dart
@@ -37,6 +37,12 @@ class SideDrawer extends StatelessWidget {
             route: NavRoutes.info,
             currentRoute: currentRoute,
           ),
+          NavigationDrawerItem(
+            title: 'Einstellungen',
+            icon: Icons.settings,
+            route: NavRoutes.settings,
+            currentRoute: currentRoute,
+          ),
         ],
       ),
     );