diff --git a/app/build.gradle b/app/build.gradle
index 6d49e79..c0b3314 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -47,4 +47,6 @@ dependencies {
compile 'com.flyco.tablayout:FlycoTabLayout_Lib:2.0.0@aar'
//viewpager transforms
compile 'com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.2.32@aar'
+ //个人信息的那个条条
+// compile 'com.akexorcist:RoundCornerProgressBar:2.0.3'
}
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HomePagerAdapter.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HomePagerAdapter.java
index 770fd09..b2cced9 100644
--- a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HomePagerAdapter.java
+++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HomePagerAdapter.java
@@ -7,7 +7,7 @@ import android.support.v4.app.FragmentPagerAdapter;
import com.example.ninefourone.nutritionmaster.R;
import com.example.ninefourone.nutritionmaster.modules.viewpagerfragments.page1.Page1;
-import com.example.ninefourone.nutritionmaster.modules.viewpagerfragments.page2.BodyInformationFragment;
+import com.example.ninefourone.nutritionmaster.modules.viewpagerfragments.bodyinformation.BodyInformationFragment;
import com.example.ninefourone.nutritionmaster.modules.viewpagerfragments.page3.Page3;
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/page2/BodyInformationFragment.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java
similarity index 87%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/page2/BodyInformationFragment.java
rename to app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java
index 3083ba5..8a712a4 100644
--- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/page2/BodyInformationFragment.java
+++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java
@@ -1,4 +1,4 @@
-package com.example.ninefourone.nutritionmaster.modules.viewpagerfragments.page2;
+package com.example.ninefourone.nutritionmaster.modules.viewpagerfragments.bodyinformation;
import android.os.Bundle;
@@ -12,7 +12,7 @@ import com.example.ninefourone.nutritionmaster.base.BaseFragment;
public class BodyInformationFragment extends BaseFragment {
@Override
public int getLayoutResId() {
- return R.layout.page_2;
+ return R.layout.body_information_fragment;
}
@Override
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 53d685e..40d848a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,7 +7,7 @@
android:layout_height="match_parent"
android:clipChildren="false"
android:clipToPadding="false"
- app:edMenuBackground="@color/colorPrimary"
+ app:edMenuBackground="#FFF"
app:edMenuSize="230dp"
app:edPosition="1">
@@ -102,15 +102,31 @@
android:layout_height="match_parent"
android:orientation="vertical">
-
+
-
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/page_2.xml b/app/src/main/res/layout/body_information_fragment.xml
similarity index 100%
rename from app/src/main/res/layout/page_2.xml
rename to app/src/main/res/layout/body_information_fragment.xml