Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Added various tweaks to dependencies and translations
Arty Bishop9e765a357555
diff --git a/app/build.gradle.kts b/app/build.gradle.ktsindex 01d6f275..d21e65c2 100644--- a/app/build.gradle.kts+++ b/app/build.gradle.kts@@ -1,7 +1,6 @@plugins {alias(libs.plugins.android.application)alias(libs.plugins.compose.compiler)- alias(libs.plugins.google.ksp)}kotlin {@@ -32,7 +31,7 @@ android {}androidResources {generateLocaleConfig = true- localeFilters.addAll(listOf("en", "es-rES", "ru", "si", "uk", "zh-rCN"))+ localeFilters.addAll(listOf("en", "es", "ru", "si", "uk", "zh"))}}@@ -41,14 +40,8 @@ dependencies {implementation(project(":domain"))implementation(libs.androidx.core.splashscreen)- implementation(libs.androidx.room)- implementation(libs.androidx.room.runtime)- ksp(libs.androidx.room.compiler)-implementation(platform(libs.compose.bom))implementation(libs.bundles.composeAll)-- implementation(libs.other.okhttp)implementation(libs.other.osmdroid)debugImplementation(libs.bundles.composeDebug)diff --git a/app/src/main/java/com/rtbishop/look4sat/MainApplication.kt b/app/src/main/java/com/rtbishop/look4sat/MainApplication.ktindex 317d0b91..e578d4f7 100644--- a/app/src/main/java/com/rtbishop/look4sat/MainApplication.kt+++ b/app/src/main/java/com/rtbishop/look4sat/MainApplication.kt@@ -18,6 +18,7 @@package com.rtbishop.look4satimport android.app.Application+import com.rtbishop.look4sat.data.injection.MainContainerimport java.text.SimpleDateFormatimport java.util.Dateimport java.util.Localediff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es/strings.xmlsimilarity index 100%rename from app/src/main/res/values-es-rES/strings.xmlrename to app/src/main/res/values-es/strings.xmldiff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh/strings.xmlsimilarity index 98%rename from app/src/main/res/values-zh-rCN/strings.xmlrename to app/src/main/res/values-zh/strings.xmlindex babfa9ef..772f407b 100644--- a/app/src/main/res/values-zh-rCN/strings.xml+++ b/app/src/main/res/values-zh/strings.xml@@ -1,153 +1,153 @@-<?xml version="1.0" encoding="utf-8"?>-<resources>- <!-- Commmon -->- <string name="btn_accept">确定</string>- <string name="btn_cancel">取消</string>- <string name="empty_list_message">没有可显示的内容</string>-- <!-- Navigation -->- <string name="nav_satellites">卫星</string>- <string name="nav_passes">过境</string>- <string name="nav_radar">Radar</string>- <string name="nav_map">地图</string>- <string name="nav_settings">设置</string>-- <!-- Satellites screen -->- <string name="satellites_select_all">全选</string>- <string name="satellites_clear_all">全部清空</string>- <string name="satellites_select_type">选择卫星类型</string>- <string name="satellites_type">选择类型:%s</string>- <string name="satellites_search_hint">Name / Id</string>- <string name="satellites_empty_list_message">请确保您的搜素无误并且卫星数据已更新</string>- <string name="satellites_warning_title">警告!</string>- <string name="satellites_warning_message">此应用收录了超过9000颗卫星信息\n同时追踪所有卫星并不现实\n建议始终通过搜索和分类筛选功能仅勾选您感兴趣的卫星</string>-- <!-- Passes screen -->- <string name="passes_filter_passes">筛选过境</string>- <string name="passes_filter_within">小时数</string>- <string name="passes_filter_above">仰角值</string>- <string name="passes_filter_modes">选择调制类型</string>- <string name="passes_error">没有即将过境的卫星</string>- <string name="passes_empty_db">没有数据可显示,请通过设置菜单更新卫星数据。</string>- <string name="passes_deep_space">DeepSpace</string>- <string name="passes_elevation">仰角:%.1f°</string>- <string name="passes_altitude">高度:%d km</string>- <string name="passes_placeholder"> -- : -- : -- </string>- <string name="passes_empty_list_message">请确保您的筛选设置正确并且已勾选卫星</string>- <string name="passes_welcome_title">欢迎使用Look4Sat!</string>- <string name="passes_welcome_message">请务必在设置中通过GPS、经纬度或QTH定位您的位置\n建议至少每周更新一次数据库,以确保预测结果的准确性</string>-- <!-- Radar screen -->- <string name="radar_az_text">方位角</string>- <string name="radar_el_text">仰角</string>- <string name="radar_alt_text">高度</string>- <string name="radar_dist_text">距离</string>- <string name="radar_visible">日照中</string>- <string name="radar_eclipsed">地影中</string>- <string name="radar_mode">调制:%s</string>- <string name="radar_inverted">倒置:%s</string>- <string name="radar_info">%s</string>- <string name="radar_no_link">- - . - -</string>- <string name="radar_link_low">%.4f</string>- <string name="radar_link_lowHigh">%.4f - %.4f</string>- <string name="radar_data">卫星收发器:</string>- <string name="radar_no_data">这颗卫星没有收发器</string>- <string name="radar_string_yes">是</string>- <string name="radar_string_no">否</string>- <string name="radar_downlink">下行链路</string>- <string name="radar_uplink">上行链路</string>- <string name="radar_add">添加</string>- <string name="radar_back">后退</string>- <string name="radar_notify">通知</string>-- <!-- Map screen -->- <string name="map_title">世界地图</string>- <string name="map_sat_name">%s</string>- <string name="map_sat_id">Id:%d</string>- <string name="map_azimuth">方位角:%.1f°</string>- <string name="map_elevation">仰角:%.1f°</string>- <string name="map_latitude">纬度:%.1f°</string>- <string name="map_longitude">经度:%.1f°</string>- <string name="map_visible">日照中</string>- <string name="map_eclipsed">地影中</string>- <string name="map_visibility">能见度:%s</string>- <string name="map_period">周期:% .0f min</string>- <string name="map_phase">相位:%.1f°</string>- <string name="map_altitude">高度:%.0f km</string>- <string name="map_distance">距离:%.0f km</string>- <string name="map_velocity">速度:%.2f km/s</string>- <string name="map_copyright">维基媒体地图 | 地图数据 贡献者 © OpenStreetMap</string>- <string name="map_prev">上一个</string>- <string name="map_next">下一个</string>-- <!-- Settings screen -->- <string name="settings_location_title">站位</string>- <string name="settings_location_lat">纬度:%.4f°</string>- <string name="settings_location_lon">经度:%.4f°</string>- <string name="settings_location_null">没有地理位置数据</string>- <string name="settings_location_gps_error">检查您的位置权限</string>- <string name="settings_location_manual_error">输入的位置无效</string>- <string name="settings_location_qth_error">无效的 QTH 网格</string>- <string name="settings_location_success">位置更新成功</string>-- <string name="settings_data_title">卫星数据更新</string>- <string name="settings_data_error">更新完成但出现错误</string>- <string name="settings_data_update">最后更新时间:%s</string>- <string name="settings_data_entries">卫星:%s</string>- <string name="settings_data_radios">收发器:%s</string>- <string name="settings_data_success">更新成功</string>- <string name="settings_data_clear_success">数据清空成功</string>-- <string name="settings_last_updated_pattern">yyyy MMM d - HH:mm:ss</string>- <string name="settings_remote_title">旋转器首选项</string>- <string name="settings_remote_switch">启用远程控制</string>- <string name="settings_remote_ip_hint">IP地址</string>- <string name="settings_remote_port_hint">端口</string>-- <string name="settings_BTremote_title">蓝牙数据输出</string>- <string name="settings_BTremote_switch">启用输出</string>- <string name="settings_BTremote_device_hint">蓝牙设备 ID</string>- <string name="settings_BTremote_output_hint">数据格式</string>- <string name="settings_BTremote_perm_error">请检查蓝牙权限</string>-- <string name="settings_other_switch_utc">以 UTC 时间显示</string>- <string name="settings_other_switch_update">启用卫星数据自动更新</string>- <string name="settings_other_switch_sweep">启用雷达扫描动画</string>- <string name="settings_other_switch_sensors">使用传感器旋转雷达视图</string>-- <string name="settings_data_clear">清空</string>- <string name="settings_station_gps">GPS 定位</string>- <string name="settings_station_manual">手动输入</string>- <string name="settings_station_qth">QTH 网格</string>- <string name="settings_data_online">在线更新</string>- <string name="settings_data_import">导入文件</string>- <string name="settings_github">GitHub</string>- <string name="settings_donate">支持</string>- <string name="settings_fdroid">F-Droid</string>- <string name="settings_license">GNU GPLv3</string>- <string name="settings_privacy">隐私政策</string>-- <string name="settings_locator_title">QTH 网格</string>- <string name="settings_locator_text">使用梅登黑德网格设置站位</string>- <string name="settings_position_title">站位设置</string>- <string name="settings_position_lat_text">输入站位的纬度</string>- <string name="settings_position_lon_text">输入站位的经度</string>-- <string name="settings_outro_title">我要感谢:</string>- <string name="settings_outro_thanks">感谢下载和使用 Look4Sat!愿你的天空永远晴朗!- \n简体中文版翻译由 <a href="https://github.com/BA7LWN">BA7LWN</a> 于 2022.5.10 创建。- \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>.- \n<a href="https://github.com/csete">Alexandru Csete</a> for creating Gpredict- satellite tracker that inspired the creation of Look4Sat.- \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 DB providing a huge amount of satellite data.- \n<a href="https://appoftheday.downloadastro.com/app/look4sat-satellite-tracker/">DownloadAstro</a>- team for their interest to the app and the interview published.- </string>- <string name="settings_outro_license">该应用程序不提供任何保修.</string>--</resources>+<?xml version="1.0" encoding="utf-8"?>+<resources>+ <!-- Commmon -->+ <string name="btn_accept">确定</string>+ <string name="btn_cancel">取消</string>+ <string name="empty_list_message">没有可显示的内容</string>++ <!-- Navigation -->+ <string name="nav_satellites">卫星</string>+ <string name="nav_passes">过境</string>+ <string name="nav_radar">Radar</string>+ <string name="nav_map">地图</string>+ <string name="nav_settings">设置</string>++ <!-- Satellites screen -->+ <string name="satellites_select_all">全选</string>+ <string name="satellites_clear_all">全部清空</string>+ <string name="satellites_select_type">选择卫星类型</string>+ <string name="satellites_type">选择类型:%s</string>+ <string name="satellites_search_hint">Name / Id</string>+ <string name="satellites_empty_list_message">请确保您的搜素无误并且卫星数据已更新</string>+ <string name="satellites_warning_title">警告!</string>+ <string name="satellites_warning_message">此应用收录了超过9000颗卫星信息\n同时追踪所有卫星并不现实\n建议始终通过搜索和分类筛选功能仅勾选您感兴趣的卫星</string>++ <!-- Passes screen -->+ <string name="passes_filter_passes">筛选过境</string>+ <string name="passes_filter_within">小时数</string>+ <string name="passes_filter_above">仰角值</string>+ <string name="passes_filter_modes">选择调制类型</string>+ <string name="passes_error">没有即将过境的卫星</string>+ <string name="passes_empty_db">没有数据可显示,请通过设置菜单更新卫星数据。</string>+ <string name="passes_deep_space">DeepSpace</string>+ <string name="passes_elevation">仰角:%.1f°</string>+ <string name="passes_altitude">高度:%d km</string>+ <string name="passes_placeholder"> -- : -- : -- </string>+ <string name="passes_empty_list_message">请确保您的筛选设置正确并且已勾选卫星</string>+ <string name="passes_welcome_title">欢迎使用Look4Sat!</string>+ <string name="passes_welcome_message">请务必在设置中通过GPS、经纬度或QTH定位您的位置\n建议至少每周更新一次数据库,以确保预测结果的准确性</string>++ <!-- Radar screen -->+ <string name="radar_az_text">方位角</string>+ <string name="radar_el_text">仰角</string>+ <string name="radar_alt_text">高度</string>+ <string name="radar_dist_text">距离</string>+ <string name="radar_visible">日照中</string>+ <string name="radar_eclipsed">地影中</string>+ <string name="radar_mode">调制:%s</string>+ <string name="radar_inverted">倒置:%s</string>+ <string name="radar_info">%s</string>+ <string name="radar_no_link">- - . - -</string>+ <string name="radar_link_low">%.4f</string>+ <string name="radar_link_lowHigh">%.4f - %.4f</string>+ <string name="radar_data">卫星收发器:</string>+ <string name="radar_no_data">这颗卫星没有收发器</string>+ <string name="radar_string_yes">是</string>+ <string name="radar_string_no">否</string>+ <string name="radar_downlink">下行链路</string>+ <string name="radar_uplink">上行链路</string>+ <string name="radar_add">添加</string>+ <string name="radar_back">后退</string>+ <string name="radar_notify">通知</string>++ <!-- Map screen -->+ <string name="map_title">世界地图</string>+ <string name="map_sat_name">%s</string>+ <string name="map_sat_id">Id:%d</string>+ <string name="map_azimuth">方位角:%.1f°</string>+ <string name="map_elevation">仰角:%.1f°</string>+ <string name="map_latitude">纬度:%.1f°</string>+ <string name="map_longitude">经度:%.1f°</string>+ <string name="map_visible">日照中</string>+ <string name="map_eclipsed">地影中</string>+ <string name="map_visibility">能见度:%s</string>+ <string name="map_period">周期:% .0f min</string>+ <string name="map_phase">相位:%.1f°</string>+ <string name="map_altitude">高度:%.0f km</string>+ <string name="map_distance">距离:%.0f km</string>+ <string name="map_velocity">速度:%.2f km/s</string>+ <string name="map_copyright">维基媒体地图 | 地图数据 贡献者 © OpenStreetMap</string>+ <string name="map_prev">上一个</string>+ <string name="map_next">下一个</string>++ <!-- Settings screen -->+ <string name="settings_location_title">站位</string>+ <string name="settings_location_lat">纬度:%.4f°</string>+ <string name="settings_location_lon">经度:%.4f°</string>+ <string name="settings_location_null">没有地理位置数据</string>+ <string name="settings_location_gps_error">检查您的位置权限</string>+ <string name="settings_location_manual_error">输入的位置无效</string>+ <string name="settings_location_qth_error">无效的 QTH 网格</string>+ <string name="settings_location_success">位置更新成功</string>++ <string name="settings_data_title">卫星数据更新</string>+ <string name="settings_data_error">更新完成但出现错误</string>+ <string name="settings_data_update">最后更新时间:%s</string>+ <string name="settings_data_entries">卫星:%s</string>+ <string name="settings_data_radios">收发器:%s</string>+ <string name="settings_data_success">更新成功</string>+ <string name="settings_data_clear_success">数据清空成功</string>++ <string name="settings_last_updated_pattern">yyyy MMM d - HH:mm:ss</string>+ <string name="settings_remote_title">旋转器首选项</string>+ <string name="settings_remote_switch">启用远程控制</string>+ <string name="settings_remote_ip_hint">IP地址</string>+ <string name="settings_remote_port_hint">端口</string>++ <string name="settings_BTremote_title">蓝牙数据输出</string>+ <string name="settings_BTremote_switch">启用输出</string>+ <string name="settings_BTremote_device_hint">蓝牙设备 ID</string>+ <string name="settings_BTremote_output_hint">数据格式</string>+ <string name="settings_BTremote_perm_error">请检查蓝牙权限</string>++ <string name="settings_other_switch_utc">以 UTC 时间显示</string>+ <string name="settings_other_switch_update">启用卫星数据自动更新</string>+ <string name="settings_other_switch_sweep">启用雷达扫描动画</string>+ <string name="settings_other_switch_sensors">使用传感器旋转雷达视图</string>++ <string name="settings_data_clear">清空</string>+ <string name="settings_station_gps">GPS 定位</string>+ <string name="settings_station_manual">手动输入</string>+ <string name="settings_station_qth">QTH 网格</string>+ <string name="settings_data_online">在线更新</string>+ <string name="settings_data_import">导入文件</string>+ <string name="settings_github">GitHub</string>+ <string name="settings_donate">支持</string>+ <string name="settings_fdroid">F-Droid</string>+ <string name="settings_license">GNU GPLv3</string>+ <string name="settings_privacy">隐私政策</string>++ <string name="settings_locator_title">QTH 网格</string>+ <string name="settings_locator_text">使用梅登黑德网格设置站位</string>+ <string name="settings_position_title">站位设置</string>+ <string name="settings_position_lat_text">输入站位的纬度</string>+ <string name="settings_position_lon_text">输入站位的经度</string>++ <string name="settings_outro_title">我要感谢:</string>+ <string name="settings_outro_thanks">感谢下载和使用 Look4Sat!愿你的天空永远晴朗!+ \n简体中文版翻译由 <a href="https://github.com/BA7LWN">BA7LWN</a> 于 2022.5.10 创建。+ \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>.+ \n<a href="https://github.com/csete">Alexandru Csete</a> for creating Gpredict+ satellite tracker that inspired the creation of Look4Sat.+ \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 DB providing a huge amount of satellite data.+ \n<a href="https://appoftheday.downloadastro.com/app/look4sat-satellite-tracker/">DownloadAstro</a>+ team for their interest to the app and the interview published.+ </string>+ <string name="settings_outro_license">该应用程序不提供任何保修.</string>++</resources>diff --git a/data/build.gradle.kts b/data/build.gradle.ktsindex d71a49c5..be774419 100644--- a/data/build.gradle.kts+++ b/data/build.gradle.kts@@ -22,7 +22,6 @@ dependencies {implementation(libs.androidx.room)implementation(libs.androidx.room.runtime)ksp(libs.androidx.room.compiler)-implementation(libs.other.coroutines)implementation(libs.other.okhttp)diff --git a/app/src/main/java/com/rtbishop/look4sat/MainContainer.kt b/data/src/main/java/com/rtbishop/look4sat/data/injection/MainContainer.ktsimilarity index 83%rename from app/src/main/java/com/rtbishop/look4sat/MainContainer.ktrename to data/src/main/java/com/rtbishop/look4sat/data/injection/MainContainer.ktindex e59066cf..2ef2120b 100644--- a/app/src/main/java/com/rtbishop/look4sat/MainContainer.kt+++ b/data/src/main/java/com/rtbishop/look4sat/data/injection/MainContainer.kt@@ -1,4 +1,4 @@-package com.rtbishop.look4sat+package com.rtbishop.look4sat.data.injectionimport android.bluetooth.BluetoothManagerimport android.content.Context@@ -33,14 +33,11 @@ import kotlinx.coroutines.CoroutineScopeimport kotlinx.coroutines.Dispatchersimport kotlinx.coroutines.SupervisorJobimport okhttp3.OkHttpClient-import org.osmdroid.config.Configurationclass MainContainer(private val context: Context) {private val localSource = provideLocalSource()- private val mainHandler = CoroutineExceptionHandler { _, error ->- println("MainHandler: $error")- }+ private val mainHandler = CoroutineExceptionHandler { _, error -> println("MainHandler: $error") }val appScope = CoroutineScope(SupervisorJob() + Dispatchers.Default + mainHandler)val settingsRepo = provideSettingsRepo()val selectionRepo = provideSelectionRepo()@@ -48,26 +45,19 @@ class MainContainer(private val context: Context) {val databaseRepo = provideDatabaseRepo()fun provideAppVersionName(): String {- val packageInfo = context.packageManager.getPackageInfo(context.packageName, 0)- return packageInfo.versionName ?: "4.0.0"+ return context.packageManager.getPackageInfo(context.packageName, 0).versionName ?: "4.0.0"}- fun provideAddToCalendar(): IAddToCalendar {- return AddToCalendar(context)- }+ fun provideAddToCalendar(): IAddToCalendar = AddToCalendar(context)- fun provideShowToast(): IShowToast {- return ShowToast(context)- }+ fun provideShowToast(): IShowToast = ShowToast(context)fun provideBluetoothReporter(): BluetoothReporter {val manager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManagerreturn BluetoothReporter(manager, CoroutineScope(Dispatchers.IO))}- fun provideNetworkReporter(): NetworkReporter {- return NetworkReporter(CoroutineScope(Dispatchers.IO))- }+ fun provideNetworkReporter(): NetworkReporter = NetworkReporter(CoroutineScope(Dispatchers.IO))fun provideSensorsRepo(): ISensorsRepo {val manager = context.getSystemService(Context.SENSOR_SERVICE) as SensorManager@@ -104,9 +94,6 @@ class MainContainer(private val context: Context) {val manager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManagerval appPrefsFileName = "${context.packageName}_preferences"val appPreferences = context.getSharedPreferences(appPrefsFileName, Context.MODE_PRIVATE)- val mapPrefsFileName = "${context.packageName}_osmdroid"- val mapPreferences = context.getSharedPreferences(mapPrefsFileName, Context.MODE_PRIVATE)- Configuration.getInstance().load(context, mapPreferences)return SettingsRepo(manager, appPreferences)}}