Skip to content

Satellite tracker and pass predictor for Android, inspired by Gpredict

Even more fixes for pass item in Compose

Arty Bishopa817423e7e6f
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/MainTheme.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/MainTheme.kt
index 435fc1ad..fd67369e 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/MainTheme.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/MainTheme.kt
@@ -17,7 +17,8 @@ private val AccentYellow = Color(0xFFFFE082)
private val TextWhite = Color(0xCCFFFFFF)
private val TextGrey = Color(0x66FFFFFF)
private val TextBlack = Color(0xFF000000)
-private val SurfaceBtn = Color(0xFF2A2A2A)
+private val SurfaceInverse = Color(0x40FFFFFF)
+private val SurfaceBtn = Color(0xFF303030)
private val SurfaceCard = Color(0xFF1C1C1C)
private val SurfaceBg = Color(0xFF121212)
private val Transparent = Color(0x00000000)
@@ -43,7 +44,7 @@ private val MainColors = lightColorScheme(
surfaceVariant = SurfaceCard,
onSurfaceVariant = TextGrey, // navBar inactive icon
surfaceTint = Transparent,
-// inverseSurface = inverseSurface,
+ inverseSurface = SurfaceInverse,
// inverseOnSurface = inverseOnSurface,
// error = error,
// onError = onError,
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesScreen.kt
index fae82d76..d2c89eb1 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesScreen.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesScreen.kt
@@ -10,11 +10,14 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
+import com.rtbishop.look4sat.R
import com.rtbishop.look4sat.domain.model.DataState
import com.rtbishop.look4sat.domain.predict.NearEarthSat
import com.rtbishop.look4sat.domain.predict.OrbitalData
@@ -51,6 +54,12 @@ private fun Pass(pass: SatPass, modifier: Modifier = Modifier) {
.padding(6.dp)
) {
Row(verticalAlignment = Alignment.CenterVertically) {
+ Text(
+ text = "Id:${pass.catNum} - ",
+ modifier = Modifier.width(90.dp),
+ textAlign = TextAlign.End,
+ color = MaterialTheme.colorScheme.primary
+ )
Text(
text = pass.name,
modifier = Modifier
@@ -60,8 +69,16 @@ private fun Pass(pass: SatPass, modifier: Modifier = Modifier) {
maxLines = 1,
overflow = TextOverflow.Ellipsis
)
+ Icon(
+ painter = painterResource(id = R.drawable.ic_elevation),
+ contentDescription = null,
+ tint = MaterialTheme.colorScheme.primary,
+ modifier = Modifier.size(16.dp)
+ )
Text(
- text = "Id:${pass.catNum}", color = MaterialTheme.colorScheme.secondary
+ text = " ${pass.maxElevation}°",
+ textAlign = TextAlign.End,
+ color = MaterialTheme.colorScheme.primary
)
}
Row(
@@ -79,10 +96,14 @@ private fun Pass(pass: SatPass, modifier: Modifier = Modifier) {
modifier = Modifier.fillMaxWidth()
) {
Text(text = "16:02:28 - Sun")
- Text(text = "Elevation: 75")
Text(text = "Sun - 16:02:28")
}
- LinearProgressIndicator(progress = pass.progress, modifier = modifier.fillMaxWidth())
+ LinearProgressIndicator(
+ progress = pass.progress,
+ modifier = modifier.fillMaxWidth(),
+ color = MaterialTheme.colorScheme.primary,
+ trackColor = MaterialTheme.colorScheme.inverseSurface
+ )
}
}
}
@@ -95,7 +116,9 @@ private fun PassesCard(state: DataState<List<SatPass>>) {
when (state) {
is DataState.Success -> {
LazyColumn {
- items(items = state.data, key = { item -> item.catNum + item.aosTime }) { pass ->
+ items(
+ items = state.data,
+ key = { item -> item.catNum + item.aosTime }) { pass ->
Pass(pass, Modifier.animateItemPlacement())
}
}
diff --git a/app/src/main/res/drawable/ic_elevation.xml b/app/src/main/res/drawable/ic_elevation.xml
new file mode 100644
index 00000000..639d9884
--- /dev/null
+++ b/app/src/main/res/drawable/ic_elevation.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="512"
+ android:viewportWidth="512" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="#000000" android:pathData="M495.3,425.74H255.18c-3.58,-52 -23.78,-100.69 -58.12,-140.07L401.37,81.37c6.52,-6.52 6.52,-17.09 0,-23.61c-6.52,-6.52 -17.09,-6.52 -23.61,0L162.23,273.29L4.89,430.63c-4.77,4.77 -6.21,11.96 -3.62,18.2s8.67,10.3 15.42,10.3h222.61h256c9.22,0 16.7,-7.47 16.7,-16.7C512,433.21 504.52,425.74 495.3,425.74z"/>
+</vector>