Skip to content

Commit

Permalink
updated layout
Browse files Browse the repository at this point in the history
  • Loading branch information
@mohak1712
mohak1712 committed Aug 1, 2017
1 parent d3c88f1 commit d72d775
Show file tree
Hide file tree
Showing 3 changed files with 87 additions and 19 deletions.
70 changes: 63 additions & 7 deletions app/src/main/res/layout/activity_map.xml
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,83 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/rootFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/rootFrame"
android:background="#000">

<LinearLayout
android:id="@+id/rootll"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/rootll"
android:background="#fff"
android:gravity="center"
android:orientation="vertical">



<fragment
android:id="@+id/map"
android:name="com.google.android.gms.maps.SupportMapFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />

</LinearLayout>


<android.support.v4.view.ViewPager
android:id="@+id/viewPager"
android:layout_width="match_parent"
android:layout_height="200dp"
android:id="@+id/viewPager"
android:layout_gravity="bottom"/>
android:layout_gravity="bottom"
android:background="#fff"
android:visibility="invisible" />

<RelativeLayout
android:id="@+id/rlwhere"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_gravity="top"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginTop="50dp"
android:background="#fff"
android:elevation="4dp"
android:orientation="horizontal"
android:visibility="gone">

<TextView
android:id="@+id/tvWhereTo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="10dp"
android:background="@null"
android:text="Where to?" />

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="10dp"
android:src="@drawable/ic_access_time" />

</RelativeLayout>

<ImageView
android:id="@+id/location"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="bottom|end"
android:layout_marginBottom="50dp"
android:layout_marginRight="10dp"
android:background="@drawable/ic_location_searching" />

<ImageView
android:id="@+id/ivHome"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_gravity="bottom|center_horizontal"
android:layout_marginBottom="50dp"
android:background="@drawable/circle"
android:padding="10dp"
android:src="@drawable/ic_home"
android:visibility="gone" />

</FrameLayout>
7 changes: 4 additions & 3 deletions app/src/main/res/layout/uber_economy.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?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="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical"
android:paddingTop="20dp">
Expand All @@ -12,7 +12,8 @@
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:text="Economy"
android:textColor="#000"
android:gravity="center"
android:textColor="@color/black"
android:textSize="16sp" />

<LinearLayout
Expand All @@ -34,7 +35,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="UberGo"
android:textColor="#000"
android:textColor="@color/black"
android:textSize="16sp" />

</LinearLayout>
Expand Down
29 changes: 20 additions & 9 deletions app/src/main/res/layout/uber_premium.xml
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,35 @@
<?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="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:id="@+id/rootPrell"
android:orientation="vertical"
android:paddingTop="20dp">

<TextView
android:id="@+id/tvuberPre"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="Premium"
android:textColor="#000"
android:textSize="16sp" />
android:textColor="@color/grey"
android:textSize="12sp" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/llUberPre"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="3"
android:orientation="horizontal">
android:orientation="horizontal"
android:visibility="visible">


<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_marginStart="10dp"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
Expand All @@ -40,14 +47,16 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="UberX"
android:textColor="#000"
android:textColor="@color/black"
android:textSize="16sp" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_marginStart="10dp"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
Expand All @@ -66,14 +75,16 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="UberXL"
android:textColor="#000"
android:textColor="@color/black"
android:textSize="16sp" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_marginStart="10dp"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
Expand All @@ -92,7 +103,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="UberHIRE"
android:textColor="#000"
android:textColor="@color/black"
android:textSize="16sp" />

</LinearLayout>
Expand Down

0 comments on commit d72d775

Please sign in to comment.