-
Notifications
You must be signed in to change notification settings - Fork 78
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #297 from livehan/master
- Loading branch information
Showing
3 changed files
with
47 additions
and
17 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 0 additions & 17 deletions
17
AndroidLabs/app/src/main/res/layout/activity_net1412070501227.xml
This file was deleted.
Oops, something went wrong.
47 changes: 47 additions & 0 deletions
47
AndroidLabs/app/src/main/res/layout/activity_net1412070501227_index.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| <?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:id="@+id/activity_index_net1412070501227" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:paddingBottom="@dimen/activity_vertical_margin" | ||
| android:paddingLeft="@dimen/activity_horizontal_margin" | ||
| android:paddingRight="@dimen/activity_horizontal_margin" | ||
| android:paddingTop="@dimen/activity_vertical_margin" | ||
| android:background="@drawable/qiche" | ||
| tools:context="edu.hzuapps.androidlabs.homeworks.net1412070501227.Net1412070501227index"> | ||
|
|
||
|
|
||
| <Button | ||
| android:text="首页" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_alignParentBottom="true" | ||
| android:layout_alignParentLeft="true" | ||
| android:layout_alignParentStart="true" | ||
| android:layout_marginLeft="14dp" | ||
| android:layout_marginStart="14dp" | ||
| android:id="@+id/index" /> | ||
|
|
||
| <Button | ||
| android:text="购物车" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:id="@+id/btn_cart" | ||
| android:layout_alignParentBottom="true" | ||
| android:layout_toRightOf="@+id/index" | ||
| android:layout_toEndOf="@+id/index" | ||
| android:layout_marginLeft="28dp" | ||
| android:layout_marginStart="28dp" /> | ||
|
|
||
| <Button | ||
| android:text="登陆" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginRight="22dp" | ||
| android:layout_marginEnd="22dp" | ||
| android:id="@+id/btn_login" | ||
| android:layout_alignParentBottom="true" | ||
| android:layout_alignParentRight="true" | ||
| android:layout_alignParentEnd="true" /> | ||
| </RelativeLayout> |