Commit 3d56b84e authored by Ari Trachtenberg's avatar Ari Trachtenberg
Browse files

Updated GUI.

parent b0692287

app/src/main/res/layout/activity_main.xml

+156 −142
Original line number Diff line number Diff line 
<?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:orientation="vertical">



    <Space

        android:layout_width="match_parent"

        android:layout_height="77dp" />



    <TextView

        android:id="@+id/text_view_result"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="#6CEBEB"

        android:textAlignment="viewEnd"

        android:textSize="60sp" />



    <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"



        xmlns:tools="http://schemas.android.com/tools"
@@ -8,12 +25,6 @@ 
        android:orientation="vertical"

        tools:context=".MainActivity">



    <TextView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:id="@+id/text_view_result"

        android:textSize="60sp"

        android:textAlignment="viewEnd"/>

        <TableRow

            style="?android:attr/buttonBarStyle"

            android:layout_width="match_parent"
@@ -21,32 +32,33 @@ 


            <Button

                android:id="@+id/button1"

            style="?android:attr/buttonBarButtonStyle"

            android:text="@string/_1"



                android:layout_weight="1"

                android:text="@string/_1"

                android:textSize="20sp" />



            <Button

                android:id="@+id/button2"

            style="?android:attr/buttonBarButtonStyle"

            android:text="@string/_2"



                android:layout_weight="1"

                android:text="@string/_2"

                android:textSize="20sp" />



            <Button

                android:id="@+id/button3"

            style="?android:attr/buttonBarButtonStyle"

            android:text="@string/_3"



                android:layout_weight="1"

                android:text="@string/_3"

                android:textSize="20sp" />



            <Button

                android:id="@+id/buttonAdd"

            style="?android:attr/buttonBarButtonStyle"

            android:text="@string/_plus"



                android:layout_weight="1"

                android:text="@string/_plus"

                android:textSize="20sp" />

        </TableRow>



        <TableRow

            style="?android:attr/buttonBarStyle"

            android:layout_width="match_parent"
@@ -54,30 +66,30 @@ 


            <Button

                android:id="@+id/button4"

            style="?android:attr/buttonBarButtonStyle"

            android:text="@string/_4"



                android:layout_weight="1"

                android:text="@string/_4"

                android:textSize="20sp" />



            <Button

                android:id="@+id/button5"

            style="?android:attr/buttonBarButtonStyle"

            android:text="@string/_5"



                android:layout_weight="1"

                android:text="@string/_5"

                android:textSize="20sp" />



            <Button

                android:id="@+id/button6"

            style="?android:attr/buttonBarButtonStyle"

            android:text="@string/_6"



                android:layout_weight="1"

                android:text="@string/_6"

                android:textSize="20sp" />



            <Button

                android:id="@+id/buttonSub"

            style="?android:attr/buttonBarButtonStyle"

            android:text="@string/_minus"



                android:layout_weight="1"

                android:text="@string/_minus"

                android:textSize="20sp" />

        </TableRow>
@@ -88,32 +100,33 @@ 


            <Button

                android:id="@+id/button7"

            style="?android:attr/buttonBarButtonStyle"

            android:text="@string/_7"



                android:layout_weight="1"

                android:text="@string/_7"

                android:textSize="20sp" />



            <Button

                android:id="@+id/button8"

            style="?android:attr/buttonBarButtonStyle"

            android:text="@string/_8"



                android:layout_weight="1"

                android:text="@string/_8"

                android:textSize="20sp" />



            <Button

                android:id="@+id/button9"

            style="?android:attr/buttonBarButtonStyle"

            android:text="@string/_9"



                android:layout_weight="1"

                android:text="@string/_9"

                android:textSize="20sp" />



            <Button

                android:id="@+id/buttonMul"

            style="?android:attr/buttonBarButtonStyle"

            android:text="@string/_times"



                android:layout_weight="1"

                android:text="@string/_times"

                android:textSize="20sp" />

        </TableRow>



        <TableRow

            style="?android:attr/buttonBarStyle"

            android:layout_width="match_parent"
@@ -121,31 +134,32 @@ 


            <Button

                android:id="@+id/buttonClear"

            style="?android:attr/buttonBarButtonStyle"

            android:text="@string/clear"



                android:layout_weight="1"

                android:text="@string/clear"

                android:textSize="20sp" />



            <Button

                android:id="@+id/button0"

            style="?android:attr/buttonBarButtonStyle"

            android:text="@string/_0"



                android:layout_weight="1"

                android:text="@string/_0"

                android:textSize="20sp" />



            <Button

                android:id="@+id/buttonEqual"

            style="?android:attr/buttonBarButtonStyle"

            android:text="@string/_equals"



                android:layout_weight="1"

                android:text="@string/_equals"

                android:textSize="20sp" />



            <Button

                android:id="@+id/buttonDiv"

            style="?android:attr/buttonBarButtonStyle"

            android:text="@string/_divides"



                android:layout_weight="1"

                android:text="@string/_divides"

                android:textSize="20sp" />

        </TableRow>



    </TableLayout>

</LinearLayout>
 
 No newline at end of file