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

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>