Skip to content

Commit 6fae4f6

Browse files
committed
project #8: add methods for specific task
1 parent e47bc5e commit 6fae4f6

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

Calculator/app/src/main/java/com/example/calculator/MainActivity.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,8 @@ class MainActivity : AppCompatActivity() {
1111
}
1212

1313
fun onDigit(view: View) {}
14+
fun onEqual(view: View) {}
15+
fun onOperator(view: View) {}
16+
fun onClear(view: View) {}
17+
fun onDecimalPoint(view: View) {}
1418
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
android:layout_width="0dp"
6262
android:layout_height="match_parent"
6363
android:layout_weight="1"
64-
android:onClick="onDigit"
64+
android:onClick="onOperator"
6565
android:text="@string/divide"
6666
android:textSize="20sp"
6767
tools:ignore="ButtonStyle,NestedWeights" />
@@ -113,7 +113,7 @@
113113
android:layout_width="0dp"
114114
android:layout_height="match_parent"
115115
android:layout_weight="1"
116-
android:onClick="onDigit"
116+
android:onClick="onOperator"
117117
android:text="@string/multi"
118118
android:textSize="20sp"
119119
tools:ignore="ButtonStyle,NestedWeights" />
@@ -165,7 +165,7 @@
165165
android:layout_width="0dp"
166166
android:layout_height="match_parent"
167167
android:layout_weight="1"
168-
android:onClick="onDigit"
168+
android:onClick="onOperator"
169169
android:text="@string/sub"
170170
android:textSize="20sp"
171171
tools:ignore="ButtonStyle,NestedWeights" />
@@ -187,7 +187,7 @@
187187
android:layout_width="0dp"
188188
android:layout_height="match_parent"
189189
android:layout_weight="1"
190-
android:onClick="onDigit"
190+
android:onClick="onDecimalPoint"
191191
android:text="@string/dot"
192192
android:textSize="20sp"
193193
tools:ignore="ButtonStyle,NestedWeights" />
@@ -207,7 +207,7 @@
207207
android:layout_width="0dp"
208208
android:layout_height="match_parent"
209209
android:layout_weight="1"
210-
android:onClick="onDigit"
210+
android:onClick="onClear"
211211
android:text="@string/clear"
212212
android:textSize="20sp"
213213
tools:ignore="ButtonStyle,NestedWeights" />
@@ -217,7 +217,7 @@
217217
android:layout_width="0dp"
218218
android:layout_height="match_parent"
219219
android:layout_weight="1"
220-
android:onClick="onDigit"
220+
android:onClick="onOperator"
221221
android:text="@string/plus"
222222
android:textSize="20sp"
223223
tools:ignore="ButtonStyle,NestedWeights" />
@@ -239,7 +239,7 @@
239239
android:layout_width="0dp"
240240
android:layout_height="match_parent"
241241
android:layout_weight="1"
242-
android:onClick="onDigit"
242+
android:onClick="onEqual"
243243
android:text="@string/equal"
244244
android:textSize="30sp"
245245
tools:ignore="ButtonStyle,NestedWeights" />

0 commit comments

Comments
 (0)