diff --git a/app/build.gradle b/app/build.gradle index 0a7ab15..4f4a977 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,4 +53,6 @@ dependencies { implementation 'me.itangqi.waveloadingview:library:0.3.5' //计步 implementation project(':todaystepcounterlib') + //打分ui + compile 'com.github.CB-ysx:CBRatingBar:3.0.1' } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java index bf3fbf8..8044150 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java @@ -1,17 +1,19 @@ package com.example.ninefourone.nutritionmaster.modules; import android.annotation.SuppressLint; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.FrameLayout; import android.widget.LinearLayout; +import android.widget.Toast; import com.ToxicBakery.viewpager.transforms.CubeOutTransformer; +import com.cb.ratingbar.CBRatingBar; import com.example.ninefourone.nutritionmaster.R; import com.example.ninefourone.nutritionmaster.adapter.HomePagerAdapter; import com.example.ninefourone.nutritionmaster.base.BaseActivity; import com.example.ninefourone.nutritionmaster.ui.NoScrollViewPager; -import com.example.ninefourone.nutritionmaster.utils.MessageUtils; import com.flyco.tablayout.SlidingTabLayout; import com.mxn.soul.flowingdrawer_core.ElasticDrawer; import com.mxn.soul.flowingdrawer_core.FlowingDrawer; @@ -32,6 +34,8 @@ public class MainActivity extends BaseActivity { SlidingTabLayout slidingTabLayout; @BindView(R.id.bar_cover) FrameLayout barCover; + @BindView(R.id.cb_rating_bar) + CBRatingBar cbRatingBar; @Override @@ -58,6 +62,7 @@ public class MainActivity extends BaseActivity { // Logger.i("openRatio=" + openRatio + " ,offsetPixels=" + offsetPixels); } }); + initViewPager(); } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java index 9b25015..32b76ea 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java @@ -38,8 +38,6 @@ public class BodyInformationFragment extends BaseFragment { @BindView(R.id.progress_1) RoundCornerProgressBar progress1; - @BindView(R.id.progress_2) - IconRoundCornerProgressBar progress2; Unbinder unbinder; @BindView(R.id.step_text_view) TextView stepTextView; @@ -73,13 +71,6 @@ public class BodyInformationFragment extends BaseFragment { progress1.setMax(70); progress1.setProgress(15); - progress2.setProgressColor(Color.parseColor("#56d2c2")); - progress2.setProgressBackgroundColor(Color.parseColor("#757575")); - progress2.setIconBackgroundColor(Color.parseColor("#38c0ae")); - progress2.setMax(550); - progress2.setProgress(147); - progress2.setIconImageResource(R.drawable.test_avatar); - initStepCounter(); // Logger.d(((MainActivity)getActivity()).getStepCount()); diff --git a/app/src/main/res/drawable/ic_bmi.xml b/app/src/main/res/drawable/ic_bmi.xml new file mode 100644 index 0000000..470e941 --- /dev/null +++ b/app/src/main/res/drawable/ic_bmi.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_height.xml b/app/src/main/res/drawable/ic_height.xml new file mode 100644 index 0000000..803f5c5 --- /dev/null +++ b/app/src/main/res/drawable/ic_height.xml @@ -0,0 +1,5 @@ + + + + diff --git a/app/src/main/res/drawable/ic_score.xml b/app/src/main/res/drawable/ic_score.xml new file mode 100644 index 0000000..0b3d8a5 --- /dev/null +++ b/app/src/main/res/drawable/ic_score.xml @@ -0,0 +1,5 @@ + + + + diff --git a/app/src/main/res/drawable/ic_weight.xml b/app/src/main/res/drawable/ic_weight.xml new file mode 100644 index 0000000..28da841 --- /dev/null +++ b/app/src/main/res/drawable/ic_weight.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/drawable/icon_black.xml b/app/src/main/res/drawable/icon_black.xml new file mode 100644 index 0000000..0154340 --- /dev/null +++ b/app/src/main/res/drawable/icon_black.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/drawable/icon_colorful.png b/app/src/main/res/drawable/icon_colorful.png new file mode 100644 index 0000000..8df889d Binary files /dev/null and b/app/src/main/res/drawable/icon_colorful.png differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 6e9e8a1..13598b5 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -122,31 +122,385 @@ android:layout_height="match_parent" android:orientation="vertical"> + - - + android:orientation="horizontal"> + android:layout_width="match_parent" + android:layout_height="match_parent"> - + android:gravity="center" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/body_information_fragment.xml b/app/src/main/res/layout/body_information_fragment.xml index d2ea7fa..6b3b974 100644 --- a/app/src/main/res/layout/body_information_fragment.xml +++ b/app/src/main/res/layout/body_information_fragment.xml @@ -16,15 +16,6 @@ android:layout_width="match_parent" android:layout_height="50dp" /> - #045ca1 + #b3b3b3 + #e6e5e5 + #52ec2f + #9ac3f9 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index df15394..db43015 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,6 @@ NutritionMaster + 当前值 + 标准值 + M1080.3,453.7c-77.2,88.2 -214.6,234.4 -214.6,234.4s22,160.2 35.3,269.7c5.9,55.9 -37.5,80.1 -86,58.1 -92.6,-43.4 -233.7,-111 -265.3,-126.4 -32.3,14.7 -174.2,81.6 -267.5,124.9 -49.2,21.3 -92.6,-2.2 -87.5,-58.1 12.5,-109.5 35.3,-269 35.3,-269S91.1,541.9 13.2,453.7c-27.9,-32.3 -9.6,-77.9 44.8,-86 111.7,-19.8 284.4,-51.4 284.4,-51.4s94.8,-163.1 154.3,-263.1C529.8,-7.8 552.6,-0.4 556.3,1c10.3,2.9 26.5,15.4 47,52.2 58.8,99.9 152.1,263.1 152.1,263.1s170.5,31.6 280.7,51.4c53.6,8.1 71.3,54.4 44.1,86z diff --git a/build.gradle b/build.gradle index a1cb46b..14a009b 100644 --- a/build.gradle +++ b/build.gradle @@ -21,6 +21,7 @@ allprojects { repositories { google() jcenter() + maven { url 'https://jitpack.io' } } }