Version 2.2: Bookmarks, Airspy HF+, RTL-SDR Direct Sampling, use libhackrf, upgrade libhydrasdr, low performance mode, bugfixes

Author: Dennis Mantz

.gitignore

@@ -25,3 +25,6 @@ app/src/main/assets/docs
 # Vim and ctags
 tags
 *.swp
+
+# tmp
+ipc

Readme.md

@@ -18,6 +18,8 @@ phone both practical and fun.
 - Real-time **FFT and waterfall display** with scroll and pinch-to-zoom
 - Audio demodulation: **CW**, **AM**, **nFM**, **wFM**, **LSB**, **USB**
 - Record raw IQ data
+- Comprehensive Bookmark Manager for Stations (Frequencies) and Bands
+- Download and Synchronize EiBi Shortwave Radio Database, POTA & SOTA Spots
 - Modern and dynamic UI with a bottom (or side) drawer for full control
 - Adjustable Settings such as averaging, peak hold, FFT size, color maps, color
   theme, screen orientation and more
@@ -27,9 +29,10 @@ phone both practical and fun.
 
 ## Supported Devices
 
-- HackRF (via [hackrf_android](https://github.com/demantz/hackrf_android))
+- HackRF (via [libhackrf](https://github.com/greatscottgadgets/hackrf/tree/master/host/libhackrf))
 - RTL-SDR dongles (via [rtl-sdr driver](http://sdr.osmocom.org/trac/wiki/rtl-sdr))
 - Airspy (via [libairspy](https://github.com/airspy/airspyone_host/tree/master/libairspy))
+- Airspy HF+ (via [libairspyhf](https://github.com/airspy/airspyhf/tree/master/libairspyhf))
 - HydraSDR (via [libhydrasdr](https://github.com/hydrasdr/rfone_host/tree/main/libhydrasdr))
 - File input (from previously recorded IQ files or external sources)
 
@@ -57,6 +60,7 @@ Topics include:
 - User Interface & Controls
 - SDR & FFT Configuration
 - Demodulation Modes
+- Bookmark Manager
 - Signal Identification Tips
 - Recording & Playback
 - Advanced SDR Topics (dB, FFT theory, ham radio...)

app/build.gradle.kts

@@ -1,9 +1,13 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.android.devtools)
     alias(libs.plugins.dagger.hilt)
+    alias(libs.plugins.kotlin.serialization)
+    alias(libs.plugins.androidx.room)
 }
 
 android {
@@ -14,8 +18,8 @@ android {
         applicationId = "com.mantz_it.rfanalyzer"
         minSdk = 28
         targetSdk = 36
-        versionCode = 20107
-        versionName = "2.1.1"
+        versionCode = 20205
+        versionName = "2.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -53,9 +57,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlinOptions {
-        jvmTarget = "11"
-    }
     buildFeatures {
         compose = true
         buildConfig = true
@@ -66,6 +67,16 @@ android {
     useLibrary("android.test.mock")
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_11)
+    }
+}
+
+room {
+    schemaDirectory("$projectDir/schemas")
+}
+
 // Build static site from /docs and make it available in the app's assets:
 tasks.register<Exec>("generateDocs") {
     description = "Builds the MkDocs static website"
@@ -85,7 +96,6 @@ tasks.named("preBuild") {
 }
 
 dependencies {
-    implementation(files("lib/hackrf_android.aar"))
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.lifecycle.runtime.ktx)
@@ -99,14 +109,23 @@ dependencies {
     implementation(libs.androidx.media3.common.ktx)
     implementation(libs.androidx.localbroadcastmanager)
     implementation(project(":nativedsp"))
+    implementation(project(":libhackrf"))
     implementation(project(":libairspy"))
+    implementation(project(":libairspyhf"))
     implementation(project(":libhydrasdr"))
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.foundation.android)
     implementation(libs.androidx.room.runtime)
+    implementation(libs.androidx.room.paging)
     implementation(libs.androidx.material3.android)
     implementation(libs.androidx.datastore.core.android)
     implementation(libs.androidx.datastore.preferences)
+    implementation(libs.androidx.sqlite.ktx)
+    implementation(libs.androidx.compose.runtime.saveable)
+    implementation(libs.androidx.paging.runtime)
+    implementation(libs.androidx.paging.runtime.ktx)
+    implementation(libs.androidx.paging.compose)
+    implementation(libs.androidx.compose.animation)
     annotationProcessor(libs.androidx.room.compiler)
     ksp(libs.androidx.room.compiler)
     implementation(libs.androidx.room.common)
@@ -117,7 +136,9 @@ dependencies {
     debugImplementation(libs.androidx.ui.tooling)
     implementation(libs.androidx.security.crypto)
     implementation(libs.dagger.hilt)
+    implementation(libs.hilt.navigation.compose)
     ksp(libs.dagger.hilt.compiler)
+    implementation(libs.kotlinx.serialization.json)
 
     // Flavor-specific dependencies:
     add("playImplementation", libs.billing)  // "play" is the flavor

app/lib/hackrf_android.aar

@@ -0,0 +1,79 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 1,
+    "identityHash": "88212c38aec27c44a2ea5e92074ff515",
+    "entities": [
+      {
+        "tableName": "recordings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `frequency` INTEGER NOT NULL, `sampleRate` INTEGER NOT NULL, `date` INTEGER NOT NULL, `fileFormat` TEXT NOT NULL, `sizeInBytes` INTEGER NOT NULL, `filePath` TEXT NOT NULL, `favorite` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "frequency",
+            "columnName": "frequency",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sampleRate",
+            "columnName": "sampleRate",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fileFormat",
+            "columnName": "fileFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sizeInBytes",
+            "columnName": "sizeInBytes",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "filePath",
+            "columnName": "filePath",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "favorite",
+            "columnName": "favorite",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      }
+    ],
+    "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, '88212c38aec27c44a2ea5e92074ff515')"
+    ]
+  }
+}