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/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_history.xml b/app/src/main/res/layout/activity_history.xml
index 63fa4967357ef3317794af3b062e78ab42917909..661298e220a08b8f006ce0f3862ef64cbbc04d82 100644
--- a/app/src/main/res/layout/activity_history.xml
+++ b/app/src/main/res/layout/activity_history.xml
@@ -7,7 +7,6 @@
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="16dp"
- android:background="@drawable/layout_bg"
tools:context="com.example.leo.fitnessdiy.HIstoryActivity">
<android.support.v7.widget.CardView
android:id="@+id/jogging"
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 8335d696fb35467d7b5607f14bfb4d521c38440b..47c11af41d1d967ed837231751097e94ce2f4874 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -34,15 +34,17 @@
android:textSize="20sp"
android:layout_height="50dp"
android:layout_gravity="center"
+ android:background="@drawable/buttton_login"
android:layout_margin="8dp"
android:onClick="doLogin"
android:text="@string/login" />
<Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="191dp"
+ android:layout_height="30dp"
android:layout_gravity="center"
- android:text="Don't Have Account?"
android:layout_margin="8dp"
- android:onClick="toRegister"/>
+ android:background="@drawable/buttton_grey"
+ android:onClick="toRegister"
+ android:text="Don't Have Account?" />
</LinearLayout>