diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index c8e58c2e12de9082c0429f1190d184d33e20ec31..29d2745ff418272ead416159e6963f9057dcd7cf 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,16 +6,36 @@ android:layout_height="match_parent" tools:context="com.darshanbshah.odsystem.MainActivity"> - <Button - android:text="Sign Out" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/sign_out_button" - android:onClick="signOut" - style="@style/Widget.AppCompat.Button.Borderless" - android:textColor="@color/colorAccent" - android:layout_alignParentTop="true" - android:layout_alignParentEnd="true" /> + <LinearLayout + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="55dp" + android:background="@color/colorPrimary"> + + <TextView + android:text="Apply OD" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:id="@+id/textView2" + android:textSize="30sp" + android:textAllCaps="false" + android:layout_weight="1" + android:textColor="#FFF" /> + + <Button + android:text="Sign Out" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/sign_out_button" + android:onClick="signOut" + style="@style/Widget.AppCompat.Button.Borderless" + android:textColor="@color/colorAccent" + android:layout_alignParentTop="true" + android:layout_alignParentEnd="true" + android:layout_weight="1" /> + </LinearLayout> <TextView android:layout_width="match_parent" @@ -27,24 +47,14 @@ android:textSize="12sp" android:textAlignment="center" /> - <TextView - android:text="Apply OD" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_marginTop="14dp" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:id="@+id/textView2" - android:textSize="30sp" - android:textAllCaps="false" /> - <ScrollView android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_below="@+id/sign_out_button" - android:layout_centerHorizontal="true"> + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" + android:layout_marginTop="61dp"> <LinearLayout android:layout_width="match_parent" @@ -100,7 +110,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/toDate" - android:onClick="onClickToDatePicker" /> + android:onClick="onClickToDatePicker" + style="@style/Widget.AppCompat.Button.Colored" + android:backgroundTint="@color/colorPrimary" /> <TextView android:layout_width="wrap_content" @@ -149,7 +161,8 @@ android:layout_height="wrap_content" android:id="@+id/requestButton" android:layout_marginTop="@dimen/activity_vertical_margin" - android:onClick="onRequestClick" /> + android:onClick="onRequestClick" + style="@style/Widget.AppCompat.Button.Colored" /> </LinearLayout>