v4.0.3 - KeepScreenOn for RadarScreen, translation fixes

Thanks for this great app!

A Spanish translation is missing, so I have added the spanish `.../values-es-rES/strings.xml`. Hope this will give access to many new users.

Pulled against development branch for you to use it as you wish.

Regards

.editorconfig

@@ -0,0 +1,10 @@
+# indicate this is the root of the project
+root = true
+
+[*.{kt,java,xml,gradle,md}]
+charset = utf-8
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+insert_final_newline = true
+end_of_line = lf

.github/workflows/main.yml

@@ -1,70 +0,0 @@
-name: Look4Sat CI
-
-on:
-  push:
-    tags:
-      - v**
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Latest Commit
-        uses: actions/checkout@v4
-
-      - name: Setup java environment
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-
-      - name: Assemble APK and Bundle
-        run: |
-          chmod +x ./gradlew
-          ./gradlew assembleRelease
-          ./gradlew bundleRelease
-
-      - name: Sign APK
-        uses: r0adkll/sign-android-release@v1
-        id: sign_apk
-        with:
-          releaseDirectory: app/build/outputs/apk/release
-          signingKeyBase64: ${{ secrets.KEY_STORE }}
-          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
-          alias: ${{ secrets.KEY_ALIAS }}
-          keyPassword: ${{ secrets.KEY_PASSWORD }}
-        env:
-          BUILD_TOOLS_VERSION: "35.0.1"
-
-      - name: Sign Bundle
-        uses: r0adkll/sign-android-release@v1
-        id: sign_bundle
-        with:
-          releaseDirectory: app/build/outputs/bundle/release
-          signingKeyBase64: ${{ secrets.KEY_STORE }}
-          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
-          alias: ${{ secrets.KEY_ALIAS }}
-          keyPassword: ${{ secrets.KEY_PASSWORD }}
-        env:
-          BUILD_TOOLS_VERSION: "35.0.1"
-
-      - name: Rename APK and Bundle
-        run: |
-          mv ${{steps.sign_apk.outputs.signedReleaseFile}} app/build/outputs/apk/release/look4sat.apk
-          mv ${{steps.sign_bundle.outputs.signedReleaseFile}} app/build/outputs/apk/release/look4sat.aab
-
-      - name: Deploy Bundle to Play Store
-        uses: r0adkll/upload-google-play@v1
-        with:
-          serviceAccountJsonPlainText: ${{secrets.SERVICE_ACCOUNT_JSON}}
-          packageName: com.rtbishop.look4sat
-          releaseFiles: app/build/outputs/apk/release/look4sat.aab
-          track: beta
-          whatsNewDirectory: fastlane/metadata/android/en-US/whatsnew
-
-      - name: Create release
-        uses: ncipollo/release-action@v1
-        with:
-          artifacts: "app/build/outputs/apk/release/look4sat.apk,app/build/outputs/apk/release/look4sat.aab"
-          bodyFile: fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US
-          token: ${{ secrets.RELEASE_TOKEN }}

.github/workflows/release.yml

@@ -0,0 +1,76 @@
+name: release
+
+on:
+  push:
+    tags:
+      - v**
+
+env:
+  TAG_NAME: ${{ github.ref_name }}
+  GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v6
+
+      - name: Setup Java
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
+
+      - name: Assemble Artifacts
+        run: |
+          ./gradlew assembleRelease
+          ./gradlew bundleRelease
+
+      - name: Sign APK
+        uses: r0adkll/sign-android-release@v1
+        id: sign_apk
+        with:
+          releaseDirectory: app/build/outputs/apk/release
+          signingKeyBase64: ${{ secrets.KEY_STORE }}
+          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
+          alias: ${{ secrets.KEY_ALIAS }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+        env:
+          BUILD_TOOLS_VERSION: "36.0.0"
+
+      - name: Sign Bundle
+        uses: r0adkll/sign-android-release@v1
+        id: sign_bundle
+        with:
+          releaseDirectory: app/build/outputs/bundle/release
+          signingKeyBase64: ${{ secrets.KEY_STORE }}
+          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
+          alias: ${{ secrets.KEY_ALIAS }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+        env:
+          BUILD_TOOLS_VERSION: "36.0.0"
+
+      - name: Rename Artifacts
+        run: |
+          mv ${{steps.sign_apk.outputs.signedReleaseFile}} app/build/outputs/apk/release/look4sat.apk
+          mv ${{steps.sign_bundle.outputs.signedReleaseFile}} app/build/outputs/apk/release/look4sat.aab
+
+      - name: Deploy Bundle
+        uses: r0adkll/upload-google-play@v1
+        with:
+          serviceAccountJsonPlainText: ${{secrets.SERVICE_ACCOUNT_JSON}}
+          packageName: com.rtbishop.look4sat
+          releaseFiles: app/build/outputs/apk/release/look4sat.aab
+          track: production
+          whatsNewDirectory: fastlane/metadata/android/en-US/whatsnew
+
+      - name: Create Release
+        run: |
+          gh release create $TAG_NAME --title=$TAG_NAME --generate-notes
+          gh release upload $TAG_NAME app/build/outputs/apk/release/look4sat.apk

.gitignore

@@ -63,3 +63,4 @@ fastlane/readme.md
 /app/release/app-release.apk
 /app/release/output-metadata.json
 /app/release/
+/.kotlin/sessions/

README.md

@@ -1,6 +1,6 @@
 # Look4Sat: Satellite tracker
 
-[![Look4Sat CI](https://github.com/rt-bishop/Look4Sat/actions/workflows/main.yml/badge.svg)](https://github.com/rt-bishop/Look4Sat/actions/workflows/main.yml)
+[![Look4Sat CI](https://github.com/rt-bishop/Look4Sat/actions/workflows/release.yml/badge.svg)](https://github.com/rt-bishop/Look4Sat/actions/workflows/release.yml)
 
 [<img src="https://play.google.com/intl/en_gb/badges/static/images/badges/en_badge_web_generic.png" alt="Get it on Google Play" height="80">](https://play.google.com/store/apps/details?id=com.rtbishop.look4sat)
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="80">](https://f-droid.org/packages/com.rtbishop.look4sat/)
@@ -8,27 +8,28 @@
 ### Radio satellite tracker and pass predictor for Android, inspired by Gpredict
 
 <p float="left">
-<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="180"/>
-<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" width="180"/>
-<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/3.png" width="180"/>
-<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/4.png" width="180">
+<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="192"/>
+<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" width="192"/>
+<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/3.png" width="192"/>
+<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/4.png" width="192">
 </p>
 
 ### Track satellite passes with ease!
 
-Thanks to the huge database provided by [Celestrak](https://celestrak.com/) and [SatNOGS](https://satnogs.org/) you have access to more than 5000 active satellites orbiting Earth. You can search the entire DB by satellite name or by NORAD catnum.
+Thanks to [Celestrak](https://celestrak.com/) and [SatNOGS](https://satnogs.org/) you have access to over 9000 active satellites.\
+You can search the entire database by NORAD Catalog Number or the satellite's name.
 
-Satellite positions and passes are calculated relative to your location. To get reliable info make sure to set the observation position using GPS or QTH Locator in the Settings menu.
+Orbital positions and passes are calculated relative to your location.\
+To get reliable data make sure to set the station position via the app Settings.
 
-The application is built using Kotlin, Coroutines, Architecture Components and Jetpack Navigation. It is now and always will be completely ad-free and open-source.
-
-Huge thanks to [DownloadAstro](https://appoftheday.downloadastro.com/app/look4sat-satellite-tracker/) team for their interest to the app and the interview published.
+The application is built using Kotlin, Coroutines, Jetpack Compose and Navigation.\
+It is now and always will be completely ad-free and open-source.
 
 ## Main features:
 
-*  Predicting satellite positions and passes for up to a week
+*  Predicting satellite positions and passes for up to 10 days
 *  Showing the list of currently active and upcoming satellite passes
 *  Showing the active pass progress, polar trajectory and transceivers info
-*  Showing the satellite positional data, footprint and ground track on a map
-*  Custom TLE data import is available via files with TXT or TLE extensions
-*  Offline first: calculations are made offline. Weekly update of TLE data is recommended.
+*  Showing the satellite positional data, footprint and ground track on the map
+*  Custom TLE satellite data import is available via Three Line Element .txt files
+*  Offline first: calculations are made offline. Weekly TLE data update is recommended.

app/build.gradle

@@ -1,114 +0,0 @@
-plugins {
-    id "com.android.application"
-    id "org.jetbrains.kotlin.android"
-    id "org.jetbrains.kotlin.kapt"
-    id "dagger.hilt.android.plugin"
-    id "androidx.navigation.safeargs.kotlin"
-}
-
-android {
-    namespace 'com.rtbishop.look4sat'
-    compileSdk 35
-    defaultConfig {
-        applicationId "com.rtbishop.look4sat"
-        minSdk 21
-        targetSdk 35
-        versionCode 323
-        versionName '3.2.3'
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
-        kapt {
-            arguments {
-                arg("room.schemaLocation", "$projectDir/schemas")
-                arg("room.incremental", "true")
-                arg("room.expandProjection", "true")
-            }
-        }
-    }
-    buildTypes {
-        release {
-            minifyEnabled true
-            shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    buildFeatures {
-//        compose true
-        viewBinding true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion compose_compiler_version
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
-    testOptions {
-        animationsDisabled true
-        unitTests.includeAndroidResources true
-    }
-    androidResources {
-        generateLocaleConfig true
-    }
-}
-
-kotlin {
-    jvmToolchain(17)
-}
-
-dependencies {
-    implementation project(":base")
-    implementation "androidx.core:core-ktx:$core_ktx_version"
-    implementation "androidx.core:core-splashscreen:$core_splashscreen_version"
-    implementation "androidx.constraintlayout:constraintlayout:$constraint_version"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
-    implementation "androidx.navigation:navigation-runtime-ktx:$navigation_version"
-    implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
-    implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
-    implementation "androidx.room:room-runtime:$room_version"
-    implementation "androidx.room:room-ktx:$room_version"
-    kapt "androidx.room:room-compiler:$room_version"
-    implementation "com.google.android.material:material:$material_version"
-    implementation "com.google.dagger:hilt-android:$hilt_version"
-    kapt "com.google.dagger:hilt-compiler:$hilt_version"
-    implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
-    implementation "org.osmdroid:osmdroid-android:$osmdroid_version"
-
-//    implementation "androidx.compose.ui:ui:$compose_version"
-//    implementation "androidx.compose.ui:ui-tooling:$compose_version"
-//    implementation "androidx.compose.runtime:runtime:$compose_version"
-//    implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
-//    implementation "androidx.compose.compiler:compiler:$compose_compiler_version"
-//    implementation "androidx.compose.animation:animation:$compose_version"
-//    implementation "androidx.compose.foundation:foundation:$compose_foundation_version"
-//    implementation "androidx.activity:activity-compose:$activity_compose_version"
-//    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
-//    implementation "androidx.compose.material:material:$compose_material_version"
-//    implementation "androidx.compose.material:material-icons-extended:$compose_material_version"
-//    implementation "com.google.android.material:compose-theme-adapter:$material_adapter_version"
-
-//    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
-    debugImplementation "androidx.fragment:fragment-testing:$fragment_test_version"
-    debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version"
-
-    testImplementation "junit:junit:$junit_version"
-    testImplementation "org.mockito:mockito-core:$mockito_version"
-    testImplementation "org.robolectric:robolectric:$robolectric_version"
-    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_test_version"
-
-    androidTestImplementation "androidx.test:core:$androidx_test_version"
-    androidTestImplementation "androidx.test:runner:$androidx_test_version"
-    androidTestImplementation "androidx.test:rules:$androidx_test_version"
-    androidTestImplementation "androidx.test.ext:junit:$androidx_junit_version"
-    androidTestImplementation "androidx.test.ext:truth:$androidx_test_version"
-    androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
-//    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
-    androidTestImplementation "org.mockito:mockito-android:$mockito_version"
-    androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_test_version"
-}

app/build.gradle.kts

@@ -0,0 +1,50 @@
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.compose.compiler)
+}
+
+kotlin {
+    jvmToolchain(17)
+}
+
+android {
+    namespace = "com.rtbishop.look4sat"
+    compileSdk = 36
+    defaultConfig {
+        applicationId = "com.rtbishop.look4sat"
+        minSdk = 24
+        versionCode = 403
+        versionName = "4.0.3"
+    }
+    buildFeatures {
+        compose = true
+    }
+    buildTypes {
+        debug {
+            applicationIdSuffix = ".debug"
+        }
+        release {
+            isMinifyEnabled = true
+            isShrinkResources = true
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"))
+        }
+    }
+    androidResources {
+        generateLocaleConfig = true
+        localeFilters.addAll(listOf("en", "es", "ru", "si", "uk", "zh"))
+    }
+}
+
+dependencies {
+    implementation(project(":data"))
+    implementation(project(":domain"))
+
+    implementation(libs.androidx.core.splashscreen)
+    implementation(platform(libs.compose.bom))
+    implementation(libs.bundles.composeAll)
+    implementation(libs.other.osmdroid)
+
+    debugImplementation(libs.bundles.composeDebug)
+    testImplementation(libs.bundles.unitTest)
+    androidTestImplementation(libs.bundles.androidTest)
+}

app/proguard-rules.pro

@@ -1,11 +0,0 @@
-# Please add these rules to your existing keep rules in order to suppress warnings.
-# This is generated automatically by the Android Gradle plugin.
--dontwarn org.bouncycastle.jsse.BCSSLParameters
--dontwarn org.bouncycastle.jsse.BCSSLSocket
--dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
--dontwarn org.conscrypt.Conscrypt$Version
--dontwarn org.conscrypt.Conscrypt
--dontwarn org.conscrypt.ConscryptHostnameVerifier
--dontwarn org.openjsse.javax.net.ssl.SSLParameters
--dontwarn org.openjsse.javax.net.ssl.SSLSocket
--dontwarn org.openjsse.net.ssl.OpenJSSE

app/schemas/com.rtbishop.look4sat.framework.data.LocalDatabase/1.json

@@ -1,198 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 1,
-    "identityHash": "834981e960b712254e56b633f3772115",
-    "entities": [
-      {
-        "tableName": "entries",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`comment` TEXT, `name` TEXT NOT NULL, `epoch` REAL NOT NULL, `meanmo` REAL NOT NULL, `eccn` REAL NOT NULL, `incl` REAL NOT NULL, `raan` REAL NOT NULL, `argper` REAL NOT NULL, `meanan` REAL NOT NULL, `catnum` INTEGER NOT NULL, `bstar` REAL NOT NULL, `xincl` REAL NOT NULL, `xnodeo` REAL NOT NULL, `omegao` REAL NOT NULL, `xmo` REAL NOT NULL, `xno` REAL NOT NULL, `isDeepspace` INTEGER NOT NULL, PRIMARY KEY(`catnum`))",
-        "fields": [
-          {
-            "fieldPath": "comment",
-            "columnName": "comment",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "data.name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.epoch",
-            "columnName": "epoch",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.meanmo",
-            "columnName": "meanmo",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.eccn",
-            "columnName": "eccn",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.incl",
-            "columnName": "incl",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.raan",
-            "columnName": "raan",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.argper",
-            "columnName": "argper",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.meanan",
-            "columnName": "meanan",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.catnum",
-            "columnName": "catnum",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.bstar",
-            "columnName": "bstar",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.xincl",
-            "columnName": "xincl",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.xnodeo",
-            "columnName": "xnodeo",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.omegao",
-            "columnName": "omegao",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.xmo",
-            "columnName": "xmo",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.xno",
-            "columnName": "xno",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.isDeepspace",
-            "columnName": "isDeepspace",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "catnum"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "radios",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uuid` TEXT NOT NULL, `info` TEXT NOT NULL, `isAlive` INTEGER NOT NULL, `downlink` INTEGER, `uplink` INTEGER, `mode` TEXT, `isInverted` INTEGER NOT NULL, `catnum` INTEGER, `comment` TEXT, PRIMARY KEY(`uuid`))",
-        "fields": [
-          {
-            "fieldPath": "uuid",
-            "columnName": "uuid",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "info",
-            "columnName": "info",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAlive",
-            "columnName": "isAlive",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "downlink",
-            "columnName": "downlink",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uplink",
-            "columnName": "uplink",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mode",
-            "columnName": "mode",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isInverted",
-            "columnName": "isInverted",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "catnum",
-            "columnName": "catnum",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "comment",
-            "columnName": "comment",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "uuid"
-          ],
-          "autoGenerate": false
-        },
-        "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, '834981e960b712254e56b633f3772115')"
-    ]
-  }
-}

app/schemas/com.rtbishop.look4sat.framework.data.LocalDatabase/2.json

@@ -1,204 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 2,
-    "identityHash": "f43ab966fb7b0508057c359530582ff5",
-    "entities": [
-      {
-        "tableName": "entries",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`comment` TEXT, `name` TEXT NOT NULL, `epoch` REAL NOT NULL, `meanmo` REAL NOT NULL, `eccn` REAL NOT NULL, `incl` REAL NOT NULL, `raan` REAL NOT NULL, `argper` REAL NOT NULL, `meanan` REAL NOT NULL, `catnum` INTEGER NOT NULL, `bstar` REAL NOT NULL, `xincl` REAL NOT NULL, `xnodeo` REAL NOT NULL, `omegao` REAL NOT NULL, `xmo` REAL NOT NULL, `xno` REAL NOT NULL, `orbitalPeriod` REAL NOT NULL, `isDeepSpace` INTEGER NOT NULL, PRIMARY KEY(`catnum`))",
-        "fields": [
-          {
-            "fieldPath": "comment",
-            "columnName": "comment",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "data.name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.epoch",
-            "columnName": "epoch",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.meanmo",
-            "columnName": "meanmo",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.eccn",
-            "columnName": "eccn",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.incl",
-            "columnName": "incl",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.raan",
-            "columnName": "raan",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.argper",
-            "columnName": "argper",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.meanan",
-            "columnName": "meanan",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.catnum",
-            "columnName": "catnum",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.bstar",
-            "columnName": "bstar",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.xincl",
-            "columnName": "xincl",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.xnodeo",
-            "columnName": "xnodeo",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.omegao",
-            "columnName": "omegao",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.xmo",
-            "columnName": "xmo",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.xno",
-            "columnName": "xno",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.orbitalPeriod",
-            "columnName": "orbitalPeriod",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "data.isDeepSpace",
-            "columnName": "isDeepSpace",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "catnum"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "radios",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uuid` TEXT NOT NULL, `info` TEXT NOT NULL, `isAlive` INTEGER NOT NULL, `downlink` INTEGER, `uplink` INTEGER, `mode` TEXT, `isInverted` INTEGER NOT NULL, `catnum` INTEGER, `comment` TEXT, PRIMARY KEY(`uuid`))",
-        "fields": [
-          {
-            "fieldPath": "uuid",
-            "columnName": "uuid",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "info",
-            "columnName": "info",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAlive",
-            "columnName": "isAlive",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "downlink",
-            "columnName": "downlink",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uplink",
-            "columnName": "uplink",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mode",
-            "columnName": "mode",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isInverted",
-            "columnName": "isInverted",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "catnum",
-            "columnName": "catnum",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "comment",
-            "columnName": "comment",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "uuid"
-          ],
-          "autoGenerate": false
-        },
-        "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, 'f43ab966fb7b0508057c359530582ff5')"
-    ]
-  }
-}

app/src/androidTest/java/com/rtbishop/look4sat/ExampleInstrumentedTest.kt

@@ -1,17 +0,0 @@
-package com.rtbishop.look4sat
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-
-    @Test
-    fun useAppContext() {
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.rtbishop.bbctestapp", appContext.packageName)
-    }
-}

app/src/main/AndroidManifest.xml

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission
         android:name="android.permission.BLUETOOTH"
         android:maxSdkVersion="30" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:name=".presentation.MainApplication"
+        android:name=".MainApplication"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:networkSecurityConfig="@xml/network_security_config"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.Look4Sat.Main">
+        android:roundIcon="@mipmap/ic_launcher_round">
+
         <activity
-            android:name=".presentation.MainActivity"
+            android:name=".MainActivity"
             android:exported="true"
             android:theme="@style/Theme.Look4Sat.SplashScreen">
             <intent-filter>
@@ -27,6 +27,10 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-    </application>
 
+        <meta-data
+            android:name="android.telephony.PROPERTY_SATELLITE_DATA_OPTIMIZED"
+            android:value="com.rtbishop.look4sat" />
+
+    </application>
 </manifest>