From 66cf41a8ce9aa779891af87dc42d468e6399cd08 Mon Sep 17 00:00:00 2001 From: Sam Hos Date: Tue, 21 May 2024 10:51:23 +0200 Subject: [PATCH] Test if animation class works --- .../java/com/example/fitbot/{ => sports}/Animations.java | 3 ++- .../com/example/fitbot/ui/activities/FitnessActivity.java | 6 ++++-- .../com/example/fitbot/ui/activities/MainActivity.java | 8 ++++++-- 3 files changed, 12 insertions(+), 5 deletions(-) rename code/src/Fitbot/app/src/main/java/com/example/fitbot/{ => sports}/Animations.java (91%) 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/sports/Animations.java similarity index 91% rename from code/src/Fitbot/app/src/main/java/com/example/fitbot/Animations.java rename to code/src/Fitbot/app/src/main/java/com/example/fitbot/sports/Animations.java index 3bfff8a..72ab436 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/sports/Animations.java @@ -1,4 +1,4 @@ -package com.example.fitbot; +package com.example.fitbot.sports; import android.support.v7.app.AppCompatActivity; @@ -7,6 +7,7 @@ import com.aldebaran.qi.sdk.builder.AnimateBuilder; import com.aldebaran.qi.sdk.builder.AnimationBuilder; import com.aldebaran.qi.sdk.object.actuation.Animate; import com.aldebaran.qi.sdk.object.actuation.Animation; +import com.example.fitbot.ui.activities.MainActivity; public class Animations extends AppCompatActivity { diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java index 17ab4b2..dba7cfd 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java @@ -1,11 +1,13 @@ package com.example.fitbot.ui.activities; +import static com.example.fitbot.sports.Animations.Animate; + import android.os.Bundle; import com.aldebaran.qi.sdk.QiContext; import com.aldebaran.qi.sdk.QiSDK; import com.aldebaran.qi.sdk.RobotLifecycleCallbacks; import com.aldebaran.qi.sdk.design.activity.RobotActivity; -import com.example.fitbot.Animations; +import com.example.fitbot.sports.Animations; public class FitnessActivity extends RobotActivity implements RobotLifecycleCallbacks { @@ -19,7 +21,7 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall @Override public void onRobotFocusGained(QiContext qiContext) { // Implement your logic when the robot focus is gained - Animations.Animate("bicepcurl", qiContext); + Animate("bicepcurl", qiContext); } diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java index f81d844..eae8842 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java @@ -1,7 +1,8 @@ package com.example.fitbot.ui.activities; +import static com.example.fitbot.sports.Animations.Animate; + import android.annotation.SuppressLint; -import android.content.Intent; import android.os.Bundle; import android.support.design.widget.NavigationView; import android.support.v4.view.GravityCompat; @@ -10,6 +11,9 @@ import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; +import com.aldebaran.qi.sdk.QiContext; +import com.aldebaran.qi.sdk.QiSDK; +import com.aldebaran.qi.sdk.RobotLifecycleCallbacks; import com.example.fitbot.R; public class MainActivity extends AppCompatActivity { @@ -24,6 +28,7 @@ public class MainActivity extends AppCompatActivity { protected void onCreate (Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + QiSDK.register(this, (RobotLifecycleCallbacks) this); /*---Hooks---*/ drawerLayout = findViewById(R.id.drawer_layout); @@ -40,7 +45,6 @@ public class MainActivity extends AppCompatActivity { ActionBarDrawerToggle(this,drawerLayout,toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); drawerLayout.addDrawerListener(toggle); toggle.syncState(); - new FitnessActivity(); } @Override