Updated dependencies

Author: OmGodse

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "com.omgodse.notally"
         minSdk 21
         targetSdk 30
-        versionCode 41
-        versionName "4.6"
+        versionCode 42
+        versionName "4.7"
         resConfigs "en", "ca", "cs", "da", "de", "es", "fr", "hu", "in", "it", "ja", "nb", "nl", "nn", "pl", "pt-rBR", "pt-rPT", "ru", "sk", "sv", "tl", "tr", "uk", "zh-rCN"
         vectorDrawables.generatedDensities = []
     }
@@ -44,7 +44,7 @@ android {
 
 dependencies {
     final def navVersion = "2.3.5"
-    final def roomVersion = "2.4.1"
+    final def roomVersion = "2.4.2"
 
     implementation "androidx.preference:preference-ktx:1.1.1"
 

app/src/main/java/com/omgodse/notally/miscellaneous/Extensions.kt

@@ -1,8 +1,6 @@
 package com.omgodse.notally.miscellaneous
 
-import android.content.Context
 import android.graphics.Typeface
-import android.os.Build
 import android.text.Editable
 import android.text.InputType
 import android.text.Spannable
@@ -11,55 +9,42 @@ import android.text.style.StrikethroughSpan
 import android.text.style.StyleSpan
 import android.text.style.TypefaceSpan
 import android.text.style.URLSpan
-import android.view.*
+import android.view.KeyEvent
+import android.view.Menu
+import android.view.MenuItem
 import android.view.inputmethod.EditorInfo
 import android.widget.EditText
-import com.google.android.material.chip.ChipGroup
 import com.omgodse.notally.activities.TakeNote
-import com.omgodse.notally.databinding.LabelBinding
-import com.omgodse.notally.room.ListItem
 import com.omgodse.notally.room.SpanRepresentation
-import java.util.*
-
-fun List<ListItem>?.getBody() = buildString {
-    this@getBody?.forEachIndexed { index, (body) ->
-        appendLine("${(index + 1)}) $body")
-    }
-}
-
-
-fun ChipGroup.bindLabels(labels: HashSet<String>) {
-    if (labels.isEmpty()) {
-        visibility = View.GONE
-    } else {
-        visibility = View.VISIBLE
-        removeAllViews()
-        val inflater = LayoutInflater.from(context)
-        for (label in labels) {
-            val view = LabelBinding.inflate(inflater, this, true).root
-            view.text = label
-        }
-    }
-}
 
+/**
+ * For some reason, this method crashes sometimes with an
+ * IndexOutOfBoundsException that I've not been able to replicate.
+ * When this happens, to prevent the entire app from crashing and becoming
+ * unusable, the exception is suppressed.
+ */
 fun String.applySpans(representations: List<SpanRepresentation>): Editable {
     val editable = Editable.Factory.getInstance().newEditable(this)
     representations.forEach { (bold, link, italic, monospace, strikethrough, start, end) ->
-        if (bold) {
-            editable.setSpan(StyleSpan(Typeface.BOLD), start, end)
-        }
-        if (italic) {
-            editable.setSpan(StyleSpan(Typeface.ITALIC), start, end)
-        }
-        if (link) {
-            val url = getURL(start, end)
-            editable.setSpan(URLSpan(url), start, end)
-        }
-        if (monospace) {
-            editable.setSpan(TypefaceSpan("monospace"), start, end)
-        }
-        if (strikethrough) {
-            editable.setSpan(StrikethroughSpan(), start, end)
+        try {
+            if (bold) {
+                editable.setSpan(StyleSpan(Typeface.BOLD), start, end)
+            }
+            if (italic) {
+                editable.setSpan(StyleSpan(Typeface.ITALIC), start, end)
+            }
+            if (link) {
+                val url = getURL(start, end)
+                editable.setSpan(URLSpan(url), start, end)
+            }
+            if (monospace) {
+                editable.setSpan(TypefaceSpan("monospace"), start, end)
+            }
+            if (strikethrough) {
+                editable.setSpan(StrikethroughSpan(), start, end)
+            }
+        } catch (exception: Exception) {
+            exception.printStackTrace()
         }
     }
     return editable
@@ -72,29 +57,13 @@ private fun String.getURL(start: Int, end: Int): String {
     } else TakeNote.getURLFrom(substring(start, length))
 }
 
-/**
- * For some reason, this method crashes sometimes with an
- * IndexOutOfBoundsException that I've not been able to replicate.
- * When this happens, to prevent the entire app from crashing and becoming
- * unusable, the exception is suppressed.
- */
 private fun Spannable.setSpan(span: Any, start: Int, end: Int) {
-    try {
-        if (end <= length) {
-            setSpan(span, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-        } else setSpan(span, start, length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-    } catch (exception: Exception) {
-        exception.printStackTrace()
-    }
+    if (end <= length) {
+        setSpan(span, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+    } else setSpan(span, start, length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
 }
 
 
-fun Context.getLocale(): Locale {
-    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-        resources.configuration.locales[0]
-    } else resources.configuration.locale
-}
-
 fun EditText.setOnNextAction(onNext: () -> Unit) {
     setRawInputType(InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES)
 

app/src/main/java/com/omgodse/notally/viewmodels/BaseNoteModel.kt

@@ -111,7 +111,7 @@ class BaseNoteModel(private val app: Application) : AndroidViewModel(app) {
     fun exportBackup(uri: Uri) {
         viewModelScope.launch {
             withContext(Dispatchers.IO) {
-                val labels = labelDao.getListOfAll().toHashSet()
+                val labels = labelDao.getListOfAll()
                 val baseNotes = baseNoteDao.getListFrom(Folder.NOTES)
                 val deletedNotes = baseNoteDao.getListFrom(Folder.DELETED)
                 val archivedNotes = baseNoteDao.getListFrom(Folder.ARCHIVED)
@@ -158,41 +158,36 @@ class BaseNoteModel(private val app: Application) : AndroidViewModel(app) {
 
 
     suspend fun getXMLFile(baseNote: BaseNote) = withContext(Dispatchers.IO) {
-        val name = getFileName(baseNote)
-        val file = File(getExportedPath(), "$name.xml")
+        val file = File(getExportedPath(), "Untitled.xml")
         val outputStream = FileOutputStream(file)
         XMLUtils.writeBaseNoteToStream(baseNote, outputStream)
         outputStream.close()
         file
     }
 
     suspend fun getJSONFile(baseNote: BaseNote) = withContext(Dispatchers.IO) {
-        val name = getFileName(baseNote)
-        val file = File(getExportedPath(), "$name.json")
+        val file = File(getExportedPath(), "Untitled.json")
         val json = getJSON(baseNote)
         file.writeText(json)
         file
     }
 
     suspend fun getTXTFile(baseNote: BaseNote, showDateCreated: Boolean) = withContext(Dispatchers.IO) {
-        val name = getFileName(baseNote)
-        val file = File(getExportedPath(), "$name.txt")
+        val file = File(getExportedPath(), "Untitled.txt")
         val text = getTXT(baseNote, showDateCreated)
         file.writeText(text)
         file
     }
 
     suspend fun getHTMLFile(baseNote: BaseNote, showDateCreated: Boolean) = withContext(Dispatchers.IO) {
-        val name = getFileName(baseNote)
-        val file = File(getExportedPath(), "$name.html")
+        val file = File(getExportedPath(), "Untitled.html")
         val html = getHTML(baseNote, showDateCreated)
         file.writeText(html)
         file
     }
 
     fun getPDFFile(baseNote: BaseNote, showDateCreated: Boolean, onResult: PostPDFGenerator.OnResult) {
-        val name = getFileName(baseNote)
-        val file = File(getExportedPath(), "$name.pdf")
+        val file = File(getExportedPath(), "Untitled.pdf")
         val html = getHTML(baseNote, showDateCreated)
         PostPDFGenerator.create(file, html, app, onResult)
     }
@@ -246,6 +241,7 @@ class BaseNoteModel(private val app: Application) : AndroidViewModel(app) {
 
         val jsonObject = JSONObject()
             .put("type", baseNote.type.name)
+            .put("color", baseNote.color.name)
             .put(XMLTags.Title, baseNote.title)
             .put(XMLTags.Pinned, baseNote.pinned)
             .put(XMLTags.DateCreated, baseNote.timestamp)

app/src/main/java/com/omgodse/notally/xml/Backup.kt

@@ -6,5 +6,5 @@ class Backup(
     val baseNotes: List<BaseNote>,
     val deletedNotes: List<BaseNote>,
     val archivedNotes: List<BaseNote>,
-    val labels: HashSet<String>
+    val labels: List<String>
 )

app/src/main/java/com/omgodse/notally/xml/XMLUtils.kt

@@ -28,7 +28,7 @@ object XMLUtils {
         var baseNotes = listOf<BaseNote>()
         var deletedNotes = listOf<BaseNote>()
         var archivedNotes = listOf<BaseNote>()
-        val labels = HashSet<String>()
+        val labels = ArrayList<String>()
 
         while (parser.next() != XmlPullParser.END_DOCUMENT) {
             if (parser.eventType == XmlPullParser.START_TAG) {

build.gradle

@@ -7,7 +7,7 @@ buildscript {
 
     dependencies {
         classpath "com.android.tools.build:gradle:7.0.4"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
     }
 }
 

fastlane/metadata/android/en-US/full_description.txt

@@ -4,7 +4,7 @@ Notally is a minimalistic note taking app with a beautiful material design and p
 
 Create lists to stay on track
 Pin notes to always keep them at the top
-Add labels to your notes for quick organisation
+Color and label your notes for quick organisation
 Archive notes to keep them around, but out of your way
 Create rich text notes with support for bold, italics, mono space and strike-through
 Add clickable links to notes with support for phone numbers, email addresses and web urls