Place the noBtn button on the left and the yesBtn button on the right. This aligns with the common reading pattern (left to right) and helps users quickly identify the action they want to take.

uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkDialog.kt

@@ -25,6 +25,7 @@ import android.view.LayoutInflater
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import androidx.appcompat.app.AppCompatDialogFragment
+import androidx.preference.PreferenceManager
 import org.isoron.uhabits.HabitsApplication
 import org.isoron.uhabits.R
 import org.isoron.uhabits.core.models.Entry.Companion.NO
@@ -53,8 +54,12 @@ class CheckmarkDialog : AppCompatDialogFragment() {
             it.typeface = getFontAwesome(requireContext())
         }
         view.notes.setText(requireArguments().getString("notes")!!)
-        if (!prefs.isSkipEnabled) view.skipBtn.visibility = GONE
+        if (!prefs.isSkipEnabled)
-        if (!prefs.areQuestionMarksEnabled) view.unknownBtn.visibility = GONE
+            view.skipBtn.visibility = GONE
+
+        if (!prefs.areQuestionMarksEnabled)
+            view.unknownBtn.visibility = GONE
+
         view.booleanButtons.visibility = VISIBLE
         val dialog = Dialog(requireContext())
         dialog.setContentView(view.root)

uhabits-android/src/main/res/layout/checkmark_popup.xml

@@ -53,9 +53,9 @@
         app:showDividers="middle">
 
         <TextView
-            android:id="@+id/yesBtn"
+            android:id="@+id/noBtn"
             style="@style/CheckmarkPopupBtn"
-            android:text="@string/fa_check" />
+            android:text="@string/fa_times" />
 
         <TextView
             android:id="@+id/skipBtn"
@@ -63,9 +63,9 @@
             android:text="@string/fa_skipped" />
 
         <TextView
-            android:id="@+id/noBtn"
+            android:id="@+id/yesBtn"
             style="@style/CheckmarkPopupBtn"
-            android:text="@string/fa_times" />
+            android:text="@string/fa_check" />
 
         <TextView
             android:id="@+id/unknownBtn"