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 7c8e4dd..1fa0df9 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 @@ -1,6 +1,8 @@ package com.example.ninefourone.nutritionmaster.adapter; import android.content.Context; +import android.os.Build; +import android.support.annotation.RequiresApi; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; @@ -18,6 +20,16 @@ import java.util.ArrayList; public class CardAdapter extends RecyclerView.Adapter { private Context context; private ArrayList mList; + private int[] picList = new int[]{ + R.drawable.monday, + R.drawable.tuesday, + R.drawable.wednesday, + R.drawable.thursday, + R.drawable.friday, + R.drawable.saturday, + R.drawable.sunday + }; + public CardAdapter(Context context, ArrayList mList) { this.context = context; @@ -32,9 +44,10 @@ public class CardAdapter extends RecyclerView.Adapter { return cardHolder; } + @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) @Override public void onBindViewHolder(CardHolder holder, int position) { - holder.bindView(mList.get(position)); + holder.bindView(picList[position], mList.get(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 0183ad1..990322a 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 @@ -1,5 +1,8 @@ package com.example.ninefourone.nutritionmaster.adapter; +import android.content.Context; +import android.os.Build; +import android.support.annotation.RequiresApi; import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ImageView; @@ -7,6 +10,8 @@ import android.widget.TextView; import com.example.ninefourone.nutritionmaster.R; +import java.util.ArrayList; + import butterknife.BindView; import butterknife.ButterKnife; @@ -23,13 +28,16 @@ public class CardHolder extends RecyclerView.ViewHolder { TextView tvSign; - public CardHolder(View itemView) { super(itemView); ButterKnife.bind(this, itemView); } - public void bindView(String text) { + @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) + public void bindView(int picId, String text, Context context) { tvName.setText(text); + ivPhoto.setImageDrawable(context.getDrawable(picId)); } + + } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java index 663ed72..1cdfa06 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java @@ -14,6 +14,7 @@ import com.example.ninefourone.nutritionmaster.base.BaseFragment; import com.example.ninefourone.nutritionmaster.cardconfig.CardConfig; import com.example.ninefourone.nutritionmaster.cardconfig.CardItemTouchCallBack; import com.example.ninefourone.nutritionmaster.cardconfig.SwipeCardLayoutManager; +import com.example.ninefourone.nutritionmaster.utils.ConstantUtils; import java.util.ArrayList; @@ -68,8 +69,8 @@ public class CustomizationFragment extends BaseFragment { @Override protected void loadData() { super.loadData(); - for (int i = 0; i < 10; i++) { - mDataList.add(i + "个"); + for (int i = 1; i <= 7; i++) { + mDataList.add("周" + ConstantUtils.arab2Chinese(i) + "美食普"); } } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java index 9b4ef5d..a982033 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java @@ -1,8 +1,31 @@ package com.example.ninefourone.nutritionmaster.utils; +import java.util.ArrayList; + /** * Created by ScorpioMiku on 2018/8/26. */ public class ConstantUtils { + public static String arab2Chinese(int number) { + switch (number) { + case 1: + return "一"; + case 2: + return "二"; + case 3: + return "三"; + case 4: + return "四"; + case 5: + return "五"; + case 6: + return "六"; + case 7: + return "日"; + default: + return ""; + } + } + } diff --git a/app/src/main/res/drawable/food_test.jpg b/app/src/main/res/drawable/food_test.jpg new file mode 100644 index 0000000..59d9a4c Binary files /dev/null and b/app/src/main/res/drawable/food_test.jpg differ diff --git a/app/src/main/res/drawable/friday.jpg b/app/src/main/res/drawable/friday.jpg new file mode 100644 index 0000000..fe6abbb Binary files /dev/null and b/app/src/main/res/drawable/friday.jpg differ diff --git a/app/src/main/res/drawable/monday.jpg b/app/src/main/res/drawable/monday.jpg new file mode 100644 index 0000000..8430c08 Binary files /dev/null and b/app/src/main/res/drawable/monday.jpg differ diff --git a/app/src/main/res/drawable/saturday.jpg b/app/src/main/res/drawable/saturday.jpg new file mode 100644 index 0000000..7757408 Binary files /dev/null and b/app/src/main/res/drawable/saturday.jpg differ diff --git a/app/src/main/res/drawable/sunday.jpg b/app/src/main/res/drawable/sunday.jpg new file mode 100644 index 0000000..bb7e1d8 Binary files /dev/null and b/app/src/main/res/drawable/sunday.jpg differ diff --git a/app/src/main/res/drawable/thursday.jpg b/app/src/main/res/drawable/thursday.jpg new file mode 100644 index 0000000..5bdb77c Binary files /dev/null and b/app/src/main/res/drawable/thursday.jpg differ diff --git a/app/src/main/res/drawable/tuesday.jpg b/app/src/main/res/drawable/tuesday.jpg new file mode 100644 index 0000000..35b4668 Binary files /dev/null and b/app/src/main/res/drawable/tuesday.jpg differ diff --git a/app/src/main/res/drawable/wednesday.jpg b/app/src/main/res/drawable/wednesday.jpg new file mode 100644 index 0000000..374fd97 Binary files /dev/null and b/app/src/main/res/drawable/wednesday.jpg differ diff --git a/app/src/main/res/layout/card_item.xml b/app/src/main/res/layout/card_item.xml index 0c02907..f363533 100644 --- a/app/src/main/res/layout/card_item.xml +++ b/app/src/main/res/layout/card_item.xml @@ -3,6 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="420dp" + android:layout_gravity="center" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:layout_marginTop="10dp" @@ -16,16 +17,17 @@ android:id="@+id/iv_photo" android:layout_width="match_parent" android:layout_height="350dp" - android:background="@drawable/foods" /> + /> diff --git a/app/src/main/res/layout/customization.xml b/app/src/main/res/layout/customization.xml index c28e9dd..8ce91da 100644 --- a/app/src/main/res/layout/customization.xml +++ b/app/src/main/res/layout/customization.xml @@ -1,13 +1,13 @@ + android:layout_height="match_parent" + android:gravity="center"> + android:layout_height="match_parent"> \ No newline at end of file