mckero/Look4Sat-BA7OPF
1
0 Fork 0
mirror of https://github.com/atsunatsu/Look4Sat.git synced 2026-10-02 03:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

v2.5.6 - APIv21, issues #68 #69, grid layout, async update

Browse Source
This commit is contained in:
Arty Bishop committed 2021-10-28 21:46:02 +01:00
1 parent 88c7bb6bca
commit f8f7aba3a8
16 files changed
+65 -74
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/build.gradle
+2 -2
View File
@@ -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 {
app/src/main/java/com/rtbishop/look4sat/framework/PreferencesSource.kt
+4 -2
View File
@@ -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())
app/src/main/res/layout/fragment_entries.xml
-2
View File
@@ -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"
app/src/main/res/values-ru/strings.xml
+11 -13
View File
@@ -71,20 +71,18 @@
<string name="info_version">Версия: %s</string>
<string name="info_subtitle">Трекер спутников для Android</string>
<string name="info_bmc">Поддержать</string>
<string name="info_bmc">Поддержать разработчика</string>
<string name="info_thanks">Огромное спасибо:
\n— Вам за использование этого приложения! \nЖелаю всегда чистого неба над головой!
\n— <a href="https://github.com/g4dpz">David A. B. Johnson</a> и
<a href="https://github.com/davidmoten">Dave Moten</a> за работу над библиотекой predict4java и
за доступ к ней по лицензии <a href="https://gnu.org/licenses/old-licenses/gpl-2.0.en.html">GNU GPLv2</a>
\n— <a href="https://github.com/csete">Alexandru Csete</a> за его замечательную
программу Gpredict, которая вдохновила меня на создание Look4Sat.
\n— <a href="https://celestrak.com/webmaster.php">Доктору T.S. Kelso</a> за его сайт
\n\nВам за использование этого приложения! \nЖелаю всегда чистого неба над головой!
\n\n<a href="https://github.com/g4dpz">David A. B. Johnson</a> и
<a href="https://github.com/davidmoten">Dave Moten</a> за работу над predict4java и
доступ к ней по <a href="https://gnu.org/licenses/old-licenses/gpl-2.0.en.html">GNU GPLv2</a>
\n\n<a href="https://github.com/csete">Alexandru Csete</a> за его программу
Gpredict, которая послужила для меня вдохновением.
\n\n<a href="https://celestrak.com/webmaster.php">Доктору T.S. Kelso</a> за его сайт
<a href="https://celestrak.com/">Celestrak</a> и доступ к файлам орбит Two-Line Element.
\n— <a href="https://libre.space/">Libre Space Foundation</a> за проект
<a href="https://db.satnogs.org/">SatNOGS</a>, API и базу данных с огромным количеством информации о спутниках.
\n— <a href="https://square.github.io/">Square</a> за библиотеки OkHttp, Retrofit, Moshi и доступ
к ним по лицензии <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache-2.0</a></string>
<string name="info_warranty"><a href="https://sites.google.com/view/look4sat-privacy-policy/home">Политика конфиденциальности</a>
\n\n<a href="https://libre.space/">Libre Space Foundation</a> за проект
<a href="https://db.satnogs.org/">SatNOGS</a>, API и базу данных с информацией о спутниках.</string>
<string name="info_warranty"><a href="https://sites.google.com/view/look4sat-privacy-policy/home">Политика конфиденциальности.</a>
\nЭто ПО поставляется без гарантий. \nПодробности в лицензии <a href="https://www.gnu.org/licenses/gpl-3.0.html">GNU GPLv3</a>.</string>
</resources>
app/src/main/res/values/strings.xml
+12 -14
View File
@@ -95,21 +95,19 @@
<string name="info_subtitle">Satellite tracker and pass predictor</string>
<string name="info_github" translatable="false">GitHub</string>
<string name="info_fdroid" translatable="false">F-Droid</string>
<string name="info_bmc">Buy me a coffee</string>
<string name="info_bmc">Support the developer</string>
<string name="info_thanks">Huge thanks to:
\n— You for downloading and using Look4Sat! \nMay your sky always be clear!
\n— <a href="https://github.com/g4dpz">David A. B. Johnson</a>
and <a href="https://github.com/davidmoten">Dave Moten</a> for creating predict4java library and making it
available under the <a href="https://gnu.org/licenses/old-licenses/gpl-2.0.en.html">GNU GPLv2</a> license.
\n— <a href="https://github.com/csete">Alexandru Csete</a> for creating Gpredict
sat tracker that inspired the creation of Look4Sat.
\n— <a href="https://celestrak.com/webmaster.php">Dr T.S. Kelso</a> for maintaining his
\n\nYou for downloading and using Look4Sat! \nMay your sky always be clear!
\n\n<a href="https://github.com/g4dpz">David A. B. Johnson</a>
and <a href="https://github.com/davidmoten">Dave Moten</a> for creating predict4java lib
under the <a href="https://gnu.org/licenses/old-licenses/gpl-2.0.en.html">GNU GPLv2</a> license.
\n\n<a href="https://github.com/csete">Alexandru Csete</a> for creating Gpredict
satellite tracker that inspired the creation of Look4Sat.
\n\n<a href="https://celestrak.com/webmaster.php">Dr T.S. Kelso</a> for maintaining his
<a href="https://celestrak.com/">Celestrak</a> website that provides access to the TLE data.
\n— <a href="https://libre.space/">Libre Space Foundation</a> for their <a href="https://db.satnogs.org/">SatNOGS</a>
API and database providing a huge amount of satellite data used by Look4Sat.
\n— <a href="https://square.github.io/">Square</a> for epic OkHttp, Retrofit and Moshi libs
available under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache-2.0</a> license.
\n\n<a href="https://libre.space/">Libre Space Foundation</a> for their <a href="https://db.satnogs.org/">SatNOGS</a>
API and DB providing a huge amount of satellite data.
</string>
<string name="info_warranty"><a href="https://sites.google.com/view/look4sat-privacy-policy/home">Privacy Policy</a>
\nThis app comes with no warranty. \nSee the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GNU GPLv3</a> license for details.</string>
<string name="info_warranty"><a href="https://sites.google.com/view/look4sat-privacy-policy/home">Privacy Policy.</a>
The app comes with no warranty. \nSee the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GNU GPLv3</a> license for details.</string>
</resources>