From f808c5dea6d3a7449cafb835a68b6dc5907cd97d Mon Sep 17 00:00:00 2001
From: ScorpioMiku <1056992492@qq.com>
Date: Mon, 10 Sep 2018 22:12:23 +0800
Subject: [PATCH] menu

---
 app/build.gradle                              |   2 +
 .../RecipeActivity/RecipeActivity.java        |  27 +-
 .../main/res/drawable/ic_fortune_cookie.xml   |  20 ++
 app/src/main/res/layout/activity_recipe.xml   | 301 ++++++++++++------
 .../res/layout/body_information_fragment.xml  |   7 +-
 .../normal_recommend_fragment_layout.xml      |   4 +-
 6 files changed, 225 insertions(+), 136 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_fortune_cookie.xml

diff --git a/app/build.gradle b/app/build.gradle
index a0f3dee..d4d9192 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -68,5 +68,7 @@ dependencies {
     compile 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30'
     //翻页view
     compile 'com.github.czy1121:turncardlistview:1.0.0'
+    //油表盘
+    compile 'com.github.lzyzsd:circleprogress:1.2.1'
 
 }
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/RecipeActivity/RecipeActivity.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/RecipeActivity/RecipeActivity.java
index 0f71cd0..335dfa5 100644
--- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/RecipeActivity/RecipeActivity.java
+++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/RecipeActivity/RecipeActivity.java
@@ -23,16 +23,7 @@ import butterknife.BindView;
 
 public class RecipeActivity extends BaseActivity {
 
-    @BindView(R.id.recipe_list)
-    RecyclerView recipeList;
-    @BindView(R.id.nested_scorll_view)
-    NestedScrollView nestedScorllView;
-    @BindView(R.id.tv_title)
-    TextView tvTitle;
-    @BindView(R.id.tv_subTitle)
-    TextView tvSubTitle;
-    @BindView(R.id.ll_title)
-    LinearLayout llTitle;
+
     private RecommendFood recommendFood;
     private Menu menu;
 
@@ -52,20 +43,6 @@ public class RecipeActivity extends BaseActivity {
     public void initViews(Bundle savedInstanceState) {
 
         final int changedHeight = UiUtils.dp2px(this, 214);
-        nestedScorllView.setOnScrollChangeListener(new NestedScrollView.OnScrollChangeListener() {
-            @Override
-            public void onScrollChange(NestedScrollView v, int scrollX, int scrollY, int oldScrollX, int oldScrollY) {
-
-                float scale = (float) v.getScrollY() / changedHeight;
-                //变化范围0-255 表示从透明到纯色背景
-                float alpha = scale * 255 >= 255 ? 255 : scale * 255;
-
-                llTitle.setBackgroundColor(Color.argb((int) alpha, 212, 62, 55));
-                tvTitle.setTextColor(Color.argb((int) alpha, 255, 255, 255));
-                tvSubTitle.setTextColor(Color.argb((int) alpha, 255, 255, 255));
-
-            }
-        });
 
         Intent intent = getIntent();
         recommendFood = (RecommendFood) intent.getSerializableExtra("SEND_OBJECT");
@@ -93,7 +70,5 @@ public class RecipeActivity extends BaseActivity {
     public void initRecyclerView() {
         super.initRecyclerView();
         MenuAdapter adapter = new MenuAdapter(menuList, this);
-        recipeList.setAdapter(adapter);
-        recipeList.setLayoutManager(new LinearLayoutManager(this));
     }
 }
diff --git a/app/src/main/res/drawable/ic_fortune_cookie.xml b/app/src/main/res/drawable/ic_fortune_cookie.xml
new file mode 100644
index 0000000..c8a1b82
--- /dev/null
+++ b/app/src/main/res/drawable/ic_fortune_cookie.xml
@@ -0,0 +1,20 @@
+<vector android:height="24dp" android:viewportHeight="1024.0"
+    android:viewportWidth="1024.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#C3DDF7" android:pathData="M735.5,460.3c-8.8,8.8 -23.1,8.8 -31.9,0L391.1,147.8c-8.8,-8.8 -8.8,-23.1 0,-31.9l109.4,-109.4c8.8,-8.8 23.1,-8.8 31.9,0L844.8,319.1c8.8,8.8 8.8,23.1 -0,31.9l-109.4,109.4z"/>
+    <path android:fillColor="#3F4963" android:pathData="M744.6,331.2a16.5,16.5 0,0 1,-11.7 -4.8L525,118.4a16.5,16.5 0,0 1,23.4 -23.4l207.9,207.9a16.5,16.5 0,0 1,0 23.4,16.5 16.5,0 0,1 -11.7,4.8zM664,341.4a16.5,16.5 0,0 1,-11.7 -4.8l-137.4,-137.4a16.5,16.5 0,0 1,23.4 -23.4l137.4,137.4a16.5,16.5 0,0 1,-11.7 28.2z"/>
+    <path android:fillColor="#FFD553" android:pathData="M835.7,249.9c-9.8,-10.4 -14.3,-12.5 -29.9,-11 -128.5,12 -236.2,100.9 -282.5,223.1v-0c-5,12.6 -7.9,15.5 -11.3,15.5 -3.5,0 -6.3,-2.9 -11.3,-15.5l-0,0c-46.2,-122.3 -154,-211.1 -282.4,-223.1 -15.7,-1.5 -20.2,0.6 -29.9,11 -83.3,88.4 -134.9,210.7 -134.9,345.9C53.3,865.4 258.7,1024 512,1024h0c253.3,0 458.6,-158.6 458.6,-428.2 0,-135.1 -51.6,-257.4 -134.9,-345.9z"/>
+    <path android:fillColor="#FF6376" android:pathData="M774.8,695.2h-64a16.5,16.5 0,0 1,-16.5 -16.5,16.5 16.5,0 0,1 16.5,-16.5h64a16.5,16.5 0,0 1,16.5 16.5,16.5 16.5,0 0,1 -16.5,16.5z"/>
+    <path android:fillColor="#3F4963" android:pathData="M474.6,674.6c-29.8,0 -54,-24.2 -54,-54 0,-9.1 7.4,-16.5 16.5,-16.5s16.5,7.4 16.5,16.5c0,11.5 9.4,20.9 20.9,20.9 11.5,0 20.9,-9.4 20.9,-20.9 0,-9.1 7.4,-16.5 16.5,-16.5s16.5,7.4 16.5,16.5c0,29.8 -24.2,54 -54,54z"/>
+    <path android:fillColor="#3F4963" android:pathData="M549.4,674.6c-29.8,0 -54,-24.2 -54,-54a16.5,16.5 0,0 1,16.5 -16.5,16.5 16.5,0 0,1 16.5,16.5c0,11.5 9.4,20.9 20.9,20.9 11.5,0 20.9,-9.4 20.9,-20.9a16.5,16.5 0,0 1,16.5 -16.5,16.5 16.5,0 0,1 16.5,16.5c0,29.8 -24.2,54 -54,54zM772.7,622.8a16.5,16.5 0,0 1,-16.5 -16.5c0,-7.4 -6,-13.4 -13.4,-13.4s-13.4,6 -13.4,13.4a16.5,16.5 0,0 1,-16.5 16.5,16.5 16.5,0 0,1 -16.5,-16.5c0,-25.6 20.8,-46.4 46.4,-46.4 25.6,0 46.4,20.8 46.4,46.4a16.5,16.5 0,0 1,-16.5 16.5z"/>
+    <path android:fillColor="#FF6376" android:pathData="M313.2,695.2h-64a16.5,16.5 0,0 1,-16.5 -16.5,16.5 16.5,0 0,1 16.5,-16.5h64a16.5,16.5 0,0 1,16.5 16.5,16.5 16.5,0 0,1 -16.5,16.5z"/>
+    <path android:fillColor="#3F4963" android:pathData="M311.1,622.8a16.5,16.5 0,0 1,-16.5 -16.5,13.4 13.4,0 0,0 -13.4,-13.4 13.4,13.4 0,0 0,-13.4 13.4c0,9.1 -7.4,16.5 -16.5,16.5s-16.5,-7.4 -16.5,-16.5c0,-25.6 20.8,-46.4 46.4,-46.4s46.4,20.8 46.4,46.4a16.5,16.5 0,0 1,-16.5 16.5z"/>
+    <path android:fillColor="#3F4963" android:pathData="M247.2,379m-29.5,0a29.5,29.5 0,1 0,59.1 0,29.5 29.5,0 1,0 -59.1,0Z"/>
+    <path android:fillColor="#3F4963" android:pathData="M736.5,395.5m-29.5,0a29.5,29.5 0,1 0,59.1 0,29.5 29.5,0 1,0 -59.1,0Z"/>
+    <path android:fillColor="#3F4963" android:pathData="M843.5,497.5m-29.5,0a29.5,29.5 0,1 0,59.1 0,29.5 29.5,0 1,0 -59.1,0Z"/>
+    <path android:fillColor="#3F4963" android:pathData="M276.8,862m-29.5,0a29.5,29.5 0,1 0,59.1 0,29.5 29.5,0 1,0 -59.1,0Z"/>
+    <path android:fillColor="#3F4963" android:pathData="M707,803.8m-29.5,0a29.5,29.5 0,1 0,59.1 0,29.5 29.5,0 1,0 -59.1,0Z"/>
+    <path android:fillColor="#3F4963" android:pathData="M370.3,804.5m-29.5,0a29.5,29.5 0,1 0,59.1 0,29.5 29.5,0 1,0 -59.1,0Z"/>
+    <path android:fillColor="#3F4963" android:pathData="M586.9,904.7m-29.5,0a29.5,29.5 0,1 0,59.1 0,29.5 29.5,0 1,0 -59.1,0Z"/>
+    <path android:fillColor="#3F4963" android:pathData="M370.3,467.9m-29.5,0a29.5,29.5 0,1 0,59.1 0,29.5 29.5,0 1,0 -59.1,0Z"/>
+    <path android:fillColor="#3F4963" android:pathData="M137.6,631.3m-29.5,0a29.5,29.5 0,1 0,59.1 0,29.5 29.5,0 1,0 -59.1,0Z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_recipe.xml b/app/src/main/res/layout/activity_recipe.xml
index 4f948a4..1af187c 100644
--- a/app/src/main/res/layout/activity_recipe.xml
+++ b/app/src/main/res/layout/activity_recipe.xml
@@ -1,125 +1,218 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     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:clipToPadding="false"
-    android:fitsSystemWindows="true">
+    android:layout_height="match_parent">
     <!--clipToPadding = false-->
     <!--令布局可以延伸到状态栏-->
 
-
-    <android.support.v4.widget.NestedScrollView
-        android:id="@+id/nested_scorll_view"
+    <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="250dp">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="200dp"
+            app:layout_collapseMode="parallax"
+            app:layout_scrollFlags="scroll|enterAlways">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1.5"
+                    android:gravity="center_horizontal"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="50dp" />
+
+                    <android.support.v7.widget.CardView
+                        android:layout_width="120dp"
+                        android:layout_height="90dp"
+                        app:cardCornerRadius="10dp">
+
+                        <ImageView
+                            android:layout_width="120dp"
+                            android:layout_height="match_parent"
+                            android:scaleType="fitXY"
+                            android:src="@drawable/food_test" />
+                    </android.support.v7.widget.CardView>
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:gravity="center"
+                        android:text="红烧肉"
+                        android:textColor="#FFF"
+                        android:textSize="20sp"
+                        android:textStyle="bold" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="2"
+                    android:orientation="vertical">
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="50dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentBottom="true"
+                            android:layout_marginLeft="15dp"
+                            android:text="营养成分"
+                            android:textSize="15sp"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentBottom="true"
+                            android:layout_alignParentRight="true"
+                            android:layout_marginRight="10dp"
+                            android:text="单位：每100克"
+                            android:textSize="10sp" />
+
+                    </RelativeLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginTop="5dp"
+                        android:gravity="center_horizontal"
+                        android:orientation="horizontal"
+                        android:paddingTop="10dp">
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:orientation="vertical">
+
+                            <com.github.lzyzsd.circleprogress.ArcProgress
+                                android:id="@+id/protein_circle"
+                                android:layout_width="60dp"
+                                android:layout_height="60dp"
+                                android:layout_margin="5dp"
+                                app:arc_bottom_text="测试"
+                                app:arc_progress="50"
+                                app:arc_suffix_text_size="15sp"
+                                app:arc_text_size="20sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="4.1克"
+                                android:textSize="10sp" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:orientation="vertical">
+
+                            <com.github.lzyzsd.circleprogress.ArcProgress
+                                android:id="@+id/fat_circle"
+                                android:layout_width="60dp"
+                                android:layout_height="60dp"
+                                android:layout_margin="5dp"
+                                app:arc_bottom_text="测试"
+                                app:arc_progress="50"
+                                app:arc_suffix_text_size="15sp"
+                                app:arc_text_size="20sp" />
+
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="4.1克"
+                                android:textSize="10sp" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:orientation="vertical">
+
+                            <com.github.lzyzsd.circleprogress.ArcProgress
+                                android:id="@+id/carbohydrate_circle"
+                                android:layout_width="60dp"
+                                android:layout_height="60dp"
+                                android:layout_margin="5dp"
+                                app:arc_bottom_text="测试"
+                                app:arc_progress="50"
+                                app:arc_suffix_text_size="15sp"
+                                app:arc_text_size="20sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="4.1克"
+                                android:textSize="10sp" />
+                        </LinearLayout>
+
+
+                    </LinearLayout>
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <ImageView
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_marginLeft="15dp"
+                android:layout_marginTop="10dp"
+                android:src="@drawable/ic_back_button_white" />
+        </RelativeLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_height="match_parent"
+            android:background="#FFF"
+            android:gravity="center"
+            android:orientation="horizontal">
 
-            <include layout="@layout/layout_menu_head_info" />
-
-
-            <!--<LinearLayout-->
-                <!--android:layout_width="wrap_content"-->
-                <!--android:layout_height="match_parent"-->
-                <!--android:gravity="center"-->
-                <!--android:orientation="vertical">-->
-
-                <!--<LinearLayout-->
-                    <!--android:layout_width="wrap_content"-->
-                    <!--android:layout_height="wrap_content"-->
-                    <!--android:orientation="horizontal">-->
-
-                    <!--<TextView-->
-                        <!--android:layout_width="wrap_content"-->
-                        <!--android:layout_height="wrap_content"-->
-                        <!--android:gravity="center"-->
-                        <!--android:text="花费：">-->
-
-                    <!--</TextView>-->
-
-                    <!--<ImageView-->
-                        <!--android:layout_width="wrap_content"-->
-                        <!--android:layout_height="match_parent"-->
-                        <!--android:paddingLeft="12dp"-->
-                        <!--android:src="@drawable/ic_right_arch" />-->
-
-                    <!--<TextView-->
-                        <!--android:id="@+id/detail_cost_text_view"-->
-                        <!--android:layout_width="wrap_content"-->
-                        <!--android:layout_height="wrap_content"-->
-                        <!--android:gravity="center"-->
-                        <!--android:paddingLeft="5dp"-->
-                        <!--android:text="详细电话咨询">-->
-
-                    <!--</TextView>-->
-
-                <!--</LinearLayout>-->
-
-                <!--<LinearLayout-->
-                    <!--android:layout_width="wrap_content"-->
-                    <!--android:layout_height="wrap_content"-->
-                    <!--android:orientation="horizontal"-->
-                    <!--android:paddingTop="10dp">-->
-
-                    <!--<TextView-->
-                        <!--android:layout_width="wrap_content"-->
-                        <!--android:layout_height="wrap_content"-->
-                        <!--android:gravity="center"-->
-                        <!--android:text="咨询电话：">-->
-
-                    <!--</TextView>-->
-
-                    <!--<ImageView-->
-                        <!--android:layout_width="wrap_content"-->
-                        <!--android:layout_height="match_parent"-->
-                        <!--android:paddingLeft="12dp"-->
-                        <!--android:src="@drawable/ic_back_button" />-->
-
-                    <!--<TextView-->
-                        <!--android:id="@+id/detail_call_text_view"-->
-                        <!--android:layout_width="wrap_content"-->
-                        <!--android:layout_height="wrap_content"-->
-                        <!--android:gravity="center"-->
-                        <!--android:paddingLeft="5dp"-->
-                        <!--android:text="店家未填写">-->
-
-                    <!--</TextView>-->
-
-                <!--</LinearLayout>-->
-            <!--</LinearLayout>-->
-
-            <!--<ImageView-->
-                <!--android:id="@+id/detail_make_call_button"-->
-                <!--android:layout_width="60dp"-->
-                <!--android:layout_height="60dp"-->
-                <!--android:layout_alignParentRight="true"-->
-                <!--android:layout_centerVertical="true"-->
-                <!--android:layout_marginRight="24dp"-->
-                <!--android:src="@drawable/ic_copy" />-->
-
-
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/recipe_list"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-            </android.support.v7.widget.RecyclerView>
+            <ImageView
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:src="@drawable/ic_fortune_cookie" />
 
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:text="原料与做法"
+                android:textSize="13sp" />
         </LinearLayout>
 
+    </android.support.design.widget.AppBarLayout>
+
+    <android.support.v4.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/test_avatar" />
 
     </android.support.v4.widget.NestedScrollView>
 
-
-    <include layout="@layout/layout_menu_detail_title" />
-
-
-</FrameLayout>
+</android.support.design.widget.CoordinatorLayout>
 
 
 
diff --git a/app/src/main/res/layout/body_information_fragment.xml b/app/src/main/res/layout/body_information_fragment.xml
index 439cd88..4e9aeb7 100644
--- a/app/src/main/res/layout/body_information_fragment.xml
+++ b/app/src/main/res/layout/body_information_fragment.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:overScrollMode="never"
-    android:scrollbars="none
-">
+    android:scrollbars="none">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -332,4 +331,4 @@
 
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/normal_recommend_fragment_layout.xml b/app/src/main/res/layout/normal_recommend_fragment_layout.xml
index 56689ec..8816cf8 100644
--- a/app/src/main/res/layout/normal_recommend_fragment_layout.xml
+++ b/app/src/main/res/layout/normal_recommend_fragment_layout.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -9,4 +9,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center" />
-</LinearLayout>
\ No newline at end of file
+</android.support.v4.widget.NestedScrollView>
\ No newline at end of file