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

1

Browse Source
This commit is contained in:
ScorpioMiku
2018-09-21 21:02:59 +08:00
parent aba473fe49
commit 6e60f7a338
8 changed files with 9 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/res/layout/activity_add.xml
View File

@@ -30,6 +30,7 @@
android:layout_height="450dp"
android:layout_centerInParent="true"
android:visibility="gone"
app:cardElevation="0dp"
app:cardCornerRadius="20dp">
<LinearLayout

6
app/src/main/res/layout/card_item.xml
View File

@@ -7,7 +7,8 @@
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginTop="10dp"
app:cardCornerRadius="5dp">
app:cardCornerRadius="5dp"
app:cardElevation="0dp">
<RelativeLayout
android:layout_width="match_parent"
@@ -16,8 +17,7 @@
<ImageView
android:id="@+id/iv_photo"
android:layout_width="match_parent"
android:layout_height="350dp"
/>
android:layout_height="350dp" />
<TextView

82
app/src/main/res/layout/layout_menu_detail_title.xml
View File

@@ -1,82 +0,0 @@
<?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:id="@+id/ll_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:orientation="vertical">
<View
android:id="@+id/status_bar_bg"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<RelativeLayout
android:id="@+id/rl_back"
android:layout_width="50dp"
android:layout_height="match_parent"
android:background="@drawable/ic_back_button">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:src="@drawable/ic_exchange" />
</RelativeLayout>
<View
android:id="@+id/divider"
android:layout_width="1px"
android:layout_height="match_parent"
android:layout_marginBottom="14dp"
android:layout_marginTop="14dp" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left"
android:textSize="@dimen/sp_16"
tools:text="标题" />
<TextView
android:id="@+id/tv_subTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="10sp"
tools:text="副标题" />
</LinearLayout>
<RelativeLayout
android:id="@+id/rl_right_icon"
android:layout_width="50dp"
android:layout_height="match_parent">
<ImageView
android:id="@+id/iv_title_right_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>

183
app/src/main/res/layout/layout_menu_head_info.xml
View File

@@ -1,183 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/rl_restaurant_info"
android:layout_width="match_parent"
android:layout_height="284dp">
<ImageView
android:id="@+id/iv_blur_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/ic_exchange"
android:foreground="@drawable/ic_back_button"
android:scaleType="centerCrop" />
<android.support.v7.widget.CardView
android:id="@+id/fl_restaurant_img"
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_centerVertical="true"
android:layout_marginLeft="14dp"
android:background="@color/colorControlNormal"
android:padding="1dp"
app:cardCornerRadius="10dp">
<ImageView
android:id="@+id/iv_restaurant_img"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop" />
</android.support.v7.widget.CardView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/fl_restaurant_img"
android:layout_alignTop="@id/fl_restaurant_img"
android:layout_centerVertical="true"
android:layout_marginLeft="22dp"
android:layout_toRightOf="@id/fl_restaurant_img"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_restaurant_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="店名"
android:textColor="@color/color_bar_deeper"
android:textSize="@dimen/sp_16" />
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/tv_restaurant_score"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="8.5"
android:textColor="@color/colorAccent"
android:textSize="@dimen/sp_16" />
<TextView
android:id="@+id/tv_snum"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/tv_restaurant_score"
android:layout_alignTop="@id/tv_restaurant_score"
android:layout_marginLeft="@dimen/dp_4"
android:layout_toRightOf="@id/tv_restaurant_score"
android:gravity="center_vertical"
android:text="(16.2万人评)"
android:textColor="@color/place_holder"
android:textSize="11sp" />
<TextView
android:id="@+id/tv_pro_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/tv_restaurant_score"
android:layout_alignTop="@id/tv_restaurant_score"
android:layout_marginLeft="@dimen/dp_4"
android:layout_toRightOf="@id/tv_restaurant_score"
android:gravity="center_vertical"
android:text="(16.2万人评)"
android:textColor="@color/bar_open"
android:textSize="11sp"
android:visibility="invisible" />
</RelativeLayout>
<TextView
android:id="@+id/tv_src_dur"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:text="火锅、自助"
android:textColor="@color/colorControlNormal"
android:textSize="@dimen/sp_12" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="22dp"
android:layout_marginLeft="14dp"
android:layout_marginRight="14dp">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginRight="6dp"
android:layout_weight="1"
android:background="@drawable/ic_right_arch"
android:gravity="center">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_search" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="14dp"
android:drawablePadding="14dp"
android:gravity="center"
android:text="喜欢"
android:textColor="@color/cardview_light_background" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="6dp"
android:layout_weight="1"
android:background="@drawable/test_avatar"
android:gravity="center">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_search" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="14dp"
android:drawablePadding="14dp"
android:text="评分"
android:textColor="@color/colorControlNormal" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>

1
app/src/main/res/layout/recommend_item_big.xml
View File

@@ -5,6 +5,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/recommend_item_big_height"
android:layout_margin="@dimen/recommend_margin"
app:cardElevation="0dp"
app:cardCornerRadius="20dp">
<LinearLayout

1
app/src/main/res/layout/recommend_item_detail.xml
View File

@@ -11,6 +11,7 @@
<android.support.v7.widget.CardView
android:layout_width="@dimen/recommend_item_default_hight"
android:layout_height="@dimen/recommend_item_default_hight"
app:cardElevation="0dp"
android:layout_marginRight="5dp"
app:cardCornerRadius="20dp">

1
app/src/main/res/layout/recommend_item_middle.xml
View File

@@ -6,6 +6,7 @@
android:layout_height="@dimen/recommend_item_default_hight"
android:layout_margin="@dimen/recommend_margin"
android:layout_weight="1"
app:cardElevation="0dp"
app:cardCornerRadius="20dp">
<LinearLayout
android:id="@+id/whole_layout"

2
build.gradle
View File

@@ -1,6 +1,8 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
google()