Smikkelbakje/J1B4-Fitbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/35-als-gebruiker-wil-ik-live-mijn-bewegingen-doen-zodat-ik-kan-inzien-of-ik-het-goed-doe'

Browse Source 
# Conflicts:
#	code/src/Fitbot/app/src/main/AndroidManifest.xml
#	code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java
This commit is contained in:
Luca Warmenhoven
2024-05-15 16:32:56 +02:00
parent 612b1c8a7c 8224327a01
commit 9107d5d9f7
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/src/Fitbot/app/src/main/AndroidManifest.xml
View File

@@ -12,11 +12,19 @@
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.Fitbot" > android:theme="@style/Theme.Fitbot" >
<activity <activity
android:name=".ui.SportMenuActivity" android:name=".Completion_Screen"
android:exported="true"> android:exported="false" />
</activity>
<activity <activity
android:name=".ui.activities.MainActivity" android:name=".BicepVideo"
android:exported="false" />
<activity
android:name=".PowerScreen"
android:exported="false" />
<activity
android:name=".MainActivity"
android:exported="true" />
<activity
android:name=".MainScreen"
android:exported="true" > android:exported="true" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

7
code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java
View File

@@ -1,7 +1,6 @@
package com.example.fitbot; package com.example.fitbot;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.design.widget.NavigationView; import android.support.design.widget.NavigationView;
import android.support.v4.view.GravityCompat; import android.support.v4.view.GravityCompat;
@@ -9,12 +8,6 @@ import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.widget.Button;
import com.example.fitbot.R;
import com.example.fitbot.util.processing.GesturePath;
import com.example.fitbot.util.processing.MotionProcessor;
import com.example.fitbot.util.processing.Vector3;
public class MainScreen extends AppCompatActivity { public class MainScreen extends AppCompatActivity {