diff --git a/code/src/Fitbot/.idea/misc.xml b/code/src/Fitbot/.idea/misc.xml index c120dfd..4496bac 100644 --- a/code/src/Fitbot/.idea/misc.xml +++ b/code/src/Fitbot/.idea/misc.xml @@ -16,6 +16,7 @@ + diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/HelpActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/HelpActivity.java index def4026..3ffa2e3 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/HelpActivity.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/HelpActivity.java @@ -4,6 +4,7 @@ import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import com.example.fitbot.R; +import com.example.fitbot.util.ButtonNavigation; public class HelpActivity extends AppCompatActivity { @@ -11,5 +12,8 @@ public class HelpActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_help); + + ButtonNavigation.setupButtonNavigation(this, R.id.homeButton, MainActivity.class); + } } \ No newline at end of file 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 ca30bf2..b2fa7ba 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 @@ -14,6 +14,7 @@ import android.util.Log; import android.widget.Button; import com.example.fitbot.R; +import com.example.fitbot.util.ButtonNavigation; public class MainActivity extends AppCompatActivity { @@ -48,11 +49,8 @@ public class MainActivity extends AppCompatActivity { toolbar = findViewById(R.id.toolbar); startButton = findViewById(R.id.startButton); - startButton.setOnClickListener(v -> { // Switch to fitness activity - Log.i("MainActivity", "Switching to FitnessActivity"); - Intent intent = new Intent(MainActivity.this, FitnessActivity.class); - startActivity(intent); - }); + ButtonNavigation.setupButtonNavigation(this, R.id.startButton, FitnessActivity.class); + ButtonNavigation.setupButtonNavigation(this, R.id.helpButton, HelpActivity.class); /*---Tool Bar---*/ setSupportActionBar(toolbar); // Make the toolbar act as the action bar diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_end_screen.xml b/code/src/Fitbot/app/src/main/res/layout/activity_end_screen.xml index fd3a2e9..b07bcad 100644 --- a/code/src/Fitbot/app/src/main/res/layout/activity_end_screen.xml +++ b/code/src/Fitbot/app/src/main/res/layout/activity_end_screen.xml @@ -56,14 +56,12 @@ style="@style/TextStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="539dp" - android:layout_marginEnd="533dp" android:text="Gefeliciteerd" - app:layout_constraintBottom_toTopOf="@+id/workoutText" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="@+id/myRectangleView" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.155" /> + + +