Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
v2.5.8 - Fixed update crash, redundant components removed
Arty Bishop80e49ad85a64
diff --git a/README.md b/README.mdindex a8b7dc3a..83ae546d 100644--- a/README.md+++ b/README.md@@ -1,4 +1,4 @@-# Look4Sat: Radio satellite tracker+# Look4Sat: Satellite tracker[](https://github.com/rt-bishop/Look4Sat/actions/workflows/main.yml)diff --git a/app/build.gradle b/app/build.gradleindex f5eed27d..2ef7f467 100644--- a/app/build.gradle+++ b/app/build.gradle@@ -14,8 +14,8 @@ android {minSdkVersion 21resConfigs "en,ru"targetSdkVersion 31- versionCode 257- versionName "2.5.7"+ versionCode 258+ versionName "2.5.8"kapt {arguments {diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/Extensions.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/Extensions.ktindex 6e3ea588..8a9d2fbb 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/Extensions.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/Extensions.kt@@ -17,7 +17,10 @@*/package com.rtbishop.look4sat.presentation+import android.content.Context+import android.content.SharedPreferencesimport android.os.Bundle+import android.widget.Toastimport androidx.annotation.IdResimport androidx.fragment.app.Fragmentimport androidx.lifecycle.Lifecycle@@ -30,6 +33,18 @@ import java.security.MessageDigestimport java.util.concurrent.TimeUnitimport java.util.regex.Pattern+fun Context.toast(text: String, duration: Int = Toast.LENGTH_SHORT) {+ Toast.makeText(this, text, duration).apply { show() }+}++fun SharedPreferences.getDouble(key: String, default: Double): Double {+ return Double.fromBits(getLong(key, default.toRawBits()))+}++fun SharedPreferences.Editor.putDouble(key: String, double: Double) {+ putLong(key, double.toRawBits())+}+fun NavController.navigateSafe(@IdRes resId: Int,args: Bundle? = null,diff --git a/build.gradle b/build.gradleindex 972f8621..2ca775ac 100644--- a/build.gradle+++ b/build.gradle@@ -1,6 +1,6 @@buildscript {ext {- gradle_version = '7.0.3'+ gradle_version = '7.0.4'kotlin_version = '1.6.0'coroutines_version = '1.5.2-native-mt'splash_screen_version = '1.0.0-alpha01'@@ -9,8 +9,8 @@ buildscript {navigation_version = '2.3.5'preference_version = '1.1.1'room_version = '2.3.0'- hilt_version = '2.40.2'- json_version = '20210307'+ hilt_version = '2.40.5'+ json_version = '20211205'osmdroid_version = '6.1.11'timber_version = '5.0.1'junit_version = '4.13.2'diff --git a/fastlane/metadata/android/en-US/changelogs/257.txt b/fastlane/metadata/android/en-US/changelogs/257.txtdeleted file mode 100644index e8175e50..00000000--- a/fastlane/metadata/android/en-US/changelogs/257.txt+++ /dev/null@@ -1,8 +0,0 @@-Reverted API version to v21, Android 5.0-Fixed antenna rotator control issue #69-Fixed Redmi dark theme colors bug-Fixed satellite selection checkbox click bug-Switched to grid layout in entries list-Fetching satellite data asynchronously-Added toggle from pass view to map view #68-Further code refactoring and cleanup\ No newline at end of filediff --git a/fastlane/metadata/android/en-US/changelogs/258.txt b/fastlane/metadata/android/en-US/changelogs/258.txtnew file mode 100644index 00000000..513f98fd--- /dev/null+++ b/fastlane/metadata/android/en-US/changelogs/258.txt@@ -0,0 +1,6 @@+Restored missing app icons for low-res/api screens+Removed redundant material components+Fixed Redmi dark theme colors bug+Fixed RemoteSource update crash+Matched CSV and TLE parsers output+Further code refactoring and cleanup\ No newline at end of filediff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txtindex 8ae65531..d0565b18 100644--- a/fastlane/metadata/android/en-US/short_description.txt+++ b/fastlane/metadata/android/en-US/short_description.txt@@ -1 +1 @@-Radio satellite tracker and pass predictor for Android+Radio satellite tracker and pass predictor for Android\ No newline at end of filediff --git a/fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txtindex 89ef6d7b..c1b8a774 100644--- a/fastlane/metadata/android/en-US/title.txt+++ b/fastlane/metadata/android/en-US/title.txt@@ -1 +1 @@-Look4Sat: Radio satellite tracker+Look4Sat: Satellite tracker\ No newline at end of filediff --git a/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US b/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-USindex e8175e50..513f98fd 100644--- a/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US+++ b/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US@@ -1,8 +1,6 @@-Reverted API version to v21, Android 5.0-Fixed antenna rotator control issue #69+Restored missing app icons for low-res/api screens+Removed redundant material componentsFixed Redmi dark theme colors bug-Fixed satellite selection checkbox click bug-Switched to grid layout in entries list-Fetching satellite data asynchronously-Added toggle from pass view to map view #68+Fixed RemoteSource update crash+Matched CSV and TLE parsers outputFurther code refactoring and cleanup\ No newline at end of filediff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jarindex f6b961fd..e708b1c0 100644Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differdiff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.propertiesindex bbb1a552..84d1f85f 100644--- a/gradle/wrapper/gradle-wrapper.properties+++ b/gradle/wrapper/gradle-wrapper.properties@@ -1,6 +1,5 @@-#Mon Oct 12 23:30:44 BST 2020distributionBase=GRADLE_USER_HOMEdistributionPath=wrapper/dists+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zipzipStoreBase=GRADLE_USER_HOMEzipStorePath=wrapper/dists-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zipdiff --git a/gradlew b/gradlewindex cccdd3d5..4f906e0c 100755--- a/gradlew+++ b/gradlew@@ -1,5 +1,21 @@#!/usr/bin/env sh+#+# Copyright 2015 the original author or authors.+#+# Licensed under the Apache License, Version 2.0 (the "License");+# you may not use this file except in compliance with the License.+# You may obtain a copy of the License at+#+# https://www.apache.org/licenses/LICENSE-2.0+#+# Unless required by applicable law or agreed to in writing, software+# distributed under the License is distributed on an "AS IS" BASIS,+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+# See the License for the specific language governing permissions and+# limitations under the License.+#+################################################################################## Gradle start up script for UN*X@@ -28,7 +44,7 @@ APP_NAME="Gradle"APP_BASE_NAME=`basename "$0"`# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.-DEFAULT_JVM_OPTS=""+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'# Use the maximum available, or set MAX_FD != -1 to use that value.MAX_FD="maximum"@@ -66,6 +82,7 @@ esacCLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar+# Determine the Java command to use to start the JVM.if [ -n "$JAVA_HOME" ] ; thenif [ -x "$JAVA_HOME/jre/sh/java" ] ; then@@ -109,10 +126,11 @@ if $darwin; thenGRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""fi-# For Cygwin, switch paths to Windows format before running java-if $cygwin ; then+# For Cygwin or MSYS, switch paths to Windows format before running java+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; thenAPP_HOME=`cygpath --path --mixed "$APP_HOME"`CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`+JAVACMD=`cygpath --unix "$JAVACMD"`# We build the pattern for arguments to be converted via cygpath@@ -138,19 +156,19 @@ if $cygwin ; thenelseeval `echo args$i`="\"$arg\""fi- i=$((i+1))+ i=`expr $i + 1`donecase $i in- (0) set -- ;;- (1) set -- "$args0" ;;- (2) set -- "$args0" "$args1" ;;- (3) set -- "$args0" "$args1" "$args2" ;;- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;+ 0) set -- ;;+ 1) set -- "$args0" ;;+ 2) set -- "$args0" "$args1" ;;+ 3) set -- "$args0" "$args1" "$args2" ;;+ 4) set -- "$args0" "$args1" "$args2" "$args3" ;;+ 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;+ 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;+ 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;+ 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;+ 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;esacfi@@ -159,14 +177,9 @@ save () {for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; doneecho " "}-APP_ARGS=$(save "$@")+APP_ARGS=`save "$@"`# Collect all arguments for the java command, following the shell quoting and substitution ruleseval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then- cd "$(dirname "$0")"-fi-exec "$JAVACMD" "$@"diff --git a/gradlew.bat b/gradlew.batindex f9553162..107acd32 100644--- a/gradlew.bat+++ b/gradlew.bat@@ -1,3 +1,19 @@+@rem+@rem Copyright 2015 the original author or authors.+@rem+@rem Licensed under the Apache License, Version 2.0 (the "License");+@rem you may not use this file except in compliance with the License.+@rem You may obtain a copy of the License at+@rem+@rem https://www.apache.org/licenses/LICENSE-2.0+@rem+@rem Unless required by applicable law or agreed to in writing, software+@rem distributed under the License is distributed on an "AS IS" BASIS,+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+@rem See the License for the specific language governing permissions and+@rem limitations under the License.+@rem+@if "%DEBUG%" == "" @echo off@rem ##########################################################################@rem@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.set APP_BASE_NAME=%~n0set APP_HOME=%DIRNAME%+@rem Resolve any "." and ".." in APP_HOME to make it shorter.+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.-set DEFAULT_JVM_OPTS=+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"@rem Find java.exeif defined JAVA_HOME goto findJavaFromJavaHomeset JAVA_EXE=java.exe%JAVA_EXE% -version >NUL 2>&1-if "%ERRORLEVEL%" == "0" goto init+if "%ERRORLEVEL%" == "0" goto executeecho.echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.@@ -35,7 +54,7 @@ goto failset JAVA_HOME=%JAVA_HOME:"=%set JAVA_EXE=%JAVA_HOME%/bin/java.exe-if exist "%JAVA_EXE%" goto init+if exist "%JAVA_EXE%" goto executeecho.echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%@@ -45,28 +64,14 @@ echo location of your Java installation.goto fail-:init-@rem Get command-line arguments, handling Windows variants--if not "%OS%" == "Windows_NT" goto win9xME_args--:win9xME_args-@rem Slurp the command line arguments.-set CMD_LINE_ARGS=-set _SKIP=2--:win9xME_args_slurp-if "x%~1" == "x" goto execute--set CMD_LINE_ARGS=%*-:execute@rem Setup the command lineset CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar+@rem Execute Gradle-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*:end@rem End local scope for the variables with windows NT shell