Corrected Merge Conflicts

android/app/build.gradle

@@ -43,11 +43,7 @@ android {
     }
 
     defaultConfig {
-<<<<<<< HEAD
-        applicationId "it.uniurb.balance_app"
-=======
         applicationId "srl.digit.balance"
->>>>>>> dev
         minSdkVersion 16
         targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()
@@ -65,11 +61,7 @@ android {
 
     buildTypes {
         release {
-<<<<<<< HEAD
-            signingConfig signingConfigs.release
-=======
             signingConfig signingConfigs.debug
->>>>>>> dev
         }
     }
 }

android/app/src/debug/AndroidManifest.xml

@@ -1,9 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-<<<<<<< HEAD
-    package="it.uniurb.balance_app">
-=======
     package="srl.digit.balance">
->>>>>>> dev
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

android/app/src/profile/AndroidManifest.xml

@@ -1,9 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-<<<<<<< HEAD
-    package="it.uniurb.balance_app">
-=======
     package="srl.digit.balance">
->>>>>>> dev
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

ios/Flutter/Debug.xcconfig

@@ -1,5 +1,2 @@
-<<<<<<< HEAD
-=======
 #include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
->>>>>>> dev
 #include "Generated.xcconfig"

ios/Flutter/Release.xcconfig

@@ -1,5 +1,2 @@
-<<<<<<< HEAD
-=======
 #include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
->>>>>>> dev
 #include "Generated.xcconfig"

ios/Runner/Info.plist

@@ -11,11 +11,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-<<<<<<< HEAD
-	<string>balance_app</string>
-=======
 	<string>Balance</string>
->>>>>>> dev
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>

lib/model/measurement.dart

@@ -146,34 +146,6 @@ class Measurement {
       grZ: s.grZ,
     );
 
-  /// Maps this object to json
-<<<<<<< HEAD
-  Map toJson() => {
-      "id": this.id,
-      "creationDate": this.creationDate,
-      "eyesOpen": this.eyesOpen,
-      "hasFeatures": this.hasFeatures,
-      "swayPath": this.swayPath,
-      "meanDisplacement": this.meanDisplacement,
-      "stdDisplacement": this.stdDisplacement,
-      "minDist": this.minDist,
-      "maxDist": this.maxDist,
-      "frequencyPeakAP": this.frequencyPeakAP,
-      "frequencyPeakML": this.frequencyPeakML,
-      "meanFrequencyML": this.meanFrequencyML,
-      "meanFrequencyAP": this.meanFrequencyAP,
-      "f80ML": this.f80ML,
-      "f80AP": this.f80AP,
-      "np": this.numMax, "meanTime": this.meanTime,
-      "stdTime": this.stdTime, "meanDistance": this.meanDistance,
-      "stdDistance": this.stdDistance, "meanPeaks": this.meanPeaks,
-      "stdPeaks": this.stdPeaks,
-      "gsX": this.gsX, "gsY": this.gsY, "gsZ": this.gsZ,
-      "gkX": this.gkX, "gkY": this.gkY, "gkZ": this.gkZ,
-      "gmX": this.gmX, "gmY": this.gmY, "gmZ": this.gmZ,
-      "gvX": this.gvX, "gvY": this.gvY, "gvZ": this.gvZ,
-      "grX": this.grX, "grY": this.grY, "grZ": this.grZ,
-=======
   Map<String, dynamic> toJson() => {
       'id': this.id,
       'token': this.token,
@@ -204,7 +176,6 @@ class Measurement {
       'gmX': this.gmX, 'gmY': this.gmY, 'gmZ': this.gmZ,
       'gvX': this.gvX, 'gvY': this.gvY, 'gvZ': this.gvZ,
       'grX': this.grX, 'grY': this.grY, 'grZ': this.grZ,
->>>>>>> dev
     };
 
 

lib/repository/measure_countdown_repository.dart

@@ -1,19 +1,14 @@
-
-<<<<<<< HEAD
-=======
 import 'dart:convert';
 
->>>>>>> dev
+
 import 'package:balance_app/floor/measurement_database.dart';
 import 'package:balance_app/floor/test_database_view.dart';
 import 'package:balance_app/manager/preference_manager.dart';
 import 'package:balance_app/model/measurement.dart';
 import 'package:balance_app/model/raw_measurement_data.dart';
 import 'package:balance_app/model/sensor_data.dart';
-<<<<<<< HEAD
-=======
 import 'package:http/http.dart';
->>>>>>> dev
+
 
 class MeasureCountdownRepository {
   final MeasurementDatabase database;
@@ -39,12 +34,9 @@ class MeasureCountdownRepository {
         await _generateRawData(rawSensorData, newMeasId).toList()
       );
 
-<<<<<<< HEAD
-=======
       // send data to server
       _makePostRequest(await _generateRawData(rawSensorData, newMeasId).toList());
 
->>>>>>> dev
       // return the newly added Test
       return await measurementDao.findTestById(newMeasId);
     } catch(e) {
@@ -53,8 +45,6 @@ class MeasureCountdownRepository {
     }
   }
 
-<<<<<<< HEAD
-=======
   _makePostRequest(var data) async {
     // TODO: This stuff here is hardcode. Need changes
     // set up POST request arguments
@@ -72,7 +62,6 @@ class MeasureCountdownRepository {
     print("RawMeasurement Sent to the Backend");
   }
 
->>>>>>> dev
   /// Asynchronously generate the [RawMeasurementData] from the [SensorData]
   ///
   /// This method will generate one-by-one each [RawMeasurementData] that will be then