部分界面修改,以及软件logo设计图
This commit is contained in:
parent
dca165ca45
commit
85f05176a6
Binary file not shown.
After Width: | Height: | Size: 17 KiB |
Binary file not shown.
After Width: | Height: | Size: 73 KiB |
Binary file not shown.
|
@ -1,4 +1,4 @@
|
|||
# view res/layout/activity_shop_item.xml #generated:12
|
||||
# view res/layout/activity_shop_item.xml #generated:14
|
||||
-keep class android.support.v4.view.PagerTabStrip { <init>(...); }
|
||||
|
||||
# view AndroidManifest.xml #generated:145
|
||||
|
|
|
@ -42,19 +42,21 @@
|
|||
android:layout_height="40dp"
|
||||
android:layout_below="@id/rl_welcome"
|
||||
android:orientation="horizontal" >
|
||||
|
||||
<EditText
|
||||
android:id="@+id/et_username"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="40dp"
|
||||
android:layout_weight="1"
|
||||
android:hint="账号"
|
||||
android:background="#F0F8FF"
|
||||
android:inputType="text"
|
||||
android:lines="2"
|
||||
android:paddingLeft="12.0dp"
|
||||
android:textSize="18sp"
|
||||
android:typeface="monospace" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/et_password"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="40dp"
|
||||
android:layout_weight="1"
|
||||
android:background="#F0F8FF"
|
||||
android:ems="10"
|
||||
android:hint="密码"
|
||||
android:inputType="textPassword"
|
||||
android:lines="2"
|
||||
android:paddingLeft="12.0dp"
|
||||
android:textSize="18sp"
|
||||
android:typeface="monospace" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
|
@ -65,20 +67,15 @@
|
|||
android:layout_marginTop="20dp"
|
||||
android:orientation="horizontal" >
|
||||
|
||||
|
||||
|
||||
<EditText
|
||||
android:id="@+id/et_password"
|
||||
<Button
|
||||
android:id="@+id/btn_login"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="40dp"
|
||||
android:layout_weight="1"
|
||||
android:hint="密码"
|
||||
android:background="#F0F8FF"
|
||||
android:inputType="textPassword"
|
||||
android:lines="2"
|
||||
android:paddingLeft="12.0dp"
|
||||
android:textSize="18sp"
|
||||
android:typeface="monospace" />
|
||||
android:layout_height="45dp"
|
||||
android:background="#FFFFFF"
|
||||
android:text="登录"
|
||||
android:textColor="#20B2AA"
|
||||
android:textSize="24.0sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
|
@ -88,15 +85,6 @@
|
|||
android:layout_below="@id/ll_row2"
|
||||
android:layout_marginTop="30dp"
|
||||
android:orientation="horizontal" >
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_login"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="45dp"
|
||||
android:background="#FFFFFF"
|
||||
android:text="登录"
|
||||
android:textColor="#20B2AA"
|
||||
android:textSize="24.0sp"/>
|
||||
</LinearLayout>
|
||||
|
||||
<RelativeLayout
|
||||
|
@ -175,4 +163,24 @@
|
|||
android:text="返回消息" />
|
||||
</LinearLayout>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/et_username"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="40dp"
|
||||
android:layout_above="@+id/ll_row2"
|
||||
android:layout_alignLeft="@+id/rl_welcome"
|
||||
android:layout_marginBottom="66dp"
|
||||
android:layout_weight="1"
|
||||
android:background="#F0F8FF"
|
||||
android:ems="10"
|
||||
android:hint="账号"
|
||||
android:inputType="text"
|
||||
android:lines="2"
|
||||
android:paddingLeft="12.0dp"
|
||||
android:textSize="18sp"
|
||||
android:typeface="monospace" >
|
||||
|
||||
<requestFocus />
|
||||
</EditText>
|
||||
|
||||
</RelativeLayout>
|
|
@ -112,7 +112,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="2"
|
||||
android:background="@drawable/shape_left_radius_color_square"
|
||||
android:background="#FF0000"
|
||||
android:gravity="center"
|
||||
android:padding="10dp"
|
||||
android:text="学校"
|
||||
|
@ -140,7 +140,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="2"
|
||||
android:background="@drawable/shape_left_radius_color_square"
|
||||
android:background="#FF0000"
|
||||
android:gravity="center"
|
||||
android:padding="10dp"
|
||||
android:text="学院"
|
||||
|
@ -168,7 +168,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="2"
|
||||
android:background="@drawable/shape_left_radius_color_square"
|
||||
android:background="#FF0000"
|
||||
android:gravity="center"
|
||||
android:padding="10dp"
|
||||
android:text="所在区"
|
||||
|
@ -196,7 +196,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="2"
|
||||
android:background="@drawable/shape_left_radius_color_square"
|
||||
android:background="#FF0000"
|
||||
android:gravity="center"
|
||||
android:padding="10dp"
|
||||
android:text="宿舍楼号"
|
||||
|
@ -255,7 +255,7 @@
|
|||
<Button
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/shape_radius_color_square"
|
||||
android:background="#FF0000"
|
||||
android:gravity="center"
|
||||
android:padding="10dp"
|
||||
android:text="在这里订单"
|
||||
|
@ -266,7 +266,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="2dp"
|
||||
android:background="@drawable/shape_radius_color_square"
|
||||
android:background="#FF0000"
|
||||
android:gravity="center"
|
||||
android:padding="10dp"
|
||||
android:text="历史订单"
|
||||
|
@ -277,7 +277,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="2dp"
|
||||
android:background="@drawable/shape_radius_color_square"
|
||||
android:background="#FF0000"
|
||||
android:gravity="center"
|
||||
android:padding="10dp"
|
||||
android:text="我的钱包"
|
||||
|
@ -297,7 +297,7 @@
|
|||
android:id="@+id/btn_about"
|
||||
android:layout_width="120dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/shape_radius_color_square"
|
||||
android:background="#FF0000"
|
||||
android:gravity="center"
|
||||
android:padding="10dp"
|
||||
android:text="关于在这里"
|
||||
|
@ -309,7 +309,7 @@
|
|||
android:layout_width="120dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="2dp"
|
||||
android:background="@drawable/shape_radius_color_square"
|
||||
android:background="#FF0000"
|
||||
android:gravity="center"
|
||||
android:padding="10dp"
|
||||
android:text="联系我们"
|
||||
|
@ -321,7 +321,7 @@
|
|||
android:layout_width="120dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="2dp"
|
||||
android:background="@drawable/shape_radius_color_square"
|
||||
android:background="#FF0000"
|
||||
android:gravity="center"
|
||||
android:padding="10dp"
|
||||
android:text="分享在这里"
|
||||
|
|
Loading…
Reference in New Issue