Merge branch 'development'

lib/Views/add_exercise.dart

@@ -5,10 +5,9 @@ import 'dart:async';
 import 'dart:convert';
 
 class AddExercise extends StatefulWidget{
-  String token;
   int workoutId;
 
-  AddExercise(this.token, this.workoutId);
+  AddExercise(this.workoutId);
 
   @override
   State<StatefulWidget> createState() {
@@ -28,7 +27,7 @@ class AddExerciseState extends State<AddExercise>{
 
   void speichern(String id) async {
     if(this.anzahl != 0){
-      var url = Uri.parse("http://10.16.17.18/api/add_exercise_to_workout.php?token=" + super.widget.token);
+      var url = Uri.parse("http://10.16.17.18/api/add_exercise_to_workout.php?token=satbwertwhbertnwertwertghwertgwertg");
       var request = http.MultipartRequest("post", url);
       Map<String, String> test = {
         "workout": this.widget.workoutId.toString(),

lib/Views/custom_drawer.dart

@@ -1,14 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 
 class CustomDrawer extends StatelessWidget{
-  void logout() async {
-    SharedPreferences prefs = await SharedPreferences.getInstance();
-    prefs.remove("api_key");
-    SystemChannels.platform.invokeMethod('SystemNavigator.pop');
-  }
-
   @override
   Widget build(BuildContext context) {
     // TODO: implement build
@@ -48,9 +40,7 @@ class CustomDrawer extends StatelessWidget{
           ListTile(
             leading: Icon(Icons.exit_to_app),
             title: Text('Logout'),
-            onTap: () {
+            onTap: () => {Navigator.of(context).pop()},
-              logout();
-            },
           ),
         ],
       ),

lib/Views/exercises_view.dart

@@ -6,11 +6,10 @@ import 'dart:async';
 import 'dart:convert';
 
 class ExerciseView extends StatefulWidget{
-  String token;
   String title;
   String id;
 
-  ExerciseView(this.token, this.title, this.id);
+  ExerciseView(this.title, this.id);
 
   @override
   State<StatefulWidget> createState() {
@@ -25,7 +24,7 @@ class ExerciseViewState extends State<ExerciseView>{
 
   Future<List> getWorkouts() async {
     var response = await http.get(
-        "http://10.16.17.18/api/workout.php?token=" + super.widget.token + "&workout="+this.widget.id,
+        "http://10.16.17.18/api/workout.php?token=satbwertwhbertnwertwertghwertgwertg&workout="+this.widget.id,
         headers: {
           "Accept": "application/json"
         }
@@ -76,7 +75,7 @@ class ExerciseViewState extends State<ExerciseView>{
       floatingActionButton: FloatingActionButton(
         onPressed: (){
           Navigator.push(context, MaterialPageRoute(
-            builder: (context) => AddExercise(super.widget.token, int.parse(this.widget.id))
+            builder: (context) => AddExercise(int.parse(this.widget.id))
           ));
         },
         child: Icon(Icons.add),

lib/Views/homescreen.dart

@@ -2,19 +2,7 @@ import 'package:fitnessapp/Views/custom_drawer.dart';
 import 'package:flutter/material.dart';
 import 'workouts_view.dart';
 
-class HomescreenView extends StatefulWidget{
+class HomescreenView extends StatelessWidget{
-  String token;
-
-  HomescreenView(this.token);
-
-  @override
-  State<StatefulWidget> createState() {
-    // TODO: implement createState
-    return new HomescreenViewState();
-  }
-}
-
-class HomescreenViewState extends State<HomescreenView>{
   @override
   Widget build(BuildContext context) {
     // TODO: implement build
@@ -23,7 +11,7 @@ class HomescreenViewState extends State<HomescreenView>{
       appBar: AppBar(
         title: Text("Workouts"),
       ),
-      body: WorkoutsView(super.widget.token),
+      body: WorkoutsView(),
     );
   }
 }

lib/Views/login_view.dart

@@ -1,96 +0,0 @@
-import 'package:fitnessapp/Views/custom_drawer.dart';
-import 'package:fitnessapp/Views/homescreen.dart';
-import 'package:flutter/material.dart';
-import 'workouts_view.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:http/http.dart' as http;
-import 'dart:async';
-import 'dart:convert';
-
-class LoginView extends StatefulWidget{
-  @override
-  State<StatefulWidget> createState() {
-    // TODO: implement createState
-    return new _LoginViewState();
-  }
-}
-
-class _LoginViewState extends State<LoginView>{
-  final usernameController = TextEditingController();
-  final passwordController = TextEditingController();
-  final _formKey = GlobalKey<FormState>();
-
-  void _saveToken(String token) async{
-    SharedPreferences prefs = await SharedPreferences.getInstance();
-    await prefs.setString("api_key", token);
-
-    String test = await prefs.getString("api_key");
-    print(test);
-  }
-
-  void _getToken() async {
-    var url = Uri.parse("http://10.16.17.18/api/login.php");
-    var request = http.MultipartRequest("post", url);
-    Map<String, String> test = {
-      "username": usernameController.value.text,
-      "password": passwordController.value.text
-    };
-    request.fields.addAll(test);
-    var response = await request.send();
-    if(response.statusCode == 200){
-      String text = await response.stream.bytesToString();
-      await _saveToken(text);
-      Navigator.push(context, MaterialPageRoute(
-        builder: (context) => HomescreenView(text)
-      ));
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    // TODO: implement build
-    return Scaffold(
-      appBar: AppBar(
-        title: Text("Login"),
-      ),
-      body: Form(
-        key: _formKey,
-        child: Column(
-          children: <Widget>[
-            TextFormField(
-              decoration: InputDecoration(
-                labelText: "username"
-              ),
-              controller: usernameController,
-              validator: (value){
-                if(value.isEmpty){
-                  return "bitte gib einen Nutzername ein";
-                }
-              },
-            ),
-            TextFormField(
-              decoration: InputDecoration(
-                  labelText: "password"
-              ),
-              controller: passwordController,
-              validator: (value){
-                if(value.isEmpty){
-                  return "bitte gib Passwort ein";
-                }
-              },
-              obscureText: true,
-            ),
-            RaisedButton(
-              child: Text("Login"),
-              onPressed: (){
-                if(_formKey.currentState.validate()){
-                  _getToken();
-                }
-              },
-            )
-          ],
-        ),
-      )
-    );
-  }
-}

lib/Views/new_workout_view.dart

@@ -5,10 +5,6 @@ import 'dart:async';
 import 'dart:convert';
 
 class NewWorkoutView extends StatefulWidget{
-  String token;
-
-  NewWorkoutView(this.token);
-
   @override
   State<StatefulWidget> createState() {
     return new NewWorkoutViewState();
@@ -26,7 +22,10 @@ class NewWorkoutViewState extends State<NewWorkoutView>{
 
   void speichern() async {
     if(this.name != ''){
-      var url = Uri.parse("http://10.16.17.18/api/new_workout.php?token=" + super.widget.token);
+      FormData data = new FormData.fromMap({
+        "name": "Hallo Welt"
+      });
+      var url = Uri.parse("http://10.16.17.18/api/new_workout.php?token=satbwertwhbertnwertwertghwertgwertg");
       var request = http.MultipartRequest("post", url);
       Map<String, String> test = {"name": name};
       request.fields.addAll(test);
@@ -39,7 +38,7 @@ class NewWorkoutViewState extends State<NewWorkoutView>{
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text("Neues Workout"),
+        title: Text("Füge eine Übung hinzu"),
       ),
       body: Column(
         mainAxisSize: MainAxisSize.max,
@@ -47,6 +46,7 @@ class NewWorkoutViewState extends State<NewWorkoutView>{
           Padding(
             padding: EdgeInsets.all(8),
             child: TextField(
+              keyboardType: TextInputType.number,
               autocorrect: true,
               decoration: InputDecoration(
                   border: OutlineInputBorder(),

lib/Views/workouts_view.dart

@@ -6,11 +6,6 @@ import 'dart:async';
 import 'dart:convert';
 
 class WorkoutsView extends StatefulWidget{
-  String token;
-
-
-  WorkoutsView(this.token);
-
   @override
   State<StatefulWidget> createState() {
     // TODO: implement createState
@@ -23,7 +18,7 @@ class WorkoutsViewState extends State<WorkoutsView>{
 
   Future<List> getWorkouts() async {
     var response = await http.get(
-      "http://10.16.17.18/api/index.php?token=" + super.widget.token,
+      "http://10.16.17.18/api/index.php?token=satbwertwhbertnwertwertghwertgwertg",
       headers: {
         "Accept": "application/json"
       }
@@ -54,7 +49,7 @@ class WorkoutsViewState extends State<WorkoutsView>{
               subtitle: Text(data[index]['creator']),
               onTap: (){
                 Navigator.push(context, MaterialPageRoute(
-                    builder: (context) => ExerciseView(super.widget.token, data[index]['title'], data[index]['id'])
+                    builder: (context) => ExerciseView(data[index]['title'], data[index]['id'])
                 ));
               },
             );
@@ -65,7 +60,7 @@ class WorkoutsViewState extends State<WorkoutsView>{
       floatingActionButton: FloatingActionButton(
         onPressed: (){
           Navigator.push(context, MaterialPageRoute(
-              builder: (context) => NewWorkoutView(super.widget.token)
+              builder: (context) => NewWorkoutView()
           ));
         },
         child: Icon(Icons.add),

lib/main.dart

@@ -1,15 +1,14 @@
 import 'package:fitnessapp/Views/homescreen.dart';
-import 'package:fitnessapp/Views/login_view.dart';
-import 'package:fitnessapp/Views/new_workout_view.dart';
 import 'package:flutter/material.dart';
 import 'dart:async';
-import 'package:shared_preferences/shared_preferences.dart';
 
-void main() async {
+void main() => runApp(MyApp());
-  WidgetsFlutterBinding.ensureInitialized();
+
-  SharedPreferences prefs = await SharedPreferences.getInstance();
+class MyApp extends StatelessWidget {
-  String apiKey = await prefs.getString('api_key');
+  // This widget is the root of your application.
-  runApp(MaterialApp(
+  @override
+  Widget build(BuildContext context) {
+    return MaterialApp(
       title: 'Flutter Demo',
       theme: ThemeData(
         // Define the default brightness and colors.
@@ -28,7 +27,7 @@ void main() async {
           body1: TextStyle(fontSize: 14.0, fontFamily: 'Verdana'),
         ),
       ),
-    home: apiKey == null ? LoginView() : HomescreenView(apiKey),
+      home: HomescreenView(),
-  )
     );
   }
+}

pubspec.lock

@@ -81,11 +81,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_web_plugins:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
   http:
     dependency: "direct main"
     description:
@@ -134,7 +129,7 @@ packages:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.0"
+    version: "1.8.0+1"
   petitparser:
     dependency: transitive
     description:
@@ -149,34 +144,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.5"
-  shared_preferences:
-    dependency: "direct main"
-    description:
-      name: shared_preferences
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.5.6+3"
-  shared_preferences_macos:
-    dependency: transitive
-    description:
-      name: shared_preferences_macos
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.0.1+6"
-  shared_preferences_platform_interface:
-    dependency: transitive
-    description:
-      name: shared_preferences_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.3"
-  shared_preferences_web:
-    dependency: transitive
-    description:
-      name: shared_preferences_web
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.2+4"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -247,4 +214,3 @@ packages:
     version: "3.5.0"
 sdks:
   dart: ">2.4.0 <3.0.0"
-  flutter: ">=1.12.13+hotfix.4 <2.0.0"

pubspec.yaml

@@ -25,7 +25,6 @@ dependencies:
   cupertino_icons: ^0.1.2
   http:
   dio:
-  shared_preferences:
 
 dev_dependencies:
   flutter_test:

test/widget_test.dart

@@ -13,7 +13,7 @@ import 'package:fitnessapp/main.dart';
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.
-    /*await tester.pumpWidget(MyApp());
+    await tester.pumpWidget(MyApp());
 
     // Verify that our counter starts at 0.
     expect(find.text('0'), findsOneWidget);
@@ -25,6 +25,6 @@ void main() {
 
     // Verify that our counter has incremented.
     expect(find.text('0'), findsNothing);
-    expect(find.text('1'), findsOneWidget);*/
+    expect(find.text('1'), findsOneWidget);
   });
 }