v4.4.6 - AMSAT status page, fully customizable data sources
This commit is contained in:
1 parent
bd51044690
commit
7cdc2952dc
5 files changed
+24
-28
No files matched your search
@@ -93,11 +93,11 @@ fun NavRoot(deeplink: String? = null) {
|
|||||||
val navigateBack: () -> Unit = { rootBackStack.removeLastOrNull() }
|
val navigateBack: () -> Unit = { rootBackStack.removeLastOrNull() }
|
||||||
val navigateToRadar: () -> Unit = { rootBackStack.add(RadarDestination) }
|
val navigateToRadar: () -> Unit = { rootBackStack.add(RadarDestination) }
|
||||||
// Incoming screen slides in from the right, outgoing drifts left at 1/3 speed (API35+ style)
|
// Incoming screen slides in from the right, outgoing drifts left at 1/3 speed (API35+ style)
|
||||||
val pushTransition = slideInHorizontally(tween(350)) { it } togetherWith
|
val pushTransition = slideInHorizontally(tween(300)) { it } togetherWith
|
||||||
slideOutHorizontally(tween(350)) { -it / 3 }
|
slideOutHorizontally(tween(300)) { -it / 3 }
|
||||||
// Reverse: outgoing slides out to the right, incoming drifts in from the left
|
// Reverse: outgoing slides out to the right, incoming drifts in from the left
|
||||||
val popTransition = slideInHorizontally(tween(350)) { -it / 3 } togetherWith
|
val popTransition = slideInHorizontally(tween(300)) { -it / 3 } togetherWith
|
||||||
slideOutHorizontally(tween(350)) { it }
|
slideOutHorizontally(tween(300)) { it }
|
||||||
NavDisplay(
|
NavDisplay(
|
||||||
modifier = Modifier.fillMaxSize(),
|
modifier = Modifier.fillMaxSize(),
|
||||||
backStack = rootBackStack,
|
backStack = rootBackStack,
|
||||||
@@ -133,8 +133,8 @@ private fun MainScreen(navigateToRadar: () -> Unit = {}) {
|
|||||||
val backStack = rememberNavBackStack(Screen.Passes)
|
val backStack = rememberNavBackStack(Screen.Passes)
|
||||||
val currentKey = backStack.lastOrNull()
|
val currentKey = backStack.lastOrNull()
|
||||||
val navigateBack: () -> Unit = { backStack.removeLastOrNull() }
|
val navigateBack: () -> Unit = { backStack.removeLastOrNull() }
|
||||||
val fadeTransition = fadeIn(animationSpec = tween(350)) togetherWith
|
val fadeTransition = fadeIn(animationSpec = tween(300)) togetherWith
|
||||||
fadeOut(animationSpec = tween(350))
|
fadeOut(animationSpec = tween(300))
|
||||||
val navItems =
|
val navItems =
|
||||||
listOf(Screen.Satellites, Screen.Passes, Screen.Status, Screen.Map, Screen.Settings)
|
listOf(Screen.Satellites, Screen.Passes, Screen.Status, Screen.Map, Screen.Settings)
|
||||||
|
|
||||||
|
|||||||
@@ -56,16 +56,13 @@
|
|||||||
\n\nPlease update the database at least weekly to get accurate predictions.</string>
|
\n\nPlease update the database at least weekly to get accurate predictions.</string>
|
||||||
<string name="pass_whatsnew_title" translatable="false">What\'s new in Look4Sat</string>
|
<string name="pass_whatsnew_title" translatable="false">What\'s new in Look4Sat</string>
|
||||||
<string name="pass_whatsnew_message" translatable="false">
|
<string name="pass_whatsnew_message" translatable="false">
|
||||||
* Added small tweaks to Sources and strings. Added official ISS source (#225)
|
* Added AMSAT status tracking page by MCKero6423 (#234)
|
||||||
\n* Implemented AOS window and elevation highlight filters (#226)
|
\n* Tweaked Radar track on reposition by atsunatsu (#235)
|
||||||
\n* Added cleartext traffic support for custom TLE URLs (#227)
|
\n* Tweaked linear transponder calc by atsunatsu (#236)
|
||||||
\n* Fixed manual OMM (.csv) data import, tweaked error messaging (#228)
|
\n* Added saving per-sat doppler offset by atsunatsu (#237)
|
||||||
\n* Added support for Icom IC-705 CAT by ruilvo (#229)
|
\n* Added custom freq offset setting to network reporting
|
||||||
\n* Added configurable Radar offset to the sensors output by qwqtoday (#230)
|
\n* Added ability to customize data sources via import
|
||||||
\n* Localized pass date and time formats for Chinese by atsunatsu (#231)
|
\n* Fixed star chart in README by PingouinFerreux (#240)
|
||||||
\n* Added linear transponder Doppler calculator by atsunatsu (#232)
|
|
||||||
\n* Added a few tweaks to SSTV sensitivity and reception, similar to Robot36
|
|
||||||
\n* Replaced the types selection dialog with modes selection to avoid confusion
|
|
||||||
</string>
|
</string>
|
||||||
|
|
||||||
<!-- AMSAT Status screen -->
|
<!-- AMSAT Status screen -->
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
* Added ARISS source, tweaked SSTV sensitivity #225
|
* Added AMSAT status tracking page by MCKero6423 (#234)
|
||||||
* Implemented AOS window and elev filter #226
|
* Tweaked Radar track on reposition by atsunatsu (#235)
|
||||||
* Added cleartext traffic support for TLEs #227
|
* Tweaked linear transponder calc by atsunatsu (#236)
|
||||||
* Fixed OMM import, tweaked error messages #228
|
* Added saving per-sat doppler offset by atsunatsu (#237)
|
||||||
* Added support for Icom CAT by ruilvo #229
|
* Added custom freq offset setting to network reporting
|
||||||
* Added tweakable Radar offset by qwqtoday #230
|
* Added ability to customize data sources via import
|
||||||
* Localized date/time formats by atsunatsu #231
|
* Fixed star chart in README by PingouinFerreux (#240)
|
||||||
* Added linear radio Doppler calc by atsunatsu #232
|
|
||||||
+2
-2
@@ -51,7 +51,7 @@ import com.rtbishop.look4sat.core.domain.model.SatReport
|
|||||||
import com.rtbishop.look4sat.core.domain.model.SatSlot
|
import com.rtbishop.look4sat.core.domain.model.SatSlot
|
||||||
import com.rtbishop.look4sat.core.domain.model.SatStatus
|
import com.rtbishop.look4sat.core.domain.model.SatStatus
|
||||||
import com.rtbishop.look4sat.core.domain.repository.IContainerProvider
|
import com.rtbishop.look4sat.core.domain.repository.IContainerProvider
|
||||||
import com.rtbishop.look4sat.core.presentation.ConfirmDialog
|
import com.rtbishop.look4sat.core.presentation.InfoDialog
|
||||||
import com.rtbishop.look4sat.core.presentation.R
|
import com.rtbishop.look4sat.core.presentation.R
|
||||||
import com.rtbishop.look4sat.core.presentation.layoutPadding
|
import com.rtbishop.look4sat.core.presentation.layoutPadding
|
||||||
import java.util.Calendar
|
import java.util.Calendar
|
||||||
@@ -280,7 +280,7 @@ private fun DayCell(slot: SatSlot, modifier: Modifier, onClick: () -> Unit) {
|
|||||||
@Composable
|
@Composable
|
||||||
private fun ReportDialog(statusName: String, day: SatDay, reports: Map<String, SatReport>, onDismiss: () -> Unit) {
|
private fun ReportDialog(statusName: String, day: SatDay, reports: Map<String, SatReport>, onDismiss: () -> Unit) {
|
||||||
val dayReports = day.slots.flatMap { it.reportIds }.mapNotNull { reports[it] }
|
val dayReports = day.slots.flatMap { it.reportIds }.mapNotNull { reports[it] }
|
||||||
ConfirmDialog(title = "$statusName · ${day.dateLabel}", onCancel = onDismiss, onAccept = onDismiss) {
|
InfoDialog(title = "$statusName · ${day.dateLabel}", onDismiss = onDismiss, onAccept = onDismiss) {
|
||||||
if (dayReports.isEmpty()) {
|
if (dayReports.isEmpty()) {
|
||||||
Text(stringResource(id = R.string.amsat_no_reports))
|
Text(stringResource(id = R.string.amsat_no_reports))
|
||||||
Spacer(modifier = Modifier.height(8.dp))
|
Spacer(modifier = Modifier.height(8.dp))
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
[versions]
|
[versions]
|
||||||
#noinspection UnusedVersionCatalogEntry
|
#noinspection UnusedVersionCatalogEntry
|
||||||
appVersionCode = "445"
|
appVersionCode = "446"
|
||||||
#noinspection UnusedVersionCatalogEntry
|
#noinspection UnusedVersionCatalogEntry
|
||||||
appVersionName = "4.4.5"
|
appVersionName = "4.4.6"
|
||||||
#noinspection UnusedVersionCatalogEntry
|
#noinspection UnusedVersionCatalogEntry
|
||||||
compileSdk = "37"
|
compileSdk = "37"
|
||||||
#noinspection UnusedVersionCatalogEntry
|
#noinspection UnusedVersionCatalogEntry
|
||||||
|
|||||||
Reference in new issue
Block a user