Add setting to set default supplier. Make supplier & mfg editable dropdowns

Author: frmdstryr

app/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.jetbrains.kotlin.android)
+    alias(libs.plugins.jetbrains.kotlin.serialization)
     alias(libs.plugins.com.google.devtools.ksp)
     alias(libs.plugins.compose.compiler)
 }
@@ -13,8 +14,8 @@ android {
         applicationId = "com.codelv.inventory"
         minSdk = 24
         targetSdk = 34
-        versionCode = 8
-        versionName = "1.0.8"
+        versionCode = 9
+        versionName = "1.0.9"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -79,6 +80,7 @@ dependencies {
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.datastore)
     implementation(libs.androidx.datastore.android)
+    implementation(libs.kotlinx.serialization.json)
 
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)

app/proguard-rules.pro

@@ -21,3 +21,4 @@
 #-renamesourcefileattribute SourceFile
 
 -dontwarn org.jetbrains.annotations.**
+-dontwarn org.intellij.lang.annotations.Language

app/src/main/java/com/codelv/inventory/MainActivity.kt

@@ -9,6 +9,8 @@ import androidx.room.*
 import com.journeyapps.barcodescanner.ScanOptions
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
@@ -17,7 +19,6 @@ import java.io.OutputStream
 import java.io.InputStream
 import java.net.URLEncoder
 import java.util.*
-import java.util.concurrent.Callable
 import kotlin.math.max
 
 val USER_AGENTS = listOf(
@@ -594,6 +595,12 @@ interface PartManager {
 
     @Query("SELECT EXISTS(SELECT * FROM parts WHERE id = :id)")
     suspend fun withIdExists(id: Int): Boolean
+
+    @Query("SELECT DISTINCT supplier FROM parts ORDER BY supplier")
+    suspend fun distinctSuppliers(): List<String>
+
+    @Query("SELECT DISTINCT manufacturer FROM parts ORDER BY manufacturer")
+    suspend fun distinctManufacturers(): List<String>
 }
 
 @Dao
@@ -719,6 +726,10 @@ class AppViewModel(val database: AppDatabase) : ViewModel() {
     var parts: MutableList<Part> = mutableStateListOf();
     var scans: MutableList<Scan> = mutableStateListOf();
     var scanOptions: ScanOptions = ScanOptions();
+    var supplierOptions: MutableList<String> = mutableStateListOf();
+    var manufacturerOptions: MutableList<String> = mutableStateListOf();
+    var settings: Settings = Settings();
+
 
     init {
         scanOptions
@@ -737,9 +748,25 @@ class AppViewModel(val database: AppDatabase) : ViewModel() {
         load()
     }
 
+    suspend fun loadOptions() {
+        supplierOptions.clear()
+        supplierOptions.addAll(database.parts().distinctSuppliers().filter{ it.isNotBlank() })
+        Log.d("DB", "Distinct suppliers: ${supplierOptions}")
+        listOf("Arrow", "Digikey", "LCSC", "Mouser").forEach { supplier ->
+            if (supplierOptions.find{it.contains(supplier, ignoreCase=true)} == null) {
+                supplierOptions.add(supplier);
+            }
+        }
+
+        manufacturerOptions.clear()
+        manufacturerOptions.addAll(database.parts().distinctManufacturers().filter{ it.isNotBlank() })
+        Log.d("DB", "Distinct manufacturers: ${manufacturerOptions}")
+    }
+
     suspend fun load() {
         parts.addAll(database.parts().all())
         scans.addAll(database.scans().all())
+        loadOptions()
     }
 
     suspend fun addScan(scan: Scan): Boolean {
@@ -807,4 +834,16 @@ class AppViewModel(val database: AppDatabase) : ViewModel() {
     suspend fun importDb(context: Context, stream: InputStream): Long {
         return database.importDb(context, stream);
     }
+
+    suspend fun loadSettings(context: Context) {
+        this.settings = context.dataStore.data.first();
+        Log.d("DB", "Loaded settings ${this.settings}")
+    }
+
+    suspend fun saveSettings(context: Context) {
+        Log.d("DB", "Update settings ${this.settings}")
+        context.dataStore.updateData { this.settings };
+        Log.d("DB", "Save settings ${context.dataStore.data.first()}")
+    }
+
 }

app/src/main/java/com/codelv/inventory/Models.kt

@@ -0,0 +1,44 @@
+package com.codelv.inventory
+
+import android.content.Context
+import androidx.datastore.core.CorruptionException
+import androidx.datastore.core.DataStore
+import androidx.datastore.core.Serializer
+import androidx.datastore.dataStore
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import org.jsoup.SerializationException
+import java.io.InputStream
+import java.io.OutputStream
+
+@Serializable
+data class Settings(
+    var defaultSupplier: String = ""
+)
+
+object SettingsSerializer : Serializer<Settings> {
+
+    override val defaultValue: Settings = Settings()
+
+    override suspend fun readFrom(input: InputStream): Settings =
+        try {
+            Json.decodeFromString<Settings>(
+                input.readBytes().decodeToString()
+            )
+        } catch (serialization: SerializationException) {
+            throw CorruptionException("Unable to read Settings", serialization)
+        }
+
+    override suspend fun writeTo(t: Settings, output: OutputStream) {
+        output.write(
+            Json.encodeToString(t)
+                .encodeToByteArray()
+        )
+    }
+}
+
+val Context.dataStore: DataStore<Settings> by dataStore(
+    fileName = "settings.json",
+    serializer = SettingsSerializer,
+)

app/src/main/java/com/codelv/inventory/Settings.kt

@@ -3,5 +3,6 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.jetbrains.kotlin.android) apply false
+    alias(libs.plugins.jetbrains.kotlin.serialization) apply false
     alias(libs.plugins.com.google.devtools.ksp) apply false
 }

build.gradle.kts

@@ -3,6 +3,7 @@ agp = "8.13.1"
 kotlin = "2.0.21"
 ksp = "2.0.21-1.0.26"
 coreKtx = "1.13.1"
+json = "1.7.3"
 junit = "4.13.2"
 junitVersion = "1.2.1"
 espressoCore = "3.6.1"
@@ -17,6 +18,7 @@ coil = "3.0.0-rc02"
 accompanist = "0.32.0"
 zxingEmbedded = "4.3.0"
 zxing = "3.5.3"
+foundationLayout = "1.9.4"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -44,6 +46,7 @@ androidx-room-gradle-plugin = {group = "androidx.room", name = "room-gradle-plug
 androidx-room-compiler = {group = "androidx.room", name = "room-compiler", version.ref = "room"}
 androidx-room-ktx = {group = "androidx.room", name = "room-ktx", version.ref = "room"}
 
+kotlinx-serialization-json = {group ="org.jetbrains.kotlinx", name="kotlinx-serialization-json", version.ref = "json"}
 
 com-google-accompanist = {group = "com.google.accompanist", name="accompanist-permissions", version.ref="accompanist"}
 
@@ -55,9 +58,9 @@ com-journeyapps = {group = "com.journeyapps", name="zxing-android-embedded", ver
 com-google-zxing = {group = "com.google.zxing", name="core", version.ref="zxing"}
 org-jsoup = {group = "org.jsoup", name = "jsoup", version.ref = "jsoup"}
 
-
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 com-google-devtools-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+jetbrains-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin"}

gradle/libs.versions.toml

@@ -0,0 +1,3 @@
+- Fix scanning from Digikey invoices
+- Add setting page to set default supplier
+- Make part supplier and manufacturer inputs editable dropdowns