shen/NutritionMaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

all ok

Browse Source
This commit is contained in:
ScorpioMiku
2018-09-11 21:05:12 +08:00
parent f808c5dea6
commit be04693e4d
14 changed files with 316 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/build.gradle
View File

@@ -40,35 +40,35 @@ dependencies {
implementation 'com.mxn.soul:flowingdrawer-core:2.0.0'
implementation 'com.nineoldandroids:library:2.4.0'
//图片形状库
compile 'com.github.siyamed:android-shape-imageview:0.9.+@aar'
implementation 'com.github.siyamed:android-shape-imageview:0.9.+@aar'
//cardview
compile 'com.android.support:cardview-v7:26.1.0'
implementation 'com.android.support:cardview-v7:26.1.0'
//tablayout
compile 'com.flyco.tablayout:FlycoTabLayout_Lib:2.0.0@aar'
implementation 'com.flyco.tablayout:FlycoTabLayout_Lib:2.0.0@aar'
//viewpager transforms
compile 'com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.2.32@aar'
implementation 'com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.2.32@aar'
//个人信息的那个条条
compile 'com.akexorcist:RoundCornerProgressBar:2.0.3'
implementation 'com.akexorcist:RoundCornerProgressBar:2.0.3'
//wave
implementation 'me.itangqi.waveloadingview:library:0.3.5'
//计步
implementation project(':todaystepcounterlib')
//打分ui
compile 'com.github.CB-ysx:CBRatingBar:3.0.1'
implementation 'com.github.CB-ysx:CBRatingBar:3.0.1'
//折线
implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
//searchview
compile 'com.miguelcatalan:materialsearchview:1.4.0'
implementation 'com.miguelcatalan:materialsearchview:1.4.0'
//floatbuttom
compile 'com.nightonke:boommenu:2.1.1'
implementation 'com.nightonke:boommenu:2.1.1'
//recycler and card
implementation 'com.android.support:recyclerview-v7:26.1.0'
implementation 'com.android.support:cardview-v7:26.1.0'
//混合式recyclerview
compile 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30'
implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30'
//翻页view
compile 'com.github.czy1121:turncardlistview:1.0.0'
implementation 'com.github.czy1121:turncardlistview:1.0.0'
//油表盘
compile 'com.github.lzyzsd:circleprogress:1.2.1'
implementation 'com.github.lzyzsd:circleprogress:1.2.1'
}

12
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MenuAdapter.java → app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepAdapter.java
View File

@@ -14,23 +14,23 @@ import java.util.ArrayList;
* Created by ScorpioMiku on 2018/9/9.
*/
public class MenuAdapter extends RecyclerView.Adapter<MenuHolder> {
public class MakeStepAdapter extends RecyclerView.Adapter<MakeStepHolder> {
private ArrayList<String> mList;
private Context mContext;
public MenuAdapter(ArrayList mList, Context mContext) {
public MakeStepAdapter(ArrayList mList, Context mContext) {
this.mList = mList;
this.mContext = mContext;
}
@Override
public MenuHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view = LayoutInflater.from(mContext).inflate(R.layout.menu_item, parent, false);
return new MenuHolder(view);
public MakeStepHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view = LayoutInflater.from(mContext).inflate(R.layout.make_step_item, parent, false);
return new MakeStepHolder(view);
}
@Override
public void onBindViewHolder(MenuHolder holder, int position) {
public void onBindViewHolder(MakeStepHolder holder, int position) {
holder.bindView(mList.get(position));
}

15
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MenuHolder.java → app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepHolder.java
View File

@@ -7,21 +7,24 @@ import android.widget.TextView;
import com.example.ninefourone.nutritionmaster.R;
import butterknife.BindView;
import butterknife.ButterKnife;
/**
* Created by ScorpioMiku on 2018/9/9.
*/
public class MenuHolder extends RecyclerView.ViewHolder {
@BindView(R.id.text)
TextView textView;
public class MakeStepHolder extends RecyclerView.ViewHolder {
public MenuHolder(View itemView) {
@BindView(R.id.make_step_text_view)
TextView makeStepTextView;
public MakeStepHolder(View itemView) {
super(itemView);
ButterKnife.bind(this, itemView);
}
public void bindView(String text) {
textView.setText(text);
makeStepTextView.setText(text);
}
}

42
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialAdapter.java Normal file
View File

@@ -0,0 +1,42 @@
package com.example.ninefourone.nutritionmaster.adapter;
import android.content.Context;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.example.ninefourone.nutritionmaster.R;
import com.example.ninefourone.nutritionmaster.bean.Material;
import java.util.ArrayList;
/**
* Created by ScorpioMiku on 2018/9/9.
*/
public class MaterialAdapter extends RecyclerView.Adapter<MaterialHolder> {
private ArrayList<Material> mList;
private Context mContext;
public MaterialAdapter(ArrayList mList, Context mContext) {
this.mList = mList;
this.mContext = mContext;
}
@Override
public MaterialHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view = LayoutInflater.from(mContext).inflate(R.layout.material_item, parent, false);
return new MaterialHolder(view);
}
@Override
public void onBindViewHolder(MaterialHolder holder, int position) {
holder.bindView(mList.get(position));
}
@Override
public int getItemCount() {
return mList.size();
}
}

34
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialHolder.java Normal file
View File

@@ -0,0 +1,34 @@
package com.example.ninefourone.nutritionmaster.adapter;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.TextView;
import com.example.ninefourone.nutritionmaster.R;
import com.example.ninefourone.nutritionmaster.bean.Material;
import butterknife.BindView;
import butterknife.ButterKnife;
/**
* Created by ScorpioMiku on 2018/9/9.
*/
public class MaterialHolder extends RecyclerView.ViewHolder {
@BindView(R.id.weight_number)
TextView weightNumber;
@BindView(R.id.name)
TextView name;
public MaterialHolder(View itemView) {
super(itemView);
ButterKnife.bind(this,itemView);
}
public void bindView(Material material) {
weightNumber.setText(material.getWeight() + "");
name.setText(material.getMaterialName());
}
}

31
app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Material.java Normal file
View File

@@ -0,0 +1,31 @@
package com.example.ninefourone.nutritionmaster.bean;
/**
* Created by ScorpioMiku on 2018/9/11.
*/
public class Material {
private String materialName;
private float weight;
public Material(String materialName, float weight) {
this.materialName = materialName;
this.weight = weight;
}
public String getMaterialName() {
return materialName;
}
public void setMaterialName(String materialName) {
this.materialName = materialName;
}
public float getWeight() {
return weight;
}
public void setWeight(float weight) {
this.weight = weight;
}
}

34
app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Menu.java
View File

@@ -1,10 +1,44 @@
package com.example.ninefourone.nutritionmaster.bean;
import java.util.ArrayList;
/**
* Created by ScorpioMiku on 2018/9/9.
*/
public class Menu {
private String menuName;
private ArrayList<Material> materialArrayList;
private ArrayList<String> makeSteps;
public Menu(String menuName, ArrayList<Material> materialArrayList, ArrayList<String> makeSteps) {
this.menuName = menuName;
this.materialArrayList = materialArrayList;
this.makeSteps = makeSteps;
}
public String getMenuName() {
return menuName;
}
public void setMenuName(String menuName) {
this.menuName = menuName;
}
public ArrayList<Material> getMaterialArrayList() {
return materialArrayList;
}
public void setMaterialArrayList(ArrayList<Material> materialArrayList) {
this.materialArrayList = materialArrayList;
}
public ArrayList<String> getMakeSteps() {
return makeSteps;
}
public void setMakeSteps(ArrayList<String> makeSteps) {
this.makeSteps = makeSteps;
}
}

51
app/src/main/java/com/example/ninefourone/nutritionmaster/modules/RecipeActivity/RecipeActivity.java
View File

@@ -1,20 +1,19 @@
package com.example.ninefourone.nutritionmaster.modules.RecipeActivity;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.support.v4.widget.NestedScrollView;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.example.ninefourone.nutritionmaster.R;
import com.example.ninefourone.nutritionmaster.adapter.MenuAdapter;
import com.example.ninefourone.nutritionmaster.adapter.MakeStepAdapter;
import com.example.ninefourone.nutritionmaster.adapter.MaterialAdapter;
import com.example.ninefourone.nutritionmaster.base.BaseActivity;
import com.example.ninefourone.nutritionmaster.bean.Material;
import com.example.ninefourone.nutritionmaster.bean.Menu;
import com.example.ninefourone.nutritionmaster.bean.RecommendFood;
import com.example.ninefourone.nutritionmaster.utils.UiUtils;
import com.github.lzyzsd.circleprogress.ArcProgress;
import com.orhanobut.logger.Logger;
import java.util.ArrayList;
@@ -24,10 +23,21 @@ import butterknife.BindView;
public class RecipeActivity extends BaseActivity {
@BindView(R.id.protein_circle)
ArcProgress proteinCircle;
@BindView(R.id.fat_circle)
ArcProgress fatCircle;
@BindView(R.id.carbohydrate_circle)
ArcProgress carbohydrateCircle;
@BindView(R.id.material_recycler_view)
RecyclerView materialRecyclerView;
@BindView(R.id.detail_way_recycler_view)
RecyclerView detailWayRecyclerView;
private RecommendFood recommendFood;
private Menu menu;
private ArrayList<String> menuList = new ArrayList<>();
private MaterialAdapter materialAdapter;
private MakeStepAdapter makeStepAdapter;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -41,12 +51,8 @@ public class RecipeActivity extends BaseActivity {
@Override
public void initViews(Bundle savedInstanceState) {
final int changedHeight = UiUtils.dp2px(this, 214);
Intent intent = getIntent();
recommendFood = (RecommendFood) intent.getSerializableExtra("SEND_OBJECT");
Logger.d(recommendFood.getItemType());
initList();
}
@@ -61,14 +67,25 @@ public class RecipeActivity extends BaseActivity {
}
private void initList() {
for (int i = 0; i < 10; i++) {
menuList.add("1");
ArrayList<Material> list = new ArrayList<>();
for (int i = 0; i < 7; i++) {
Material material = new Material("毛豆", 100);
list.add(material);
}
ArrayList<String> mList = new ArrayList<>();
for (int i = 0; i < 7; i++) {
String step = "第一步";
mList.add(step);
}
menu = new Menu("毛豆炒肉", list, mList);
makeStepAdapter = new MakeStepAdapter(menu.getMakeSteps(), this);
detailWayRecyclerView.setAdapter(makeStepAdapter);
detailWayRecyclerView.setLayoutManager(new LinearLayoutManager(this));
materialAdapter = new MaterialAdapter(menu.getMaterialArrayList(), this);
materialRecyclerView.setAdapter(materialAdapter);
materialRecyclerView.setLayoutManager(new LinearLayoutManager(this));
}
@Override
public void initRecyclerView() {
super.initRecyclerView();
MenuAdapter adapter = new MenuAdapter(menuList, this);
}
}

2
app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java
View File

@@ -36,7 +36,6 @@ import me.itangqi.waveloadingview.WaveLoadingView;
public class BodyInformationFragment extends BaseFragment {
Unbinder unbinder;
@BindView(R.id.step_text_view)
TextView stepTextView;
@@ -69,7 +68,6 @@ public class BodyInformationFragment extends BaseFragment {
initChart();
}
public static BaseFragment getInstance() {
return new BodyInformationFragment();
}

14
app/src/main/res/layout/activity_main.xml
View File

@@ -254,20 +254,6 @@
android:layout_height="wrap_content"
android:clipChildren="false">
<!--<me.panpf.swsv.SpiderWebScoreView-->
<!--android:id="@+id/spiderWeb_mainActivity"-->
<!--android:layout_width="100dp"-->
<!--android:layout_height="100dp"-->
<!--android:layout_gravity="center"-->
<!--app:scoreColor="@color/colorPrimary"-->
<!--app:scoreStrokeColor="@color/colorPrimary" />-->
<!--<me.panpf.swsv.CircularLayout-->
<!--android:id="@+id/layout_mainActivity_circular"-->
<!--android:layout_width="100dp"-->
<!--android:layout_height="100dp"-->
<!--android:layout_gravity="center"-->
<!--android:clipChildren="false" />-->
<com.github.mikephil.charting.charts.RadarChart
android:id="@+id/spider_view"
android:layout_width="170dp"

67
app/src/main/res/layout/activity_recipe.xml
View File

@@ -72,6 +72,7 @@
android:layout_alignParentBottom="true"
android:layout_marginLeft="15dp"
android:text="营养成分"
android:textColor="#000000"
android:textSize="15sp"
android:textStyle="bold" />
@@ -107,8 +108,8 @@
android:layout_margin="5dp"
app:arc_bottom_text="测试"
app:arc_progress="50"
app:arc_suffix_text_size="15sp"
app:arc_text_size="20sp" />
app:arc_suffix_text_size="12sp"
app:arc_text_size="12sp" />
<TextView
android:layout_width="wrap_content"
@@ -130,8 +131,8 @@
android:layout_margin="5dp"
app:arc_bottom_text="测试"
app:arc_progress="50"
app:arc_suffix_text_size="15sp"
app:arc_text_size="20sp" />
app:arc_suffix_text_size="12sp"
app:arc_text_size="12sp" />
<TextView
@@ -154,8 +155,8 @@
android:layout_margin="5dp"
app:arc_bottom_text="测试"
app:arc_progress="50"
app:arc_suffix_text_size="15sp"
app:arc_text_size="20sp" />
app:arc_suffix_text_size="12sp"
app:arc_text_size="12sp" />
<TextView
android:layout_width="wrap_content"
@@ -195,6 +196,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:text="原料与做法"
android:textColor="#131313"
android:textSize="13sp" />
</LinearLayout>
@@ -205,10 +207,57 @@
android:layout_height="wrap_content"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<ImageView
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/test_avatar" />
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:background="#FFF"
android:gravity="center_vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:text="主要材料"
android:textColor="#000000"
android:textSize="15sp"
android:textStyle="bold" />
</RelativeLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/material_recycler_view"
android:layout_width="match_parent"
android:layout_height="wrap_content">
</android.support.v7.widget.RecyclerView>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:background="#FFF"
android:gravity="center_vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:text="详细步骤"
android:textColor="#000000"
android:textSize="15sp"
android:textStyle="bold" />
</RelativeLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/detail_way_recycler_view"
android:layout_width="match_parent"
android:layout_height="wrap_content">
</android.support.v7.widget.RecyclerView>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>

18
app/src/main/res/layout/make_step_item.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/make_step_text_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="20dp"
android:textColor="#212121"
tools:text="@string/app_name" />
</LinearLayout>

39
app/src/main/res/layout/material_item.xml Normal file
View File

@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="50dp"
android:gravity="center_vertical">
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:textColor="#131212"
android:textSize="13sp"
tools:text="花菜" />
<TextView
android:id="@+id/weight_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:layout_toLeftOf="@+id/ke"
android:textColor="#131212"
android:textSize="13sp"
tools:text="克" />
<TextView
android:id="@+id/ke"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="15dp"
android:text="克"
android:textColor="#131212"
android:textSize="13sp" />
</RelativeLayout>

12
app/src/main/res/layout/menu_item.xml
View File

@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="100dp"
android:orientation="vertical">
<TextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center" />
</LinearLayout>