Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
First attempt to add Doppler shift frequency calculations
Peter Javorskyd8ef1c9f4000
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/TransmitterAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/adapters/TransmitterAdapter.ktindex b9091688..a1b4d65b 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/TransmitterAdapter.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/adapters/TransmitterAdapter.kt@@ -27,10 +27,17 @@ import androidx.recyclerview.widget.RecyclerViewimport com.rtbishop.look4sat.Rimport com.rtbishop.look4sat.data.Transmitterimport com.rtbishop.look4sat.databinding.ItemTransmitterBinding+import com.rtbishop.look4sat.utility.PassPredictor+import java.util.*class TransmitterAdapter : RecyclerView.Adapter<TransmitterAdapter.TransmitterHolder>() {private var transmittersList = emptyList<Transmitter>()+ private lateinit var predictor: PassPredictor++ fun setPredictor(predict: PassPredictor) {+ predictor = predict+ }fun setList(list: List<Transmitter>) {transmittersList = list@@ -65,6 +72,11 @@ class TransmitterAdapter : RecyclerView.Adapter<TransmitterAdapter.TransmitterHocontext.getString(R.string.trans_down_low),transmitter.downlinkLow / freqDivider)+ binding.transDownlinkDoppler.text = String+ .format(+ context.getString(R.string.trans_down_low_doppler),+ predictor.getDownlinkFreq(transmitter.downlinkLow, Date()) / freqDivider+ )} else if (transmitter.downlinkLow != null && transmitter.downlinkHigh != null) {binding.transDownlink.text = String.format(@@ -72,8 +84,15 @@ class TransmitterAdapter : RecyclerView.Adapter<TransmitterAdapter.TransmitterHotransmitter.downlinkLow / freqDivider,transmitter.downlinkHigh / freqDivider)+ binding.transDownlinkDoppler.text = String+ .format(+ context.getString(R.string.trans_down_lowHigh_doppler),+ predictor.getDownlinkFreq(transmitter.downlinkLow, Date()) / freqDivider,+ predictor.getDownlinkFreq(transmitter.downlinkHigh, Date()) / freqDivider+ )} else {binding.transDownlink.text = context.getString(R.string.no_downlink)+ binding.transDownlinkDoppler.text = context.getString(R.string.no_downlink_doppler)}if (transmitter.uplinkLow != null && transmitter.uplinkHigh == null) {@@ -81,14 +100,24 @@ class TransmitterAdapter : RecyclerView.Adapter<TransmitterAdapter.TransmitterHocontext.getString(R.string.trans_up_low),transmitter.uplinkLow / freqDivider)+ binding.transUplinkDoppler.text = String.format(+ context.getString(R.string.trans_up_low_doppler),+ predictor.getUplinkFreq(transmitter.uplinkLow, Date()) / freqDivider+ )} else if (transmitter.uplinkLow != null && transmitter.uplinkHigh != null) {binding.transUplink.text = String.format(context.getString(R.string.trans_up_lowHigh),transmitter.uplinkLow / freqDivider,transmitter.uplinkHigh / freqDivider)+ binding.transUplinkDoppler.text = String.format(+ context.getString(R.string.trans_up_lowHigh_doppler),+ predictor.getUplinkFreq(transmitter.uplinkLow, Date()) / freqDivider,+ predictor.getUplinkFreq(transmitter.uplinkHigh, Date()) / freqDivider+ )} else {binding.transUplink.text = context.getString(R.string.no_uplink)+ binding.transUplinkDoppler.text = context.getString(R.string.no_uplink_doppler)}if (transmitter.mode != null) {diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PolarViewFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PolarViewFragment.ktindex f6706f84..f8395424 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PolarViewFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PolarViewFragment.kt@@ -142,6 +142,7 @@ class PolarViewFragment : Fragment(R.layout.fragment_polar_view), SensorEventLisprivate fun observeTransmitters() {viewModel.getTransmittersForSat(satPass.tle.catnum).observe(viewLifecycleOwner, Observer {if (it.isNotEmpty()) {+ transmitterAdapter.setPredictor(satPass.predictor)transmitterAdapter.setList(it)transmitterAdapter.notifyDataSetChanged()binding.recPolar.visibility = View.VISIBLEdiff --git a/app/src/main/res/layout/item_transmitter.xml b/app/src/main/res/layout/item_transmitter.xmlindex 3c1b747a..9516c89f 100644--- a/app/src/main/res/layout/item_transmitter.xml+++ b/app/src/main/res/layout/item_transmitter.xml@@ -57,6 +57,34 @@app:layout_constraintStart_toEndOf="@+id/trans_img_uplink"app:layout_constraintTop_toBottomOf="@+id/trans_downlink" />+ <View+ android:id="@+id/separator"+ android:layout_width="match_parent"+ android:padding="15dp"+ android:layout_marginLeft="20dp"+ android:layout_marginRight="20dp"+ android:layout_height="1dp"+ app:layout_constraintHorizontal_bias="0.5"+ app:layout_constraintTop_toBottomOf="@+id/trans_uplink"+ android:background="#333"/>++ <TextView+ android:id="@+id/trans_downlink_doppler"+ style="@style/CardTransText"+ android:text="@string/trans_down_lowHigh_doppler"+ app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintStart_toEndOf="@+id/trans_img_downlink_doppler"+ app:layout_constraintTop_toBottomOf="@+id/separator" />++ <TextView+ android:id="@+id/trans_uplink_doppler"+ style="@style/CardTransText"+ android:text="@string/trans_up_lowHigh_doppler"+ app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintHorizontal_bias="0.5"+ app:layout_constraintStart_toEndOf="@+id/trans_img_uplink_doppler"+ app:layout_constraintTop_toBottomOf="@+id/trans_downlink_doppler" />+<TextViewandroid:id="@+id/trans_mode"style="@style/CardTransText"@@ -65,7 +93,7 @@android:text="@string/trans_mode"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/trans_uplink" />+ app:layout_constraintTop_toBottomOf="@+id/trans_uplink_doppler" /><TextViewandroid:id="@+id/trans_inverted"@@ -114,5 +142,32 @@app:layout_constraintTop_toBottomOf="@+id/trans_downlink"app:srcCompat="@drawable/ic_arrow" />+ <ImageView+ android:id="@+id/trans_img_downlink_doppler"+ android:layout_width="20dp"+ android:layout_height="20dp"+ android:contentDescription="@string/placeholder"+ android:rotation="180"+ app:layout_constraintBottom_toBottomOf="@+id/trans_downlink_doppler"+ app:layout_constraintEnd_toStartOf="@+id/trans_downlink_doppler"+ app:layout_constraintHorizontal_bias="0.5"+ app:layout_constraintHorizontal_chainStyle="packed"+ app:layout_constraintStart_toStartOf="parent"+ app:layout_constraintTop_toTopOf="@+id/trans_downlink_doppler"+ app:srcCompat="@drawable/ic_arrow" />++ <ImageView+ android:id="@+id/trans_img_uplink_doppler"+ android:layout_width="20dp"+ android:layout_height="20dp"+ android:contentDescription="@string/placeholder"+ app:layout_constraintBottom_toBottomOf="@+id/trans_uplink_doppler"+ app:layout_constraintEnd_toStartOf="@+id/trans_uplink_doppler"+ app:layout_constraintHorizontal_bias="0.5"+ app:layout_constraintHorizontal_chainStyle="packed"+ app:layout_constraintStart_toStartOf="parent"+ app:layout_constraintTop_toBottomOf="@+id/trans_downlink_doppler"+ app:srcCompat="@drawable/ic_arrow" />+</androidx.constraintlayout.widget.ConstraintLayout></com.google.android.material.card.MaterialCardView>diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xmlindex 2ba2204a..7f04e73e 100644--- a/app/src/main/res/values-ru/strings.xml+++ b/app/src/main/res/values-ru/strings.xml@@ -92,6 +92,10 @@<string name="trans_up_lowHigh">Восход.: %.4f - %.4f MHz</string><string name="trans_down_low">Нисход.: %.4f MHz</string><string name="trans_down_lowHigh">Нисход.: %.4f - %.4f MHz</string>+ <string name="trans_up_low_doppler">Восход.: %.4f MHz</string>+ <string name="trans_up_lowHigh_doppler">Восход.: %.4f - %.4f MHz</string>+ <string name="trans_down_low_doppler">Нисход.: %.4f MHz</string>+ <string name="trans_down_lowHigh_doppler">Нисход.: %.4f - %.4f MHz</string><string name="info_swipe_text">Проведите по экрану вниз, чтобы обновить список пролетовдля выбранных спутников</string>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex 3d8afbe9..c124bd81 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -78,6 +78,8 @@<string name="no_mode">Mode: null</string><string name="no_uplink">Uplink: null</string><string name="no_downlink">Downlink: null</string>+ <string name="no_uplink_doppler">Current uplink: null</string>+ <string name="no_downlink_doppler">Current downlink: null</string><string name="no_trans">No transceivers found for this satellite</string><string name="err_no_permissions">Missing permissions</string>@@ -108,6 +110,10 @@<string name="trans_up_lowHigh">Uplink: %.4f - %.4f MHz</string><string name="trans_down_low">Downlink: %.4f MHz</string><string name="trans_down_lowHigh">Downlink: %.4f - %.4f MHz</string>+ <string name="trans_up_low_doppler">Current uplink: %.4f MHz</string>+ <string name="trans_up_lowHigh_doppler">Current uplink: %.4f - %.4f MHz</string>+ <string name="trans_down_low_doppler">Current downlink: %.4f MHz</string>+ <string name="trans_down_lowHigh_doppler">Current downlink: %.4f - %.4f MHz</string><string name="info_swipe_text">Swipe the screen to refresh the list of passes for selected satellites</string>diff --git a/build.gradle b/build.gradleindex ff0f5156..057169d3 100644--- a/build.gradle+++ b/build.gradle@@ -26,9 +26,10 @@ buildscript {}dependencies {- classpath 'com.android.tools.build:gradle:3.6.3'+ classpath 'com.android.tools.build:gradle:4.0.1'classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72"classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.2.2"+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10"}}diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.propertiesindex b02380e4..a769df24 100644--- a/gradle/wrapper/gradle-wrapper.properties+++ b/gradle/wrapper/gradle-wrapper.properties@@ -1,26 +1,6 @@-#-# Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android.-# Copyright (C) 2019, 2020 Arty Bishop ([email protected])-#-# This program is free software; you can redistribute it and/or modify-# it under the terms of the GNU General Public License as published by-# the Free Software Foundation; either version 2 of the License, or-# (at your option) any later version.-#-# This program is distributed in the hope that it will be useful,-# but WITHOUT ANY WARRANTY; without even the implied warranty of-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-# GNU General Public License for more details.-#-# You should have received a copy of the GNU General Public License along-# with this program; if not, write to the Free Software Foundation, Inc.,-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.-#--#Mon Feb 24 22:26:03 GMT 2020+#Thu Sep 17 13:43:53 CEST 2020distributionBase=GRADLE_USER_HOMEdistributionPath=wrapper/distszipStoreBase=GRADLE_USER_HOMEzipStorePath=wrapper/dists-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip-distributionSha256Sum=abc10bcedb58806e8654210f96031db541bcd2d6fc3161e81cb0572d6a15e821+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip