Skip to content

Commit

Permalink
renamed package
Browse files Browse the repository at this point in the history
  • Loading branch information
tbfuerst committed Mar 22, 2020
1 parent 97a3618 commit 6e0ab59
Show file tree
Hide file tree
Showing 24 changed files with 55 additions and 49 deletions.
4 changes: 2 additions & 2 deletions lib/activities/distance-page.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions lib/activities/drink-page.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions lib/activities/eat-page.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions lib/activities/gym-page.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions lib/activities/hand-page.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions lib/activities/handsface-page.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/activities/health-page.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions lib/activities/hygiene-page.dart
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion lib/activities/psych-page.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions lib/activities/run-page.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions lib/activities/sleep-page.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions lib/activities/smartdes-page.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions lib/activities/sneeze-page.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions lib/activities/ventilate-page.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
6 changes: 3 additions & 3 deletions lib/activities/walk-page.dart
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion lib/app-container.dart
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion lib/database/db.dart
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
26 changes: 16 additions & 10 deletions lib/notification-manager.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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);
Expand All @@ -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');
}
}
4 changes: 2 additions & 2 deletions lib/pages/activity-page.dart
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/mascot-page.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/quiz/quiz-widget.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/scoped-model/database-model.dart
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
4 changes: 2 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/widget_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 6e0ab59

Please sign in to comment.