diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/BicepVideo.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/BicepVideo.java deleted file mode 100644 index 3016b0a..0000000 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/BicepVideo.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.example.fitbot; - -import android.content.Intent; -import android.net.Uri; -import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.widget.Button; -import android.widget.MediaController; -import android.widget.VideoView; - -import com.aldebaran.qi.sdk.QiContext; -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; - -public class BicepVideo extends AppCompatActivity { - -// private QiContext qiContext; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_bicepvideo); - setupButtons(); - } - - public void Video(QiContext qiContext) { - VideoView videoView = findViewById(R.id.videoView); - videoView.setVideoURI(Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.bicepvideo)); - - MediaController mediaController = new MediaController(this); - videoView.setMediaController(mediaController); - videoView.setOnCompletionListener(mp -> videoView.start()); - videoView.start(); - - Animation animation = AnimationBuilder.with(qiContext) - .withResources(R.raw.bicepcurl) - .build(); - - Animate animate = AnimateBuilder.with(qiContext) - .withAnimation(animation) - .build(); - - - animate.async().run(); - - } - private void setupButtons() { - Button backButton = findViewById(R.id.buttonback); - backButton.setOnClickListener(v -> finish()); - - Button completeButton = findViewById(R.id.buttoncomplete); - completeButton.setOnClickListener(v -> { - Intent intent = new Intent(BicepVideo.this, Completion_Screen.class); - startActivity(intent); - }); - } -} \ No newline at end of file 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/EndScreenActivity.java similarity index 65% rename from code/src/Fitbot/app/src/main/java/com/example/fitbot/Completion_Screen.java rename to code/src/Fitbot/app/src/main/java/com/example/fitbot/EndScreenActivity.java index 55dd036..62154e6 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/EndScreenActivity.java @@ -1,13 +1,13 @@ package com.example.fitbot; -import android.os.Bundle; import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; -public class Completion_Screen extends AppCompatActivity { +public class EndScreenActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_completion_screen); + setContentView(R.layout.activity_end_screen); } } \ No newline at end of file diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainScreen.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainScreen.java deleted file mode 100644 index f8ddf0a..0000000 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainScreen.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.example.fitbot; - -import android.annotation.SuppressLint; -import android.os.Bundle; -import android.support.design.widget.NavigationView; -import android.support.v4.view.GravityCompat; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; - -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 { - - //Variables - DrawerLayout drawerLayout; - NavigationView navigationView; - Toolbar toolbar; - - @SuppressLint("WrongViewCast") - @Override - protected void onCreate (Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - - /*---Hooks---*/ - drawerLayout = findViewById(R.id.drawer_layout); - navigationView = findViewById(R.id.nav_view); - toolbar = findViewById(R.id.toolbar); - - /*---Tool Bar---*/ -// setSupportActionBar(toolbar); - - /*---Navigation Drawer Menu---*/ - navigationView.bringToFront(); - - ActionBarDrawerToggle toggle=new - ActionBarDrawerToggle(this,drawerLayout,toolbar,R.string.navigation_drawer_open,R.string.navigation_drawer_close); - drawerLayout.addDrawerListener(toggle); - toggle.syncState(); - } - - @Override - public void onBackPressed(){ - if(drawerLayout.isDrawerOpen(GravityCompat.START)){ - drawerLayout.closeDrawer(GravityCompat.START); - } - else - {super.onBackPressed(); - } - } -} diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/PowerScreen.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/PowerScreen.java deleted file mode 100644 index ff1f891..0000000 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/PowerScreen.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.example.fitbot; - -import android.content.Intent; -import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.widget.ImageButton; - -public class PowerScreen extends AppCompatActivity { - ImageButton openBicepVideo; - ImageButton openSquatVideo; - ImageButton openTricepVideo; - ImageButton goToHome; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_power_screen); - - openBicepVideo = findViewById(R.id.open_BicepVideo); - openSquatVideo = findViewById(R.id.open_SquatVideo); - openTricepVideo = findViewById(R.id.open_TricepVideo); - goToHome = findViewById(R.id.GoToHome); - - openBicepVideo.setOnClickListener(v -> { - Intent intent = new Intent(PowerScreen.this, BicepVideo.class); - startActivity(intent); - }); -// openSquatVideo.setOnClickListener(v -> { -// Intent intent = new Intent(PowerScreen.this, SquatVideo.class); -// startActivity(intent); -// }); -// -// openTricepVideo.setOnClickListener(v -> { -// Intent intent = new Intent(PowerScreen.this, TricepVideo.class); -// startActivity(intent); -// }); - - goToHome.setOnClickListener(v -> { - Intent intent = new Intent(PowerScreen.this, MainActivity.class); - startActivity(intent); - }); - } -} \ No newline at end of file diff --git a/code/src/Fitbot/app/src/main/res/drawable/rectangle.xml b/code/src/Fitbot/app/src/main/res/drawable/rectangle.xml new file mode 100644 index 0000000..a8b409b --- /dev/null +++ b/code/src/Fitbot/app/src/main/res/drawable/rectangle.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_bicepvideo.xml b/code/src/Fitbot/app/src/main/res/layout/activity_bicepvideo.xml deleted file mode 100644 index b866143..0000000 --- a/code/src/Fitbot/app/src/main/res/layout/activity_bicepvideo.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - -