Merge pull request #1294 from keymapperorg/develop

Version 2.6.2
keymapperorg · Sep 8, 2024 · 16cbcf6 · 16cbcf6
2 parents 9590876 + 26080a5
commit 16cbcf6
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 51 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [2.6.2](https://github.com/sds100/KeyMapper/releases/tag/v2.6.2)
+
+#### 9 September 2024
+
+- #1293 Checkbox buttons were invisible when configuring some actions.
+
 ## [2.6.1](https://github.com/sds100/KeyMapper/releases/tag/v2.6.1)
 
 #### 4 September 2024

diff --git a/app/src/main/res/layout/fragment_config_intent.xml b/app/src/main/res/layout/fragment_config_intent.xml
@@ -329,6 +329,16 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.core.widget.NestedScrollView>
 
+        <com.google.android.material.bottomappbar.BottomAppBar
+            android:id="@+id/appBar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            app:fabAlignmentMode="end"
+            app:fabAnimationMode="slide"
+            app:menuAlignmentMode="auto"
+            app:navigationIcon="@drawable/ic_baseline_arrow_back_24" />
+
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fab"
             android:layout_width="wrap_content"
@@ -339,14 +349,5 @@
             android:src="@drawable/ic_baseline_done_24"
             app:layout_anchor="@id/appBar" />
 
-        <com.google.android.material.bottomappbar.BottomAppBar
-            android:id="@+id/appBar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            app:fabAlignmentMode="end"
-            app:fabAnimationMode="slide"
-            app:menuAlignmentMode="auto"
-            app:navigationIcon="@drawable/ic_baseline_arrow_back_24" />
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>
diff --git a/app/src/main/res/layout/fragment_config_key_event.xml b/app/src/main/res/layout/fragment_config_key_event.xml
@@ -170,16 +170,6 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.core.widget.NestedScrollView>
 
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/content_description_done_configuring_key_event"
-            android:enabled="@{viewModel.uiState.isDoneButtonEnabled}"
-            android:onClick="@{() -> viewModel.onDoneClick()}"
-            android:src="@drawable/ic_baseline_done_24"
-            app:layout_anchor="@id/appBar" />
-
         <com.google.android.material.bottomappbar.BottomAppBar
             android:id="@+id/appBar"
             app:menuAlignmentMode="auto"
@@ -190,5 +180,15 @@
             app:fabAnimationMode="slide"
             app:navigationIcon="@drawable/ic_baseline_arrow_back_24" />
 
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/fab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/content_description_done_configuring_key_event"
+            android:enabled="@{viewModel.uiState.isDoneButtonEnabled}"
+            android:onClick="@{() -> viewModel.onDoneClick()}"
+            android:src="@drawable/ic_baseline_done_24"
+            app:layout_anchor="@id/appBar" />
+
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>
diff --git a/app/src/main/res/layout/fragment_pick_coordinate.xml b/app/src/main/res/layout/fragment_pick_coordinate.xml
@@ -123,16 +123,6 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.core.widget.NestedScrollView>
 
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/content_description_done_configuring_coordinate"
-            android:enabled="@{viewModel.isDoneButtonEnabled()}"
-            android:onClick="@{() -> viewModel.onDoneClick()}"
-            android:src="@drawable/ic_baseline_done_24"
-            app:layout_anchor="@id/appBar" />
-
         <com.google.android.material.bottomappbar.BottomAppBar
             android:id="@+id/appBar"
             app:menuAlignmentMode="auto"
@@ -143,5 +133,15 @@
             app:fabAnimationMode="slide"
             app:navigationIcon="@drawable/ic_baseline_arrow_back_24" />
 
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/fab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/content_description_done_configuring_coordinate"
+            android:enabled="@{viewModel.isDoneButtonEnabled()}"
+            android:onClick="@{() -> viewModel.onDoneClick()}"
+            android:src="@drawable/ic_baseline_done_24"
+            app:layout_anchor="@id/appBar" />
+
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>
diff --git a/app/src/main/res/layout/fragment_pinch_pick_coordinates.xml b/app/src/main/res/layout/fragment_pinch_pick_coordinates.xml
@@ -262,16 +262,6 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.core.widget.NestedScrollView>
 
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/content_description_done_configuring_coordinate"
-            android:enabled="@{viewModel.isDoneButtonEnabled()}"
-            android:onClick="@{() -> viewModel.onDoneClick()}"
-            android:src="@drawable/ic_baseline_done_24"
-            app:layout_anchor="@id/appBar" />
-
         <com.google.android.material.bottomappbar.BottomAppBar
             android:id="@+id/appBar"
             app:menuAlignmentMode="auto"
@@ -282,6 +272,16 @@
             app:fabAnimationMode="slide"
             app:navigationIcon="@drawable/ic_baseline_arrow_back_24" />
 
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/fab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/content_description_done_configuring_coordinate"
+            android:enabled="@{viewModel.isDoneButtonEnabled()}"
+            android:onClick="@{() -> viewModel.onDoneClick()}"
+            android:src="@drawable/ic_baseline_done_24"
+            app:layout_anchor="@id/appBar" />
+
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>
diff --git a/app/src/main/res/layout/fragment_swipe_pick_coordinates.xml b/app/src/main/res/layout/fragment_swipe_pick_coordinates.xml
@@ -306,16 +306,6 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.core.widget.NestedScrollView>
 
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/content_description_done_configuring_coordinate"
-            android:enabled="@{viewModel.isDoneButtonEnabled()}"
-            android:onClick="@{() -> viewModel.onDoneClick()}"
-            android:src="@drawable/ic_baseline_done_24"
-            app:layout_anchor="@id/appBar" />
-
         <com.google.android.material.bottomappbar.BottomAppBar
             android:id="@+id/appBar"
             app:menuAlignmentMode="auto"
@@ -326,6 +316,16 @@
             app:fabAnimationMode="slide"
             app:navigationIcon="@drawable/ic_baseline_arrow_back_24" />
 
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/fab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/content_description_done_configuring_coordinate"
+            android:enabled="@{viewModel.isDoneButtonEnabled()}"
+            android:onClick="@{() -> viewModel.onDoneClick()}"
+            android:src="@drawable/ic_baseline_done_24"
+            app:layout_anchor="@id/appBar" />
+
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>
diff --git a/app/version.properties b/app/version.properties
@@ -1,3 +1,3 @@
-VERSION_NAME=2.6.1
-VERSION_CODE=64
+VERSION_NAME=2.6.2
+VERSION_CODE=65
 VERSION_NUM=0