diff --git a/.idea/modules.xml b/.idea/modules.xml
index bb30654bc3fdff63415d219a445a8a6712af24a2..e7f8ce27d03a577d3d01e18a03a64c9c7d4d14c9 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,9 +2,10 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
+ <module fileurl="file://$PROJECT_DIR$/android.iml" filepath="$PROJECT_DIR$/android.iml" />
<module fileurl="file://F:\informatika\pbd\fitness\android.iml" filepath="F:\informatika\pbd\fitness\android.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
- <module fileurl="file://$PROJECT_DIR$/fitness.iml" filepath="$PROJECT_DIR$/fitness.iml" />
+ <module fileurl="file://D:\tugas\sem6\pbd\tubes\android\fitness.iml" filepath="D:\tugas\sem6\pbd\tubes\android\fitness.iml" />
<module fileurl="file://D:\Semester 6\PBD\Tugas Besar\android\fitness.iml" filepath="D:\Semester 6\PBD\Tugas Besar\android\fitness.iml" />
</modules>
</component>
diff --git a/app/src/main/java/com/example/leo/fitnessdiy/ChatActivity.java b/app/src/main/java/com/example/leo/fitnessdiy/ChatActivity.java
index 9a727e15edbe1db039749942a876fa20fc1efae0..eea4730a2326a1a193517de58e300590b1bbd3cb 100644
--- a/app/src/main/java/com/example/leo/fitnessdiy/ChatActivity.java
+++ b/app/src/main/java/com/example/leo/fitnessdiy/ChatActivity.java
@@ -73,14 +73,11 @@ public class ChatActivity extends AppCompatActivity {
getWindow().getDecorView().setBackground(getResources().getDrawable(background));
if(FirebaseAuth.getInstance().getCurrentUser() == null) {
- // Start sign in/sign up activity
startActivityForResult(
AuthUI.getInstance().createSignInIntentBuilder().build(),
SIGN_IN_REQUEST_CODE
);
} else {
- // User is already signed in. Therefore, display
- // a welcome Toast
Toast.makeText(this,
"Welcome " + FirebaseAuth.getInstance()
.getCurrentUser()
@@ -97,8 +94,6 @@ public class ChatActivity extends AppCompatActivity {
public void onClick(View view) {
EditText input = (EditText)findViewById(R.id.input);
- // Read the input field and push a new instance
- // of ChatMessage to the Firebase database
FirebaseDatabase.getInstance()
.getReference()
.push()
@@ -108,7 +103,6 @@ public class ChatActivity extends AppCompatActivity {
.getDisplayName())
);
- // Clear the input
input.setText("");
}
});
@@ -132,9 +126,9 @@ public class ChatActivity extends AppCompatActivity {
acelLast = acelVal;
acelVal = (float) Math.sqrt((double) (x*x + y*y + z*z));
float delta = acelVal - acelLast;
- shake = shake * 0.9f + delta; // perform low-cut filter
+ shake = shake * 0.9f + delta;
if (shake >12) {
- Intent i = new Intent(getApplicationContext(), HomeActivity.class);
+ Intent i = new Intent(getApplicationContext(), HIstoryActivity.class);
startActivity(i);
}
}
@@ -199,12 +193,10 @@ public class ChatActivity extends AppCompatActivity {
R.layout.message, FirebaseDatabase.getInstance().getReference()) {
@Override
protected void populateView(View v, ChatMessage model, int position) {
- // Get references to the views of message.xml
TextView messageText = (TextView)v.findViewById(R.id.message_text);
TextView messageUser = (TextView)v.findViewById(R.id.message_user);
TextView messageTime = (TextView)v.findViewById(R.id.message_time);
- // Set their text
messageText.setText(model.getMessageText());
messageUser.setText(model.getMessageUser());
messageTime.setText(DateFormat.format("dd-MM-yyyy (HH:mm:ss)",
diff --git a/app/src/main/java/com/example/leo/fitnessdiy/PlankActivity.java b/app/src/main/java/com/example/leo/fitnessdiy/PlankActivity.java
index fd56f20182fb0326b35588b18e876fcc9a7a306b..206c8321d7b9b06339fc50854f96f7d3b1d52f5b 100644
--- a/app/src/main/java/com/example/leo/fitnessdiy/PlankActivity.java
+++ b/app/src/main/java/com/example/leo/fitnessdiy/PlankActivity.java
@@ -4,6 +4,7 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
import android.os.CountDownTimer;
+import android.os.StrictMode;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log;
@@ -20,33 +21,59 @@ import org.json.JSONException;
import org.json.JSONObject;
import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
import java.net.URL;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Scanner;
public class PlankActivity extends AppCompatActivity {
private String LOG_TAG = "TES PLANK ACTIVITY";
String sharedPrefFile = "com.example.leo.fitnessdiy";
+ private String user;
+ private String plank_date;
+ private String plank_time_start;
+ private String plank_time_end;
+ private String plank_duration;
+
private SharedPreferences mPreferences;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_plank);
- SharedPreferences mPreferences;
-
final String BACKGROUND_KEY = "background";
mPreferences = getSharedPreferences(sharedPrefFile, MODE_PRIVATE);
int background = mPreferences.getInt(BACKGROUND_KEY, R.drawable.green_theme);
getWindow().getDecorView().setBackground(getResources().getDrawable(background));
+
+ SimpleDateFormat formatDate = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat formatTime = new SimpleDateFormat("HH:mm:ss");
+ Date date = new Date();
+
+ plank_date = formatDate.format(date);
+// Log.d(LOG_TAG, plank_date);
+
+ plank_time_start = formatTime.format(date);
+// Log.d(LOG_TAG, plank_time_start);
+ user = Integer.toString(mPreferences.getInt(UsersSharedPreferences.ID_USERS, -999));
}
public int setCountTime(String level){
if(level.equals("begineer")){
+ plank_duration = ""+60;
return 60000;
} else if(level.equals("intermediate")){
+ plank_duration = ""+120;
return 120000;
} else {
+ plank_duration = ""+180;
return 180000;
}
}
@@ -74,11 +101,41 @@ public class PlankActivity extends AppCompatActivity {
@Override
public void onFinish() {
countText.setText("BERHASIL");
+
+ SimpleDateFormat formatTime = new SimpleDateFormat("HH:mm:ss");
+ plank_time_end = formatTime.format(new Date());
+ Log.d(LOG_TAG, plank_time_end);
+
+ addPlankHistory(user, plank_date, plank_time_start, plank_time_end, plank_duration);
}
}.start();
}
+ public void addPlankHistory(String user, String plank_date, String plank_time_start,
+ String plank_time_end, String plank_duration){
+ String urlstring = api.ADD_PLANK_HISTORY_URL+"user="+user+"&plank_date="+plank_date+"&plank_time_start="+plank_time_start+
+ "&plank_time_end="+plank_time_end+"&plank_duration="+plank_duration;
+ if (android.os.Build.VERSION.SDK_INT > 9) {
+ StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build();
+ StrictMode.setThreadPolicy(policy);
+ }
+ try{
+ URL url = new URL(urlstring);
+ HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
+
+ try{
+ InputStream in = urlConnection.getInputStream();
+ Scanner scanner = new Scanner(in);
+ } finally {
+ urlConnection.disconnect();
+ }
+ } catch (MalformedURLException e){
+ e.printStackTrace();
+ }catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
public void openVideo(View view) {
String url = (String)view.getTag();
diff --git a/app/src/main/java/com/example/leo/fitnessdiy/PushupActivity.java b/app/src/main/java/com/example/leo/fitnessdiy/PushupActivity.java
index dccec83fc0fd4daad31f837fefddc4a5750bece0..86fd774d8ffe57da9e5c95c28dc793358efde995 100644
--- a/app/src/main/java/com/example/leo/fitnessdiy/PushupActivity.java
+++ b/app/src/main/java/com/example/leo/fitnessdiy/PushupActivity.java
@@ -4,17 +4,36 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
import android.os.Bundle;
+import android.os.StrictMode;
import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
import android.view.View;
+import android.widget.Button;
import android.widget.TextView;
import com.example.leo.fitnessdiy.model.UsersSharedPreferences;
+import com.example.leo.fitnessdiy.routes.api;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Scanner;
/**
* Created by Heil on 2/19/2018.
*/
public class PushupActivity extends AppCompatActivity{
+ private String user;
+ private String pushup_date;
+ private String pushup_time_start;
+ private String pushup_time_end;
+ private String pushup_frequency;
+ private String LOG_TAG = "PUSHUP ACTIVITY";
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -31,6 +50,9 @@ public class PushupActivity extends AppCompatActivity{
int background = mPreferences.getInt(BACKGROUND_KEY, R.drawable.green_theme);
getWindow().getDecorView().setBackground(getResources().getDrawable(background));
+
+ SimpleDateFormat formatDate = new SimpleDateFormat("yyyy-MM-dd");
+ pushup_date = formatDate.format(new Date());
}
public void setPushUpFrequency(String level){
@@ -59,5 +81,50 @@ public class PushupActivity extends AppCompatActivity{
public void taskComplete(View view) {
TextView tv = (TextView)findViewById(R.id.pushUpTask);
tv.setText("Berhasil");
+
+ SimpleDateFormat formatTime = new SimpleDateFormat("HH:mm:ss");
+ pushup_time_end = formatTime.format(new Date());
+ addPlankHistory(user, pushup_date, pushup_time_start, pushup_time_end, pushup_frequency);
+ Log.d(LOG_TAG, "waktu selesai pushup : "+pushup_time_end);
+ }
+
+ public void taskBegin(View view) {
+ TextView tv = (TextView)findViewById(R.id.pushUpTask);
+ Button button1 = (Button) findViewById(R.id.start_pushup_button);
+ button1.setVisibility(View.GONE);
+
+ Button button2 = (Button) findViewById(R.id.finish_pushup_button);
+ button2.setVisibility(View.VISIBLE);
+
+ SimpleDateFormat formatTime = new SimpleDateFormat("HH:mm:ss");
+ pushup_time_start = formatTime.format(new Date());
+ Log.d(LOG_TAG, "waktu mulai pushup : "+pushup_time_start);
+ }
+
+ public void addPlankHistory(String user, String pushup_date, String pushup_time_start,
+ String pushup_time_end, String pushup_frequency){
+
+ String urlstring = api.ADD_PUSHUP_HISTORY_URL+"user="+user+"&pushup_date="+pushup_date+"&pushup_time_start="+pushup_time_start+
+ "&pushup_time_end="+pushup_time_end+"&pushup_frequency="+pushup_frequency;
+
+ if (android.os.Build.VERSION.SDK_INT > 9) {
+ StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build();
+ StrictMode.setThreadPolicy(policy);
+ }
+ try{
+ URL url = new URL(urlstring);
+ HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
+
+ try{
+ InputStream in = urlConnection.getInputStream();
+ Scanner scanner = new Scanner(in);
+ } finally {
+ urlConnection.disconnect();
+ }
+ } catch (MalformedURLException e){
+ e.printStackTrace();
+ }catch (IOException e) {
+ e.printStackTrace();
+ }
}
}
diff --git a/app/src/main/java/com/example/leo/fitnessdiy/SitupActivity.java b/app/src/main/java/com/example/leo/fitnessdiy/SitupActivity.java
index e035c59aad356afae28c5503f19026b7e6020225..74a035cf9bd1481dd48dbdd96e0bfb0bdc8184cf 100644
--- a/app/src/main/java/com/example/leo/fitnessdiy/SitupActivity.java
+++ b/app/src/main/java/com/example/leo/fitnessdiy/SitupActivity.java
@@ -6,6 +6,7 @@ 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.TextView;
import com.example.leo.fitnessdiy.model.UsersSharedPreferences;
@@ -36,11 +37,11 @@ public class SitupActivity extends AppCompatActivity{
public void setSitUpFrequency(String level){
TextView sitUpTask = (TextView)findViewById(R.id.sitUpTask);
if(level.equals("begineer")){
- sitUpTask.setText("Do Push Up 30 times");
+ sitUpTask.setText("Do Sit Up 30 times");
}else if(level.equals("intermediate")){
- sitUpTask.setText("Do Push Up 60 times");
+ sitUpTask.setText("Do Sit Up 60 times");
}else if(level.equals("advanced")){
- sitUpTask.setText("Do Push Up 90 times");
+ sitUpTask.setText("Do Sit Up 90 times");
}
}
@@ -59,4 +60,13 @@ public class SitupActivity extends AppCompatActivity{
TextView tv = (TextView)findViewById(R.id.sitUpTask);
tv.setText("Berhasil");
}
+
+ public void taskBegin(View view) {
+ TextView tv = (TextView)findViewById(R.id.sitUpTask);
+ Button button1 = (Button) findViewById(R.id.start_situp_button);
+ button1.setVisibility(View.GONE);
+
+ Button button2 = (Button) findViewById(R.id.finish_situp_button);
+ button2.setVisibility(View.VISIBLE);
+ }
}
diff --git a/app/src/main/java/com/example/leo/fitnessdiy/routes/api.java b/app/src/main/java/com/example/leo/fitnessdiy/routes/api.java
index f1d5dbfad197a4cad4a60ff9d34871f69d9fb2da..c0966549b8e2a391775c118bc1c12218146239f4 100644
--- a/app/src/main/java/com/example/leo/fitnessdiy/routes/api.java
+++ b/app/src/main/java/com/example/leo/fitnessdiy/routes/api.java
@@ -14,8 +14,8 @@ public class api {
public static final String USERS_URL = BASE_URL + "users.php?user=";
public static final String newJoggingHistory(int id_user, String date,
- String start, String end, float distance,
- String sPoint, String ePoint) {
+ String start, String end, float distance,
+ String sPoint, String ePoint) {
return BASE_URL + "new_jogging_history.php?user=" + id_user +
"&date="+date+"&start="+start+"&end="+end+"&distance="+distance+"&spoint="+
sPoint+"&epoint=" + ePoint;
@@ -30,4 +30,8 @@ public class api {
public static final String SITUP_HISTORY_URL = BASE_URL + "situp_history.php?user=";
public static final String EDIT_LEVEL_URL = BASE_URL + "edit_level.php?";
+
+ public static final String ADD_PLANK_HISTORY_URL = BASE_URL + "add_plank_history.php?";
+
+ public static final String ADD_PUSHUP_HISTORY_URL = BASE_URL + "add_pushup_history.php?";
}
diff --git a/app/src/main/res/drawable/buttton_grey.xml b/app/src/main/res/drawable/buttton_grey.xml
new file mode 100644
index 0000000000000000000000000000000000000000..636e2581eb682df324d61766d4e5821afcc2c0eb
--- /dev/null
+++ b/app/src/main/res/drawable/buttton_grey.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+ <corners
+ android:radius="4dp"
+ />
+ <solid
+ android:color="#e8e8e8"
+ />
+ <padding
+ android:left="0dp"
+ android:top="0dp"
+ android:right="0dp"
+ android:bottom="0dp"
+ />
+ <size
+ android:width="190dp"
+ android:height="30dp"
+ />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/buttton_login.xml b/app/src/main/res/drawable/buttton_login.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7e59a92b98cd30c64ec55261816fbb130e2112a1
--- /dev/null
+++ b/app/src/main/res/drawable/buttton_login.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+ <corners
+ android:radius="14dp"
+ />
+ <solid
+ android:color="#0CE1E8"
+ />
+ <padding
+ android:left="0dp"
+ android:top="0dp"
+ android:right="0dp"
+ android:bottom="0dp"
+ />
+ <size
+ android:width="270dp"
+ android:height="60dp"
+ />
+ <stroke
+ android:width="2dp"
+ android:color="#878787"
+ />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/plank_video_2.PNG b/app/src/main/res/drawable/plank_video_2.PNG
index 647a0a8372c82077f14d73d982e1eee420ad7b05..76dacd7c57c7f4b1fd08fba3acb5668419575d5d 100644
Binary files a/app/src/main/res/drawable/plank_video_2.PNG and b/app/src/main/res/drawable/plank_video_2.PNG differ
diff --git a/app/src/main/res/drawable/pushup_video_1.png b/app/src/main/res/drawable/pushup_video_1.png
index 33e5be01b679a2fd7ea94fa8a2c6f03558b3c03d..23d7d6a460b3922c08763ee8486a746fcf4f1f5b 100644
Binary files a/app/src/main/res/drawable/pushup_video_1.png and b/app/src/main/res/drawable/pushup_video_1.png differ
diff --git a/app/src/main/res/drawable/pushup_video_2.png b/app/src/main/res/drawable/pushup_video_2.png
index ce7c69a881f2d23e4455ded78b2da9608db40576..6060b956d980f9005ce067b75713b21720eb50d6 100644
Binary files a/app/src/main/res/drawable/pushup_video_2.png and b/app/src/main/res/drawable/pushup_video_2.png differ
diff --git a/app/src/main/res/drawable/situp_video_1.png b/app/src/main/res/drawable/situp_video_1.png
index 09dd0f57d2ee8808b76de822bd7ebebd5145e2df..752f666e6cb2b1a2c6955264476e1fc2e8d9e258 100644
Binary files a/app/src/main/res/drawable/situp_video_1.png and b/app/src/main/res/drawable/situp_video_1.png differ
diff --git a/app/src/main/res/drawable/situp_video_2.png b/app/src/main/res/drawable/situp_video_2.png
index 63075dafe854147faa9e46291dd9f30eabd916d2..463e810c9461bc4ad0759c3a27c46675acb40bce 100644
Binary files a/app/src/main/res/drawable/situp_video_2.png and b/app/src/main/res/drawable/situp_video_2.png differ
diff --git a/app/src/main/res/layout/activity_chat.xml b/app/src/main/res/layout/activity_chat.xml
index cd23aa97715a7a46594eca0b993cf4bffd3214b9..90c3a579f0ee97175543274948099b2ef32c9b0a 100644
--- a/app/src/main/res/layout/activity_chat.xml
+++ b/app/src/main/res/layout/activity_chat.xml
@@ -9,6 +9,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
+ android:background="@drawable/layout_bg"
tools:context="com.example.leo.fitnessdiy.ChatActivity">
<android.support.design.widget.FloatingActionButton
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index dec7caff1f99854debe9f087e008d133870eb213..efa9c2952ad7c3f0653f0b48e8576cb3fe01fd49 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -14,7 +14,7 @@
<Button
android:id="@+id/history_button"
- android:layout_width="0dp"
+ android:layout_width="2dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:onClick="openHistory"
@@ -22,7 +22,7 @@
<Button
android:id="@+id/exercise_button"
- android:layout_width="0dp"
+ android:layout_width="2dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:onClick="changeFragment"
diff --git a/app/src/main/res/layout/activity_level.xml b/app/src/main/res/layout/activity_level.xml
index b64142d143920c8ba898b12352c880ac0aa375eb..5f05d883452f2c88b0a159de3c4b96bd6552c1fa 100644
--- a/app/src/main/res/layout/activity_level.xml
+++ b/app/src/main/res/layout/activity_level.xml
@@ -11,32 +11,41 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Select Your Level"
- android:layout_marginBottom="80dp"
+ android:layout_gravity="center"
+ android:layout_marginTop="30dp"
+ android:layout_marginBottom="40dp"
android:textSize="40sp" />
<RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="left">
+ android:layout_gravity="center"
+ android:background="@drawable/layout_bg"
+ android:minWidth="200dp">
+
<RadioButton
+ android:id="@+id/level_begineer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:id="@+id/level_begineer"
- android:text="@string/beginner"
android:onClick="selectLevel"
- />
+ android:textSize="22sp"
+ android:text="@string/beginner" />
+
<RadioButton
+ android:id="@+id/level_intermediate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:id="@+id/level_intermediate"
- android:text="@string/intermediate"
- android:onClick="selectLevel"/>
+ android:onClick="selectLevel"
+ android:textSize="22sp"
+ android:text="@string/intermediate" />
+
<RadioButton
+ android:id="@+id/level_advanced"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:id="@+id/level_advanced"
- android:text="@string/advanced"
- android:onClick="selectLevel"/>
+ android:onClick="selectLevel"
+ android:textSize="22sp"
+ android:text="@string/advanced" />
</RadioGroup>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 798814be02d537b389b3dc2a0136608c86e8b017..eb40c444e831ac28f075f98d0a9c861ccf8c5691 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -39,25 +39,24 @@
android:layout_margin="8dp"/>
<Button
- android:layout_width="match_parent"
- android:textSize="20sp"
- android:layout_height="wrap_content"
- android:padding="8dp"
- android:background="#38ed10"
+
+ android:layout_width="wrap_content"
+ android:layout_height="50dp"
+ android:layout_gravity="center"
android:layout_margin="8dp"
+ android:background="@drawable/buttton_login"
+ android:padding="8dp"
android:textColor="#ffffff"
- android:layout_gravity="center"
android:onClick="doLogin"
- android:text="@string/login" />
+ android:text="@string/login"
+ android:textSize="20sp" />
<Button
- android:layout_width="match_parent"
- android:padding="8dp"
- android:layout_margin="8dp"
- android:layout_height="wrap_content"
+ android:layout_width="191dp"
+ android:layout_height="30dp"
android:layout_gravity="center"
- android:text="@string/register_req"
- android:background="#38ed10"
- android:textColor="#ffffff"
- android:onClick="toRegister"/>
-</LinearLayout>
\ No newline at end of file
+ android:layout_margin="8dp"
+ android:background="@drawable/buttton_grey"
+ android:onClick="toRegister"
+ android:text="Don't Have Account?" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_pushup.xml b/app/src/main/res/layout/activity_pushup.xml
index 0b4e5b525bd065fd233c493e63a16cbceff5f218..32dfce50f955a2f1c87ddad3f5ce025e48368eba 100644
--- a/app/src/main/res/layout/activity_pushup.xml
+++ b/app/src/main/res/layout/activity_pushup.xml
@@ -46,7 +46,6 @@
android:layout_marginTop="30dp"
android:layout_marginBottom="20dp"
android:text="Do Push Up 30 Times"
- android:textColor="@color/bodyTextColor"
android:textSize="18dp" />
<Button
@@ -55,7 +54,18 @@
android:layout_gravity="center_horizontal"
android:layout_marginBottom="30dp"
android:textColor="@color/headingColor"
+ android:onClick="taskBegin"
+ android:id="@+id/start_pushup_button"
+ android:text="Start" />
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginBottom="30dp"
+ android:textColor="@color/headingColor"
+ android:id="@+id/finish_pushup_button"
android:onClick="taskComplete"
+ android:visibility="gone"
android:text="Done!" />
<TextView
@@ -82,7 +92,7 @@
android:src="@drawable/pushup_video_1" />
<TextView
- android:layout_width="106dp"
+ android:layout_width="84dp"
android:layout_height="53dp"
android:text="@string/pushup_demo"
android:textColor="@color/headingColor" />
diff --git a/app/src/main/res/layout/activity_situp.xml b/app/src/main/res/layout/activity_situp.xml
index e0a363d18a9480b5e0c73f19c1f4ea90d0f1d5f3..05640361b941e172daec2944dd0606d68fa87fb8 100644
--- a/app/src/main/res/layout/activity_situp.xml
+++ b/app/src/main/res/layout/activity_situp.xml
@@ -54,7 +54,19 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="30dp"
+ android:textColor="@color/headingColor"
+ android:onClick="taskBegin"
+ android:id="@+id/start_situp_button"
+ android:text="Start" />
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginBottom="30dp"
+ android:textColor="@color/headingColor"
+ android:id="@+id/finish_situp_button"
android:onClick="taskComplete"
+ android:visibility="gone"
android:text="Done!" />
<TextView
diff --git a/app/src/main/res/layout/registration.xml b/app/src/main/res/layout/registration.xml
index 8ec26c3957903f4ea57f78f28aae97382a5dd9a1..2aaa7cf215e53c5b3a80a75daa3a9a37deb4397a 100644
--- a/app/src/main/res/layout/registration.xml
+++ b/app/src/main/res/layout/registration.xml
@@ -3,123 +3,133 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
+ tools:context=".RegistrationActivity"
android:layout_height="match_parent">
<LinearLayout
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@drawable/layout_bg"
+ android:layout_marginRight="20dp"
+ android:layout_marginLeft="20dp"
+ android:layout_marginTop="20dp"
+ android:layout_marginBottom="20dp"
android:gravity="center"
android:orientation="vertical"
- tools:context="com.example.leo.fitnessdiy.RegistrationActivity">
+ tools:layout_editor_absoluteX="42dp"
+ tools:layout_editor_absoluteY="54dp">
<EditText
android:id="@+id/username"
- android:layout_width="wrap_content"
+ android:layout_width="300dp"
android:layout_height="wrap_content"
android:ems="10"
- android:inputType="textPersonName"
android:hint="@string/name"
+ android:inputType="textPersonName"
tools:layout_editor_absoluteX="53dp"
tools:layout_editor_absoluteY="55dp" />
<EditText
android:id="@+id/password"
- android:layout_width="wrap_content"
+ android:layout_width="300dp"
android:layout_height="wrap_content"
android:ems="10"
- android:inputType="textPassword"
android:hint="@string/password"
+ android:inputType="textPassword"
tools:layout_editor_absoluteX="53dp"
tools:layout_editor_absoluteY="131dp" />
<EditText
android:id="@+id/email"
- android:layout_width="wrap_content"
+ android:layout_width="300dp"
android:layout_height="wrap_content"
android:ems="10"
- android:inputType="textEmailAddress"
android:hint="@string/email"
+ android:inputType="textEmailAddress"
tools:layout_editor_absoluteX="53dp"
tools:layout_editor_absoluteY="206dp" />
<EditText
android:id="@+id/phone"
- android:layout_width="wrap_content"
+ android:layout_width="300dp"
android:layout_height="wrap_content"
android:ems="10"
- android:inputType="phone"
android:hint="@string/phone"
+ android:inputType="phone"
tools:layout_editor_absoluteX="53dp"
tools:layout_editor_absoluteY="272dp" />
<EditText
android:id="@+id/address"
- android:layout_width="wrap_content"
+ android:layout_width="300dp"
android:layout_height="wrap_content"
android:ems="10"
- android:inputType="textPostalAddress"
android:hint="@string/address"
+ android:inputType="textPostalAddress"
tools:layout_editor_absoluteX="53dp"
tools:layout_editor_absoluteY="344dp" />
<EditText
android:id="@+id/age"
- android:layout_width="wrap_content"
+ android:layout_width="300dp"
android:layout_height="wrap_content"
android:ems="10"
- android:inputType="textPostalAddress"
android:hint="Age"
+ android:inputType="textPostalAddress"
tools:layout_editor_absoluteX="53dp"
tools:layout_editor_absoluteY="344dp" />
<TextView
android:layout_width="164dp"
android:layout_height="wrap_content"
- android:text="@string/choice_command" />
-
+ android:layout_marginRight="50dp"
+ android:text="@string/choice_command"
+ android:textColor="@color/headingColor"
+ android:textSize="18sp" />
<RadioGroup
android:layout_width="wrap_content"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:layout_marginRight="75dp">
<RadioButton
android:id="@+id/level_begineer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:onClick="getLevel"
android:text="@string/beginner"
tools:layout_editor_absoluteX="41dp"
- tools:layout_editor_absoluteY="417dp"
- android:onClick="getLevel"/>
+ tools:layout_editor_absoluteY="417dp" />
<RadioButton
android:id="@+id/level_intermediate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:onClick="getLevel"
android:text="@string/intermediate"
tools:layout_editor_absoluteX="41dp"
- tools:layout_editor_absoluteY="463dp"
- android:onClick="getLevel"/>
+ tools:layout_editor_absoluteY="463dp" />
<RadioButton
android:id="@+id/level_advanced"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:onClick="getLevel"
android:text="@string/advanced"
tools:layout_editor_absoluteX="220dp"
- tools:layout_editor_absoluteY="417dp"
- android:onClick="getLevel"/>
+ tools:layout_editor_absoluteY="417dp" />
</RadioGroup>
<Button
android:id="@+id/registration_button"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="47dp"
+ android:background="@drawable/buttton_login"
+ android:onClick="doRegistration"
android:text="REGISTER"
- android:onClick="doRegistration"/>
+ android:textSize="20sp" />
</LinearLayout>
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index db2bc103340c4ff3465887022e7d7eb760f06701..47b7eeb562ad83f1fc3920748bcda25f7971eccd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -23,7 +23,7 @@
<string name="pushup">Push Up</string>
<string name="motivation_pushup">Push Up Challenge : Before and After</string>
<string name="pushup_demo">How to Push Up Properly</string>
- <string name="pushup_video">Push Up Video</string>
+ <string name="pushup_video">Need Insight?</string>
<string name="situp">Sit Up</string>
<string name="motivation_situp">Sit Up Challenge : Before and After</string>
<string name="situp_demo">How to do sit up properly</string>
diff --git a/gradle.properties b/gradle.properties
index 028b47c641f407886db2966697075a2aa8f124f3..fb44349327622cc9edf64a1bd8a2cc5acd473755 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,8 +12,8 @@
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
-#Fri Feb 23 11:16:21 GMT+07:00 2018
-systemProp.http.proxyPassword=02414056
+#Fri Feb 23 14:55:09 ICT 2018
+systemProp.http.proxyPassword=07007831
systemProp.http.proxyHost=cache.itb.ac.id
-systemProp.http.proxyUser=leo16515325
+systemProp.http.proxyUser=rizki_halasan
systemProp.http.proxyPort=8080