summaryrefslogtreecommitdiff
path: root/app/src/main/res/layout/activity_main.xml
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res/layout/activity_main.xml')
-rw-r--r--app/src/main/res/layout/activity_main.xml190
1 files changed, 93 insertions, 97 deletions
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d39b400..bf79a10 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,128 +7,56 @@
tools:context=".MainActivity">
<TableLayout
- android:id="@+id/tableLayout2"
+ android:id="@+id/tableLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp"
+ android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/tableLayout"
+ app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.648">
+ app:layout_constraintVertical_bias="0.675">
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">
<Button
- android:id="@+id/buttondiv"
- android:layout_width="80dp"
- android:layout_height="80dp"
- android:fontFamily="monospace"
- android:text="÷"
- android:textAppearance="@style/TextAppearance.AppCompat"
- android:textSize="30sp"
- android:typeface="monospace" />
-
- <Button
- android:id="@+id/buttonC"
+ android:id="@+id/button1"
android:layout_width="80dp"
android:layout_height="80dp"
android:fontFamily="monospace"
- android:text="C"
+ android:onClick="UpdatePreResult"
+ android:text="1"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="30sp"
android:typeface="monospace"
tools:layout_editor_absoluteX="16dp"
tools:layout_editor_absoluteY="16dp" />
- </TableRow>
-
- <TableRow
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <Button
- android:id="@+id/buttonmul"
- android:layout_width="80dp"
- android:layout_height="80dp"
- android:fontFamily="monospace"
- android:text="×"
- android:textAppearance="@style/TextAppearance.AppCompat"
- android:textSize="30sp"
- android:typeface="monospace" />
-
- </TableRow>
-
- <TableRow
- android:layout_width="match_parent"
- android:layout_height="match_parent">
<Button
- android:id="@+id/buttonadd"
- android:layout_width="80dp"
- android:layout_height="80dp"
- android:fontFamily="monospace"
- android:text="+"
- android:textAppearance="@style/TextAppearance.AppCompat"
- android:textSize="30sp"
- android:typeface="monospace" />
-
- </TableRow>
-
- <TableRow
- android:layout_width="match_parent"
- android:layout_height="92dp">
-
- <Button
- android:id="@+id/buttonsub"
- android:layout_width="80dp"
- android:layout_height="80dp"
- android:fontFamily="monospace"
- android:text="-"
- android:textAppearance="@style/TextAppearance.AppCompat"
- android:textSize="30sp"
- android:typeface="monospace" />
-
- <Button
- android:id="@+id/buttoneql"
+ android:id="@+id/button2"
android:layout_width="80dp"
android:layout_height="80dp"
android:fontFamily="monospace"
- android:text="="
+ android:onClick="UpdatePreResult"
+ android:text="2"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="30sp"
- android:typeface="monospace" />
-
- </TableRow>
-
- </TableLayout>
-
- <TableLayout
- android:id="@+id/tableLayout"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="16dp"
- android:layout_marginStart="16dp"
- android:layout_marginTop="16dp"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toStartOf="@+id/tableLayout2"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.649">
-
- <TableRow
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:typeface="monospace"
+ tools:layout_editor_absoluteX="16dp"
+ tools:layout_editor_absoluteY="16dp" />
<Button
- android:id="@+id/button1"
+ android:id="@+id/button3"
android:layout_width="80dp"
android:layout_height="80dp"
android:fontFamily="monospace"
- android:text="1"
+ android:onClick="UpdatePreResult"
+ android:text="3"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="30sp"
android:typeface="monospace"
@@ -136,23 +64,21 @@
tools:layout_editor_absoluteY="16dp" />
<Button
- android:id="@+id/button2"
+ android:id="@+id/buttondiv"
android:layout_width="80dp"
android:layout_height="80dp"
android:fontFamily="monospace"
- android:text="2"
+ android:text="÷"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="30sp"
- android:typeface="monospace"
- tools:layout_editor_absoluteX="16dp"
- tools:layout_editor_absoluteY="16dp" />
+ android:typeface="monospace" />
<Button
- android:id="@+id/button3"
+ android:id="@+id/buttonC"
android:layout_width="80dp"
android:layout_height="80dp"
android:fontFamily="monospace"
- android:text="3"
+ android:text="C"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="30sp"
android:typeface="monospace"
@@ -170,6 +96,7 @@
android:layout_width="80dp"
android:layout_height="80dp"
android:fontFamily="monospace"
+ android:onClick="UpdatePreResult"
android:text="4"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="30sp"
@@ -182,6 +109,7 @@
android:layout_width="80dp"
android:layout_height="80dp"
android:fontFamily="monospace"
+ android:onClick="UpdatePreResult"
android:text="5"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="30sp"
@@ -194,6 +122,7 @@
android:layout_width="80dp"
android:layout_height="80dp"
android:fontFamily="monospace"
+ android:onClick="UpdatePreResult"
android:text="6"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="30sp"
@@ -201,6 +130,16 @@
tools:layout_editor_absoluteX="16dp"
tools:layout_editor_absoluteY="16dp" />
+ <Button
+ android:id="@+id/buttonmul"
+ android:layout_width="80dp"
+ android:layout_height="80dp"
+ android:fontFamily="monospace"
+ android:text="×"
+ android:textAppearance="@style/TextAppearance.AppCompat"
+ android:textSize="30sp"
+ android:typeface="monospace" />
+
</TableRow>
<TableRow
@@ -212,6 +151,7 @@
android:layout_width="80dp"
android:layout_height="80dp"
android:fontFamily="monospace"
+ android:onClick="UpdatePreResult"
android:text="7"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="30sp"
@@ -224,6 +164,7 @@
android:layout_width="80dp"
android:layout_height="80dp"
android:fontFamily="monospace"
+ android:onClick="UpdatePreResult"
android:text="8"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="30sp"
@@ -236,6 +177,7 @@
android:layout_width="80dp"
android:layout_height="80dp"
android:fontFamily="monospace"
+ android:onClick="UpdatePreResult"
android:text="9"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="30sp"
@@ -243,6 +185,16 @@
tools:layout_editor_absoluteX="16dp"
tools:layout_editor_absoluteY="16dp" />
+ <Button
+ android:id="@+id/buttonadd"
+ android:layout_width="80dp"
+ android:layout_height="80dp"
+ android:fontFamily="monospace"
+ android:text="+"
+ android:textAppearance="@style/TextAppearance.AppCompat"
+ android:textSize="30sp"
+ android:typeface="monospace" />
+
</TableRow>
<TableRow
@@ -266,6 +218,7 @@
android:layout_width="80dp"
android:layout_height="80dp"
android:fontFamily="monospace"
+ android:onClick="UpdatePreResult"
android:text="0"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="30sp"
@@ -273,24 +226,67 @@
tools:layout_editor_absoluteX="16dp"
tools:layout_editor_absoluteY="16dp" />
+ <Space
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent" />
+
+ <Button
+ android:id="@+id/buttonsub"
+ android:layout_width="80dp"
+ android:layout_height="80dp"
+ android:fontFamily="monospace"
+ android:text="-"
+ android:textAppearance="@style/TextAppearance.AppCompat"
+ android:textSize="30sp"
+ android:typeface="monospace" />
+
+ <Button
+ android:id="@+id/buttoneql"
+ android:layout_width="80dp"
+ android:layout_height="80dp"
+ android:fontFamily="monospace"
+ android:text="="
+ android:textAppearance="@style/TextAppearance.AppCompat"
+ android:textSize="30sp"
+ android:typeface="monospace" />
+
</TableRow>
</TableLayout>
<TextView
- android:id="@+id/edt1"
+ android:id="@+id/res"
android:layout_width="334dp"
android:layout_height="wrap_content"
- android:layout_marginBottom="52dp"
+ android:layout_marginBottom="8dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
+ android:layout_marginTop="56dp"
android:fontFamily="monospace"
android:maxLines="1"
android:scrollbars="horizontal"
android:textSize="50sp"
android:typeface="monospace"
+ app:layout_constraintBottom_toTopOf="@+id/preRes"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.488"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/preRes"
+ android:layout_width="334dp"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="24dp"
+ android:layout_marginEnd="16dp"
+ android:layout_marginStart="16dp"
+ android:fontFamily="monospace"
+ android:textColor="@android:color/darker_gray"
+ android:textSize="30sp"
+ android:typeface="monospace"
app:layout_constraintBottom_toTopOf="@+id/tableLayout"
app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.488"
app:layout_constraintStart_toStartOf="parent" />
</android.support.constraint.ConstraintLayout> \ No newline at end of file