diff --git a/code/arduino/Movement-sensor-code/Connectivity.cpp b/code/arduino/Movement-sensor-code/Connectivity.cpp index 5bdaa9e..d4c5837 100644 --- a/code/arduino/Movement-sensor-code/Connectivity.cpp +++ b/code/arduino/Movement-sensor-code/Connectivity.cpp @@ -23,6 +23,7 @@ void Connectivity::connectWiFi(char* ssid, char* pass){ const char* getServerURL = "http://145.92.8.132:443/get-ip"; String ipAddress = ""; // string that will hold the server's IP address +/** Fetch the IP address of pepper from the server */ const char* Connectivity::fetchIPAddress() { char* ipAddress = NULL; // Declare ipAddress as a char* if (WiFi.status() == WL_CONNECTED) { @@ -41,14 +42,14 @@ const char* Connectivity::fetchIPAddress() { ipAddress = strdup(ip); } } else { - Serial.printf("GET request failed, error: %s\n", http.errorToString(httpCode).c_str()); + Serial.printf("GET request failed, error: %s\n", http.errorToString(httpCode).c_str()); } http.end(); } else { Serial.println("WiFi not connected"); } - return ipAddress; // Add this return statement + return ipAddress; } /** Send a POST request to a server with provided data */ diff --git a/code/arduino/Movement-sensor-code/Connectivity.h b/code/arduino/Movement-sensor-code/Connectivity.h index 3df3524..ae711e7 100644 --- a/code/arduino/Movement-sensor-code/Connectivity.h +++ b/code/arduino/Movement-sensor-code/Connectivity.h @@ -14,8 +14,8 @@ #include - -class Connectivity { +// declare the class Connectivity with all functions +class Connectivity { public: void connectWiFi(char* ssid, char* pass); void websocketSetup(char* ip, uint16_t port, char* adress); diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/CompletionActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/CompletionActivity.java deleted file mode 100644 index 8cc269b..0000000 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/CompletionActivity.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.example.fitbot.ui.activities; - -public class CompletionActivity { -} diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/EndScreenActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/EndScreenActivity.java index 1c36be4..e2286ee 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/EndScreenActivity.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/EndScreenActivity.java @@ -16,6 +16,5 @@ public class EndScreenActivity extends AppCompatActivity { NavigationManager.hideSystemUI(this); NavigationManager.setupButtonNavigation(this, R.id.homeButtonEndScreen, MainActivity.class); - NavigationManager.setupButtonNavigation(this, R.id.startButtonEndScreen, FitnessActivity.class); } } \ No newline at end of file diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_end_screen.xml b/code/src/Fitbot/app/src/main/res/layout/activity_end_screen.xml index d8a48fd..c2e3033 100644 --- a/code/src/Fitbot/app/src/main/res/layout/activity_end_screen.xml +++ b/code/src/Fitbot/app/src/main/res/layout/activity_end_screen.xml @@ -8,13 +8,14 @@ tools:context=".ui.activities.HelpActivity"> @@ -26,8 +27,8 @@ android:layout_marginBottom="40dp" android:background="@drawable/border_background_3" android:orientation="vertical" - android:paddingVertical="15dp" android:paddingHorizontal="20dp" + android:paddingVertical="15dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> @@ -56,27 +57,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:text="@string/voltooid" - android:textAlignment="center"/> - - - - - + android:textAlignment="center" /> @@ -85,8 +66,8 @@ android:id="@+id/homeButtonEndScreen" android:layout_width="150dp" android:layout_height="75dp" - android:layout_marginEnd="280dp" - android:layout_marginBottom="30dp" + android:layout_marginEnd="404dp" + android:layout_marginBottom="48dp" android:background="@drawable/red_button_gradient" android:drawableTop="@drawable/ic_baseline_home_48" android:drawableTint="@color/white" @@ -94,20 +75,4 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> -