diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/Animations.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/Animations.java index 33a3e3e..3bfff8a 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/Animations.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/Animations.java @@ -1,6 +1,7 @@ package com.example.fitbot; import android.support.v7.app.AppCompatActivity; + import com.aldebaran.qi.sdk.QiContext; import com.aldebaran.qi.sdk.builder.AnimateBuilder; import com.aldebaran.qi.sdk.builder.AnimationBuilder; diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/Completion_Screen.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/Completion_Screen.java index 092c65a..55dd036 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/Completion_Screen.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/Completion_Screen.java @@ -1,7 +1,7 @@ package com.example.fitbot; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; public class Completion_Screen extends AppCompatActivity { diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java index b087adc..9ebdb80 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java @@ -12,6 +12,7 @@ import com.aldebaran.qi.sdk.object.conversation.Say; import com.aldebaran.qi.sdk.object.locale.Language; import com.aldebaran.qi.sdk.object.locale.Locale; import com.aldebaran.qi.sdk.object.locale.Region; +//import com.example.fitbot.ui.SportMenuActivity; public class MainActivity extends RobotActivity implements RobotLifecycleCallbacks { diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/SportPreviewActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/SportPreviewActivity.java new file mode 100644 index 0000000..9557bce --- /dev/null +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/SportPreviewActivity.java @@ -0,0 +1,27 @@ +package com.example.fitbot.ui; + +import com.aldebaran.qi.sdk.QiContext; +import com.aldebaran.qi.sdk.RobotLifecycleCallbacks; +import com.aldebaran.qi.sdk.design.activity.RobotActivity; + +public class SportPreviewActivity extends RobotActivity implements RobotLifecycleCallbacks { + + + @Override + public void onRobotFocusGained(QiContext qiContext) { + + } + + @Override + + + @Override + public void onRobotFocusLost() { + + } + + @Override + public void onRobotFocusRefused(String reason) { + + } +} diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/components/SportPreviewCanvas.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/components/SportPreviewCanvas.java new file mode 100644 index 0000000..86b7cda --- /dev/null +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/components/SportPreviewCanvas.java @@ -0,0 +1,22 @@ +package com.example.fitbot.ui.components; + +import android.content.Context; +import android.graphics.Canvas; +import android.view.View; + +public class SportPreviewCanvas extends View { + + + private void calculatePath + + + public SportPreviewCanvas(Context context, GesturePath path) { + super(context); + } + + @Override + public void onDraw(Canvas canvas) { + // Draw the sport preview canvas + + } +}