diff --git a/code/src/Fitbot/.idea/misc.xml b/code/src/Fitbot/.idea/misc.xml index ad50441..0a1d973 100644 --- a/code/src/Fitbot/.idea/misc.xml +++ b/code/src/Fitbot/.idea/misc.xml @@ -3,6 +3,9 @@ diff --git a/code/src/Fitbot/app/src/main/AndroidManifest.xml b/code/src/Fitbot/app/src/main/AndroidManifest.xml index 3891652..69e9077 100644 --- a/code/src/Fitbot/app/src/main/AndroidManifest.xml +++ b/code/src/Fitbot/app/src/main/AndroidManifest.xml @@ -2,6 +2,8 @@ + + + + @@ -20,5 +28,4 @@ - \ 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 new file mode 100644 index 0000000..048af45 --- /dev/null +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainScreen.java @@ -0,0 +1,24 @@ +package com.example.fitbot; + +import android.content.Intent; +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.widget.Button; + +import com.example.fitbot.bicepvideo; + +public class MainScreen extends AppCompatActivity { + Button button; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + button = findViewById(R.id.open_video); + button.setOnClickListener(v -> { + Intent i = new Intent(MainScreen.this, bicepvideo.class); + startActivity(i); + }); + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..c0b252e --- /dev/null +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/bicepvideo.java @@ -0,0 +1,42 @@ +package com.example.fitbot; + +import android.media.MediaPlayer; +import android.net.Uri; +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.view.View; +import android.widget.Button; +import android.widget.MediaController; +import android.widget.VideoView; + +public class bicepvideo extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_bicepvideo); + + VideoView videoView = findViewById(R.id.videoView); + videoView.setVideoURI(Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.bicepvideo)); + + Button backButton = findViewById(R.id.buttonback); + backButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + // Finish the current activity (VideoViewHere) + finish(); + } + }); + + MediaController mediaController = new MediaController(this); + videoView.setMediaController(mediaController); + videoView.setOnCompletionListener(new MediaPlayer.OnCompletionListener() { + @Override + public void onCompletion(MediaPlayer mp) { + videoView.start(); // Restart video on completion + } + }); + + videoView.start(); + } +} \ 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 new file mode 100644 index 0000000..dd27bab --- /dev/null +++ b/code/src/Fitbot/app/src/main/res/layout/activity_bicepvideo.xml @@ -0,0 +1,58 @@ + + + + + +