Skip to content

Commit a6ecb2a

Browse files
roranmorearoranmorea
authored
Merge pull request #82 from Rumpelstilzli/master
release v1.0.0
2 parents daf2970 + 7db530e commit a6ecb2a

31 files changed

Lines changed: 701 additions & 360 deletions

‎.vscode/launch.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
"name": "Flutter",
99
"request": "launch",
1010
"type": "dart",
11+
/*
1112
"args": [
1213
"--flavor",
1314
"Runner 2"
14-
]
15+
]*/
1516
}
1617
]
1718
}

‎README.md‎

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,35 @@
11
# Morea
22

3-
Teleblitz app
3+
This Project is an IOS and Android application.
4+
It is used for the youth organisation [Pfadi Morea] (https://www.morea.ch).
45

6+
The use-cases can be seperated into three parts:
57

6-
## Getting Started
7-
8-
This project is a starting point for a Flutter application.
9-
10-
A few resources to get you started if this is your first Flutter project:
11-
12-
13-
- [Lab: Write your first Flutter app](https://flutter.io/docs/get-started/codelab)
14-
- [Cookbook: Useful Flutter samples](https://flutter.io/docs/cookbook)
15-
16-
For help getting started with Flutter, view our
17-
[online documentation](https://flutter.io/docs), which offers tutorials,
18-
samples, guidance on mobile development, and a full API reference.
19-
20-
## What is it for
21-
22-
- This application is used to store activity information by the "Leiter" users and display it on devices of "Teilnehmer".
23-
- This application can display an agenda, with previously uploaded Events by "Leiter"
24-
25-
## What will (hopefully) the application be in the future
26-
27-
For "Teilnehmer":
8+
For "Teilnehmer":
289
- Get your information for the next activity.
2910
- Sign up for the next activity.
3011
- An agenda with the important events of scout group.
31-
- A place where you can comunicate with others of your scout group.
12+
- Connect your user account with your parent.
13+
14+
For "Eltern":
15+
- Get your childs information for the next activity.
16+
- Sign up for the next activity.
17+
- An agenda with the important events of scout group.
18+
- Connect your user account with your child.
3219

3320
For "Leiter":
3421
- An application to upload the information for the next activity.
3522
- See who is coming to the next activity.
3623
- Set events to the agenda.
3724
- Write to your "Teilnehmer"
25+
- Send push notification
26+
27+
## Contact
28+
29+
If your intressed in what we have done have suggestions or might implement
30+
our app for your organisation pls contact us: production@morea.ch
31+
32+
33+
3834

3935

‎android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ android {
4343
defaultConfig {
4444
applicationId "ch.morea.morea"
4545
minSdkVersion 16
46-
targetSdkVersion 28
46+
targetSdkVersion 29
4747
versionCode flutterVersionCode.toInteger()
4848
versionName flutterVersionName
4949
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

‎ios/Flutter/flutter_export_environment.sh‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
#!/bin/sh
22
# This is a generated file; do not edit or check into version control.
3-
export "FLUTTER_ROOT=/Users/z_admin/Downloads/flutter"
4-
export "FLUTTER_APPLICATION_PATH=/Users/z_admin/Documents/dev/morea"
5-
export "FLUTTER_TARGET=/Users/z_admin/Documents/dev/morea/lib/main.dart"
3+
export "FLUTTER_ROOT=C:\Users\David Wild\flutter\flutter"
4+
export "FLUTTER_APPLICATION_PATH=C:\Users\David Wild\Documents\app"
5+
export "FLUTTER_TARGET=lib\main.dart"
66
export "FLUTTER_BUILD_DIR=build"
7-
export "SYMROOT=${SOURCE_ROOT}/../build/ios"
8-
export "FLUTTER_FRAMEWORK_DIR=/Users/z_admin/Downloads/flutter/bin/cache/artifacts/engine/ios"
7+
export "SYMROOT=${SOURCE_ROOT}/../build\ios"
8+
export "FLUTTER_FRAMEWORK_DIR=C:\Users\David Wild\flutter\flutter\bin\cache\artifacts\engine\ios"
99
export "FLUTTER_BUILD_NAME=1.0.1"
1010
export "FLUTTER_BUILD_NUMBER=3"
11-
export "TRACK_WIDGET_CREATION=true"

‎lib/Pages/About/about.dart‎

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,49 @@
11
import 'package:flutter/cupertino.dart';
22
import 'package:flutter/material.dart';
3+
import 'package:flutter_html/rich_text_parser.dart';
34
import 'package:morea/Widgets/standart/moreaTextStyle.dart';
45
import 'package:morea/morealayout.dart';
5-
import 'package:share/share.dart';
6+
import 'package:morea/services/utilities/url_launcher.dart';
67

78
class AboutThisApp extends StatelessWidget {
9+
final Urllauncher urllauncher = Urllauncher();
10+
final String aboutText =
11+
"Warum haben wir eine App für die Pfadi Morea kreiert?\nHeutzutage will man alles mit dem Handy machen können, vom chatten bis zum eBanking. Also wollten wir euch dies auch für die Pfadi ermöglichen. Unser Ziel ist es, gewisse Abläufe für euch zu vereinfachen. So haben wir den E-Mail-Verteiler in die App integriert, so dass ihr automatisch in den Verteiler aufgenommen werdet, wenn ihr euch für die App registriert.\nDie App soll in Zukunft erweitert werden mit Funktionen, die euch das Leben in der Pfadi weiter vereinfachen.\nFalls ihr Ideen für die Weiterentwicklung der App habt oder wenn ihr Fehler findet, dann schreibt uns auf ";
12+
813
@override
914
Widget build(BuildContext context) {
1015
return new Scaffold(
1116
appBar: new AppBar(
12-
title: new Text("Über dieses App"),
17+
title: new Text("Über dieses App", style: MoreaTextStyle.lable,),
1318
),
1419
body: MoreaBackgroundContainer(
1520
child: SingleChildScrollView(
1621
child: MoreaShadowContainer(
1722
child: Column(
1823
children: <Widget>[
1924
Padding(
20-
padding: const EdgeInsets.all(20.0),
21-
child: new Text("Gefällt dir die App?", style: MoreaTextStyle.lable,),
25+
padding: EdgeInsets.all(20),
26+
child: RichText(
27+
text: TextSpan(text: 'Die Pfadi Morea hat eine App!?', style: TextStyle(
28+
color: MoreaColors.violett,
29+
fontWeight: FontWeight.w600,
30+
fontSize: 18,
31+
letterSpacing: 0.15)),
32+
),
2233
),
23-
new Row(
24-
mainAxisAlignment: MainAxisAlignment.center,
25-
children: <Widget>[
26-
new Text("Erzähle allen davon!"),
27-
new IconButton(
28-
icon: Icon(Icons.share),
29-
onPressed: () => {
30-
Share.share("Möchtest du auch in die Pfadi? Lade dir unsere Pfadi Morea App im Playstore/Applestore herunter und komm vorbei!")
31-
},
32-
),
33-
],
34+
Padding(
35+
padding: const EdgeInsets.only(right: 20.0, left: 20.0,),
36+
child: RichText(
37+
text: TextSpan(
38+
text: aboutText,
39+
style: MoreaTextStyle.normal,
40+
children: <TextSpan>[
41+
LinkTextSpan(text: 'it@morea.ch', style: MoreaTextStyle.link, onLinkTap: (url){urllauncher.openMail('it@morea.ch');}, url: 'mailto:<it@morea.ch>'),
42+
TextSpan(text: '.\nAzb Jarvis und Roran', style: MoreaTextStyle.normal)
43+
]
44+
)
45+
),
3446
),
35-
3647
Padding(
3748
padding: EdgeInsets.only(bottom: 20),
3849
)

‎lib/Pages/Agenda/Agenda_Eventadd_page.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,6 @@ class EventAddPageState extends State<EventAddPage> {
346346
}
347347
}
348348

349-
//TODO pass Abteilunggoup to this page
350349
initSubgoup() async {
351350
Map<String, dynamic> data =
352351
(await crud0.getDocument(pathGroups, "1165")).data;

‎lib/Pages/Agenda/Agenda_page.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ class _AgendaStatePage extends State<AgendaState>
213213
disableAnimation: true,
214214
description: 'Hier kannst du Events/Lager hinzufügen',
215215
child: new FloatingActionButton(
216+
elevation: 1,
216217
child: Icon(Icons.add),
217218
backgroundColor: Color(0xff7a62ff),
218219
onPressed: () => routetoAddevent(),

‎lib/Pages/Grundbausteine/datenschutz.dart‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Datenschutz implements BaseDatenschutz {
2727
context: context,
2828
barrierDismissible: false,
2929
builder: (BuildContext context) => Container(
30-
padding: EdgeInsets.all(15),
30+
padding: EdgeInsets.all(10),
3131
child: new Card(
3232
child: Container(
3333
padding: EdgeInsets.all(10),
@@ -38,7 +38,7 @@ class Datenschutz implements BaseDatenschutz {
3838
child: Text(
3939
'Datenschutzerklährung',
4040
style: new TextStyle(
41-
fontSize: 25,
41+
fontSize: 24,
4242
color: Color(0xff7a62ff),
4343
fontWeight: FontWeight.bold),
4444
),
@@ -84,7 +84,7 @@ class Datenschutz implements BaseDatenschutz {
8484
crossAxisAlignment: CrossAxisAlignment.start,
8585
children: <Widget>[
8686
Expanded(
87-
flex: 2,
87+
flex: 1,
8888
child: SizedBox(),
8989
),
9090
Expanded(
@@ -93,6 +93,7 @@ class Datenschutz implements BaseDatenschutz {
9393
child: const Text('Ablehnen',
9494
style: TextStyle(color: Color(0xff7a62ff))),
9595
onPressed: () {
96+
akzeptiert = false;
9697
Navigator.pop(context);
9798
}),
9899
),

‎lib/Pages/Grundbausteine/loading_page.dart‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)