From 6e0ab59cfbae48f8d97b55bc26d8bbaf29883294 Mon Sep 17 00:00:00 2001 From: Tobias Luderer Date: Sun, 22 Mar 2020 19:30:32 +0100 Subject: [PATCH] renamed package --- lib/activities/distance-page.dart | 4 ++-- lib/activities/drink-page.dart | 4 ++-- lib/activities/eat-page.dart | 4 ++-- lib/activities/gym-page.dart | 4 ++-- lib/activities/hand-page.dart | 4 ++-- lib/activities/handsface-page.dart | 4 ++-- lib/activities/health-page.dart | 2 +- lib/activities/hygiene-page.dart | 4 ++-- lib/activities/psych-page.dart | 2 +- lib/activities/run-page.dart | 4 ++-- lib/activities/sleep-page.dart | 4 ++-- lib/activities/smartdes-page.dart | 4 ++-- lib/activities/sneeze-page.dart | 4 ++-- lib/activities/ventilate-page.dart | 4 ++-- lib/activities/walk-page.dart | 6 +++--- lib/app-container.dart | 2 +- lib/database/db.dart | 2 +- lib/notification-manager.dart | 26 ++++++++++++++++---------- lib/pages/activity-page.dart | 4 ++-- lib/pages/mascot-page.dart | 2 +- lib/quiz/quiz-widget.dart | 2 +- lib/scoped-model/database-model.dart | 2 +- pubspec.yaml | 4 ++-- test/widget_test.dart | 2 +- 24 files changed, 55 insertions(+), 49 deletions(-) diff --git a/lib/activities/distance-page.dart b/lib/activities/distance-page.dart index 5deb3e4..3a25277 100644 --- a/lib/activities/distance-page.dart +++ b/lib/activities/distance-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/designed-button.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../scoped-model/main-model.dart'; import '../model/activity.dart'; diff --git a/lib/activities/drink-page.dart b/lib/activities/drink-page.dart index 604c61b..761bd63 100644 --- a/lib/activities/drink-page.dart +++ b/lib/activities/drink-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/designed-button.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../scoped-model/main-model.dart'; import '../model/activity.dart'; diff --git a/lib/activities/eat-page.dart b/lib/activities/eat-page.dart index f1cd1ca..d72efe4 100644 --- a/lib/activities/eat-page.dart +++ b/lib/activities/eat-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/designed-button.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../scoped-model/main-model.dart'; import '../model/activity.dart'; diff --git a/lib/activities/gym-page.dart b/lib/activities/gym-page.dart index 3af81d0..384bbd8 100644 --- a/lib/activities/gym-page.dart +++ b/lib/activities/gym-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/designed-button.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../scoped-model/main-model.dart'; import '../model/activity.dart'; diff --git a/lib/activities/hand-page.dart b/lib/activities/hand-page.dart index 6a15cea..64d5ebd 100644 --- a/lib/activities/hand-page.dart +++ b/lib/activities/hand-page.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/designed-button.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../scoped-model/main-model.dart'; import '../model/activity.dart'; diff --git a/lib/activities/handsface-page.dart b/lib/activities/handsface-page.dart index 064d3b0..ea51f97 100644 --- a/lib/activities/handsface-page.dart +++ b/lib/activities/handsface-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/designed-button.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../scoped-model/main-model.dart'; import '../model/activity.dart'; diff --git a/lib/activities/health-page.dart b/lib/activities/health-page.dart index fc5ee31..b3f67fe 100644 --- a/lib/activities/health-page.dart +++ b/lib/activities/health-page.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/scoped-model/main-model.dart'; +import 'package:Karlorona/scoped-model/main-model.dart'; import 'package:scoped_model/scoped_model.dart'; import 'activity-start-button.dart'; diff --git a/lib/activities/hygiene-page.dart b/lib/activities/hygiene-page.dart index 4992e96..637ab25 100644 --- a/lib/activities/hygiene-page.dart +++ b/lib/activities/hygiene-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/activity-start-button.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/scoped-model/main-model.dart'; +import 'package:Karlorona/activities/activity-start-button.dart'; +import 'package:Karlorona/scoped-model/main-model.dart'; import 'package:scoped_model/scoped_model.dart'; class HygienePage extends StatefulWidget { diff --git a/lib/activities/psych-page.dart b/lib/activities/psych-page.dart index aedb8ad..b5cb093 100644 --- a/lib/activities/psych-page.dart +++ b/lib/activities/psych-page.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/scoped-model/main-model.dart'; +import 'package:Karlorona/scoped-model/main-model.dart'; import 'package:scoped_model/scoped_model.dart'; import 'activity-start-button.dart'; diff --git a/lib/activities/run-page.dart b/lib/activities/run-page.dart index 911ef58..e1af8f7 100644 --- a/lib/activities/run-page.dart +++ b/lib/activities/run-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/designed-button.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../scoped-model/main-model.dart'; import '../model/activity.dart'; diff --git a/lib/activities/sleep-page.dart b/lib/activities/sleep-page.dart index 37f23df..adaf24a 100644 --- a/lib/activities/sleep-page.dart +++ b/lib/activities/sleep-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/designed-button.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../scoped-model/main-model.dart'; import '../model/activity.dart'; diff --git a/lib/activities/smartdes-page.dart b/lib/activities/smartdes-page.dart index b4717e1..7612d94 100644 --- a/lib/activities/smartdes-page.dart +++ b/lib/activities/smartdes-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/designed-button.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../scoped-model/main-model.dart'; import '../model/activity.dart'; diff --git a/lib/activities/sneeze-page.dart b/lib/activities/sneeze-page.dart index 3aaa291..9c7e41b 100644 --- a/lib/activities/sneeze-page.dart +++ b/lib/activities/sneeze-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/designed-button.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../scoped-model/main-model.dart'; import '../model/activity.dart'; diff --git a/lib/activities/ventilate-page.dart b/lib/activities/ventilate-page.dart index f73f5e0..71ec9fe 100644 --- a/lib/activities/ventilate-page.dart +++ b/lib/activities/ventilate-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/designed-button.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../scoped-model/main-model.dart'; import '../model/activity.dart'; diff --git a/lib/activities/walk-page.dart b/lib/activities/walk-page.dart index 1883d5f..46b7bb2 100644 --- a/lib/activities/walk-page.dart +++ b/lib/activities/walk-page.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/designed-button.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/done-button.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/scoped-model/main-model.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; +import 'package:Karlorona/scoped-model/main-model.dart'; import 'package:scoped_model/scoped_model.dart'; import '../model/activity.dart'; diff --git a/lib/app-container.dart b/lib/app-container.dart index 04a8207..c27153f 100644 --- a/lib/app-container.dart +++ b/lib/app-container.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/pages/welcome-page.dart'; +import 'package:Karlorona/pages/welcome-page.dart'; import 'package:scoped_model/scoped_model.dart'; import './scoped-model/main-model.dart'; diff --git a/lib/database/db.dart b/lib/database/db.dart index b568a0e..f6fcdbe 100644 --- a/lib/database/db.dart +++ b/lib/database/db.dart @@ -1,4 +1,4 @@ -import 'package:ich_mache_es_richtig_richtig_oder/model/activity.dart'; +import 'package:Karlorona/model/activity.dart'; import 'package:sqflite/sqflite.dart'; import 'package:path/path.dart'; diff --git a/lib/notification-manager.dart b/lib/notification-manager.dart index ed4eaf6..d1e1ebb 100644 --- a/lib/notification-manager.dart +++ b/lib/notification-manager.dart @@ -4,21 +4,25 @@ import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/pages/about-page.dart'; +import 'package:Karlorona/pages/about-page.dart'; import './main.dart'; class NotificationManager { - - final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin(); + final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = + FlutterLocalNotificationsPlugin(); initNotifications(BuildContext context) async { // initialise the plugin. app_icon needs to be a added as a drawable resource to the Android head project - var initializationSettingsAndroid = AndroidInitializationSettings('app_icon'); - var initializationSettingsIOS = IOSInitializationSettings(onDidReceiveLocalNotification: onDidReceiveLocalNotification); - var initializationSettings = InitializationSettings(initializationSettingsAndroid, initializationSettingsIOS); + var initializationSettingsAndroid = + AndroidInitializationSettings('app_icon'); + var initializationSettingsIOS = IOSInitializationSettings( + onDidReceiveLocalNotification: onDidReceiveLocalNotification); + var initializationSettings = InitializationSettings( + initializationSettingsAndroid, initializationSettingsIOS); await flutterLocalNotificationsPlugin.initialize(initializationSettings, - onSelectNotification: (payload) => onSelectNotification(payload, context)); + onSelectNotification: (payload) => + onSelectNotification(payload, context)); } /// Handle a opened notification: Navigate to a page of payload. @@ -30,10 +34,11 @@ class NotificationManager { } // Navigate - switch(payload) { + switch (payload) { case '/about': debugPrint('Notification: Navigate to $payload'); - await Navigator.push(context, MaterialPageRoute(builder: (context) => AboutPage())); + await Navigator.push( + context, MaterialPageRoute(builder: (context) => AboutPage())); break; default: debugPrint('Error: Unknown notification payload: ' + payload); @@ -42,7 +47,8 @@ class NotificationManager { } /// Handle a received notification - Future onDidReceiveLocalNotification(int id, String title, String body, String payload) async { + Future onDidReceiveLocalNotification( + int id, String title, String body, String payload) async { debugPrint('Received local notification: $id - $title - $body - $payload'); } } diff --git a/lib/pages/activity-page.dart b/lib/pages/activity-page.dart index bf8c3db..342cc29 100644 --- a/lib/pages/activity-page.dart +++ b/lib/pages/activity-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/activities/activity-start-button.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/scoped-model/main-model.dart'; +import 'package:Karlorona/activities/activity-start-button.dart'; +import 'package:Karlorona/scoped-model/main-model.dart'; import 'package:scoped_model/scoped_model.dart'; class ActivityPage extends StatelessWidget { diff --git a/lib/pages/mascot-page.dart b/lib/pages/mascot-page.dart index 36bf446..64a3999 100644 --- a/lib/pages/mascot-page.dart +++ b/lib/pages/mascot-page.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/scoped-model/main-model.dart'; +import 'package:Karlorona/scoped-model/main-model.dart'; import 'package:percent_indicator/percent_indicator.dart'; import 'package:scoped_model/scoped_model.dart'; diff --git a/lib/quiz/quiz-widget.dart b/lib/quiz/quiz-widget.dart index 7a8a340..7fb67c7 100644 --- a/lib/quiz/quiz-widget.dart +++ b/lib/quiz/quiz-widget.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/scoped-model/main-model.dart'; +import 'package:Karlorona/scoped-model/main-model.dart'; import 'package:scoped_model/scoped_model.dart'; import '../quiz/question-page.dart'; import 'dart:convert'; diff --git a/lib/scoped-model/database-model.dart b/lib/scoped-model/database-model.dart index 8cc3374..719fa95 100644 --- a/lib/scoped-model/database-model.dart +++ b/lib/scoped-model/database-model.dart @@ -1,4 +1,4 @@ -import 'package:ich_mache_es_richtig_richtig_oder/model/activity.dart'; +import 'package:Karlorona/model/activity.dart'; import 'package:scoped_model/scoped_model.dart'; import '../database/db.dart'; diff --git a/pubspec.yaml b/pubspec.yaml index 9dfd5bd..267404d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ -name: ich_mache_es_richtig_richtig_oder -description: A new Flutter project. +name: Karlorona +description: Ein Projekt im Rahmen des Hackathon \#wirvsvirus. # The following defines the version and build number for your application. # A version number is three numbers separated by dots, like 1.2.43 diff --git a/test/widget_test.dart b/test/widget_test.dart index d31f72b..9287ca1 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -8,7 +8,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:ich_mache_es_richtig_richtig_oder/main.dart'; +import 'package:Karlorona/main.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async {