Skip to content

Commit

Permalink
Changed main_layout to have alert button
Browse files Browse the repository at this point in the history
  • Loading branch information
JimmyHuang0904 committed Jan 14, 2018
1 parent d34cb00 commit 697b5e8
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 35 deletions.
66 changes: 31 additions & 35 deletions app/src/main/res/layout/activity_main.xml
Expand Up @@ -28,39 +28,35 @@
android:layout_marginTop="34dp"
android:text="Creating Tokens..." />

<Button
android:enabled="false"
android:id="@+id/btnHello"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:onClick="sendHello"
android:text="Send Hello"/>

<Button
android:enabled="false"
android:id="@+id/btnConfigure"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/btnHello"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:onClick="configure"
android:text="Configure"/>

<Button
android:id="@+id/button2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/btnConfigure"
android:layout_marginBottom="13dp"
android:layout_marginLeft="63dp"
android:layout_marginStart="63dp"
android:layout_toEndOf="@+id/username"
android:layout_toRightOf="@+id/username"
android:text="testAlarm"
android:onClick="onUserDisconnect" />

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<View android:id="@+id/strut"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_centerHorizontal="true"/>
<Button
android:enabled="false"
android:id="@+id/btnHello"
android:layout_width="0dp"
android:textColor="@color/white"
android:background="@color/red"
android:layout_height="wrap_content"
android:layout_alignRight="@id/strut"
android:layout_alignParentLeft="true"
android:layout_alignParentBottom="true"
android:onClick="sendHello"
android:text="Alert"/>
<Button
android:enabled="false"
android:id="@+id/btnConfigure"
android:layout_width="0dp"
android:textColor="@color/black"
android:layout_height="wrap_content"
android:layout_alignLeft="@id/strut"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:onClick="configure"
android:text="Configure"/>
</RelativeLayout>
</RelativeLayout>
2 changes: 2 additions & 0 deletions app/src/main/res/values/colors.xml
Expand Up @@ -9,8 +9,10 @@
<color name="black_semi_transparent">#B2000000</color>
<color name="background">#e5e5e5</color>
<color name="half_black">#808080</color>
<color name="black">#000000</color>
<color name="white">#fafafa</color>
<color name="white_pressed">#f1f1f1</color>
<color name="red">#ff0000</color>
<color name="pink">#e91e63</color>
<color name="pink_pressed">#ec407a</color>
<color name="blue_semi_transparent">#805677fc</color>
Expand Down

0 comments on commit 697b5e8

Please sign in to comment.