Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Even further changes to layout components and colors
Arty Bishop886a27b016ff
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapFragment.ktindex e1551c95..b738ff29 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapFragment.kt@@ -87,7 +87,7 @@ class MapFragment : Fragment(R.layout.fragment_map) {setTileSource(getWikimediaTileSource())minZoomLevel = 2.5maxZoomLevel = 6.0- controller.setZoom(minZoomLevel)+ controller.setZoom(3.0)zoomController.setVisibility(CustomZoomButtonsController.Visibility.NEVER)isHorizontalMapRepetitionEnabled = falseisVerticalMapRepetitionEnabled = false@@ -123,13 +123,11 @@ class MapFragment : Fragment(R.layout.fragment_map) {private fun setupObservers() {viewModel.getPasses().observe(viewLifecycleOwner, { satPasses ->- when (satPasses) {- is Result.Success -> {- if (satPasses.data.isNotEmpty()) {- val filteredPasses = satPasses.data.distinctBy { it.tle }- selectedPass = filteredPasses[0]- setupSatOverlay(filteredPasses)- }+ if (satPasses is Result.Success) {+ if (satPasses.data.isNotEmpty()) {+ val filteredPasses = satPasses.data.distinctBy { it.tle }+ selectedPass = filteredPasses[0]+ setupSatOverlay(filteredPasses)}}})diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xmlindex bdf38b2c..8eb778f3 100644--- a/app/src/main/res/layout/activity_main.xml+++ b/app/src/main/res/layout/activity_main.xml@@ -20,6 +20,7 @@android:id="@+id/nav_bottom"android:layout_width="match_parent"android:layout_height="48dp"+ app:elevation="2dp"app:itemIconTint="@color/nav_bottom_item"app:itemTextColor="@color/nav_bottom_item"app:labelVisibilityMode="labeled"diff --git a/app/src/main/res/layout/dialog_sources.xml b/app/src/main/res/layout/dialog_sources.xmlindex bd40ee96..3323207c 100644--- a/app/src/main/res/layout/dialog_sources.xml+++ b/app/src/main/res/layout/dialog_sources.xml@@ -6,7 +6,7 @@android:layout_height="match_parent"android:layout_margin="4dp">- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/tleSourcesTitle"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -51,7 +51,7 @@</androidx.recyclerview.widget.RecyclerView>- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/tleSourcesWarning"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -62,7 +62,7 @@app:layout_constraintStart_toStartOf="@+id/tleSourcesTitle"app:layout_constraintTop_toBottomOf="@+id/tleSourcesTitle" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/tleSourcesBtnNeg"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -73,7 +73,7 @@app:layout_constraintEnd_toStartOf="@+id/tleSourcesBtnPos"app:layout_constraintHorizontal_chainStyle="spread_inside" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/tleSourcesBtnPos"android:layout_width="wrap_content"android:layout_height="wrap_content"diff --git a/app/src/main/res/layout/fragment_entries.xml b/app/src/main/res/layout/fragment_entries.xmlindex 94b18ab5..96639107 100644--- a/app/src/main/res/layout/fragment_entries.xml+++ b/app/src/main/res/layout/fragment_entries.xml@@ -26,19 +26,22 @@android:layout_width="match_parent"android:layout_height="match_parent">- <View+ <com.google.android.material.card.MaterialCardViewandroid:id="@+id/entries_bar"android:layout_width="0dp"android:layout_height="48dp"+ app:cardCornerRadius="0dp"+ app:cardElevation="2dp"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toTopOf="parent" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/import_msg"android:layout_width="wrap_content"android:layout_height="wrap_content"android:layout_marginStart="24dp"+ android:elevation="4dp"android:text="@string/sat_import"android:textSize="18sp"app:layout_constraintBottom_toBottomOf="@+id/import_web"@@ -49,7 +52,9 @@android:id="@+id/import_web"android:layout_width="64dp"android:layout_height="48dp"+ android:backgroundTint="@color/greyDark"android:contentDescription="@string/placeholder"+ android:elevation="4dp"android:src="@drawable/ic_update_web"app:layout_constraintBottom_toBottomOf="@+id/import_file"app:layout_constraintEnd_toStartOf="@+id/import_file"@@ -60,7 +65,9 @@android:layout_width="64dp"android:layout_height="48dp"android:layout_marginEnd="4dp"+ android:backgroundTint="@color/greyDark"android:contentDescription="@string/placeholder"+ android:elevation="4dp"android:src="@drawable/ic_update_file"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintTop_toTopOf="parent" />@@ -80,6 +87,7 @@android:id="@+id/select_all"android:layout_width="64dp"android:layout_height="48dp"+ android:backgroundTint="@color/greySurface"android:contentDescription="@string/placeholder"android:src="@drawable/ic_select_all"app:layout_constraintEnd_toEndOf="@+id/import_file"diff --git a/app/src/main/res/layout/fragment_info.xml b/app/src/main/res/layout/fragment_info.xmlindex 5c91c8bb..8c45a90d 100644--- a/app/src/main/res/layout/fragment_info.xml+++ b/app/src/main/res/layout/fragment_info.xml@@ -28,7 +28,7 @@android:layout_width="match_parent"android:layout_height="wrap_content">- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/title"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -58,7 +58,7 @@app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toTopOf="parent" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/version"android:layout_width="0dp"android:layout_height="wrap_content"@@ -72,7 +72,7 @@app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toBottomOf="@+id/title" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/subtitle"android:layout_width="0dp"android:layout_height="wrap_content"@@ -86,7 +86,7 @@app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toBottomOf="@+id/version" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/thanks"android:layout_width="0dp"android:layout_height="wrap_content"@@ -98,7 +98,7 @@app:layout_constraintStart_toStartOf="@+id/subtitle"app:layout_constraintTop_toBottomOf="@+id/subtitle" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/message"android:layout_width="0dp"android:layout_height="wrap_content"diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xmlindex 4abccb71..6925baf0 100644--- a/app/src/main/res/layout/fragment_map.xml+++ b/app/src/main/res/layout/fragment_map.xml@@ -40,7 +40,7 @@app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toTopOf="parent">- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/id_name"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -52,7 +52,7 @@app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toTopOf="parent" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/altitude"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -62,7 +62,7 @@app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toBottomOf="@+id/id_name" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/distance"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -73,7 +73,7 @@app:layout_constraintStart_toStartOf="@+id/altitude"app:layout_constraintTop_toBottomOf="@+id/altitude" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/velocity"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -83,7 +83,7 @@app:layout_constraintBaseline_toBaselineOf="@+id/altitude"app:layout_constraintEnd_toEndOf="parent" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/lat_lon"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -94,7 +94,7 @@</androidx.constraintlayout.widget.ConstraintLayout>- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/copyright"android:layout_width="wrap_content"android:layout_height="wrap_content"diff --git a/app/src/main/res/layout/fragment_passes.xml b/app/src/main/res/layout/fragment_passes.xmlindex cf7fb901..36eb6707 100644--- a/app/src/main/res/layout/fragment_passes.xml+++ b/app/src/main/res/layout/fragment_passes.xml@@ -27,18 +27,21 @@android:layout_width="match_parent"android:layout_height="match_parent">- <View+ <com.google.android.material.card.MaterialCardViewandroid:id="@+id/passes_bar"android:layout_width="0dp"android:layout_height="48dp"+ app:cardCornerRadius="0dp"+ app:cardElevation="2dp"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toTopOf="parent" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/passes_timer"android:layout_width="wrap_content"android:layout_height="wrap_content"+ android:elevation="4dp"android:fontFamily="@font/digital_dismay"android:text="@string/timer_zero"android:textColor="@color/themeLight"diff --git a/app/src/main/res/layout/fragment_polar.xml b/app/src/main/res/layout/fragment_polar.xmlindex dd1cbe74..edee13d8 100644--- a/app/src/main/res/layout/fragment_polar.xml+++ b/app/src/main/res/layout/fragment_polar.xml@@ -32,7 +32,7 @@app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toTopOf="parent" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/azimuth"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -42,7 +42,7 @@app:layout_constraintStart_toStartOf="@+id/frame"app:layout_constraintTop_toTopOf="@+id/frame" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/elevation"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -52,7 +52,7 @@app:layout_constraintEnd_toEndOf="@+id/frame"app:layout_constraintTop_toTopOf="@+id/frame" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/altitude"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -62,7 +62,7 @@app:layout_constraintBottom_toBottomOf="@+id/frame"app:layout_constraintStart_toStartOf="@+id/frame" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/distance"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -82,7 +82,7 @@app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toBottomOf="@+id/frame" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/no_trans_msg"android:layout_width="0dp"android:layout_height="wrap_content"diff --git a/app/src/main/res/layout/item_pass_geo.xml b/app/src/main/res/layout/item_pass_geo.xmlindex 9dd34d93..4721f2fb 100644--- a/app/src/main/res/layout/item_pass_geo.xml+++ b/app/src/main/res/layout/item_pass_geo.xml@@ -26,7 +26,7 @@android:layout_marginTop="2dp"android:layout_marginEnd="4dp"android:layout_marginBottom="2dp"- app:cardElevation="4dp">+ app:cardElevation="1dp"><androidx.constraintlayout.widget.ConstraintLayoutandroid:layout_width="match_parent"@@ -41,8 +41,7 @@app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toTopOf="parent"- app:srcCompat="@drawable/card_pass_bg" />+ app:layout_constraintTop_toTopOf="parent" /><ImageViewandroid:id="@+id/pass_geo_img"@@ -54,7 +53,7 @@app:layout_constraintTop_toTopOf="@+id/pass_geo_name"app:srcCompat="@drawable/ic_pass_active" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/pass_geo_name"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -66,7 +65,7 @@app:layout_constraintHorizontal_bias="0.02"app:layout_constraintStart_toEndOf="@+id/pass_geo_img" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/pass_geo_id"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -77,7 +76,7 @@app:layout_constraintEnd_toEndOf="@+id/pass_geo_el"app:layout_constraintTop_toTopOf="parent" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/pass_geo_az"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -90,7 +89,7 @@app:layout_constraintHorizontal_chainStyle="spread_inside"app:layout_constraintStart_toStartOf="parent" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/pass_geo_el"android:layout_width="wrap_content"android:layout_height="wrap_content"diff --git a/app/src/main/res/layout/item_pass_leo.xml b/app/src/main/res/layout/item_pass_leo.xmlindex 9687717b..c779c379 100644--- a/app/src/main/res/layout/item_pass_leo.xml+++ b/app/src/main/res/layout/item_pass_leo.xml@@ -26,7 +26,7 @@android:layout_marginTop="2dp"android:layout_marginEnd="4dp"android:layout_marginBottom="2dp"- app:cardElevation="4dp">+ app:cardElevation="1dp"><androidx.constraintlayout.widget.ConstraintLayoutandroid:layout_width="match_parent"@@ -37,14 +37,12 @@android:layout_width="0dp"android:layout_height="0dp"android:contentDescription="@string/placeholder"- android:scaleType="centerCrop"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toTopOf="parent"- app:srcCompat="@drawable/card_pass_bg" />+ app:layout_constraintTop_toTopOf="parent" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/pass_leo_losAz"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -55,7 +53,7 @@app:layout_constraintHorizontal_bias="1.0"app:layout_constraintStart_toEndOf="@+id/pass_leo_maxEl" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/pass_leo_satId"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -66,7 +64,7 @@app:layout_constraintEnd_toEndOf="@+id/pass_leo_progress"app:layout_constraintTop_toTopOf="parent" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/pass_leo_maxEl"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -88,7 +86,7 @@app:layout_constraintTop_toTopOf="@+id/pass_leo_satName"app:srcCompat="@drawable/ic_pass_inactive" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/pass_leo_satName"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -101,7 +99,7 @@app:layout_constraintStart_toEndOf="@+id/pass_leo_img"app:layout_constraintTop_toTopOf="@+id/pass_leo_satId" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/pass_leo_aosAz"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -112,7 +110,7 @@app:layout_constraintHorizontal_bias="0.0"app:layout_constraintStart_toStartOf="@+id/pass_leo_progress" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/pass_leo_aosTime"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -124,7 +122,7 @@app:layout_constraintHorizontal_chainStyle="spread_inside"app:layout_constraintStart_toStartOf="@+id/pass_leo_progress" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/pass_leo_losTime"android:layout_width="wrap_content"android:layout_height="wrap_content"diff --git a/app/src/main/res/layout/item_trans.xml b/app/src/main/res/layout/item_trans.xmlindex 8fe7a5a0..e137eb07 100644--- a/app/src/main/res/layout/item_trans.xml+++ b/app/src/main/res/layout/item_trans.xml@@ -25,13 +25,13 @@android:layout_marginStart="4dp"android:layout_marginTop="4dp"android:layout_marginEnd="4dp"- app:cardElevation="4dp">+ app:cardElevation="1dp"><androidx.constraintlayout.widget.ConstraintLayoutandroid:layout_width="match_parent"android:layout_height="match_parent">- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/trans_description"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -41,7 +41,7 @@app:layout_constraintStart_toEndOf="@+id/trans_img"app:layout_constraintTop_toTopOf="@+id/trans_img" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/trans_downlink"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -51,7 +51,7 @@app:layout_constraintStart_toEndOf="@+id/trans_img_downlink"app:layout_constraintTop_toBottomOf="@+id/trans_description" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/trans_uplink"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -75,7 +75,7 @@app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toBottomOf="@+id/trans_uplink" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/trans_downlink_doppler"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -86,7 +86,7 @@app:layout_constraintStart_toEndOf="@+id/trans_img_downlink_doppler"app:layout_constraintTop_toBottomOf="@+id/separator" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/trans_uplink_doppler"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -97,7 +97,7 @@app:layout_constraintStart_toEndOf="@+id/trans_img_uplink_doppler"app:layout_constraintTop_toBottomOf="@+id/trans_downlink_doppler" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/trans_mode"android:layout_width="wrap_content"android:layout_height="wrap_content"@@ -109,7 +109,7 @@app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toBottomOf="@+id/trans_uplink_doppler" />- <TextView+ <com.google.android.material.textview.MaterialTextViewandroid:id="@+id/trans_inverted"android:layout_width="wrap_content"android:layout_height="wrap_content"diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xmlindex 61b68a0d..4da71b78 100644--- a/app/src/main/res/values/colors.xml+++ b/app/src/main/res/values/colors.xml@@ -22,6 +22,7 @@<color name="themeLight">#FFE082</color><color name="greyDark">#121212</color><color name="greyLight">#E0E0E0</color>+ <color name="greySurface">#242424</color><!-- map colors --><color name="satTrack">#B00020</color><color name="satFootprint">#26FFE082</color>