diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8a332d88..1ab3fb39 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,14 +46,14 @@ jobs: env: BUILD_TOOLS_VERSION: "31.0.0" - - name: Deploy Bundle to Play Store - uses: r0adkll/upload-google-play@v1 - with: - serviceAccountJsonPlainText: ${{secrets.SERVICE_ACCOUNT_JSON}} - packageName: com.rtbishop.look4sat - track: production - whatsNewDirectory: fastlane/metadata/android/en-US/whatsnew - releaseFiles: ${{steps.sign_bundle.outputs.signedReleaseFile}} +# - name: Deploy Bundle to Play Store +# uses: r0adkll/upload-google-play@v1 +# with: +# serviceAccountJsonPlainText: ${{secrets.SERVICE_ACCOUNT_JSON}} +# packageName: com.rtbishop.look4sat +# track: production +# whatsNewDirectory: fastlane/metadata/android/en-US/whatsnew +# releaseFiles: ${{steps.sign_bundle.outputs.signedReleaseFile}} - name: Create release uses: ncipollo/release-action@v1 diff --git a/README.md b/README.md index d02401b0..a8b7dc3a 100644 --- a/README.md +++ b/README.md @@ -5,27 +5,22 @@ [Get it on Google Play](https://play.google.com/store/apps/details?id=com.rtbishop.look4sat) [Get it on F-Droid](https://f-droid.org/packages/com.rtbishop.look4sat/) -### Open-source amateur radio satellite tracker and pass predictor for Android +### Radio satellite tracker and pass predictor for Android, inspired by Gpredict

- - - - + + + +

-### Let this app look for satellites for you! +### Track satellite passes with ease! -Thanks to the huge database provided by Celestrak and SatNOGS you have access to more than 3000 -active satellites orbiting Earth at this very moment. You can search the entire DB by satellite -name or by NORAD catalog number. Track them with ease! +Thanks to the huge database provided by Celestrak and SatNOGS you have access to more than 3000 active satellites orbiting Earth. You can search the entire DB by satellite name or by NORAD catnum. -Satellite positions and passes are calculated relative to your location. In order to get reliable -predictions set the observation position using GPS or QTH Locator in the Settings menu. +Satellite positions and passes are calculated relative to your location. To get reliable info make sure to set the observation position using GPS or QTH Locator in the Settings menu. -The application is built using predict4java library, Kotlin, Coroutines, Dagger2, Retrofit2, Moshi, -Architecture Components and Jetpack Navigation. It is now and always will be completely ad-free -and open-source. +The application is built using Kotlin, Coroutines, Architecture Components and Jetpack Navigation. It is now and always will be completely ad-free and open-source. ## Main features: diff --git a/app/build.gradle b/app/build.gradle index 07116392..c7f9bc1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,8 +14,8 @@ android { minSdkVersion 21 resConfigs "en,ru" targetSdkVersion 31 - versionCode 255 - versionName "2.5.5" + versionCode 256 + versionName "2.5.6" kapt { arguments { diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/PreferencesSource.kt b/app/src/main/java/com/rtbishop/look4sat/framework/PreferencesSource.kt index 65a7f120..d08c44a2 100644 --- a/app/src/main/java/com/rtbishop/look4sat/framework/PreferencesSource.kt +++ b/app/src/main/java/com/rtbishop/look4sat/framework/PreferencesSource.kt @@ -21,6 +21,7 @@ import android.content.SharedPreferences import android.hardware.GeomagneticField import android.location.LocationManager import androidx.core.content.edit +import com.rtbishop.look4sat.BuildConfig import com.rtbishop.look4sat.domain.predict.GeoPos import com.rtbishop.look4sat.domain.QthConverter import com.rtbishop.look4sat.presentation.round @@ -33,6 +34,8 @@ class PreferencesSource @Inject constructor( private val preferences: SharedPreferences ) { + private val keyInitialSetup = "${BuildConfig.VERSION_NAME}update" + companion object { const val keyModes = "satModes" const val keyCompass = "compass" @@ -41,7 +44,6 @@ class PreferencesSource @Inject constructor( const val keyTimeUTC = "timeUTC" const val keyHoursAhead = "hoursAhead" const val keyMinElevation = "minElevation" - const val keyInitialSetup = "initialSetupDone" const val keyRotator = "isRotatorEnabled" const val keyRotatorAddress = "rotatorAddress" const val keyRotatorPort = "rotatorPort" @@ -58,7 +60,7 @@ class PreferencesSource @Inject constructor( return GeoPos(latitude.toDouble(), longitude.toDouble()) } - fun saveStationPosition(pos: GeoPos) { + private fun saveStationPosition(pos: GeoPos) { preferences.edit { putString(keyLatitude, pos.latitude.toString()) putString(keyLongitude, pos.longitude.toString()) diff --git a/app/src/main/res/layout/fragment_entries.xml b/app/src/main/res/layout/fragment_entries.xml index cc09d82c..995539d4 100644 --- a/app/src/main/res/layout/fragment_entries.xml +++ b/app/src/main/res/layout/fragment_entries.xml @@ -54,10 +54,8 @@ android:id="@+id/entries_search_bar" android:layout_width="0dp" android:layout_height="0dp" - android:layout_marginStart="2dp" android:iconifiedByDefault="false" android:queryHint="@string/entries_search_hint" - android:searchIcon="@null" app:layout_constraintBottom_toBottomOf="@+id/entries_select_mode" app:layout_constraintEnd_toStartOf="@+id/entries_select_mode" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index e5498bd3..4bcc92e4 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -71,20 +71,18 @@ Версия: %s Трекер спутников для Android - Поддержать + Поддержать разработчика Огромное спасибо: - \n— Вам за использование этого приложения! \nЖелаю всегда чистого неба над головой! - \n— David A. B. Johnson и - Dave Moten за работу над библиотекой predict4java и - за доступ к ней по лицензии GNU GPLv2 - \n— Alexandru Csete за его замечательную - программу Gpredict, которая вдохновила меня на создание Look4Sat. - \n— Доктору T.S. Kelso за его сайт + \n\nВам за использование этого приложения! \nЖелаю всегда чистого неба над головой! + \n\nDavid A. B. Johnson и + Dave Moten за работу над predict4java и + доступ к ней по GNU GPLv2 + \n\nAlexandru Csete за его программу + Gpredict, которая послужила для меня вдохновением. + \n\nДоктору T.S. Kelso за его сайт Celestrak и доступ к файлам орбит Two-Line Element. - \n— Libre Space Foundation за проект - SatNOGS, API и базу данных с огромным количеством информации о спутниках. - \n— Square за библиотеки OkHttp, Retrofit, Moshi и доступ - к ним по лицензии Apache-2.0 - Политика конфиденциальности + \n\nLibre Space Foundation за проект + SatNOGS, API и базу данных с информацией о спутниках. + Политика конфиденциальности. \nЭто ПО поставляется без гарантий. \nПодробности в лицензии GNU GPLv3. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6937892b..dd535d4f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -95,21 +95,19 @@ Satellite tracker and pass predictor GitHub F-Droid - Buy me a coffee + Support the developer Huge thanks to: - \n— You for downloading and using Look4Sat! \nMay your sky always be clear! - \n— David A. B. Johnson - and Dave Moten for creating predict4java library and making it - available under the GNU GPLv2 license. - \n— Alexandru Csete for creating Gpredict - sat tracker that inspired the creation of Look4Sat. - \n— Dr T.S. Kelso for maintaining his + \n\nYou for downloading and using Look4Sat! \nMay your sky always be clear! + \n\nDavid A. B. Johnson + and Dave Moten for creating predict4java lib + under the GNU GPLv2 license. + \n\nAlexandru Csete for creating Gpredict + satellite tracker that inspired the creation of Look4Sat. + \n\nDr T.S. Kelso for maintaining his Celestrak website that provides access to the TLE data. - \n— Libre Space Foundation for their SatNOGS - API and database providing a huge amount of satellite data used by Look4Sat. - \n— Square for epic OkHttp, Retrofit and Moshi libs - available under the Apache-2.0 license. + \n\nLibre Space Foundation for their SatNOGS + API and DB providing a huge amount of satellite data. - Privacy Policy - \nThis app comes with no warranty. \nSee the GNU GPLv3 license for details. + Privacy Policy. + The app comes with no warranty. \nSee the GNU GPLv3 license for details. diff --git a/fastlane/metadata/android/en-US/changelogs/255.txt b/fastlane/metadata/android/en-US/changelogs/255.txt deleted file mode 100644 index c83c9242..00000000 --- a/fastlane/metadata/android/en-US/changelogs/255.txt +++ /dev/null @@ -1,4 +0,0 @@ -Now correctly using the hours ahead setting #66 -Fixed broken pass progress indicator #67 -Fixed satellite data update crash -Lots of refactoring, getting codebase ready for new features \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/256.txt b/fastlane/metadata/android/en-US/changelogs/256.txt new file mode 100644 index 00000000..503f5032 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/256.txt @@ -0,0 +1,7 @@ +Reverted API version to v21, Android 5.0 +Fixed antenna rotator control issue #69 +Fixed Redmi dark theme colors 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 file diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt index cfd08421..4f683749 100644 --- a/fastlane/metadata/android/en-US/full_description.txt +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -1,16 +1,10 @@ -Let this app look for satellites for you! +Track satellite passes with ease! -Thanks to the huge database provided by Celestrak and SatNOGS you have access to more than 3000 -active satellites orbiting Earth at this very moment. You can search the entire DB by satellite -name or by NORAD catalog number. Track them with ease! +Thanks to the huge database provided by Celestrak and SatNOGS you have access to more than 3000 active satellites orbiting Earth. You can search the entire DB by satellite name or by NORAD catnum. -Satellite positions and passes are calculated relative to your location. In order to get reliable -predictions set the observation position using GPS or QTH Locator in the Settings menu. +Satellite positions and passes are calculated relative to your location. To get reliable info make sure to set the observation position using GPS or QTH Locator in the Settings menu. -The application is built using predict4java library, Kotlin, Coroutines, Dagger2, Retrofit2, Moshi, -Architecture Components and Jetpack Navigation. It is now and always will be completely ad-free -and open-source. Make sure you check the app developer's -GitHub repository. +The application is built using Kotlin, Coroutines, Architecture Components and Jetpack Navigation. It is now and always will be completely ad-free and open-source. Main features: