From 71cb6fa72726402a3b4bf60203b32bfb938a3c6d Mon Sep 17 00:00:00 2001
From: sds100 <seth.developer@proton.me>
Date: Sun, 8 Sep 2024 22:20:56 +0200
Subject: [PATCH 1/3] #1293 fix: checkbox FABs not visible in multiple screens

Moving this to after the appbar in the xml file fixed the problem for some reason.
---
 .../res/layout/fragment_config_intent.xml     | 19 +++++++++---------
 .../res/layout/fragment_config_key_event.xml  | 20 +++++++++----------
 .../res/layout/fragment_pick_coordinate.xml   | 20 +++++++++----------
 .../fragment_pinch_pick_coordinates.xml       | 20 +++++++++----------
 .../fragment_swipe_pick_coordinates.xml       | 20 +++++++++----------
 5 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/app/src/main/res/layout/fragment_config_intent.xml b/app/src/main/res/layout/fragment_config_intent.xml
index 1a9daf403f..f971453e10 100644
--- 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>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_config_key_event.xml b/app/src/main/res/layout/fragment_config_key_event.xml
index f09007987a..87b7853f12 100644
--- 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>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_pick_coordinate.xml b/app/src/main/res/layout/fragment_pick_coordinate.xml
index 556eff985d..9b24ac8ed7 100644
--- 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>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_pinch_pick_coordinates.xml b/app/src/main/res/layout/fragment_pinch_pick_coordinates.xml
index 967c4c4d78..4068833614 100644
--- 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
index 24ff22c700..ad085dc381 100644
--- 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>

From 5fdc7c93c595ae8af1c7478db322cd4697496f93 Mon Sep 17 00:00:00 2001
From: sds100 <seth.developer@proton.me>
Date: Sun, 8 Sep 2024 22:22:12 +0200
Subject: [PATCH 2/3] chore: bump version to 2.6.2

---
 app/version.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/version.properties b/app/version.properties
index 53053211c5..2d5e7f719b 100644
--- 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
\ No newline at end of file

From 26080a51db9404dc0e62b44facab9d591e40b179 Mon Sep 17 00:00:00 2001
From: sds100 <seth.developer@proton.me>
Date: Sun, 8 Sep 2024 22:23:02 +0200
Subject: [PATCH 3/3] docs: changelog for version 2.6.2

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c80d8d4804..a455836e2f 100644
--- 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