From ed71c8148bb27aad4062c01188a08f62eea8f010 Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Sat, 7 Feb 2026 13:58:35 +0000 Subject: [PATCH] v4.0.2 - Custom data import by londre7, minor UI tweaks --- .github/workflows/release.yml | 4 ++-- app/build.gradle.kts | 4 ++-- .../com/rtbishop/look4sat/presentation/MainScreen.kt | 10 +++++++++- .../look4sat/presentation/settings/SettingsScreen.kt | 3 +++ .../presentation/settings/SettingsViewModel.kt | 4 +--- .../look4sat/data/repository/DatabaseRepo.kt | 2 +- .../metadata/android/en-US/changelogs/default.txt | 12 +++--------- .../metadata/android/en-US/whatsnew/whatsnew-en-US | 12 +++--------- 8 files changed, 24 insertions(+), 27 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d95771c1..3360b0e4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ jobs: uses: actions/setup-java@v5 with: distribution: 'temurin' - java-version: '21' + java-version: '17' - name: Setup Gradle uses: gradle/actions/setup-gradle@v5 @@ -69,7 +69,7 @@ jobs: serviceAccountJsonPlainText: ${{secrets.SERVICE_ACCOUNT_JSON}} packageName: com.rtbishop.look4sat releaseFiles: app/build/outputs/apk/release/look4sat.aab - track: beta + track: production whatsNewDirectory: fastlane/metadata/android/en-US/whatsnew - name: Create Release diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 4237f918..526bc430 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -13,8 +13,8 @@ android { defaultConfig { applicationId = "com.rtbishop.look4sat" minSdk = 24 - versionCode = 401 - versionName = "4.0.1" + versionCode = 402 + versionName = "4.0.2" } buildFeatures { compose = true diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/MainScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/MainScreen.kt index 8b52e9e8..1a3444bf 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/MainScreen.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/MainScreen.kt @@ -17,6 +17,9 @@ */ package com.rtbishop.look4sat.presentation +import androidx.compose.animation.core.tween +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -76,7 +79,12 @@ fun MainScreen(navController: NavHostController = rememberNavController()) { else -> NavigationSuiteType.ShortNavigationBarMedium } ) { - NavHost(navController = navController, startDestination = startDestination) { + NavHost( + navController = navController, + startDestination = startDestination, + enterTransition = { fadeIn(animationSpec = tween(350)) }, + exitTransition = { fadeOut(animationSpec = tween(350)) } + ) { satellitesDestination { navController.navigateUp() } passesDestination { catNum: Int, aosTime: Long -> val radarRoute = "${Screen.Radar.route}?catNum=${catNum}&aosTime=${aosTime}" diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsScreen.kt index be610312..82e27091 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsScreen.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsScreen.kt @@ -163,6 +163,9 @@ private fun SettingsScreen(uiState: SettingsState) { uiState.sendDataSourcesAction(DataSourcesAction.SetUseCustomTransceivers(useCustomTransceivers)) uiState.sendDataSourcesAction(DataSourcesAction.SetTransceiversUrl(transceiversUrl)) } + if (useCustomTle || useCustomTransceivers) { + uiState.sendAction(SettingsAction.UpdateFromWeb) + } } ) } diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsViewModel.kt index ab2274b1..29a1a31d 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsViewModel.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsViewModel.kt @@ -124,9 +124,7 @@ class SettingsViewModel( } viewModelScope.launch { settingsRepo.dataSourcesSettings.collect { settings -> - _uiState.update { - it.copy(dataSourcesSettings = settings) - } + _uiState.update { it.copy(dataSourcesSettings = settings) } } } } diff --git a/data/src/main/java/com/rtbishop/look4sat/data/repository/DatabaseRepo.kt b/data/src/main/java/com/rtbishop/look4sat/data/repository/DatabaseRepo.kt index 8f9a1e91..7a2ecc90 100644 --- a/data/src/main/java/com/rtbishop/look4sat/data/repository/DatabaseRepo.kt +++ b/data/src/main/java/com/rtbishop/look4sat/data/repository/DatabaseRepo.kt @@ -61,7 +61,7 @@ class DatabaseRepo( val importedRadios = mutableListOf() val tleUrls = Sources.satelliteDataUrls.toMutableMap().apply { if (settingsRepo.dataSourcesSettings.value.useCustomTLE) { - this["Other"] = settingsRepo.dataSourcesSettings.value.transceiversUrl + this["Other"] = settingsRepo.dataSourcesSettings.value.tleUrl } } val jobsMap = tleUrls diff --git a/fastlane/metadata/android/en-US/changelogs/default.txt b/fastlane/metadata/android/en-US/changelogs/default.txt index 7e9a99b2..cfae8de8 100644 --- a/fastlane/metadata/android/en-US/changelogs/default.txt +++ b/fastlane/metadata/android/en-US/changelogs/default.txt @@ -1,9 +1,3 @@ -Added support for landscape layout and tablets -Added AOS/LOS info to the countdown component -Added various minor UI fixes for readability -Cleaned up the translations and strings.xml -Moved Modes filter dialog to Passes screen -Rewrote all the screens with Jetpack Compose -Switched to using Bottom Navigation component -Switched to using unified dialogs and top bars -Updated GitHub Actions workflow deps and scripts +Added minor tweaks for UK translation, by Eugene #188 +Added custom data sources import, by londre7 #189 +Added various UI fixes, updated dependencies diff --git a/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US b/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US index 7e9a99b2..cfae8de8 100644 --- a/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US +++ b/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US @@ -1,9 +1,3 @@ -Added support for landscape layout and tablets -Added AOS/LOS info to the countdown component -Added various minor UI fixes for readability -Cleaned up the translations and strings.xml -Moved Modes filter dialog to Passes screen -Rewrote all the screens with Jetpack Compose -Switched to using Bottom Navigation component -Switched to using unified dialogs and top bars -Updated GitHub Actions workflow deps and scripts +Added minor tweaks for UK translation, by Eugene #188 +Added custom data sources import, by londre7 #189 +Added various UI fixes, updated dependencies