From e785de3ee84cbe6e7b161c9858d1234cd06d5a37 Mon Sep 17 00:00:00 2001
From: Crustack <crustackk@gmail.com>
Date: Tue, 31 Mar 2026 22:19:28 +0200
Subject: [PATCH 1/5] Add pin to status bar note action

---
 .../main/res/drawable/notification_unpin.xml  | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 app/src/main/res/drawable/notification_unpin.xml

diff --git a/app/src/main/res/drawable/notification_unpin.xml b/app/src/main/res/drawable/notification_unpin.xml
new file mode 100644
index 00000000..81b288d8
--- /dev/null
+++ b/app/src/main/res/drawable/notification_unpin.xml
@@ -0,0 +1,33 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+
+    <path
+        android:fillColor="#000000"
+        android:pathData=
+            "M360,
+            920L320,880L320,
+            640L120,640L120,
+            560L200,480L200,
+            200L160,200L160,
+            120L445,120Q427,
+            137 412.5,157Q398, 177 387,
+            560L497,560Q521,
+            574 546.5,583.5Q572,
+            593 600,597L600,
+            640L400,640L400,880L360,920Z" />
+
+    <group
+        android:translateX="330"
+        android:translateY="30"
+        android:scaleX="0.55"
+        android:scaleY="0.55">
+        <path
+            android:fillColor="#000000"
+            android:pathData="M160,760L160,680L240,680L240,400Q240,317 290,252.5Q340,188 420,168L420,140Q420,115 437.5,97.5Q455,80 480,80Q505,80 522.5,97.5Q540,115 540,140L540,168Q620,188 670,252.5Q720,317 720,400L720,680L800,680L800,760L160,760ZM480,880Q447,880 423.5,856.5Q400,833 400,800L560,800Q560,833 536.5,856.5Q513,880 480,880ZM320,680L640,680L640,400Q640,334 593,287Q546,240 480,240Q414,240 367,287Q320,334 320,400L320,680Z" />
+    </group>
+
+</vector>
\ No newline at end of file

From 570f2002b7f09c2bcb98e094dd5695e56c33a3be Mon Sep 17 00:00:00 2001
From: Crustack <crustackk@gmail.com>
Date: Wed, 1 Apr 2026 20:34:00 +0200
Subject: [PATCH 2/5] Support changing labels order via drag and drop

---
 .../11.json                                   | 176 ++++++++++++++++++
 .../philkes/notallyx/data/NotallyDatabase.kt  |  21 ++-
 .../philkes/notallyx/data/dao/CommonDao.kt    |  12 +-
 .../com/philkes/notallyx/data/dao/LabelDao.kt |  15 +-
 .../notallyx/data/imports/NotesImporter.kt    |  10 +-
 .../com/philkes/notallyx/data/model/Label.kt  |   2 +-
 .../activity/main/MainActivity.kt             |  14 +-
 .../activity/main/fragment/LabelsFragment.kt  |  70 ++++++-
 .../fragment/settings/SettingsFragment.kt     |   2 +-
 .../activity/note/SelectLabelsActivity.kt     |  10 +-
 .../view/main/label/LabelAdapter.kt           |  10 +-
 .../view/main/label/LabelListener.kt          |   4 +
 .../presentation/view/main/label/LabelVH.kt   |  12 +-
 .../view/main/label/SelectableLabelAdapter.kt |  18 +-
 .../view/main/label/SelectableLabelVH.kt      |   5 +-
 .../presentation/viewmodel/BaseNoteModel.kt   |  20 +-
 .../notallyx/utils/backup/ImportExtensions.kt |   4 +-
 .../utils/backup/MigrationsExtensions.kt      |   6 +-
 .../utils/backup/XmlParserExtensions.kt       |   8 +-
 .../main/res/layout-v26/recycler_label.xml    |  19 +-
 app/src/main/res/layout/recycler_label.xml    |  11 ++
 21 files changed, 403 insertions(+), 46 deletions(-)
 create mode 100644 app/schemas/com.philkes.notallyx.data.NotallyDatabase/11.json

diff --git a/app/schemas/com.philkes.notallyx.data.NotallyDatabase/11.json b/app/schemas/com.philkes.notallyx.data.NotallyDatabase/11.json
new file mode 100644
index 00000000..3a3b430c
--- /dev/null
+++ b/app/schemas/com.philkes.notallyx.data.NotallyDatabase/11.json
@@ -0,0 +1,176 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 11,
+    "identityHash": "80a04d33cf13bc8ca45396f5a5d85e61",
+    "entities": [
+      {
+        "tableName": "BaseNote",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `type` TEXT NOT NULL, `folder` TEXT NOT NULL, `color` TEXT NOT NULL, `title` TEXT NOT NULL, `pinned` INTEGER NOT NULL, `timestamp` INTEGER NOT NULL, `modifiedTimestamp` INTEGER NOT NULL, `labels` TEXT NOT NULL, `body` TEXT NOT NULL, `spans` TEXT NOT NULL, `items` TEXT NOT NULL, `images` TEXT NOT NULL, `files` TEXT NOT NULL, `audios` TEXT NOT NULL, `reminders` TEXT NOT NULL, `viewMode` TEXT NOT NULL, `isPinnedToStatus` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "folder",
+            "columnName": "folder",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pinned",
+            "columnName": "pinned",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedTimestamp",
+            "columnName": "modifiedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "labels",
+            "columnName": "labels",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "body",
+            "columnName": "body",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "spans",
+            "columnName": "spans",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "items",
+            "columnName": "items",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "images",
+            "columnName": "images",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "files",
+            "columnName": "files",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "audios",
+            "columnName": "audios",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "reminders",
+            "columnName": "reminders",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "viewMode",
+            "columnName": "viewMode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPinnedToStatus",
+            "columnName": "isPinnedToStatus",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_BaseNote_id_folder_pinned_timestamp_labels",
+            "unique": false,
+            "columnNames": [
+              "id",
+              "folder",
+              "pinned",
+              "timestamp",
+              "labels"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BaseNote_id_folder_pinned_timestamp_labels` ON `${TABLE_NAME}` (`id`, `folder`, `pinned`, `timestamp`, `labels`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Label",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`value` TEXT NOT NULL, `order` INTEGER NOT NULL, PRIMARY KEY(`value`))",
+        "fields": [
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "order",
+            "columnName": "order",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "value"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '80a04d33cf13bc8ca45396f5a5d85e61')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/philkes/notallyx/data/NotallyDatabase.kt b/app/src/main/java/com/philkes/notallyx/data/NotallyDatabase.kt
index f5a8011e..7895e580 100644
--- a/app/src/main/java/com/philkes/notallyx/data/NotallyDatabase.kt
+++ b/app/src/main/java/com/philkes/notallyx/data/NotallyDatabase.kt
@@ -33,7 +33,7 @@ import java.io.File
 import net.zetetic.database.sqlcipher.SupportOpenHelperFactory
 
 @TypeConverters(Converters::class)
-@Database(entities = [BaseNote::class, Label::class], version = 10)
+@Database(entities = [BaseNote::class, Label::class], version = 11)
 abstract class NotallyDatabase : RoomDatabase() {
 
     abstract fun getLabelDao(): LabelDao
@@ -162,6 +162,7 @@ abstract class NotallyDatabase : RoomDatabase() {
                         Migration8,
                         Migration9,
                         Migration10,
+                        Migration11
                     )
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 System.loadLibrary("sqlcipher")
@@ -310,5 +311,23 @@ abstract class NotallyDatabase : RoomDatabase() {
                 )
             }
         }
+
+        object Migration11 : Migration(10, 11) {
+
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("ALTER TABLE `Label` ADD COLUMN `order` INTEGER NOT NULL DEFAULT 0")
+                val cursor = db.query("SELECT value FROM Label ORDER BY value DESC")
+                var order = 0
+                while (cursor.moveToNext()) {
+                    val value = cursor.getString(0)
+                    db.execSQL(
+                        "UPDATE Label SET `order` = ? WHERE value = ?",
+                        arrayOf(order, value),
+                    )
+                    order++
+                }
+                cursor.close()
+            }
+        }
     }
 }
diff --git a/app/src/main/java/com/philkes/notallyx/data/dao/CommonDao.kt b/app/src/main/java/com/philkes/notallyx/data/dao/CommonDao.kt
index e7f17c81..e4965f51 100644
--- a/app/src/main/java/com/philkes/notallyx/data/dao/CommonDao.kt
+++ b/app/src/main/java/com/philkes/notallyx/data/dao/CommonDao.kt
@@ -65,7 +65,11 @@ abstract class CommonDao(private val database: NotallyDatabase) {
                 duplicates++
             }
         }
-        database.getLabelDao().insert(labels)
+        val labelDao = database.getLabelDao()
+        val maxOrder = labelDao.getMaxOrder() ?: -1
+        labelDao.insert(
+            labels.mapIndexed { index, label -> Label(label.value, maxOrder + 1 + index) }
+        )
         return ImportResult(inserted = insertedCount, duplicates = duplicates)
     }
 
@@ -134,7 +138,11 @@ abstract class CommonDao(private val database: NotallyDatabase) {
             }
         }
 
-        database.getLabelDao().insert(labels)
+        val labelDaoForRemap = database.getLabelDao()
+        val maxOrderForRemap = labelDaoForRemap.getMaxOrder() ?: -1
+        labelDaoForRemap.insert(
+            labels.mapIndexed { index, label -> Label(label.value, maxOrderForRemap + 1 + index) }
+        )
         return ImportResult(inserted = insertedCount, duplicates = duplicates)
     }
 
diff --git a/app/src/main/java/com/philkes/notallyx/data/dao/LabelDao.kt b/app/src/main/java/com/philkes/notallyx/data/dao/LabelDao.kt
index ec2d8ca7..d240af55 100644
--- a/app/src/main/java/com/philkes/notallyx/data/dao/LabelDao.kt
+++ b/app/src/main/java/com/philkes/notallyx/data/dao/LabelDao.kt
@@ -5,15 +5,20 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
+import androidx.room.Update
 import com.philkes.notallyx.data.model.Label
 
 @Dao
 interface LabelDao {
 
-    @Insert suspend fun insert(label: Label)
+    @Insert(onConflict = OnConflictStrategy.IGNORE) suspend fun insert(label: Label)
 
     @Insert(onConflict = OnConflictStrategy.IGNORE) suspend fun insert(labels: List<Label>)
 
+    @Update suspend fun update(label: Label)
+
+    @Update suspend fun update(labels: List<Label>)
+
     @Query("DELETE FROM Label WHERE value = :value") suspend fun delete(value: String)
 
     @Query("DELETE FROM Label") suspend fun deleteAll()
@@ -21,10 +26,14 @@ interface LabelDao {
     @Query("UPDATE Label SET value = :newValue WHERE value = :oldValue")
     suspend fun update(oldValue: String, newValue: String)
 
-    @Query("SELECT value FROM Label ORDER BY value") fun getAll(): LiveData<List<String>>
+    @Query("SELECT * FROM Label ORDER BY `order` DESC, value ASC")
+    fun getAll(): LiveData<List<Label>>
 
-    @Query("SELECT value FROM Label ORDER BY value") suspend fun getArrayOfAll(): Array<String>
+    @Query("SELECT value FROM Label ORDER BY `order` DESC, value ASC")
+    suspend fun getArrayOfAll(): Array<String>
 
     @Query("SELECT EXISTS(SELECT 1 FROM Label WHERE value = :value)")
     suspend fun exists(value: String): Boolean
+
+    @Query("SELECT MAX(`order`) FROM Label") suspend fun getMaxOrder(): Int?
 }
diff --git a/app/src/main/java/com/philkes/notallyx/data/imports/NotesImporter.kt b/app/src/main/java/com/philkes/notallyx/data/imports/NotesImporter.kt
index a008fa1e..03082b7f 100644
--- a/app/src/main/java/com/philkes/notallyx/data/imports/NotesImporter.kt
+++ b/app/src/main/java/com/philkes/notallyx/data/imports/NotesImporter.kt
@@ -55,7 +55,15 @@ class NotesImporter(private val app: Application, private val database: NotallyD
                     progress?.postValue(ImportProgress(inProgress = false))
                     throw e
                 }
-            database.getLabelDao().insert(notes.flatMap { it.labels }.distinct().map { Label(it) })
+            val labelDao = database.getLabelDao()
+            val maxOrder = labelDao.getMaxOrder() ?: -1
+            labelDao.insert(
+                notes
+                    .flatMap { it.labels }
+                    .distinct()
+                    .sorted()
+                    .mapIndexed { index, value -> Label(value, maxOrder + 1 + index) }
+            )
             val files = notes.flatMap { it.files }.distinct()
             val images = notes.flatMap { it.images }.distinct()
             val audios = notes.flatMap { it.audios }.distinct()
diff --git a/app/src/main/java/com/philkes/notallyx/data/model/Label.kt b/app/src/main/java/com/philkes/notallyx/data/model/Label.kt
index 2714d582..3ce13f93 100644
--- a/app/src/main/java/com/philkes/notallyx/data/model/Label.kt
+++ b/app/src/main/java/com/philkes/notallyx/data/model/Label.kt
@@ -3,4 +3,4 @@ package com.philkes.notallyx.data.model
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 
-@Entity class Label(@PrimaryKey val value: String)
+@Entity class Label(@PrimaryKey val value: String, val order: Int)
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/activity/main/MainActivity.kt b/app/src/main/java/com/philkes/notallyx/presentation/activity/main/MainActivity.kt
index 90c6ed94..d187a93f 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/activity/main/MainActivity.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/activity/main/MainActivity.kt
@@ -32,6 +32,8 @@ import com.google.android.material.transition.platform.MaterialFade
 import com.philkes.notallyx.R
 import com.philkes.notallyx.data.NotallyDatabase
 import com.philkes.notallyx.data.model.BaseNote
+import com.philkes.notallyx.data.model.Folder
+import com.philkes.notallyx.data.model.Label
 import com.philkes.notallyx.databinding.ActivityMainBinding
 import com.philkes.notallyx.presentation.activity.LockedActivity
 import com.philkes.notallyx.presentation.activity.main.fragment.DisplayLabelFragment.Companion.EXTRA_DISPLAYED_LABEL
@@ -268,8 +270,8 @@ class MainActivity : LockedActivity<ActivityMainBinding>() {
 
     private var labelsMenuItems: List<MenuItem> = listOf()
     private var labelsMoreMenuItem: MenuItem? = null
-    private var labels: List<String> = listOf()
-    private var labelsLiveData: LiveData<List<String>>? = null
+    private var labels: List<Label> = listOf()
+    private var labelsLiveData: LiveData<List<Label>>? = null
 
     private fun setupMenu() {
         binding.NavigationView.menu.apply {
@@ -318,19 +320,19 @@ class MainActivity : LockedActivity<ActivityMainBinding>() {
             .setIcon(R.drawable.label_more)
     }
 
-    private fun Menu.setupLabelsMenuItems(labels: List<String>, maxLabelsToDisplay: Int) {
+    private fun Menu.setupLabelsMenuItems(labels: List<Label>, maxLabelsToDisplay: Int) {
         removeGroup(1)
         addStaticLabelsMenuItems()
         labelsMenuItems =
             labels
                 .mapIndexed { index, label ->
-                    add(1, R.id.DisplayLabel, CATEGORY_CONTAINER + index + 3, label)
+                    add(1, R.id.DisplayLabel, CATEGORY_CONTAINER + index + 3, label.value)
                         .setCheckable(true)
-                        .setChecked(baseModel.currentLabel == label)
+                        .setChecked(baseModel.currentLabel == label.value)
                         .setVisible(index < maxLabelsToDisplay)
                         .setIcon(R.drawable.label)
                         .setOnMenuItemClickListener {
-                            navigateToLabel(label)
+                            navigateToLabel(label.value)
                             false
                         }
                 }
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/LabelsFragment.kt b/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/LabelsFragment.kt
index 46e4a9f2..6ccc0491 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/LabelsFragment.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/LabelsFragment.kt
@@ -11,6 +11,8 @@ import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.philkes.notallyx.R
 import com.philkes.notallyx.data.model.Label
@@ -32,6 +34,7 @@ class LabelsFragment : Fragment(), LabelListener {
 
     private var labelAdapter: LabelAdapter? = null
     private var binding: FragmentNotesBinding? = null
+    private var itemTouchHelper: ItemTouchHelper? = null
 
     private val model: BaseNoteModel by activityViewModels()
 
@@ -39,6 +42,7 @@ class LabelsFragment : Fragment(), LabelListener {
         super.onDestroyView()
         binding = null
         labelAdapter = null
+        itemTouchHelper = null
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -48,11 +52,53 @@ class LabelsFragment : Fragment(), LabelListener {
             initListView(requireContext())
             adapter = labelAdapter
             binding?.ImageView?.setImageResource(R.drawable.label)
+            setupItemTouchHelper(this)
         }
 
         setupObserver()
     }
 
+    private fun setupItemTouchHelper(recyclerView: RecyclerView) {
+        val itemTouchHelperCallback =
+            object : ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP or ItemTouchHelper.DOWN, 0) {
+                override fun onMove(
+                    recyclerView: RecyclerView,
+                    viewHolder: RecyclerView.ViewHolder,
+                    target: RecyclerView.ViewHolder,
+                ): Boolean {
+                    val fromPosition = viewHolder.bindingAdapterPosition
+                    val toPosition = target.bindingAdapterPosition
+                    labelAdapter?.onItemMove(fromPosition, toPosition)
+                    return true
+                }
+
+                override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {}
+
+                override fun isLongPressDragEnabled(): Boolean = true
+
+                override fun clearView(
+                    recyclerView: RecyclerView,
+                    viewHolder: RecyclerView.ViewHolder,
+                ) {
+                    super.clearView(recyclerView, viewHolder)
+                    labelAdapter?.currentList?.let { list ->
+                        val size = list.size
+                        val updatedLabels =
+                            list.mapIndexed { index, labelData ->
+                                Label(labelData.value, size - 1 - index)
+                            }
+                        model.updateLabels(updatedLabels)
+                    }
+                }
+            }
+        itemTouchHelper = ItemTouchHelper(itemTouchHelperCallback)
+        itemTouchHelper?.attachToRecyclerView(recyclerView)
+    }
+
+    override fun onStartDrag(viewHolder: RecyclerView.ViewHolder) {
+        itemTouchHelper?.startDrag(viewHolder)
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -68,30 +114,32 @@ class LabelsFragment : Fragment(), LabelListener {
     }
 
     override fun onClick(position: Int) {
-        labelAdapter?.currentList?.get(position)?.let { (label, _) ->
+        labelAdapter?.currentList?.get(position)?.let { labelData ->
             val bundle = Bundle()
-            bundle.putString(EXTRA_DISPLAYED_LABEL, label)
+            bundle.putString(EXTRA_DISPLAYED_LABEL, labelData.value)
             findNavController().navigate(R.id.LabelsToDisplayLabel, bundle)
         }
     }
 
     override fun onEdit(position: Int) {
-        labelAdapter?.currentList?.get(position)?.let { (label, _) ->
-            displayEditLabelDialog(label, model)
+        labelAdapter?.currentList?.get(position)?.let { labelData ->
+            displayEditLabelDialog(labelData.value, model)
         }
     }
 
     override fun onDelete(position: Int) {
-        labelAdapter?.currentList?.get(position)?.let { (label, _) -> confirmDeletion(label) }
+        labelAdapter?.currentList?.get(position)?.let { labelData ->
+            confirmDeletion(labelData.value)
+        }
     }
 
     override fun onToggleVisibility(position: Int) {
         labelAdapter?.currentList?.get(position)?.let { value ->
             val hiddenLabels = model.preferences.labelsHidden.value.toMutableSet()
             if (value.visibleInNavigation) {
-                hiddenLabels.add(value.label)
+                hiddenLabels.add(value.value)
             } else {
-                hiddenLabels.remove(value.label)
+                hiddenLabels.remove(value.value)
             }
             model.savePreference(model.preferences.labelsHidden, hiddenLabels)
 
@@ -105,7 +153,10 @@ class LabelsFragment : Fragment(), LabelListener {
     private fun setupObserver() {
         model.labels.observe(viewLifecycleOwner) { labels ->
             val hiddenLabels = model.preferences.labelsHidden.value
-            val labelsData = labels.map { label -> LabelData(label, !hiddenLabels.contains(label)) }
+            val labelsData =
+                labels.map { label ->
+                    LabelData(label.value, !hiddenLabels.contains(label.value), label.order)
+                }
             labelAdapter?.submitList(labelsData)
             binding?.ImageView?.isVisible = labels.isEmpty()
         }
@@ -122,8 +173,7 @@ class LabelsFragment : Fragment(), LabelListener {
             .setPositiveButton(R.string.save) { dialog, _ ->
                 val value = dialogBinding.EditText.text.toString().trim()
                 if (value.isNotEmpty()) {
-                    val label = Label(value)
-                    model.insertLabel(label) { success: Boolean ->
+                    model.insertLabel(value) { success: Boolean ->
                         if (success) {
                             dialog.dismiss()
                         } else {
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/settings/SettingsFragment.kt b/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/settings/SettingsFragment.kt
index 54940322..622ff18c 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/settings/SettingsFragment.kt
@@ -407,7 +407,7 @@ class SettingsFragment : Fragment() {
             binding.StartView.setupStartView(
                 startView,
                 startViewValue,
-                labelsValue,
+                labelsValue?.map { it.value },
                 requireContext(),
                 layoutInflater,
             ) { newValue ->
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/activity/note/SelectLabelsActivity.kt b/app/src/main/java/com/philkes/notallyx/presentation/activity/note/SelectLabelsActivity.kt
index c68b1864..4a7892ad 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/activity/note/SelectLabelsActivity.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/activity/note/SelectLabelsActivity.kt
@@ -11,7 +11,6 @@ import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.philkes.notallyx.R
-import com.philkes.notallyx.data.model.Label
 import com.philkes.notallyx.databinding.ActivityLabelBinding
 import com.philkes.notallyx.databinding.DialogInputBinding
 import com.philkes.notallyx.presentation.activity.LockedActivity
@@ -107,8 +106,7 @@ class SelectLabelsActivity : LockedActivity<ActivityLabelBinding>() {
             .setPositiveButton(R.string.save) { dialog, _ ->
                 val value = binding.EditText.text.toString().trim()
                 if (value.isNotEmpty()) {
-                    val label = Label(value)
-                    baseModel.insertLabel(label) { success ->
+                    baseModel.insertLabel(value) { success ->
                         if (success) {
                             dialog.dismiss()
                         } else showToast(R.string.label_exists)
@@ -124,10 +122,10 @@ class SelectLabelsActivity : LockedActivity<ActivityLabelBinding>() {
             if (position != -1) {
                 val label = labelAdapter.currentList[position]
                 if (checked) {
-                    if (!selectedLabels.contains(label)) {
-                        selectedLabels.add(label)
+                    if (!selectedLabels.contains(label.value)) {
+                        selectedLabels.add(label.value)
                     }
-                } else selectedLabels.remove(label)
+                } else selectedLabels.remove(label.value)
             }
         }
 
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/LabelAdapter.kt b/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/LabelAdapter.kt
index 3698e43e..f8e86590 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/LabelAdapter.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/LabelAdapter.kt
@@ -19,9 +19,17 @@ class LabelAdapter(private val listener: LabelListener) :
         val binding = RecyclerLabelBinding.inflate(inflater, parent, false)
         return LabelVH(binding, listener)
     }
+
+    fun onItemMove(fromPosition: Int, toPosition: Int): List<LabelData> {
+        val list = currentList.toMutableList()
+        val fromLabel = list.removeAt(fromPosition)
+        list.add(toPosition, fromLabel)
+        submitList(list)
+        return list
+    }
 }
 
-data class LabelData(val label: String, var visibleInNavigation: Boolean)
+data class LabelData(val value: String, var visibleInNavigation: Boolean, val order: Int)
 
 private object DiffCallback : DiffUtil.ItemCallback<LabelData>() {
 
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/LabelListener.kt b/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/LabelListener.kt
index 1cfa4570..c3512c92 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/LabelListener.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/LabelListener.kt
@@ -1,7 +1,11 @@
 package com.philkes.notallyx.presentation.view.main.label
 
+import androidx.recyclerview.widget.RecyclerView
+
 interface LabelListener {
 
+    fun onStartDrag(viewHolder: RecyclerView.ViewHolder)
+
     fun onClick(position: Int)
 
     fun onEdit(position: Int)
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/LabelVH.kt b/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/LabelVH.kt
index dbba4775..2e79dbcd 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/LabelVH.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/LabelVH.kt
@@ -1,15 +1,25 @@
 package com.philkes.notallyx.presentation.view.main.label
 
+import android.annotation.SuppressLint
 import androidx.recyclerview.widget.RecyclerView
 import com.philkes.notallyx.R
 import com.philkes.notallyx.databinding.RecyclerLabelBinding
 
+@SuppressLint("ClickableViewAccessibility")
 class LabelVH(private val binding: RecyclerLabelBinding, listener: LabelListener) :
     RecyclerView.ViewHolder(binding.root) {
 
     init {
         binding.apply {
             LabelText.setOnClickListener { listener.onClick(absoluteAdapterPosition) }
+            LabelText.setOnLongClickListener { _ ->
+                listener.onStartDrag(this@LabelVH)
+                false
+            }
+            DragHandle.setOnLongClickListener { _ ->
+                listener.onStartDrag(this@LabelVH)
+                false
+            }
             EditButton.setOnClickListener { listener.onEdit(absoluteAdapterPosition) }
             DeleteButton.setOnClickListener { listener.onDelete(absoluteAdapterPosition) }
             VisibilityButton.setOnClickListener {
@@ -19,7 +29,7 @@ class LabelVH(private val binding: RecyclerLabelBinding, listener: LabelListener
     }
 
     fun bind(value: LabelData) {
-        binding.LabelText.text = value.label
+        binding.LabelText.text = value.value
         binding.VisibilityButton.setImageResource(
             if (value.visibleInNavigation) R.drawable.visibility else R.drawable.visibility_off
         )
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/SelectableLabelAdapter.kt b/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/SelectableLabelAdapter.kt
index ea48f027..cce09fb2 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/SelectableLabelAdapter.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/SelectableLabelAdapter.kt
@@ -2,18 +2,19 @@ package com.philkes.notallyx.presentation.view.main.label
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
+import com.philkes.notallyx.data.model.Label
 import com.philkes.notallyx.databinding.RecyclerSelectableLabelBinding
-import com.philkes.notallyx.presentation.view.misc.StringDiffCallback
 
 class SelectableLabelAdapter(private val selectedLabels: List<String>) :
-    ListAdapter<String, SelectableLabelVH>(StringDiffCallback()) {
+    ListAdapter<Label, SelectableLabelVH>(LabelDiffCallback()) {
 
     var onChecked: ((position: Int, checked: Boolean) -> Unit)? = null
 
     override fun onBindViewHolder(holder: SelectableLabelVH, position: Int) {
         val label = getItem(position)
-        holder.bind(label, selectedLabels.contains(label))
+        holder.bind(label, selectedLabels.contains(label.value))
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SelectableLabelVH {
@@ -22,3 +23,14 @@ class SelectableLabelAdapter(private val selectedLabels: List<String>) :
         return SelectableLabelVH(binding, requireNotNull(onChecked, { "onChecked is null" }))
     }
 }
+
+class LabelDiffCallback() : DiffUtil.ItemCallback<Label>() {
+
+    override fun areItemsTheSame(oldItem: Label, newItem: Label): Boolean {
+        return oldItem == newItem
+    }
+
+    override fun areContentsTheSame(oldItem: Label, newItem: Label): Boolean {
+        return oldItem.value == newItem.value
+    }
+}
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/SelectableLabelVH.kt b/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/SelectableLabelVH.kt
index 23d1f673..9fcaa78d 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/SelectableLabelVH.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/SelectableLabelVH.kt
@@ -1,6 +1,7 @@
 package com.philkes.notallyx.presentation.view.main.label
 
 import androidx.recyclerview.widget.RecyclerView
+import com.philkes.notallyx.data.model.Label
 import com.philkes.notallyx.databinding.RecyclerSelectableLabelBinding
 
 class SelectableLabelVH(
@@ -14,9 +15,9 @@ class SelectableLabelVH(
         }
     }
 
-    fun bind(value: String, checked: Boolean) {
+    fun bind(label: Label, checked: Boolean) {
         binding.root.apply {
-            text = value
+            text = label.value
             isChecked = checked
         }
     }
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/viewmodel/BaseNoteModel.kt b/app/src/main/java/com/philkes/notallyx/presentation/viewmodel/BaseNoteModel.kt
index 1c23b019..5cb412b1 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/viewmodel/BaseNoteModel.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/viewmodel/BaseNoteModel.kt
@@ -111,7 +111,7 @@ class BaseNoteModel(private val app: Application) : AndroidViewModel(app) {
 
     lateinit var selectedExportMimeType: ExportMimeType
 
-    var labels: LiveData<List<String>> = NotNullLiveData(mutableListOf())
+    var labels: LiveData<List<Label>> = NotNullLiveData(mutableListOf())
     var reminders: LiveData<List<NoteReminder>> = NotNullLiveData(mutableListOf())
     private var allNotes: LiveData<List<BaseNote>>? = NotNullLiveData(mutableListOf())
     private var allNotesObserver: Observer<List<BaseNote>>? = null
@@ -209,7 +209,12 @@ class BaseNoteModel(private val app: Application) : AndroidViewModel(app) {
             val previousLabels = app.getPreviousLabels()
             if (previousNotes.isNotEmpty() || previousLabels.isNotEmpty()) {
                 database.withTransaction {
-                    labelDao.insert(previousLabels)
+                    val maxOrder = labelDao.getMaxOrder() ?: -1
+                    labelDao.insert(
+                        previousLabels.mapIndexed { index, label ->
+                            Label(label.value, maxOrder + 1 + index)
+                        }
+                    )
                     baseNoteDao.insertSafe(app, previousNotes)
                     app.clearAllLabels()
                     app.clearAllFolders()
@@ -771,8 +776,15 @@ class BaseNoteModel(private val app: Application) : AndroidViewModel(app) {
         }
     }
 
-    fun insertLabel(label: Label, onComplete: (success: Boolean) -> Unit) =
-        executeAsyncWithCallback({ labelDao.insert(label) }, onComplete)
+    fun insertLabel(label: String, onComplete: (success: Boolean) -> Unit) =
+        executeAsyncWithCallback(
+            { labelDao.insert(Label(label, (labelDao.getMaxOrder() ?: -1) + 1)) },
+            onComplete,
+        )
+
+    fun updateLabels(labels: List<Label>) {
+        viewModelScope.launch(Dispatchers.IO) { labelDao.update(labels) }
+    }
 
     fun updateLabel(oldValue: String, newValue: String, onComplete: (success: Boolean) -> Unit) {
         executeAsyncWithCallback({ commonDao.updateLabel(oldValue, newValue) }, onComplete)
diff --git a/app/src/main/java/com/philkes/notallyx/utils/backup/ImportExtensions.kt b/app/src/main/java/com/philkes/notallyx/utils/backup/ImportExtensions.kt
index 05237253..61c38623 100644
--- a/app/src/main/java/com/philkes/notallyx/utils/backup/ImportExtensions.kt
+++ b/app/src/main/java/com/philkes/notallyx/utils/backup/ImportExtensions.kt
@@ -281,7 +281,9 @@ private fun ContextWrapper.importFiles(
 
 private fun Cursor.toLabel(): Label {
     val value = this.getString(getColumnIndexOrThrow("value"))
-    return Label(value)
+    val orderIndex = getColumnIndex("order")
+    val order = if (orderIndex != -1) getInt(orderIndex) else 0
+    return Label(value, order)
 }
 
 private fun Cursor.toBaseNote(sourceDb: SQLiteDatabase): BaseNote {
diff --git a/app/src/main/java/com/philkes/notallyx/utils/backup/MigrationsExtensions.kt b/app/src/main/java/com/philkes/notallyx/utils/backup/MigrationsExtensions.kt
index 4653587f..83a374fe 100644
--- a/app/src/main/java/com/philkes/notallyx/utils/backup/MigrationsExtensions.kt
+++ b/app/src/main/java/com/philkes/notallyx/utils/backup/MigrationsExtensions.kt
@@ -24,7 +24,11 @@ fun Context.getPreviousLabels(): List<Label> {
             preferences.getStringSet("labelItems", emptySet()),
             { "preference do not have 'labelItems' String set" },
         )
-    return labels.map { value -> Label(value) }
+    // Initialize order starting from 0, since this is for a legacy migration
+    // where we presumably start with an empty or fresh database.
+    // If this is called when labels already exist, BaseNoteModel.init (where it's called)
+    // should ideally handle the order offset.
+    return labels.sorted().mapIndexed { index, value -> Label(value, index) }
 }
 
 fun Context.getPreviousNotes(): List<BaseNote> {
diff --git a/app/src/main/java/com/philkes/notallyx/utils/backup/XmlParserExtensions.kt b/app/src/main/java/com/philkes/notallyx/utils/backup/XmlParserExtensions.kt
index 6f186903..126fdaef 100644
--- a/app/src/main/java/com/philkes/notallyx/utils/backup/XmlParserExtensions.kt
+++ b/app/src/main/java/com/philkes/notallyx/utils/backup/XmlParserExtensions.kt
@@ -36,7 +36,13 @@ fun InputStream.readAsBackup(): Pair<List<BaseNote>, List<Label>> {
                 "deleted-notes" -> parser.parseBaseNoteList(parser.name, baseNotes, Folder.DELETED)
                 "archived-notes" ->
                     parser.parseBaseNoteList(parser.name, baseNotes, Folder.ARCHIVED)
-                "label" -> labels.add(Label(parser.nextText()))
+                "label" -> {
+                    val value = parser.nextText()
+                    // Initialize order based on current list size to maintain sequence
+                    // We will re-adjust these in CommonDao during insertion to avoid overlaps with
+                    // existing labels
+                    labels.add(Label(value, labels.size))
+                }
             }
         }
     }
diff --git a/app/src/main/res/layout-v26/recycler_label.xml b/app/src/main/res/layout-v26/recycler_label.xml
index 25782b35..8023bfc4 100644
--- a/app/src/main/res/layout-v26/recycler_label.xml
+++ b/app/src/main/res/layout-v26/recycler_label.xml
@@ -5,6 +5,19 @@
   android:layout_height="wrap_content"
   android:orientation="horizontal">
 
+  <ImageView
+    android:id="@+id/DragHandle"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_vertical"
+    android:padding="8dp"
+    android:src="@drawable/drag_handle"
+    app:tint="?attr/colorControlNormal"
+    android:contentDescription="@null"
+    android:clickable="false"
+    android:longClickable="false"
+    android:focusable="false" />
+
   <TextView
     android:id="@+id/LabelText"
     android:layout_width="0dp"
@@ -13,7 +26,11 @@
     android:ellipsize="end"
     android:maxLines="1"
     android:padding="16dp"
-    android:textAppearance="?attr/textAppearanceBodyLarge" />
+    android:layout_marginStart="8dp"
+    android:textAppearance="?attr/textAppearanceBodyLarge"
+      android:clickable="false"
+      android:longClickable="false"
+      android:focusable="false" />
 
   <ImageButton
     android:id="@+id/VisibilityButton"
diff --git a/app/src/main/res/layout/recycler_label.xml b/app/src/main/res/layout/recycler_label.xml
index 24440cb6..c4422cfd 100644
--- a/app/src/main/res/layout/recycler_label.xml
+++ b/app/src/main/res/layout/recycler_label.xml
@@ -5,6 +5,16 @@
   android:layout_height="wrap_content"
   android:orientation="horizontal">
 
+  <ImageView
+    android:id="@+id/DragHandle"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_vertical"
+    android:padding="8dp"
+    android:src="@drawable/drag_handle"
+    app:tint="?attr/colorControlNormal"
+    android:contentDescription="@null" />
+
   <TextView
     android:id="@+id/LabelText"
     android:layout_width="0dp"
@@ -13,6 +23,7 @@
     android:ellipsize="end"
     android:maxLines="1"
     android:padding="16dp"
+    android:layout_marginStart="8dp"
     android:textAppearance="?attr/textAppearanceBodyLarge" />
 
   <ImageButton

From 30340fce647f6cf2ef07e636837a1b59de6a1753 Mon Sep 17 00:00:00 2001
From: Crustack <crustackk@gmail.com>
Date: Sun, 12 Apr 2026 19:06:53 +0200
Subject: [PATCH 3/5] PR Fixes

---
 .../activity/main/fragment/LabelsFragment.kt  |  7 ++-
 .../view/main/label/LabelAdapter.kt           |  7 +++
 .../presentation/view/main/label/LabelVH.kt   |  4 +-
 .../view/main/label/SelectableLabelAdapter.kt |  2 +-
 .../presentation/viewmodel/BaseNoteModel.kt   | 23 --------
 .../utils/backup/MigrationsExtensions.kt      | 58 -------------------
 .../main/res/layout-v26/recycler_label.xml    |  2 +-
 app/src/main/res/layout/recycler_label.xml    |  2 +-
 8 files changed, 17 insertions(+), 88 deletions(-)
 delete mode 100644 app/src/main/java/com/philkes/notallyx/utils/backup/MigrationsExtensions.kt

diff --git a/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/LabelsFragment.kt b/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/LabelsFragment.kt
index 6ccc0491..84e7fb20 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/LabelsFragment.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/LabelsFragment.kt
@@ -61,6 +61,9 @@ class LabelsFragment : Fragment(), LabelListener {
     private fun setupItemTouchHelper(recyclerView: RecyclerView) {
         val itemTouchHelperCallback =
             object : ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP or ItemTouchHelper.DOWN, 0) {
+
+                private var currentList = labelAdapter?.currentList
+
                 override fun onMove(
                     recyclerView: RecyclerView,
                     viewHolder: RecyclerView.ViewHolder,
@@ -68,7 +71,7 @@ class LabelsFragment : Fragment(), LabelListener {
                 ): Boolean {
                     val fromPosition = viewHolder.bindingAdapterPosition
                     val toPosition = target.bindingAdapterPosition
-                    labelAdapter?.onItemMove(fromPosition, toPosition)
+                    currentList = labelAdapter?.onItemMove(fromPosition, toPosition)
                     return true
                 }
 
@@ -81,7 +84,7 @@ class LabelsFragment : Fragment(), LabelListener {
                     viewHolder: RecyclerView.ViewHolder,
                 ) {
                     super.clearView(recyclerView, viewHolder)
-                    labelAdapter?.currentList?.let { list ->
+                    currentList?.let { list ->
                         val size = list.size
                         val updatedLabels =
                             list.mapIndexed { index, labelData ->
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/LabelAdapter.kt b/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/LabelAdapter.kt
index f8e86590..12511115 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/LabelAdapter.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/LabelAdapter.kt
@@ -21,6 +21,13 @@ class LabelAdapter(private val listener: LabelListener) :
     }
 
     fun onItemMove(fromPosition: Int, toPosition: Int): List<LabelData> {
+        if (
+            fromPosition !in currentList.indices ||
+                toPosition !in currentList.indices ||
+                fromPosition == toPosition
+        ) {
+            return currentList
+        }
         val list = currentList.toMutableList()
         val fromLabel = list.removeAt(fromPosition)
         list.add(toPosition, fromLabel)
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/LabelVH.kt b/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/LabelVH.kt
index 2e79dbcd..a8a034a3 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/LabelVH.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/LabelVH.kt
@@ -14,11 +14,11 @@ class LabelVH(private val binding: RecyclerLabelBinding, listener: LabelListener
             LabelText.setOnClickListener { listener.onClick(absoluteAdapterPosition) }
             LabelText.setOnLongClickListener { _ ->
                 listener.onStartDrag(this@LabelVH)
-                false
+                true
             }
             DragHandle.setOnLongClickListener { _ ->
                 listener.onStartDrag(this@LabelVH)
-                false
+                true
             }
             EditButton.setOnClickListener { listener.onEdit(absoluteAdapterPosition) }
             DeleteButton.setOnClickListener { listener.onDelete(absoluteAdapterPosition) }
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/SelectableLabelAdapter.kt b/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/SelectableLabelAdapter.kt
index cce09fb2..18157af8 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/SelectableLabelAdapter.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/view/main/label/SelectableLabelAdapter.kt
@@ -31,6 +31,6 @@ class LabelDiffCallback() : DiffUtil.ItemCallback<Label>() {
     }
 
     override fun areContentsTheSame(oldItem: Label, newItem: Label): Boolean {
-        return oldItem.value == newItem.value
+        return oldItem.value == newItem.value && oldItem.order == newItem.order
     }
 }
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/viewmodel/BaseNoteModel.kt b/app/src/main/java/com/philkes/notallyx/presentation/viewmodel/BaseNoteModel.kt
index 5cb412b1..2f0cbceb 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/viewmodel/BaseNoteModel.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/viewmodel/BaseNoteModel.kt
@@ -17,7 +17,6 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
 import androidx.lifecycle.map
 import androidx.lifecycle.viewModelScope
-import androidx.room.withTransaction
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.philkes.notallyx.R
 import com.philkes.notallyx.data.NotallyDatabase
@@ -64,16 +63,12 @@ import com.philkes.notallyx.presentation.viewmodel.progress.ExportNotesProgress
 import com.philkes.notallyx.utils.ActionMode
 import com.philkes.notallyx.utils.Cache
 import com.philkes.notallyx.utils.MIME_TYPE_JSON
-import com.philkes.notallyx.utils.backup.clearAllFolders
-import com.philkes.notallyx.utils.backup.clearAllLabels
 import com.philkes.notallyx.utils.backup.copyDatabase
 import com.philkes.notallyx.utils.backup.exportAsZip
 import com.philkes.notallyx.utils.backup.exportPdfFile
 import com.philkes.notallyx.utils.backup.exportPdfFileFolder
 import com.philkes.notallyx.utils.backup.exportPlainTextFile
 import com.philkes.notallyx.utils.backup.exportPlainTextFileFolder
-import com.philkes.notallyx.utils.backup.getPreviousLabels
-import com.philkes.notallyx.utils.backup.getPreviousNotes
 import com.philkes.notallyx.utils.backup.importZip
 import com.philkes.notallyx.utils.backup.readAsBackup
 import com.philkes.notallyx.utils.cancelPinAndReminders
@@ -203,24 +198,6 @@ class BaseNoteModel(private val app: Application) : AndroidViewModel(app) {
         } else {
             searchResults!!.baseNoteDao = baseNoteDao
         }
-
-        viewModelScope.launch {
-            val previousNotes = app.getPreviousNotes()
-            val previousLabels = app.getPreviousLabels()
-            if (previousNotes.isNotEmpty() || previousLabels.isNotEmpty()) {
-                database.withTransaction {
-                    val maxOrder = labelDao.getMaxOrder() ?: -1
-                    labelDao.insert(
-                        previousLabels.mapIndexed { index, label ->
-                            Label(label.value, maxOrder + 1 + index)
-                        }
-                    )
-                    baseNoteDao.insertSafe(app, previousNotes)
-                    app.clearAllLabels()
-                    app.clearAllFolders()
-                }
-            }
-        }
     }
 
     private fun initBaseNotes(labelsHidden: Set<String>) {
diff --git a/app/src/main/java/com/philkes/notallyx/utils/backup/MigrationsExtensions.kt b/app/src/main/java/com/philkes/notallyx/utils/backup/MigrationsExtensions.kt
deleted file mode 100644
index 83a374fe..00000000
--- a/app/src/main/java/com/philkes/notallyx/utils/backup/MigrationsExtensions.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.philkes.notallyx.utils.backup
-
-import android.content.Context
-import android.content.SharedPreferences
-import com.philkes.notallyx.data.model.BaseNote
-import com.philkes.notallyx.data.model.Folder
-import com.philkes.notallyx.data.model.Label
-import java.io.File
-
-// Backwards compatibility from v3.2 to v3.3
-
-fun Context.clearAllLabels() = getLabelsPreferences().edit().clear().commit()
-
-fun Context.clearAllFolders() {
-    getNotePath().listFiles()?.forEach { file -> file.delete() }
-    getDeletedPath().listFiles()?.forEach { file -> file.delete() }
-    getArchivedPath().listFiles()?.forEach { file -> file.delete() }
-}
-
-fun Context.getPreviousLabels(): List<Label> {
-    val preferences = getLabelsPreferences()
-    val labels =
-        requireNotNull(
-            preferences.getStringSet("labelItems", emptySet()),
-            { "preference do not have 'labelItems' String set" },
-        )
-    // Initialize order starting from 0, since this is for a legacy migration
-    // where we presumably start with an empty or fresh database.
-    // If this is called when labels already exist, BaseNoteModel.init (where it's called)
-    // should ideally handle the order offset.
-    return labels.sorted().mapIndexed { index, value -> Label(value, index) }
-}
-
-fun Context.getPreviousNotes(): List<BaseNote> {
-    val list = ArrayList<BaseNote>()
-    getNotePath().listFiles()?.mapTo(list) { file -> file.toBaseNote(Folder.NOTES) }
-    getDeletedPath().listFiles()?.mapTo(list) { file -> file.toBaseNote(Folder.DELETED) }
-    getArchivedPath().listFiles()?.mapTo(list) { file -> file.toBaseNote(Folder.ARCHIVED) }
-    return list
-}
-
-private fun Context.getNotePath() = getFolder("notes")
-
-private fun Context.getDeletedPath() = getFolder("deleted")
-
-private fun Context.getArchivedPath() = getFolder("archived")
-
-private fun Context.getLabelsPreferences(): SharedPreferences {
-    return getSharedPreferences("labelsPreferences", Context.MODE_PRIVATE)
-}
-
-private fun Context.getFolder(name: String): File {
-    val folder = File(filesDir, name)
-    if (!folder.exists()) {
-        folder.mkdir()
-    }
-    return folder
-}
diff --git a/app/src/main/res/layout-v26/recycler_label.xml b/app/src/main/res/layout-v26/recycler_label.xml
index 8023bfc4..f9069267 100644
--- a/app/src/main/res/layout-v26/recycler_label.xml
+++ b/app/src/main/res/layout-v26/recycler_label.xml
@@ -13,7 +13,7 @@
     android:padding="8dp"
     android:src="@drawable/drag_handle"
     app:tint="?attr/colorControlNormal"
-    android:contentDescription="@null"
+    android:contentDescription="@string/drag_handle"
     android:clickable="false"
     android:longClickable="false"
     android:focusable="false" />
diff --git a/app/src/main/res/layout/recycler_label.xml b/app/src/main/res/layout/recycler_label.xml
index c4422cfd..536c5927 100644
--- a/app/src/main/res/layout/recycler_label.xml
+++ b/app/src/main/res/layout/recycler_label.xml
@@ -13,7 +13,7 @@
     android:padding="8dp"
     android:src="@drawable/drag_handle"
     app:tint="?attr/colorControlNormal"
-    android:contentDescription="@null" />
+    android:contentDescription="@string/drag_handle" />
 
   <TextView
     android:id="@+id/LabelText"

From 9b6d08a4a2bed0fb2cf81078f3169af52d6f6f57 Mon Sep 17 00:00:00 2001
From: Crustack <crustackk@gmail.com>
Date: Sun, 12 Apr 2026 19:13:45 +0200
Subject: [PATCH 4/5] Update
 app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/LabelsFragment.kt

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 .../presentation/activity/main/fragment/LabelsFragment.kt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/LabelsFragment.kt b/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/LabelsFragment.kt
index 84e7fb20..d83498e2 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/LabelsFragment.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/LabelsFragment.kt
@@ -63,6 +63,7 @@ class LabelsFragment : Fragment(), LabelListener {
             object : ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP or ItemTouchHelper.DOWN, 0) {
 
                 private var currentList = labelAdapter?.currentList
+                private var didReorder = false
 
                 override fun onMove(
                     recyclerView: RecyclerView,
@@ -72,7 +73,8 @@ class LabelsFragment : Fragment(), LabelListener {
                     val fromPosition = viewHolder.bindingAdapterPosition
                     val toPosition = target.bindingAdapterPosition
                     currentList = labelAdapter?.onItemMove(fromPosition, toPosition)
-                    return true
+                    didReorder = fromPosition != toPosition
+                    return didReorder
                 }
 
                 override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {}
@@ -84,6 +86,8 @@ class LabelsFragment : Fragment(), LabelListener {
                     viewHolder: RecyclerView.ViewHolder,
                 ) {
                     super.clearView(recyclerView, viewHolder)
+                    if (!didReorder) return
+
                     currentList?.let { list ->
                         val size = list.size
                         val updatedLabels =
@@ -92,6 +96,8 @@ class LabelsFragment : Fragment(), LabelListener {
                             }
                         model.updateLabels(updatedLabels)
                     }
+                    didReorder = false
+                }
                 }
             }
         itemTouchHelper = ItemTouchHelper(itemTouchHelperCallback)

From 4b9875a3e958ad3bcb3fe756832a7457a26f55af Mon Sep 17 00:00:00 2001
From: Crustack <crustackk@gmail.com>
Date: Sun, 12 Apr 2026 19:14:16 +0200
Subject: [PATCH 5/5] PR Fixes

---
 .../presentation/activity/main/fragment/LabelsFragment.kt        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/LabelsFragment.kt b/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/LabelsFragment.kt
index d83498e2..a832ade0 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/LabelsFragment.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/LabelsFragment.kt
@@ -98,7 +98,6 @@ class LabelsFragment : Fragment(), LabelListener {
                     }
                     didReorder = false
                 }
-                }
             }
         itemTouchHelper = ItemTouchHelper(itemTouchHelperCallback)
         itemTouchHelper?.attachToRecyclerView(recyclerView)