Skip to content

Commit ad83110

Browse files
committed
Мелкие мелочи
1 parent 2183a21 commit ad83110

File tree

10 files changed

+31
-10
lines changed

10 files changed

+31
-10
lines changed

app/src/main/java/com/apochromat/codeblockmobile/BlocksAdapter.kt

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,25 @@ class BlocksAdapter(private val listBlocks:ArrayList<Block>) : RecyclerView.Adap
5252
listBlocks[position].type == "End" || listBlocks[position].type == "Else"){
5353
return
5454
}
55+
holder.editMedium.setOnEditorActionListener { _, actionId, _ ->
56+
if (actionId == EditorInfo.IME_ACTION_DONE || actionId == EditorInfo.IME_ACTION_NEXT) {
57+
// listBlocks[position].inputMediumEdit = holder.editMedium.text.toString()
58+
holder.editMedium.clearFocus()
59+
}
60+
false
61+
}
5562
holder.editLeft.setOnEditorActionListener { _, actionId, _ ->
5663
if (actionId == EditorInfo.IME_ACTION_DONE || actionId == EditorInfo.IME_ACTION_NEXT) {
57-
listBlocks[position].inputLeftEdit = holder.editLeft.text.toString()
64+
// listBlocks[position].inputLeftEdit = holder.editLeft.text.toString()
65+
holder.editLeft.clearFocus()
5866
}
5967
false
6068
}
6169
holder.editRight.setOnEditorActionListener { _, actionId, _ ->
6270
if (actionId == EditorInfo.IME_ACTION_DONE || actionId == EditorInfo.IME_ACTION_NEXT) {
63-
listBlocks[position].inputRightEdit = holder.editRight.text.toString()
64-
holder.editRight.clearFocus() }
71+
// listBlocks[position].inputRightEdit = holder.editRight.text.toString()
72+
holder.editRight.clearFocus()
73+
}
6574
false
6675
}
6776

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
android:layout_marginBottom="5dp"
6363
android:ems="10"
6464
android:hint="@string/name"
65-
android:imeOptions="actionNext"
65+
android:imeOptions="actionDone"
6666
android:inputType="textPersonName"
6767
android:textColor="@color/dark_grey"
6868
app:layout_constraintBottom_toBottomOf="parent"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
android:hint="@string/expression_one"
4444
android:inputType="textPersonName"
4545
android:textColor="@color/dark_grey"
46+
android:imeOptions="actionDone"
4647
app:layout_constraintBottom_toBottomOf="parent"
4748
app:layout_constraintEnd_toEndOf="parent"
4849
app:layout_constraintHorizontal_bias="0.128"
@@ -71,6 +72,7 @@
7172
android:hint="@string/expression_two"
7273
android:inputType="textPersonName"
7374
android:textColor="@color/dark_grey"
75+
android:imeOptions="actionDone"
7476
app:layout_constraintBottom_toBottomOf="parent"
7577
app:layout_constraintEnd_toEndOf="parent"
7678
app:layout_constraintHorizontal_bias="0.131"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
android:hint="@string/expression_one"
4545
android:inputType="textPersonName"
4646
android:textColor="@color/dark_grey"
47+
android:imeOptions="actionDone"
4748
app:layout_constraintBottom_toBottomOf="parent"
4849
app:layout_constraintEnd_toEndOf="parent"
4950
app:layout_constraintHorizontal_bias="0.128"
@@ -72,6 +73,7 @@
7273
android:hint="@string/expression_two"
7374
android:inputType="textPersonName"
7475
android:textColor="@color/dark_grey"
76+
android:imeOptions="actionDone"
7577
app:layout_constraintBottom_toBottomOf="parent"
7678
app:layout_constraintEnd_toEndOf="parent"
7779
app:layout_constraintHorizontal_bias="0.131"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
android:layout_marginBottom="5dp"
6363
android:ems="10"
6464
android:hint="@string/message"
65-
android:imeOptions="actionNext"
65+
android:imeOptions="actionDone"
6666
android:inputType="textPersonName"
6767
android:textColor="@color/dark_grey"
6868
app:layout_constraintBottom_toBottomOf="parent"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
android:layout_marginBottom="5dp"
6363
android:ems="10"
6464
android:hint="@string/message"
65-
android:imeOptions="actionNext"
65+
android:imeOptions="actionDone"
6666
android:inputType="textPersonName"
6767
android:textColor="@color/dark_grey"
6868
app:layout_constraintBottom_toBottomOf="parent"

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
android:hint="@string/expression_one"
4444
android:inputType="textPersonName"
4545
android:textColor="@color/dark_grey"
46+
android:imeOptions="actionDone"
4647
app:layout_constraintBottom_toBottomOf="parent"
4748
app:layout_constraintEnd_toEndOf="parent"
4849
app:layout_constraintHorizontal_bias="0.128"
@@ -56,6 +57,7 @@
5657
android:layout_height="53dp"
5758
android:layout_marginStart="1dp"
5859
android:entries="@array/thins"
60+
android:imeOptions="actionDone"
5961
app:layout_constraintBottom_toBottomOf="parent"
6062
app:layout_constraintEnd_toEndOf="parent"
6163
app:layout_constraintHorizontal_bias="0.0"
@@ -71,6 +73,7 @@
7173
android:hint="@string/expression_two"
7274
android:inputType="textPersonName"
7375
android:textColor="@color/dark_grey"
76+
android:imeOptions="actionDone"
7477
app:layout_constraintBottom_toBottomOf="parent"
7578
app:layout_constraintEnd_toEndOf="parent"
7679
app:layout_constraintHorizontal_bias="0.131"
@@ -87,6 +90,7 @@
8790
android:inputType="textPersonName"
8891
android:textColor="@color/dark_grey"
8992
android:visibility="gone"
93+
android:imeOptions="actionDone"
9094
app:layout_constraintBottom_toBottomOf="parent"
9195
app:layout_constraintEnd_toEndOf="parent"
9296
app:layout_constraintHorizontal_bias="0.931"

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
android:hint="@string/name"
4444
android:inputType="textPersonName"
4545
android:textColor="@color/dark_grey"
46+
android:imeOptions="actionDone"
4647
app:layout_constraintBottom_toBottomOf="parent"
4748
app:layout_constraintEnd_toStartOf="@+id/editMedium"
4849
app:layout_constraintHorizontal_bias="0.327"
@@ -70,12 +71,13 @@
7071
android:layout_height="49dp"
7172
android:ems="10"
7273
android:hint="@string/value"
74+
android:imeOptions="actionDone"
7375
android:inputType="textPersonName"
7476
android:textColor="@color/dark_grey"
7577
app:layout_constraintBottom_toBottomOf="parent"
76-
app:layout_constraintEnd_toEndOf="parent"
78+
app:layout_constraintEnd_toEndOf="@+id/editMedium"
7779
app:layout_constraintHorizontal_bias="0.444"
78-
app:layout_constraintStart_toStartOf="parent"
80+
app:layout_constraintStart_toStartOf="@+id/editLeft"
7981
app:layout_constraintTop_toTopOf="parent"
8082
app:layout_constraintVertical_bias="0.955" />
8183

@@ -87,6 +89,7 @@
8789
android:hint="@string/sizeArray"
8890
android:inputType="textPersonName"
8991
android:textColor="@color/dark_grey"
92+
android:imeOptions="actionDone"
9093
app:layout_constraintBottom_toBottomOf="parent"
9194
app:layout_constraintEnd_toEndOf="parent"
9295
app:layout_constraintHorizontal_bias="0.905"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
android:layout_marginBottom="5dp"
6363
android:ems="10"
6464
android:hint="@string/name"
65-
android:imeOptions="actionNext"
65+
android:imeOptions="actionDone"
6666
android:inputType="textPersonName"
6767
android:textColor="@color/dark_grey"
6868
app:layout_constraintBottom_toBottomOf="parent"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
android:layout_toStartOf="@+id/editRight"
6363
android:ems="10"
6464
android:hint="@string/name"
65-
android:imeOptions="actionNext"
65+
android:imeOptions="actionDone"
6666
android:inputType="textPersonName"
6767
android:textColor="@color/dark_grey"
6868
app:layout_constraintBottom_toBottomOf="parent"
@@ -114,6 +114,7 @@
114114
android:inputType="textPersonName"
115115
android:textColor="@color/dark_grey"
116116
android:visibility="gone"
117+
android:imeOptions="actionDone"
117118
app:layout_constraintBottom_toBottomOf="parent"
118119
app:layout_constraintEnd_toEndOf="parent"
119120
app:layout_constraintHorizontal_bias="0.931"

0 commit comments

Comments
 (0)