|
|
@@ -20,7 +20,6 @@
|
|
|
android:layout_weight="1"
|
|
|
android:orientation="horizontal">
|
|
|
|
|
|
-
|
|
|
<androidx.constraintlayout.widget.ConstraintLayout
|
|
|
android:layout_width="0dp"
|
|
|
android:layout_height="match_parent"
|
|
|
@@ -39,18 +38,16 @@
|
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
|
app:layout_constraintTop_toTopOf="parent" />
|
|
|
|
|
|
- <androidx.appcompat.widget.AppCompatEditText
|
|
|
+ <EditText
|
|
|
android:id="@+id/editResultOne"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="@dimen/divider_53px"
|
|
|
android:layout_marginStart="@dimen/divider_20px"
|
|
|
android:layout_marginTop="@dimen/divider_118px"
|
|
|
android:background="@drawable/bg_calculation_results"
|
|
|
- android:focusable="true"
|
|
|
- android:focusableInTouchMode="true"
|
|
|
android:gravity="center"
|
|
|
+ android:imeOptions="actionDone"
|
|
|
android:inputType="@{InputType.TYPE_CLASS_NUMBER}"
|
|
|
- android:selectAllOnFocus="true"
|
|
|
android:textColor="@color/color_FF333333"
|
|
|
android:textSize="@dimen/divider_34px"
|
|
|
android:textStyle="bold"
|
|
|
@@ -70,7 +67,7 @@
|
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
|
app:layout_constraintTop_toBottomOf="@+id/tvHundredMinusSeven" />
|
|
|
|
|
|
- <androidx.appcompat.widget.AppCompatEditText
|
|
|
+ <EditText
|
|
|
android:id="@+id/editResultTwo"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="@dimen/divider_53px"
|
|
|
@@ -78,8 +75,8 @@
|
|
|
android:layout_marginTop="@dimen/divider_15px"
|
|
|
android:background="@drawable/bg_calculation_results"
|
|
|
android:gravity="center"
|
|
|
+ android:imeOptions="actionDone"
|
|
|
android:inputType="@{InputType.TYPE_CLASS_NUMBER}"
|
|
|
- android:selectAllOnFocus="true"
|
|
|
android:textColor="@color/color_FF333333"
|
|
|
android:textSize="@dimen/divider_34px"
|
|
|
android:textStyle="bold"
|
|
|
@@ -99,7 +96,7 @@
|
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
|
app:layout_constraintTop_toBottomOf="@+id/tvHundredMinusSevenTwo" />
|
|
|
|
|
|
- <androidx.appcompat.widget.AppCompatEditText
|
|
|
+ <EditText
|
|
|
android:id="@+id/editResultThree"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="@dimen/divider_53px"
|
|
|
@@ -107,8 +104,8 @@
|
|
|
android:layout_marginTop="@dimen/divider_15px"
|
|
|
android:background="@drawable/bg_calculation_results"
|
|
|
android:gravity="center"
|
|
|
+ android:imeOptions="actionDone"
|
|
|
android:inputType="@{InputType.TYPE_CLASS_NUMBER}"
|
|
|
- android:selectAllOnFocus="true"
|
|
|
android:textColor="@color/color_FF333333"
|
|
|
android:textSize="@dimen/divider_34px"
|
|
|
android:textStyle="bold"
|
|
|
@@ -129,7 +126,7 @@
|
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
|
app:layout_constraintTop_toBottomOf="@+id/tvHundredMinusSeventhree" />
|
|
|
|
|
|
- <androidx.appcompat.widget.AppCompatEditText
|
|
|
+ <EditText
|
|
|
android:id="@+id/editResultFour"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="@dimen/divider_53px"
|
|
|
@@ -137,8 +134,8 @@
|
|
|
android:layout_marginTop="@dimen/divider_15px"
|
|
|
android:background="@drawable/bg_calculation_results"
|
|
|
android:gravity="center"
|
|
|
+ android:imeOptions="actionDone"
|
|
|
android:inputType="@{InputType.TYPE_CLASS_NUMBER}"
|
|
|
- android:selectAllOnFocus="true"
|
|
|
android:textColor="@color/color_FF333333"
|
|
|
android:textSize="@dimen/divider_34px"
|
|
|
android:textStyle="bold"
|
|
|
@@ -159,7 +156,7 @@
|
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
|
app:layout_constraintTop_toBottomOf="@+id/tvHundredMinusSevenFour" />
|
|
|
|
|
|
- <androidx.appcompat.widget.AppCompatEditText
|
|
|
+ <EditText
|
|
|
android:id="@+id/editResultFive"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="@dimen/divider_53px"
|
|
|
@@ -167,14 +164,13 @@
|
|
|
android:layout_marginTop="@dimen/divider_15px"
|
|
|
android:background="@drawable/bg_calculation_results"
|
|
|
android:gravity="center"
|
|
|
+ android:imeOptions="actionDone"
|
|
|
android:inputType="@{InputType.TYPE_CLASS_NUMBER}"
|
|
|
- android:selectAllOnFocus="true"
|
|
|
android:textColor="@color/color_FF333333"
|
|
|
android:textSize="@dimen/divider_34px"
|
|
|
android:textStyle="bold"
|
|
|
app:layout_constraintStart_toEndOf="@+id/tvHundredMinusSevenFive"
|
|
|
- app:layout_constraintTop_toBottomOf="@+id/editResultFour"
|
|
|
- tools:text="@string/previous_question" />
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/editResultFour" />
|
|
|
|
|
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
|
|