diff --git a/code/src/Fitbot/.idea/misc.xml b/code/src/Fitbot/.idea/misc.xml index 42e8983..8e691b3 100644 --- a/code/src/Fitbot/.idea/misc.xml +++ b/code/src/Fitbot/.idea/misc.xml @@ -7,6 +7,7 @@ + diff --git a/code/src/Fitbot/app/src/main/AndroidManifest.xml b/code/src/Fitbot/app/src/main/AndroidManifest.xml index 7a1dc0f..61cd8ea 100644 --- a/code/src/Fitbot/app/src/main/AndroidManifest.xml +++ b/code/src/Fitbot/app/src/main/AndroidManifest.xml @@ -27,7 +27,7 @@ android:name=".BicepVideo" android:exported="false" /> { - 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/PowerScreen.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/PowerScreen.java new file mode 100644 index 0000000..cc29742 --- /dev/null +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/PowerScreen.java @@ -0,0 +1,43 @@ +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/house_3.png b/code/src/Fitbot/app/src/main/res/drawable/house_3.png new file mode 100644 index 0000000..b2be9a1 Binary files /dev/null and b/code/src/Fitbot/app/src/main/res/drawable/house_3.png differ diff --git a/code/src/Fitbot/app/src/main/res/drawable/noun_bicep_499185.png b/code/src/Fitbot/app/src/main/res/drawable/noun_bicep_499185.png new file mode 100644 index 0000000..1cb2117 Binary files /dev/null and b/code/src/Fitbot/app/src/main/res/drawable/noun_bicep_499185.png differ diff --git a/code/src/Fitbot/app/src/main/res/drawable/squatlogo.png b/code/src/Fitbot/app/src/main/res/drawable/squatlogo.png new file mode 100644 index 0000000..a37bc8c Binary files /dev/null and b/code/src/Fitbot/app/src/main/res/drawable/squatlogo.png differ diff --git a/code/src/Fitbot/app/src/main/res/drawable/triceplogo.png b/code/src/Fitbot/app/src/main/res/drawable/triceplogo.png new file mode 100644 index 0000000..69e714d Binary files /dev/null and b/code/src/Fitbot/app/src/main/res/drawable/triceplogo.png differ diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_main_screen.xml b/code/src/Fitbot/app/src/main/res/layout/activity_main_screen.xml deleted file mode 100644 index 1ac4230..0000000 --- a/code/src/Fitbot/app/src/main/res/layout/activity_main_screen.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - -