diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c104fc7..262fe2c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -47,7 +47,9 @@ android:exported="true" /> - + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java index a2dd942..0c44585 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java @@ -39,7 +39,7 @@ public class CardAdapter extends RecyclerView.Adapter { @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) @Override public void onBindViewHolder(CardHolder holder, int position) { - holder.bindView(mList.get(position).getPictureId(), mList.get(position).getTitle(), context); + holder.bindView(mList.get(position).getPictureId(), mList.get(position).getTitle(), position, context); } @Override diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java index e8ee7d0..ce08f8d 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java @@ -11,6 +11,7 @@ import android.widget.TextView; import com.example.ninefourone.nutritionmaster.R; import com.example.ninefourone.nutritionmaster.modules.viewpagerfragments.customization.CustomizationActivity; +import com.orhanobut.logger.Logger; import java.util.ArrayList; @@ -30,7 +31,7 @@ public class CardHolder extends RecyclerView.ViewHolder { TextView tvSign; private View itemView; - + private Intent i; public CardHolder(View itemView) { super(itemView); @@ -39,14 +40,15 @@ public class CardHolder extends RecyclerView.ViewHolder { } @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) - public void bindView(int picId, String text, final Context context) { + public void bindView(int picId, String text, int index, final Context context) { tvName.setText(text); ivPhoto.setImageDrawable(context.getDrawable(picId)); + i = new Intent(context, CustomizationActivity.class); + i.putExtra("SEND_CODE", text); +// Logger.d(text); itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent i = new Intent(context, CustomizationActivity.class); - i.putExtra("SEND_CODE", getAdapterPosition()); context.startActivity(i); } }); diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java index ae396c6..e175de0 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java @@ -1,11 +1,14 @@ package com.example.ninefourone.nutritionmaster.adapter; -import android.view.LayoutInflater; + +import android.content.Intent; +import android.view.View; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.example.ninefourone.nutritionmaster.R; import com.example.ninefourone.nutritionmaster.bean.RecommendFood; +import com.example.ninefourone.nutritionmaster.modules.RecipeActivity.RecipeActivity; import com.orhanobut.logger.Logger; import java.util.List; @@ -16,6 +19,7 @@ import java.util.List; public class RecommendAdapter extends BaseMultiItemQuickAdapter { private int[] indexs = new int[]{0, 1, 1, 2}; + private Intent intent; /** * Same as QuickAdapter#QuickAdapter(Context,int) but with @@ -47,6 +51,16 @@ public class RecommendAdapter extends BaseMultiItemQuickAdapter + + diff --git a/app/src/main/res/drawable/ic_copy.xml b/app/src/main/res/drawable/ic_copy.xml new file mode 100644 index 0000000..fc173d3 --- /dev/null +++ b/app/src/main/res/drawable/ic_copy.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_exchange_customization.xml b/app/src/main/res/drawable/ic_exchange_customization.xml new file mode 100644 index 0000000..a89b3d5 --- /dev/null +++ b/app/src/main/res/drawable/ic_exchange_customization.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_right_arch.xml b/app/src/main/res/drawable/ic_right_arch.xml new file mode 100644 index 0000000..6c3c94a --- /dev/null +++ b/app/src/main/res/drawable/ic_right_arch.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_customization.xml b/app/src/main/res/layout/activity_customization.xml index 038bb90..5cabf01 100644 --- a/app/src/main/res/layout/activity_customization.xml +++ b/app/src/main/res/layout/activity_customization.xml @@ -7,9 +7,80 @@ android:orientation="vertical" tools:context="com.example.ninefourone.nutritionmaster.modules.viewpagerfragments.customization.CustomizationActivity"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_information.xml b/app/src/main/res/layout/activity_information.xml new file mode 100644 index 0000000..7f698b7 --- /dev/null +++ b/app/src/main/res/layout/activity_information.xml @@ -0,0 +1,409 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index b3cdee6..7741f13 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -231,8 +231,8 @@ + + + diff --git a/app/src/main/res/layout/recommend_item_big.xml b/app/src/main/res/layout/recommend_item_big.xml index 35afe31..655b69a 100644 --- a/app/src/main/res/layout/recommend_item_big.xml +++ b/app/src/main/res/layout/recommend_item_big.xml @@ -8,6 +8,7 @@ app:cardCornerRadius="20dp"> diff --git a/app/src/main/res/layout/recommend_item_detail.xml b/app/src/main/res/layout/recommend_item_detail.xml index 0c01e63..706685a 100644 --- a/app/src/main/res/layout/recommend_item_detail.xml +++ b/app/src/main/res/layout/recommend_item_detail.xml @@ -2,6 +2,7 @@ - @@ -41,4 +41,5 @@ + \ No newline at end of file