diff --git a/README.md b/README.md index 06bcae4..31f06cc 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ + ## 营养大师 一款基于数据分析的智能饮食推荐APP diff --git a/app/build.gradle b/app/build.gradle index 5864302..a0f3dee 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,8 +55,6 @@ dependencies { implementation project(':todaystepcounterlib') //打分ui compile 'com.github.CB-ysx:CBRatingBar:3.0.1' -// //蛛网 -// implementation 'me.panpf:spider-web-score-view:1.0.1' //折线 implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3' //searchview @@ -66,4 +64,9 @@ dependencies { //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' + //翻页view + compile 'com.github.czy1121:turncardlistview:1.0.0' + } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8bb7fa1..fa4de42 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,9 +17,11 @@ + + + android:exported="true" /> + + \ No newline at end of file diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HomePagerAdapter.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HomePagerAdapter.java index f705e2e..9667200 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HomePagerAdapter.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HomePagerAdapter.java @@ -8,7 +8,7 @@ import android.support.v4.app.FragmentPagerAdapter; import com.example.ninefourone.nutritionmaster.R; import com.example.ninefourone.nutritionmaster.modules.viewpagerfragments.customization.CustomizationFragment; import com.example.ninefourone.nutritionmaster.modules.viewpagerfragments.bodyinformation.BodyInformationFragment; -import com.example.ninefourone.nutritionmaster.modules.viewpagerfragments.page3.Page3; +import com.example.ninefourone.nutritionmaster.modules.viewpagerfragments.recommend.RecommendFragment; /** @@ -36,7 +36,7 @@ public class HomePagerAdapter extends FragmentPagerAdapter { fragments[position] = BodyInformationFragment.getInstance(); break; case 2: - fragments[position] = Page3.getInstance(); + fragments[position] = RecommendFragment.getInstance(); break; default: break; 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 new file mode 100644 index 0000000..ae396c6 --- /dev/null +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java @@ -0,0 +1,76 @@ +package com.example.ninefourone.nutritionmaster.adapter; + +import android.view.LayoutInflater; + +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.orhanobut.logger.Logger; + +import java.util.List; + +/** + * Created by ScorpioMiku on 2018/9/3. + */ + +public class RecommendAdapter extends BaseMultiItemQuickAdapter { + private int[] indexs = new int[]{0, 1, 1, 2}; + + /** + * Same as QuickAdapter#QuickAdapter(Context,int) but with + * some initialization data. + * + * @param data A new list is created out of this one to avoid mutable list + */ + public RecommendAdapter(List data) { + super(data); + addItemType(RecommendFood.TYPE_BIG, R.layout.recommend_item_big); + addItemType(RecommendFood.TYPE_DETAIL, R.layout.recommend_item_detail); + addItemType(RecommendFood.TYPE_MIDDLE, R.layout.recommend_item_middle); + } + + @Override + protected void convert(BaseViewHolder helper, RecommendFood item) { + switch (item.getItemType()) { + case RecommendFood.TYPE_BIG: + helper.setImageResource(R.id.recommend_item_imageview, R.drawable.food_test); + helper.setText(R.id.recommend_item_title, "红烧肉"); + break; + case RecommendFood.TYPE_DETAIL: + helper.setImageResource(R.id.recommend_item_imageview, R.drawable.food_test); + helper.setText(R.id.recommend_item_title, item.getTitle()); + helper.setText(R.id.recommend_item_description, item.getDescription()); + break; + case RecommendFood.TYPE_MIDDLE: + helper.setImageResource(R.id.recommend_item_imageview, R.drawable.food_test); + helper.setText(R.id.recommend_item_title, "红烧"); + break; + } + } + + @Override + public void loadMoreComplete() { + super.loadMoreComplete(); + for (int i = 0; i < 5; i++) { + RecommendFood recommendFood = new RecommendFood(1, "烧肉", "好吃", indexs[i % 4]); + getData().add(recommendFood); + } +// notifyDataSetChanged(); +// Logger.d("加载成功"); + } + + @Override + public void loadMoreEnd() { + super.loadMoreEnd(); +// Logger.d("数据没了"); + } + + @Override + public void loadMoreFail() { + super.loadMoreFail(); +// Logger.d("加载失败"); + } + + +} diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/RecommendFood.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/RecommendFood.java new file mode 100644 index 0000000..1caf57f --- /dev/null +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/RecommendFood.java @@ -0,0 +1,60 @@ +package com.example.ninefourone.nutritionmaster.bean; + +import com.chad.library.adapter.base.entity.MultiItemEntity; +import com.orhanobut.logger.Logger; + +/** + * Created by ScorpioMiku on 2018/9/3. + */ + +public class RecommendFood implements MultiItemEntity { + + //三种view + public static final int TYPE_BIG = 0; + public static final int TYPE_MIDDLE = 1; + public static final int TYPE_DETAIL = 2; + + private int picture; + private String title; + private String description; + private int type; + + public RecommendFood(int picture, String title, String description, int type) { + this.picture = picture; + this.title = title; + this.description = description; + this.type = type; + if (type > 2) { + Logger.e("混合recycler type不对"); + } + } + + public int getPicture() { + return picture; + } + + public void setPicture(int picture) { + this.picture = picture; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + @Override + public int getItemType() { + return type; + } +} 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 1d2d6ef..ee9b6e0 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 @@ -11,6 +11,7 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.FrameLayout; +import android.widget.ImageView; import android.widget.LinearLayout; import com.ToxicBakery.viewpager.transforms.CubeOutTransformer; @@ -19,6 +20,7 @@ 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.camera.FoodMaterialCamera; +import com.example.ninefourone.nutritionmaster.modules.addinformation.AddActivity; import com.example.ninefourone.nutritionmaster.ui.NoScrollViewPager; import com.example.ninefourone.nutritionmaster.utils.MessageUtils; import com.example.ninefourone.nutritionmaster.utils.PermissionUtils; @@ -81,6 +83,8 @@ public class MainActivity extends BaseActivity { BoomMenuButton boomMenuButton; @BindView(R.id.spider_view) RadarChart spiderView; + @BindView(R.id.add_information_button) + ImageView addInformationButton; @Override @@ -166,13 +170,11 @@ public class MainActivity extends BaseActivity { } + //mDrawer.openMenu(); + /** * 点击事件 */ - @OnClick(R.id.navigation_layout) - public void onViewClicked() { - mDrawer.openMenu(); - } /** @@ -305,4 +307,17 @@ public class MainActivity extends BaseActivity { super.onRequestPermissionsResult(requestCode, permissions, grantResults); MessageUtils.MakeToast("权限赋予成功"); } + + @OnClick({R.id.navigation_layout, R.id.add_information_button}) + public void onViewClicked(View view) { + switch (view.getId()) { + case R.id.navigation_layout: + mDrawer.openMenu(); + break; + case R.id.add_information_button: + Intent intent = new Intent(MainActivity.this, AddActivity.class); + startActivity(intent); + break; + } + } } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddActivity.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddActivity.java new file mode 100644 index 0000000..7dbae5c --- /dev/null +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddActivity.java @@ -0,0 +1,166 @@ +package com.example.ninefourone.nutritionmaster.modules.addinformation; + +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.CardView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.view.Window; +import android.view.WindowManager; +import android.widget.BaseAdapter; +import android.widget.Button; +import android.widget.ImageView; +import android.widget.RelativeLayout; +import android.widget.TextView; + +import com.example.ninefourone.nutritionmaster.R; +import com.example.ninefourone.nutritionmaster.utils.ConstantUtils; +import com.example.ninefourone.nutritionmaster.utils.MessageUtils; +import com.github.czy1121.view.TurnCardListView; + +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.OnClick; + +public class AddActivity extends AppCompatActivity { + + @BindView(R.id.card_list) + TurnCardListView cardList; + @BindView(R.id.bottom_content) + RelativeLayout bottomContent; + @BindView(R.id.back_button) + ImageView backButton; + @BindView(R.id.result_layout) + CardView resultLayout; + + + // private int[] colors = {0xff3F51B5, 0xff673AB7, 0xff006064, 0xffC51162, 0xffFFEB3B, 0xff795548, 0xff9E9E9E}; + private int[] colors = {0xffdef6f9, 0xffd6eeec, 0xffB2EBF2, 0xffB2DFDB, 0xff8ed0ca, 0xff80CBC4, 0xff4DB6AC, 0xff3c948b}; + private Button[] firstButtons = new Button[ConstantUtils.questionList.length]; + private Button[] secondButtons = new Button[ConstantUtils.questionList.length]; + private Button[] thirdButtons = new Button[ConstantUtils.questionList.length]; + private TextView[] titleViews = new TextView[ConstantUtils.questionList.length]; + + private Button[][] buttonList; + + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + requestWindowFeature(Window.FEATURE_NO_TITLE); + //设置全屏 + getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, + WindowManager.LayoutParams.FLAG_FULLSCREEN); + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_add); + ButterKnife.bind(this); + buttonList = new Button[][]{ + firstButtons, + secondButtons, + thirdButtons + }; + initAddView(); + } + + private void initAddView() { + BaseAdapter adapter = new BaseAdapter() { + + + @Override + public int getCount() { + return colors.length; + } + + @Override + public Object getItem(int position) { + return position; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public View getView(final int position, View child, ViewGroup parent) { + + child = LayoutInflater.from(parent.getContext()).inflate(R.layout.add_item, parent, false); + child.findViewById(R.id.image).setBackgroundColor(colors[position]); + titleViews[position] = child.findViewById(R.id.title_view); + titleViews[position].setText(ConstantUtils.questionList[position]); + + firstButtons[position] = child.findViewById(R.id.choose_first); + firstButtons[position].setBackgroundColor(colors[position] + 30); + + + secondButtons[position] = child.findViewById(R.id.choose_second); + secondButtons[position].setBackgroundColor(colors[position] + 30); + + + thirdButtons[position] = child.findViewById(R.id.choose_third); + thirdButtons[position].setBackgroundColor(colors[position] + 30); + + + if (position != ConstantUtils.questionList.length - 1) { + firstButtons[position].setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + firstButtons[position].setBackgroundColor(colors[position] - 60); + secondButtons[position].setBackgroundColor(colors[position] + 30); + thirdButtons[position].setBackgroundColor(colors[position] + 30); + cardList.turnTo(position + 1); + } + }); + } else { + firstButtons[position].setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + resultLayout.setVisibility(View.VISIBLE); + } + }); + } + secondButtons[position].setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + firstButtons[position].setBackgroundColor(colors[position] + 30); + thirdButtons[position].setBackgroundColor(colors[position] + 30); + secondButtons[position].setBackgroundColor(colors[position] - 60); + cardList.turnTo(position + 1); + } + }); + thirdButtons[position].setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + firstButtons[position].setBackgroundColor(colors[position] + 30); + secondButtons[position].setBackgroundColor(colors[position] + 30); + thirdButtons[position].setBackgroundColor(colors[position] - 60); + cardList.turnTo(position + 1); + } + }); + + for (int i = 0; i < ConstantUtils.answerList[position].length; i++) { + buttonList[i][position].setText(ConstantUtils.answerList[position][i]); + buttonList[i][position].setVisibility(View.VISIBLE); + } + return child; + } + + }; + + cardList.setAdapter(adapter); + cardList.setOnTurnListener(new TurnCardListView.OnTurnListener() { + @Override + public void onTurned(int position) { + bottomContent.setBackgroundColor(colors[position] - 60); + } + }); + + + } + + @OnClick(R.id.back_button) + public void onViewClicked() { + finish(); + } +} diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/page3/Page3.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/page3/Page3.java deleted file mode 100644 index fd1d881..0000000 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/page3/Page3.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.example.ninefourone.nutritionmaster.modules.viewpagerfragments.page3; - -import android.os.Bundle; - -import com.example.ninefourone.nutritionmaster.R; -import com.example.ninefourone.nutritionmaster.base.BaseFragment; - -/** - * Created by ScorpioMiku on 2018/8/26. - */ - -public class Page3 extends BaseFragment { - @Override - public int getLayoutResId() { - return R.layout.page_3; - } - - @Override - public void initView(Bundle state) { - - } - - - public static BaseFragment getInstance() { - return new Page3(); - } -} diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/recommend/RecommendFragment.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/recommend/RecommendFragment.java new file mode 100644 index 0000000..218e888 --- /dev/null +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/recommend/RecommendFragment.java @@ -0,0 +1,138 @@ +package com.example.ninefourone.nutritionmaster.modules.viewpagerfragments.recommend; + +import android.os.Bundle; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.chad.library.adapter.base.BaseQuickAdapter; +import com.example.ninefourone.nutritionmaster.R; +import com.example.ninefourone.nutritionmaster.adapter.RecommendAdapter; +import com.example.ninefourone.nutritionmaster.base.BaseFragment; +import com.example.ninefourone.nutritionmaster.bean.RecommendFood; +import com.orhanobut.logger.Logger; + +import java.util.ArrayList; + +import android.view.LayoutInflater; + +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.Unbinder; + +/** + * Created by ScorpioMiku on 2018/8/26. + */ + +public class RecommendFragment extends BaseFragment { + @BindView(R.id.recycler_view) + RecyclerView recyclerView; + Unbinder unbinder; + + private RecommendAdapter adapter; + private ArrayList datas = new ArrayList<>(); + private GridLayoutManager manager; + private int[] indexs = new int[]{0, 1, 1, 2}; + + @Override + public int getLayoutResId() { + return R.layout.normal_recommend_fragment_layout; + } + + @Override + public void initView(Bundle state) { + loadData(); + initRecyclerView(); + } + + + public static BaseFragment getInstance() { + return new RecommendFragment(); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + // TODO: inflate a fragment view + View rootView = super.onCreateView(inflater, container, savedInstanceState); + unbinder = ButterKnife.bind(this, rootView); + return rootView; + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + unbinder.unbind(); + } + + /** + * 初始化recyclerview + */ + @Override + protected void initRecyclerView() { + adapter = new RecommendAdapter(datas); + adapter.openLoadAnimation(BaseQuickAdapter.SCALEIN); + adapter.isFirstOnly(false); + recyclerView.setAdapter(adapter); + + adapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() { + @Override + public void onLoadMoreRequested() { + recyclerView.postDelayed(new Runnable() { + @Override + public void run() { + adapter.loadMoreComplete(); +// Logger.d("开始加载"); + } + }, 1000); + } + }, recyclerView); + adapter.disableLoadMoreIfNotFullPage(); + adapter.setEnableLoadMore(true); + adapter.setHeaderView(LayoutInflater.from(getContext()). + inflate(R.layout.recommend_head, (ViewGroup) recyclerView.getParent(), false)); + recyclerView.setNestedScrollingEnabled(false); + manager = new GridLayoutManager(getContext(), 2); + adapter.setHeaderViewAsFlow(false); + manager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() { + @Override + public int getSpanSize(int position) { + if (position == 0) { + return 2; + } else { + if (adapter.getItemViewType(position) == RecommendFood.TYPE_BIG || + adapter.getItemViewType(position) == RecommendFood.TYPE_DETAIL) { +// Logger.d(manager.getSpanCount()); + return 2; + } else { + return 1; + } + } + } + }); + recyclerView.setLayoutManager(manager); + } + + /** + * 加载数据 + */ + @Override + protected void loadData() { + super.loadData(); + for (int i = 0; i < 11; i++) { + RecommendFood recommendFood = new RecommendFood(1, "烧肉", "好吃", indexs[i % 4]); + datas.add(recommendFood); + } + } + + /** + * 判断数据是否加载完了（服务器没了） + * + * @return + */ + private boolean isDataOverCount() { + return false; + } +} 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 a982033..f1bc04c 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 @@ -28,4 +28,27 @@ public class ConstantUtils { } } + + public static String[] questionList = new String[]{ + "现在先去找个镜子吧" + + "\n下面会用到哦", + "你舌苔的颜色", + "舌底经络颜色", + "口腔整体情况", + "整体生活精神状况", + "性格特点", + "食物温度偏向", + "揭晓结果" + }; + + public static String[][] answerList = new String[][]{ + {"开始吧"}, + {"偏暗红", "偏白", "淡红"}, + {"暗红", "细红", "不明显"}, + {"口舌干燥", "口黏苔腻", "还算正常"}, + {"沉寂易疲劳", "精力充沛"}, + {"内向", "开朗"}, + {"烫的", "冷的", "没有特别喜欢的"}, + {"查看"} + }; } diff --git a/app/src/main/res/drawable/ic_back_button.xml b/app/src/main/res/drawable/ic_back_button.xml new file mode 100644 index 0000000..89e7a6b --- /dev/null +++ b/app/src/main/res/drawable/ic_back_button.xml @@ -0,0 +1,4 @@ + + + diff --git a/app/src/main/res/drawable/ic_data_add.xml b/app/src/main/res/drawable/ic_data_add.xml new file mode 100644 index 0000000..7bb3b82 --- /dev/null +++ b/app/src/main/res/drawable/ic_data_add.xml @@ -0,0 +1,5 @@ + + + + diff --git a/app/src/main/res/drawable/recommend_bg.jpg b/app/src/main/res/drawable/recommend_bg.jpg new file mode 100644 index 0000000..a094043 Binary files /dev/null and b/app/src/main/res/drawable/recommend_bg.jpg differ diff --git a/app/src/main/res/drawable/result_bg.png b/app/src/main/res/drawable/result_bg.png new file mode 100644 index 0000000..cbea2ba Binary files /dev/null and b/app/src/main/res/drawable/result_bg.png differ diff --git a/app/src/main/res/layout/activity_add.xml b/app/src/main/res/layout/activity_add.xml new file mode 100644 index 0000000..ab0a652 --- /dev/null +++ b/app/src/main/res/layout/activity_add.xml @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index c3f12e9..b3cdee6 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -18,16 +18,13 @@ + android:layout_height="match_parent"> @@ -196,6 +193,7 @@ android:layout_height="match_parent"> + + diff --git a/app/src/main/res/layout/add_item.xml b/app/src/main/res/layout/add_item.xml new file mode 100644 index 0000000..962700c --- /dev/null +++ b/app/src/main/res/layout/add_item.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/body_information_fragment.xml b/app/src/main/res/layout/body_information_fragment.xml index 5a8601f..439cd88 100644 --- a/app/src/main/res/layout/body_information_fragment.xml +++ b/app/src/main/res/layout/body_information_fragment.xml @@ -14,7 +14,7 @@ diff --git a/app/src/main/res/layout/normal_recommend_fragment_layout.xml b/app/src/main/res/layout/normal_recommend_fragment_layout.xml new file mode 100644 index 0000000..56689ec --- /dev/null +++ b/app/src/main/res/layout/normal_recommend_fragment_layout.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/page_3.xml b/app/src/main/res/layout/page_3.xml deleted file mode 100644 index b0e2af1..0000000 --- a/app/src/main/res/layout/page_3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/recommend_head.xml b/app/src/main/res/layout/recommend_head.xml new file mode 100644 index 0000000..fd35a8e --- /dev/null +++ b/app/src/main/res/layout/recommend_head.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/recommend_item_big.xml b/app/src/main/res/layout/recommend_item_big.xml new file mode 100644 index 0000000..35afe31 --- /dev/null +++ b/app/src/main/res/layout/recommend_item_big.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/recommend_item_detail.xml b/app/src/main/res/layout/recommend_item_detail.xml new file mode 100644 index 0000000..0c01e63 --- /dev/null +++ b/app/src/main/res/layout/recommend_item_detail.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/recommend_item_middle.xml b/app/src/main/res/layout/recommend_item_middle.xml new file mode 100644 index 0000000..a100c9d --- /dev/null +++ b/app/src/main/res/layout/recommend_item_middle.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index b2237a2..510c39c 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -3,6 +3,6 @@ 一周定制 今日信息 - page3 + 推荐菜谱 \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index e9c8804..957d85c 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -12,7 +12,7 @@ 36dp - 120dp + 110dp 35dp 90dp 200dp @@ -20,5 +20,9 @@ 20dp + 100dp + 180dp + 5dp +