Skip to content

Commit 16cbcf6

Browse files
sds100sds100
authored
Merge pull request #1294 from keymapperorg/develop
Version 2.6.2
2 parents 9590876 + 26080a5 commit 16cbcf6

File tree

7 files changed

+58
-51
lines changed

7 files changed

+58
-51
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## [2.6.2](https://github.com/sds100/KeyMapper/releases/tag/v2.6.2)
2+
3+
#### 9 September 2024
4+
5+
- #1293 Checkbox buttons were invisible when configuring some actions.
6+
17
## [2.6.1](https://github.com/sds100/KeyMapper/releases/tag/v2.6.1)
28

39
#### 4 September 2024

‎app/src/main/res/layout/fragment_config_intent.xml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,16 @@
329329
</androidx.constraintlayout.widget.ConstraintLayout>
330330
</androidx.core.widget.NestedScrollView>
331331

332+
<com.google.android.material.bottomappbar.BottomAppBar
333+
android:id="@+id/appBar"
334+
android:layout_width="match_parent"
335+
android:layout_height="wrap_content"
336+
android:layout_gravity="bottom"
337+
app:fabAlignmentMode="end"
338+
app:fabAnimationMode="slide"
339+
app:menuAlignmentMode="auto"
340+
app:navigationIcon="@drawable/ic_baseline_arrow_back_24" />
341+
332342
<com.google.android.material.floatingactionbutton.FloatingActionButton
333343
android:id="@+id/fab"
334344
android:layout_width="wrap_content"
@@ -339,14 +349,5 @@
339349
android:src="@drawable/ic_baseline_done_24"
340350
app:layout_anchor="@id/appBar" />
341351

342-
<com.google.android.material.bottomappbar.BottomAppBar
343-
android:id="@+id/appBar"
344-
android:layout_width="match_parent"
345-
android:layout_height="wrap_content"
346-
android:layout_gravity="bottom"
347-
app:fabAlignmentMode="end"
348-
app:fabAnimationMode="slide"
349-
app:menuAlignmentMode="auto"
350-
app:navigationIcon="@drawable/ic_baseline_arrow_back_24" />
351352
</androidx.coordinatorlayout.widget.CoordinatorLayout>
352353
</layout>

‎app/src/main/res/layout/fragment_config_key_event.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -170,16 +170,6 @@
170170
</androidx.constraintlayout.widget.ConstraintLayout>
171171
</androidx.core.widget.NestedScrollView>
172172

173-
<com.google.android.material.floatingactionbutton.FloatingActionButton
174-
android:id="@+id/fab"
175-
android:layout_width="wrap_content"
176-
android:layout_height="wrap_content"
177-
android:contentDescription="@string/content_description_done_configuring_key_event"
178-
android:enabled="@{viewModel.uiState.isDoneButtonEnabled}"
179-
android:onClick="@{() -> viewModel.onDoneClick()}"
180-
android:src="@drawable/ic_baseline_done_24"
181-
app:layout_anchor="@id/appBar" />
182-
183173
<com.google.android.material.bottomappbar.BottomAppBar
184174
android:id="@+id/appBar"
185175
app:menuAlignmentMode="auto"
@@ -190,5 +180,15 @@
190180
app:fabAnimationMode="slide"
191181
app:navigationIcon="@drawable/ic_baseline_arrow_back_24" />
192182

183+
<com.google.android.material.floatingactionbutton.FloatingActionButton
184+
android:id="@+id/fab"
185+
android:layout_width="wrap_content"
186+
android:layout_height="wrap_content"
187+
android:contentDescription="@string/content_description_done_configuring_key_event"
188+
android:enabled="@{viewModel.uiState.isDoneButtonEnabled}"
189+
android:onClick="@{() -> viewModel.onDoneClick()}"
190+
android:src="@drawable/ic_baseline_done_24"
191+
app:layout_anchor="@id/appBar" />
192+
193193
</androidx.coordinatorlayout.widget.CoordinatorLayout>
194194
</layout>

‎app/src/main/res/layout/fragment_pick_coordinate.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,16 +123,6 @@
123123
</androidx.constraintlayout.widget.ConstraintLayout>
124124
</androidx.core.widget.NestedScrollView>
125125

126-
<com.google.android.material.floatingactionbutton.FloatingActionButton
127-
android:id="@+id/fab"
128-
android:layout_width="wrap_content"
129-
android:layout_height="wrap_content"
130-
android:contentDescription="@string/content_description_done_configuring_coordinate"
131-
android:enabled="@{viewModel.isDoneButtonEnabled()}"
132-
android:onClick="@{() -> viewModel.onDoneClick()}"
133-
android:src="@drawable/ic_baseline_done_24"
134-
app:layout_anchor="@id/appBar" />
135-
136126
<com.google.android.material.bottomappbar.BottomAppBar
137127
android:id="@+id/appBar"
138128
app:menuAlignmentMode="auto"
@@ -143,5 +133,15 @@
143133
app:fabAnimationMode="slide"
144134
app:navigationIcon="@drawable/ic_baseline_arrow_back_24" />
145135

136+
<com.google.android.material.floatingactionbutton.FloatingActionButton
137+
android:id="@+id/fab"
138+
android:layout_width="wrap_content"
139+
android:layout_height="wrap_content"
140+
android:contentDescription="@string/content_description_done_configuring_coordinate"
141+
android:enabled="@{viewModel.isDoneButtonEnabled()}"
142+
android:onClick="@{() -> viewModel.onDoneClick()}"
143+
android:src="@drawable/ic_baseline_done_24"
144+
app:layout_anchor="@id/appBar" />
145+
146146
</androidx.coordinatorlayout.widget.CoordinatorLayout>
147147
</layout>

‎app/src/main/res/layout/fragment_pinch_pick_coordinates.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -262,16 +262,6 @@
262262
</androidx.constraintlayout.widget.ConstraintLayout>
263263
</androidx.core.widget.NestedScrollView>
264264

265-
<com.google.android.material.floatingactionbutton.FloatingActionButton
266-
android:id="@+id/fab"
267-
android:layout_width="wrap_content"
268-
android:layout_height="wrap_content"
269-
android:contentDescription="@string/content_description_done_configuring_coordinate"
270-
android:enabled="@{viewModel.isDoneButtonEnabled()}"
271-
android:onClick="@{() -> viewModel.onDoneClick()}"
272-
android:src="@drawable/ic_baseline_done_24"
273-
app:layout_anchor="@id/appBar" />
274-
275265
<com.google.android.material.bottomappbar.BottomAppBar
276266
android:id="@+id/appBar"
277267
app:menuAlignmentMode="auto"
@@ -282,6 +272,16 @@
282272
app:fabAnimationMode="slide"
283273
app:navigationIcon="@drawable/ic_baseline_arrow_back_24" />
284274

275+
<com.google.android.material.floatingactionbutton.FloatingActionButton
276+
android:id="@+id/fab"
277+
android:layout_width="wrap_content"
278+
android:layout_height="wrap_content"
279+
android:contentDescription="@string/content_description_done_configuring_coordinate"
280+
android:enabled="@{viewModel.isDoneButtonEnabled()}"
281+
android:onClick="@{() -> viewModel.onDoneClick()}"
282+
android:src="@drawable/ic_baseline_done_24"
283+
app:layout_anchor="@id/appBar" />
284+
285285
</androidx.coordinatorlayout.widget.CoordinatorLayout>
286286

287287
</layout>

‎app/src/main/res/layout/fragment_swipe_pick_coordinates.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -306,16 +306,6 @@
306306
</androidx.constraintlayout.widget.ConstraintLayout>
307307
</androidx.core.widget.NestedScrollView>
308308

309-
<com.google.android.material.floatingactionbutton.FloatingActionButton
310-
android:id="@+id/fab"
311-
android:layout_width="wrap_content"
312-
android:layout_height="wrap_content"
313-
android:contentDescription="@string/content_description_done_configuring_coordinate"
314-
android:enabled="@{viewModel.isDoneButtonEnabled()}"
315-
android:onClick="@{() -> viewModel.onDoneClick()}"
316-
android:src="@drawable/ic_baseline_done_24"
317-
app:layout_anchor="@id/appBar" />
318-
319309
<com.google.android.material.bottomappbar.BottomAppBar
320310
android:id="@+id/appBar"
321311
app:menuAlignmentMode="auto"
@@ -326,6 +316,16 @@
326316
app:fabAnimationMode="slide"
327317
app:navigationIcon="@drawable/ic_baseline_arrow_back_24" />
328318

319+
<com.google.android.material.floatingactionbutton.FloatingActionButton
320+
android:id="@+id/fab"
321+
android:layout_width="wrap_content"
322+
android:layout_height="wrap_content"
323+
android:contentDescription="@string/content_description_done_configuring_coordinate"
324+
android:enabled="@{viewModel.isDoneButtonEnabled()}"
325+
android:onClick="@{() -> viewModel.onDoneClick()}"
326+
android:src="@drawable/ic_baseline_done_24"
327+
app:layout_anchor="@id/appBar" />
328+
329329
</androidx.coordinatorlayout.widget.CoordinatorLayout>
330330

331331
</layout>

‎app/version.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
VERSION_NAME=2.6.1
2-
VERSION_CODE=64
1+
VERSION_NAME=2.6.2
2+
VERSION_CODE=65
33
VERSION_NUM=0

0 commit comments

Comments
 (0)