From d2eec1aff97e1d020e1e6448aeafdbc142613000 Mon Sep 17 00:00:00 2001
From: rizkihalasan <13515095@std.stei.itb.ac.id>
Date: Tue, 20 Feb 2018 22:58:43 +0700
Subject: [PATCH] add level menu
---
.../leo/fitnessdiy/ExerciseFragment.java | 18 +++++++++++
app/src/main/res/layout/activity_home.xml | 31 ++++++++-----------
app/src/main/res/layout/fragment_exercise.xml | 13 ++++++++
3 files changed, 44 insertions(+), 18 deletions(-)
diff --git a/app/src/main/java/com/example/leo/fitnessdiy/ExerciseFragment.java b/app/src/main/java/com/example/leo/fitnessdiy/ExerciseFragment.java
index 7eed62b..658cd6b 100644
--- a/app/src/main/java/com/example/leo/fitnessdiy/ExerciseFragment.java
+++ b/app/src/main/java/com/example/leo/fitnessdiy/ExerciseFragment.java
@@ -94,6 +94,24 @@ public class ExerciseFragment extends Fragment {
startActivity(i);
}
});
+
+ Button joggingButton = (Button)view.findViewById(R.id.jogging_button);
+ joggingButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Intent i = new Intent(getActivity(), JoggingActivity.class);
+ startActivity(i);
+ }
+ });
+
+ Button levelButton = (Button)view.findViewById(R.id.level_button);
+ levelButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Intent i = new Intent(getActivity(), LevelActivity.class);
+ startActivity(i);
+ }
+ });
return view;
}
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 04118a3..dec7caf 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -14,39 +14,34 @@
<Button
android:id="@+id/history_button"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
android:layout_height="wrap_content"
android:onClick="openHistory"
android:text="@string/history" />
<Button
android:id="@+id/exercise_button"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
android:layout_height="wrap_content"
android:onClick="changeFragment"
android:text="@string/exercise" />
-
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:onClick="openJogging"
- android:text="Jogging" />
-
- <android.support.design.widget.FloatingActionButton
- android:id="@+id/chat_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:layout_weight="3"
- android:onClick="goToChat" />
-
</LinearLayout>
<fragment
android:id="@+id/home_fragment"
android:name="com.example.leo.fitnessdiy.BlankFragment"
android:layout_width="match_parent"
- android:layout_height="471dp" />
+ android:layout_height="471dp"
+ />
+
+ <android.support.design.widget.FloatingActionButton
+ android:id="@+id/chat_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"
+ android:onClick="goToChat" />
</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_exercise.xml b/app/src/main/res/layout/fragment_exercise.xml
index e821291..f05accb 100644
--- a/app/src/main/res/layout/fragment_exercise.xml
+++ b/app/src/main/res/layout/fragment_exercise.xml
@@ -28,6 +28,19 @@
android:layout_height="wrap_content"
android:text="Plank"
android:id="@+id/plank_button"/>
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Jogging"
+ android:id="@+id/jogging_button"/>
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="LEVEL"
+ android:id="@+id/level_button"/>
+
</LinearLayout>
</FrameLayout>
--
GitLab