diff --git a/feature/map/src/main/java/com/rtbishop/look4sat/feature/map/MaidenheadGridOverlay.kt b/feature/map/src/main/java/com/rtbishop/look4sat/feature/map/MaidenheadGridOverlay.kt index 28eaa4c3..333c07da 100644 --- a/feature/map/src/main/java/com/rtbishop/look4sat/feature/map/MaidenheadGridOverlay.kt +++ b/feature/map/src/main/java/com/rtbishop/look4sat/feature/map/MaidenheadGridOverlay.kt @@ -67,7 +67,8 @@ class MaidenheadGridOverlay : Overlay() { private val ownLinePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { strokeWidth = 6f style = Paint.Style.STROKE - color = Color.argb(255, 90, 200, 255) + // 与普通网格线同色(淡黄), 仅加粗 — 用户要求当前网格框线不换色 + color = Color.argb(160, 255, 224, 130) } private val selectedLinePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { strokeWidth = 4.5f diff --git a/feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesScreen.kt b/feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesScreen.kt index 1155cf19..ace6618e 100644 --- a/feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesScreen.kt +++ b/feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesScreen.kt @@ -156,7 +156,7 @@ private fun PassesScreen( TopBar( isVerticalLayout = isVerticalLayout, startAction = { - IconCard(action = { onAction(PassesAction.TogglePassesDialog) }, resId = R.drawable.ic_filter) + IconCard(action = { onAction(PassesAction.ToggleRadiosDialog) }, resId = R.drawable.ic_radios) }, topInfo = { TimerRow(timeString = uiState.nextTime, isTimeAos = uiState.isNextTimeAos) @@ -165,19 +165,7 @@ private fun PassesScreen( NextPassRow(pass = uiState.nextPass, isUtc = uiState.isUtc) }, endAction = { - // 日程功能: 把下个过境写入系统日历 (原仓库雷达页的 addToCalendar). - IconCard( - action = { - onAction( - PassesAction.AddToCalendar( - uiState.nextPass.name, - uiState.nextPass.aosTime, - uiState.nextPass.losTime - ) - ) - }, - resId = R.drawable.ic_calendar - ) + IconCard(action = { onAction(PassesAction.TogglePassesDialog) }, resId = R.drawable.ic_filter) } ) } diff --git a/feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesState.kt b/feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesState.kt index 85c7ccc7..3aef6726 100644 --- a/feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesState.kt +++ b/feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesState.kt @@ -61,6 +61,4 @@ sealed interface PassesAction { data object ToggleRadiosDialog : PassesAction data class FocusCatNum(val catNum: Int) : PassesAction data object ClearFocus : PassesAction - /** 日程功能: 把下个过境写入系统日历 (ic_calendar 按钮). */ - data class AddToCalendar(val name: String, val aosTime: Long, val losTime: Long) : PassesAction } diff --git a/feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesViewModel.kt b/feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesViewModel.kt index a0f78fc7..e7468801 100644 --- a/feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesViewModel.kt +++ b/feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesViewModel.kt @@ -28,7 +28,6 @@ import com.rtbishop.look4sat.core.domain.predict.OrbitalPass import com.rtbishop.look4sat.core.domain.repository.IMainContainer import com.rtbishop.look4sat.core.domain.repository.ISatelliteRepo import com.rtbishop.look4sat.core.domain.repository.ISettingsRepo -import com.rtbishop.look4sat.core.domain.usecase.IAddToCalendar import com.rtbishop.look4sat.core.domain.utility.round import com.rtbishop.look4sat.core.domain.utility.toTimerString import com.rtbishop.look4sat.core.presentation.getDefaultPass @@ -47,8 +46,7 @@ import java.util.TimeZone class PassesViewModel( private val satelliteRepo: ISatelliteRepo, - private val settingsRepo: ISettingsRepo, - private val addToCalendar: IAddToCalendar + private val settingsRepo: ISettingsRepo ) : ViewModel() { private val defaultPass = getDefaultPass() @@ -153,8 +151,6 @@ class PassesViewModel( _uiState.update { it.copy(isRadiosDialogShown = !it.isRadiosDialogShown) } is PassesAction.FocusCatNum -> _uiState.update { it.copy(focusedCatNum = action.catNum) } PassesAction.ClearFocus -> _uiState.update { it.copy(focusedCatNum = null) } - is PassesAction.AddToCalendar -> - addToCalendar(action.name, action.aosTime, action.losTime) } } @@ -349,8 +345,7 @@ class PassesViewModel( initializer { PassesViewModel( satelliteRepo = container.satelliteRepo, - settingsRepo = container.settingsRepo, - addToCalendar = container.provideAddToCalendar() + settingsRepo = container.settingsRepo ) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1e8a05b1..a0f8d84d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ #noinspection UnusedVersionCatalogEntry appVersionCode = "468" #noinspection UnusedVersionCatalogEntry -appVersionName = "4.4.6-ba7opf.10" +appVersionName = "4.4.6-ba7opf.10.1" #noinspection UnusedVersionCatalogEntry compileSdk = "37" #noinspection UnusedVersionCatalogEntry