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

fixed issues

Browse Source
This commit is contained in:
Luca Warmenhoven
2024-05-15 16:50:22 +02:00
parent 5b5934d985
commit a4a01ae9ef
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java
View File

4
code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java
View File

@@ -1,7 +1,6 @@
package com.example.yourapp; package com.example.fitbot.ui.activities;
import android.os.Bundle; import android.os.Bundle;
import androidx.appcompat.widget.Toolbar;
import com.aldebaran.qi.sdk.QiContext; import com.aldebaran.qi.sdk.QiContext;
import com.aldebaran.qi.sdk.RobotLifecycleCallbacks; import com.aldebaran.qi.sdk.RobotLifecycleCallbacks;
import com.aldebaran.qi.sdk.design.activity.RobotActivity; import com.aldebaran.qi.sdk.design.activity.RobotActivity;
@@ -11,7 +10,6 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_fitness);
} }
@Override @Override

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

@@ -9,6 +9,8 @@ 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 com.example.fitbot.R;
public class MainActivity extends AppCompatActivity { public class MainActivity extends AppCompatActivity {
//Variables //Variables
@@ -34,7 +36,7 @@ public class MainActivity extends AppCompatActivity {
navigationView.bringToFront(); navigationView.bringToFront();
ActionBarDrawerToggle toggle=new ActionBarDrawerToggle toggle=new
ActionBarDrawerToggle(this,drawerLayout,toolbar,R.string.navigation_drawer_open,R.string.navigation_drawer_close); ActionBarDrawerToggle(this,drawerLayout,toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
drawerLayout.addDrawerListener(toggle); drawerLayout.addDrawerListener(toggle);
toggle.syncState(); toggle.syncState();
} }

2
code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/MotionProcessor.java
View File

@@ -127,7 +127,7 @@ public class MotionProcessor {
* Function for setting the motion data receiver. * Function for setting the motion data receiver.
* @param consumer The consumer to set. * @param consumer The consumer to set.
*/ */
public void setMotionDataEventHandler(DataConsumer consumer) { public void setMotionDataEventHandler(IMotionDataConsumer consumer) {
if ( consumer != null) if ( consumer != null)
this.motionDataConsumer = consumer; this.motionDataConsumer = consumer;
} }