mirror of
https://github.com/atsunatsu/Look4Sat.git
synced 2026-10-02 03:15:37 +00:00
refactor: remove satellite catalog number from UI
Remove the NORAD catalog number (e.g. '44444 - ') prefix from satellite names in three places: - Pass list items (Components.kt) - Satellite selection list (SatellitesScreen.kt) - Pass detail view (PassesScreen.kt) The number is still accessible via satellite details if needed.
This commit is contained in:
1 parent
fa55b82a5a
commit
e11b03d56b
3 files changed
-11
No files matched your search
@@ -157,10 +157,6 @@ fun RowScope.NextPassRow(pass: OrbitalPass, modifier: Modifier = Modifier, isUtc
|
|||||||
.padding(start = 6.dp, top = 1.dp, end = 6.dp, bottom = 0.dp)
|
.padding(start = 6.dp, top = 1.dp, end = 6.dp, bottom = 0.dp)
|
||||||
) {
|
) {
|
||||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||||
Text(
|
|
||||||
text = "${stringResource(R.string.pass_satId, pass.catNum)} - ",
|
|
||||||
color = MaterialTheme.colorScheme.primary
|
|
||||||
)
|
|
||||||
Text(
|
Text(
|
||||||
text = pass.name,
|
text = pass.name,
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
|
|||||||
@@ -316,7 +316,6 @@ private fun PassItem(
|
|||||||
isVerticalLayout: Boolean = true,
|
isVerticalLayout: Boolean = true,
|
||||||
isUtc: Boolean = false
|
isUtc: Boolean = false
|
||||||
) {
|
) {
|
||||||
val passSatId = stringResource(id = R.string.pass_satId, pass.catNum)
|
|
||||||
val horizontalPadding = if (isVerticalLayout) 6.dp else 10.dp
|
val horizontalPadding = if (isVerticalLayout) 6.dp else 10.dp
|
||||||
val timeZone = remember(isUtc) {
|
val timeZone = remember(isUtc) {
|
||||||
if (isUtc) TimeZone.getTimeZone("UTC") else TimeZone.getDefault()
|
if (isUtc) TimeZone.getTimeZone("UTC") else TimeZone.getDefault()
|
||||||
@@ -342,10 +341,6 @@ private fun PassItem(
|
|||||||
.padding(horizontal = horizontalPadding, vertical = 4.dp)
|
.padding(horizontal = horizontalPadding, vertical = 4.dp)
|
||||||
) {
|
) {
|
||||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||||
Text(
|
|
||||||
text = "$passSatId - ",
|
|
||||||
color = MaterialTheme.colorScheme.primary
|
|
||||||
)
|
|
||||||
Text(
|
Text(
|
||||||
text = pass.name,
|
text = pass.name,
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
|
|||||||
-2
@@ -281,7 +281,6 @@ private fun Satellite(
|
|||||||
onSelected: (Int, Boolean) -> Unit,
|
onSelected: (Int, Boolean) -> Unit,
|
||||||
modifier: Modifier = Modifier
|
modifier: Modifier = Modifier
|
||||||
) {
|
) {
|
||||||
val passSatId = stringResource(id = R.string.pass_satId, item.catnum)
|
|
||||||
Column(modifier = modifier.clickable { onSelected(item.catnum, item.isSelected) }) {
|
Column(modifier = modifier.clickable { onSelected(item.catnum, item.isSelected) }) {
|
||||||
Row(
|
Row(
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
@@ -290,7 +289,6 @@ private fun Satellite(
|
|||||||
.background(MaterialTheme.colorScheme.surface)
|
.background(MaterialTheme.colorScheme.surface)
|
||||||
.padding(start = 14.dp, top = 8.dp, end = 12.dp, bottom = 8.dp)
|
.padding(start = 14.dp, top = 8.dp, end = 12.dp, bottom = 8.dp)
|
||||||
) {
|
) {
|
||||||
Text(text = "$passSatId - ", color = MaterialTheme.colorScheme.primary)
|
|
||||||
Text(
|
Text(
|
||||||
text = item.name,
|
text = item.name,
|
||||||
modifier = Modifier.weight(1f),
|
modifier = Modifier.weight(1f),
|
||||||
|
|||||||
Reference in new issue
Block a user