From 7c19bb5b528e24f0a6fd359439b551290013585e Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Tue, 25 Feb 2020 21:13:31 +0000 Subject: [PATCH] Copyright update, libs and gradle update --- app/build.gradle | 4 ++-- app/src/main/AndroidManifest.xml | 22 ++++++++++++++++-- .../java/com/rtbishop/look4sat/Look4SatApp.kt | 4 ++-- .../com/rtbishop/look4sat/MainViewModel.kt | 4 ++-- .../com/rtbishop/look4sat/di/AndroidModule.kt | 4 ++-- .../com/rtbishop/look4sat/di/AppComponent.kt | 4 ++-- .../com/rtbishop/look4sat/di/NetworkModule.kt | 4 ++-- .../com/rtbishop/look4sat/di/StorageModule.kt | 4 ++-- .../look4sat/network/RemoteDataSource.kt | 4 ++-- .../look4sat/network/TransmittersApi.kt | 4 ++-- .../com/rtbishop/look4sat/repo/Repository.kt | 4 ++-- .../com/rtbishop/look4sat/repo/SatEntry.kt | 21 ++++++++++++++++- .../com/rtbishop/look4sat/repo/SatPass.kt | 4 ++-- .../com/rtbishop/look4sat/repo/Transmitter.kt | 4 ++-- .../look4sat/storage/LocalDataSource.kt | 4 ++-- .../look4sat/storage/TransmittersDao.kt | 4 ++-- .../look4sat/storage/TransmittersDb.kt | 4 ++-- .../com/rtbishop/look4sat/ui/AboutFragment.kt | 4 ++-- .../com/rtbishop/look4sat/ui/MainActivity.kt | 6 +++-- .../rtbishop/look4sat/ui/MapViewFragment.kt | 4 ++-- .../rtbishop/look4sat/ui/PassListFragment.kt | 4 ++-- .../rtbishop/look4sat/ui/PolarViewFragment.kt | 4 ++-- .../rtbishop/look4sat/ui/SatEntryDialog.kt | 21 ++++++++++++++++- .../rtbishop/look4sat/ui/SettingsFragment.kt | 4 ++-- .../look4sat/ui/adapters/SatEntryAdapter.kt | 21 ++++++++++++++++- .../look4sat/ui/adapters/SatPassAdapter.kt | 4 ++-- .../ui/adapters/TransmitterAdapter.kt | 4 ++-- .../main/res/drawable/bg_round_borders.xml | 22 ++++++++++++++++-- app/src/main/res/drawable/ic_about.xml | 2 +- app/src/main/res/drawable/ic_arrow.xml | 19 +++++++++++++++ app/src/main/res/drawable/ic_arrow_swipe.xml | 2 +- app/src/main/res/drawable/ic_exit_app.xml | 19 +++++++++++++++ app/src/main/res/drawable/ic_filter.xml | 19 +++++++++++++++ app/src/main/res/drawable/ic_goto_github.xml | 23 ++++++++++++++++++- .../res/drawable/ic_launcher_background.xml | 21 ++++++++++++++++- .../res/drawable/ic_launcher_foreground.xml | 23 ++++++++++++++++++- app/src/main/res/drawable/ic_pass_active.xml | 19 +++++++++++++++ .../main/res/drawable/ic_pass_inactive.xml | 19 +++++++++++++++ app/src/main/res/drawable/ic_sat_asc_left.xml | 23 ++++++++++++++++++- .../main/res/drawable/ic_sat_asc_right.xml | 23 ++++++++++++++++++- .../main/res/drawable/ic_sat_desc_left.xml | 23 ++++++++++++++++++- app/src/main/res/drawable/ic_settings.xml | 19 +++++++++++++++ app/src/main/res/drawable/ic_sputnik.xml | 6 +++-- app/src/main/res/drawable/ic_trans.xml | 19 +++++++++++++++ app/src/main/res/drawable/ic_update_loc.xml | 19 +++++++++++++++ app/src/main/res/drawable/ic_update_tle.xml | 19 +++++++++++++++ app/src/main/res/drawable/ic_update_trans.xml | 19 +++++++++++++++ app/src/main/res/drawable/ic_world_map.xml | 19 +++++++++++++++ app/src/main/res/drawable/splash_drawable.xml | 22 ++++++++++++++++-- app/src/main/res/layout/activity_main.xml | 20 +++++++++++++++- app/src/main/res/layout/app_bar_main.xml | 22 ++++++++++++++++-- app/src/main/res/layout/card_pass.xml | 4 ++-- app/src/main/res/layout/card_pass_geo.xml | 22 ++++++++++++++++-- app/src/main/res/layout/card_trans.xml | 4 ++-- app/src/main/res/layout/content_main.xml | 22 ++++++++++++++++-- app/src/main/res/layout/dialog_pass_pref.xml | 22 ++++++++++++++++-- app/src/main/res/layout/dialog_sat_entry.xml | 22 ++++++++++++++++-- app/src/main/res/layout/drawer_header.xml | 20 +++++++++++++++- app/src/main/res/layout/fragment_about.xml | 4 ++-- app/src/main/res/layout/fragment_map_view.xml | 22 ++++++++++++++++-- .../main/res/layout/fragment_pass_list.xml | 4 ++-- .../main/res/layout/fragment_polar_view.xml | 9 ++++---- app/src/main/res/layout/sat_entry_item.xml | 22 ++++++++++++++++-- app/src/main/res/menu/drawer_menu.xml | 2 +- .../res/mipmap-anydpi-v26/ic_launcher.xml | 22 ++++++++++++++++-- .../mipmap-anydpi-v26/ic_launcher_round.xml | 22 ++++++++++++++++-- app/src/main/res/navigation/nav_graph.xml | 4 ++-- app/src/main/res/values-ru/strings.xml | 4 ++-- app/src/main/res/values/colors.xml | 20 +++++++++++++++- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/values/styles.xml | 2 +- app/src/main/res/xml/preference.xml | 22 ++++++++++++++++-- build.gradle | 10 ++++---- gradle/wrapper/gradle-wrapper.properties | 23 +++++++++++++++++-- 74 files changed, 816 insertions(+), 114 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b3cb77a2..236c79e6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,6 @@ /* - * LookingSat. Amateur radio & weather satellite tracker and passes calculator. - * Copyright (C) 2019 Arty Bishop (bishop.arty@gmail.com) + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. + * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) * * 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 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c90d39d5..82dbdfdf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,4 +1,22 @@ - + + @@ -26,4 +44,4 @@ - \ No newline at end of file + diff --git a/app/src/main/java/com/rtbishop/look4sat/Look4SatApp.kt b/app/src/main/java/com/rtbishop/look4sat/Look4SatApp.kt index 1a87a8d0..20c73a74 100644 --- a/app/src/main/java/com/rtbishop/look4sat/Look4SatApp.kt +++ b/app/src/main/java/com/rtbishop/look4sat/Look4SatApp.kt @@ -1,5 +1,5 @@ /* - * Look4Sat. Amateur radio & weather satellites passes calculator for Android. + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) * * This program is free software; you can redistribute it and/or modify @@ -28,4 +28,4 @@ class Look4SatApp : Application() { val appComponent: AppComponent by lazy { DaggerAppComponent.factory().create(applicationContext) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/rtbishop/look4sat/MainViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/MainViewModel.kt index 9b0e36d3..3888dbc2 100644 --- a/app/src/main/java/com/rtbishop/look4sat/MainViewModel.kt +++ b/app/src/main/java/com/rtbishop/look4sat/MainViewModel.kt @@ -1,5 +1,5 @@ /* - * Look4Sat. Amateur radio & weather satellites passes calculator for Android. + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) * * This program is free software; you can redistribute it and/or modify @@ -257,4 +257,4 @@ fun SharedPreferences.Editor.putDouble(key: String, double: Double) { fun SharedPreferences.getDouble(key: String, default: Double): Double { return Double.fromBits(getLong(key, default.toRawBits())) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/rtbishop/look4sat/di/AndroidModule.kt b/app/src/main/java/com/rtbishop/look4sat/di/AndroidModule.kt index fc2d4639..27b1f029 100644 --- a/app/src/main/java/com/rtbishop/look4sat/di/AndroidModule.kt +++ b/app/src/main/java/com/rtbishop/look4sat/di/AndroidModule.kt @@ -1,5 +1,5 @@ /* - * Look4Sat. Amateur radio & weather satellites passes calculator for Android. + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) * * This program is free software; you can redistribute it and/or modify @@ -41,4 +41,4 @@ class AndroidModule { fun provideLocationManager(context: Context): LocationManager { return context.getSystemService(Context.LOCATION_SERVICE) as LocationManager } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/rtbishop/look4sat/di/AppComponent.kt b/app/src/main/java/com/rtbishop/look4sat/di/AppComponent.kt index c9d4c820..9612621b 100644 --- a/app/src/main/java/com/rtbishop/look4sat/di/AppComponent.kt +++ b/app/src/main/java/com/rtbishop/look4sat/di/AppComponent.kt @@ -1,5 +1,5 @@ /* - * Look4Sat. Amateur radio & weather satellites passes calculator for Android. + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) * * This program is free software; you can redistribute it and/or modify @@ -35,4 +35,4 @@ interface AppComponent { } fun inject(viewModel: MainViewModel) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/rtbishop/look4sat/di/NetworkModule.kt b/app/src/main/java/com/rtbishop/look4sat/di/NetworkModule.kt index e2f307e1..462bdb61 100644 --- a/app/src/main/java/com/rtbishop/look4sat/di/NetworkModule.kt +++ b/app/src/main/java/com/rtbishop/look4sat/di/NetworkModule.kt @@ -1,5 +1,5 @@ /* - * Look4Sat. Amateur radio & weather satellites passes calculator for Android. + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) * * This program is free software; you can redistribute it and/or modify @@ -45,4 +45,4 @@ class NetworkModule { fun provideOkHttpClient(): OkHttpClient { return OkHttpClient() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/rtbishop/look4sat/di/StorageModule.kt b/app/src/main/java/com/rtbishop/look4sat/di/StorageModule.kt index 5568dd40..fda1ed3c 100644 --- a/app/src/main/java/com/rtbishop/look4sat/di/StorageModule.kt +++ b/app/src/main/java/com/rtbishop/look4sat/di/StorageModule.kt @@ -1,5 +1,5 @@ /* - * Look4Sat. Amateur radio & weather satellites passes calculator for Android. + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) * * This program is free software; you can redistribute it and/or modify @@ -42,4 +42,4 @@ class StorageModule { fun provideTransmittersDao(db: TransmittersDb): TransmittersDao { return db.transmittersDao() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/rtbishop/look4sat/network/RemoteDataSource.kt b/app/src/main/java/com/rtbishop/look4sat/network/RemoteDataSource.kt index 019bc320..3a93bc95 100644 --- a/app/src/main/java/com/rtbishop/look4sat/network/RemoteDataSource.kt +++ b/app/src/main/java/com/rtbishop/look4sat/network/RemoteDataSource.kt @@ -1,5 +1,5 @@ /* - * Look4Sat. Amateur radio & weather satellites passes calculator for Android. + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) * * This program is free software; you can redistribute it and/or modify @@ -48,4 +48,4 @@ class RemoteDataSource @Inject constructor( suspend fun fetchTransmittersList(): List { return api.fetchTransmittersList() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/rtbishop/look4sat/network/TransmittersApi.kt b/app/src/main/java/com/rtbishop/look4sat/network/TransmittersApi.kt index ebc786e1..d4749fd2 100644 --- a/app/src/main/java/com/rtbishop/look4sat/network/TransmittersApi.kt +++ b/app/src/main/java/com/rtbishop/look4sat/network/TransmittersApi.kt @@ -1,5 +1,5 @@ /* - * Look4Sat. Amateur radio & weather satellites passes calculator for Android. + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) * * This program is free software; you can redistribute it and/or modify @@ -26,4 +26,4 @@ interface TransmittersApi { @GET("transmitters/") suspend fun fetchTransmittersList(): List -} \ No newline at end of file +} diff --git a/app/src/main/java/com/rtbishop/look4sat/repo/Repository.kt b/app/src/main/java/com/rtbishop/look4sat/repo/Repository.kt index c0e02038..78552067 100644 --- a/app/src/main/java/com/rtbishop/look4sat/repo/Repository.kt +++ b/app/src/main/java/com/rtbishop/look4sat/repo/Repository.kt @@ -1,5 +1,5 @@ /* - * Look4Sat. Amateur radio & weather satellites passes calculator for Android. + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) * * This program is free software; you can redistribute it and/or modify @@ -39,4 +39,4 @@ class Repository @Inject constructor( suspend fun getTransmittersForSat(id: Int): List { return localSource.getTransmittersForSat(id) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/rtbishop/look4sat/repo/SatEntry.kt b/app/src/main/java/com/rtbishop/look4sat/repo/SatEntry.kt index 7896333f..921cf030 100755 --- a/app/src/main/java/com/rtbishop/look4sat/repo/SatEntry.kt +++ b/app/src/main/java/com/rtbishop/look4sat/repo/SatEntry.kt @@ -1,3 +1,22 @@ +/* + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. + * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) + * + * 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. + */ + package com.rtbishop.look4sat.repo -data class SatEntry(val id: Int, val name: String, var isSelected: Boolean = false) \ No newline at end of file +data class SatEntry(val id: Int, val name: String, var isSelected: Boolean = false) diff --git a/app/src/main/java/com/rtbishop/look4sat/repo/SatPass.kt b/app/src/main/java/com/rtbishop/look4sat/repo/SatPass.kt index f6d23408..cd18905e 100644 --- a/app/src/main/java/com/rtbishop/look4sat/repo/SatPass.kt +++ b/app/src/main/java/com/rtbishop/look4sat/repo/SatPass.kt @@ -1,5 +1,5 @@ /* - * Look4Sat. Amateur radio & weather satellites passes calculator for Android. + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) * * This program is free software; you can redistribute it and/or modify @@ -29,4 +29,4 @@ data class SatPass( val pass: SatPassTime, var progress: Int = 0, var active: Boolean = false -) \ No newline at end of file +) diff --git a/app/src/main/java/com/rtbishop/look4sat/repo/Transmitter.kt b/app/src/main/java/com/rtbishop/look4sat/repo/Transmitter.kt index 8eac1c1e..9a4d288c 100644 --- a/app/src/main/java/com/rtbishop/look4sat/repo/Transmitter.kt +++ b/app/src/main/java/com/rtbishop/look4sat/repo/Transmitter.kt @@ -1,5 +1,5 @@ /* - * Look4Sat. Amateur radio & weather satellites passes calculator for Android. + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) * * This program is free software; you can redistribute it and/or modify @@ -35,4 +35,4 @@ data class Transmitter( @SerializedName("mode") val mode: String?, @SerializedName("invert") val isInverted: Boolean, @SerializedName("norad_cat_id") val noradCatId: Int -) \ No newline at end of file +) diff --git a/app/src/main/java/com/rtbishop/look4sat/storage/LocalDataSource.kt b/app/src/main/java/com/rtbishop/look4sat/storage/LocalDataSource.kt index bf0a0429..862d622c 100644 --- a/app/src/main/java/com/rtbishop/look4sat/storage/LocalDataSource.kt +++ b/app/src/main/java/com/rtbishop/look4sat/storage/LocalDataSource.kt @@ -1,5 +1,5 @@ /* - * Look4Sat. Amateur radio & weather satellites passes calculator for Android. + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) * * This program is free software; you can redistribute it and/or modify @@ -31,4 +31,4 @@ class LocalDataSource @Inject constructor(private val transmittersDao: Transmitt suspend fun getTransmittersForSat(id: Int): List { return transmittersDao.getTransmittersForSat(id) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/rtbishop/look4sat/storage/TransmittersDao.kt b/app/src/main/java/com/rtbishop/look4sat/storage/TransmittersDao.kt index 985509e5..74465b6f 100644 --- a/app/src/main/java/com/rtbishop/look4sat/storage/TransmittersDao.kt +++ b/app/src/main/java/com/rtbishop/look4sat/storage/TransmittersDao.kt @@ -1,5 +1,5 @@ /* - * Look4Sat. Amateur radio & weather satellites passes calculator for Android. + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) * * This program is free software; you can redistribute it and/or modify @@ -33,4 +33,4 @@ interface TransmittersDao { @Query("SELECT * FROM transmitters WHERE isAlive = 1 and noradCatId = :id") suspend fun getTransmittersForSat(id: Int): List -} \ No newline at end of file +} diff --git a/app/src/main/java/com/rtbishop/look4sat/storage/TransmittersDb.kt b/app/src/main/java/com/rtbishop/look4sat/storage/TransmittersDb.kt index fb8a1337..8ac0c0c8 100644 --- a/app/src/main/java/com/rtbishop/look4sat/storage/TransmittersDb.kt +++ b/app/src/main/java/com/rtbishop/look4sat/storage/TransmittersDb.kt @@ -1,5 +1,5 @@ /* - * Look4Sat. Amateur radio & weather satellites passes calculator for Android. + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) * * This program is free software; you can redistribute it and/or modify @@ -27,4 +27,4 @@ import com.rtbishop.look4sat.repo.Transmitter abstract class TransmittersDb : RoomDatabase() { abstract fun transmittersDao(): TransmittersDao -} \ No newline at end of file +} diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/AboutFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/AboutFragment.kt index 99aa2c1d..767d7e42 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/AboutFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/AboutFragment.kt @@ -1,5 +1,5 @@ /* - * Look4Sat. Amateur radio & weather satellites passes calculator for Android. + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) * * This program is free software; you can redistribute it and/or modify @@ -51,4 +51,4 @@ class AboutFragment : Fragment() { textVersion.text = String.format(getString(R.string.app_version), BuildConfig.VERSION_NAME) textThanks.movementMethod = LinkMovementMethod.getInstance() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt index ed765708..3f0d10fe 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt @@ -1,5 +1,5 @@ /* - * Look4Sat. Amateur radio & weather satellites passes calculator for Android. + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) * * This program is free software; you can redistribute it and/or modify @@ -20,6 +20,7 @@ package com.rtbishop.look4sat.ui import android.Manifest +import android.annotation.SuppressLint import android.content.Intent import android.content.pm.ActivityInfo import android.content.pm.PackageManager @@ -75,6 +76,7 @@ class MainActivity : AppCompatActivity() { setupDrawer() } + @SuppressLint("SourceLockedOrientationActivity") private fun setupComponents() { val navController = findNavController(R.id.nav_host) val navView: NavigationView = findViewById(R.id.nav_view) @@ -187,4 +189,4 @@ class MainActivity : AppCompatActivity() { val navController = findNavController(R.id.nav_host) return navController.navigateUp(appBarConfig) || super.onSupportNavigateUp() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/MapViewFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/MapViewFragment.kt index 3d6e6572..72c6e497 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/MapViewFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/MapViewFragment.kt @@ -1,5 +1,5 @@ /* - * Look4Sat. Amateur radio & weather satellites passes calculator for Android. + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) * * This program is free software; you can redistribute it and/or modify @@ -313,4 +313,4 @@ class MapViewFragment : Fragment() { return value * 180 / Math.PI } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/PassListFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/PassListFragment.kt index 37da7c53..4bbc28eb 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/PassListFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/PassListFragment.kt @@ -1,5 +1,5 @@ /* - * Look4Sat. Amateur radio & weather satellites passes calculator for Android. + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) * * This program is free software; you can redistribute it and/or modify @@ -278,4 +278,4 @@ class PassListFragment : Fragment() { if (resetToNull) aosTimerText.text = String.format(getString(R.string.pat_timer), 0, 0, 0) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/PolarViewFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/PolarViewFragment.kt index 93914837..f9b16d59 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/PolarViewFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/PolarViewFragment.kt @@ -1,5 +1,5 @@ /* - * Look4Sat. Amateur radio & weather satellites passes calculator for Android. + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) * * This program is free software; you can redistribute it and/or modify @@ -266,4 +266,4 @@ class PolarViewFragment : Fragment() { return value * 180 / Math.PI } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/SatEntryDialog.kt b/app/src/main/java/com/rtbishop/look4sat/ui/SatEntryDialog.kt index 2089e4ca..93ea5763 100755 --- a/app/src/main/java/com/rtbishop/look4sat/ui/SatEntryDialog.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/SatEntryDialog.kt @@ -1,3 +1,22 @@ +/* + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. + * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) + * + * 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. + */ + package com.rtbishop.look4sat.ui import android.app.Dialog @@ -144,4 +163,4 @@ class SatEntryDialog : AppCompatDialogFragment(), SearchView.OnQueryTextListener interface EntriesSubmitListener { fun onEntriesSubmit(list: MutableList) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/SettingsFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/SettingsFragment.kt index 5b4e76fa..55fcfea0 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/SettingsFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/SettingsFragment.kt @@ -1,5 +1,5 @@ /* - * Look4Sat. Amateur radio & weather satellites passes calculator for Android. + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) * * This program is free software; you can redistribute it and/or modify @@ -151,4 +151,4 @@ class SettingsFragment : PreferenceFragmentCompat(), super.onPause() preferenceManager.sharedPreferences.unregisterOnSharedPreferenceChangeListener(this) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/SatEntryAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/adapters/SatEntryAdapter.kt index 41d422c8..afcca097 100755 --- a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/SatEntryAdapter.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/adapters/SatEntryAdapter.kt @@ -1,3 +1,22 @@ +/* + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. + * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) + * + * 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. + */ + package com.rtbishop.look4sat.ui.adapters import android.view.LayoutInflater @@ -40,4 +59,4 @@ internal class SatEntryAdapter(private var entriesList: MutableList) : itemView.setOnClickListener { satEntry.isSelected = satEntryItem.isChecked } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/SatPassAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/adapters/SatPassAdapter.kt index 792d43f8..3147c52e 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/SatPassAdapter.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/adapters/SatPassAdapter.kt @@ -1,5 +1,5 @@ /* - * Look4Sat. Amateur radio & weather satellites passes calculator for Android. + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) * * This program is free software; you can redistribute it and/or modify @@ -172,4 +172,4 @@ class SatPassAdapter(val viewModel: MainViewModel) : } } } -} \ No newline at end of file +} 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.kt index caf8e952..19b08cf2 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 @@ -1,5 +1,5 @@ /* - * Look4Sat. Amateur radio & weather satellites passes calculator for Android. + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) * * This program is free software; you can redistribute it and/or modify @@ -113,4 +113,4 @@ class TransmitterAdapter : RecyclerView.Adapter + + - \ No newline at end of file + diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml index 012377e5..f6a43e79 100644 --- a/app/src/main/res/drawable/ic_about.xml +++ b/app/src/main/res/drawable/ic_about.xml @@ -1,5 +1,5 @@ + + + + + android:pathData="M12,0.297c-6.63,0 -12,5.373 -12,12 0,5.303 3.438,9.8 8.205,11.385 0.6,0.113 0.82,-0.258 0.82,-0.577 0,-0.285 -0.01,-1.04 -0.015,-2.04 -3.338,0.724 -4.042,-1.61 -4.042,-1.61C4.422,18.07 3.633,17.7 3.633,17.7c-1.087,-0.744 0.084,-0.729 0.084,-0.729 1.205,0.084 1.838,1.236 1.838,1.236 1.07,1.835 2.809,1.305 3.495,0.998 0.108,-0.776 0.417,-1.305 0.76,-1.605 -2.665,-0.3 -5.466,-1.332 -5.466,-5.93 0,-1.31 0.465,-2.38 1.235,-3.22 -0.135,-0.303 -0.54,-1.523 0.105,-3.176 0,0 1.005,-0.322 3.3,1.23 0.96,-0.267 1.98,-0.399 3,-0.405 1.02,0.006 2.04,0.138 3,0.405 2.28,-1.552 3.285,-1.23 3.285,-1.23 0.645,1.653 0.24,2.873 0.12,3.176 0.765,0.84 1.23,1.91 1.23,3.22 0,4.61 -2.805,5.625 -5.475,5.92 0.42,0.36 0.81,1.096 0.81,2.22 0,1.606 -0.015,2.896 -0.015,3.286 0,0.315 0.21,0.69 0.825,0.57C20.565,22.092 24,17.592 24,12.297c0,-6.627 -5.373,-12 -12,-12" + tools:ignore="VectorPath" /> diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 96c84546..2509af5f 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -1,3 +1,22 @@ + + - \ No newline at end of file + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index 99aa7384..54472524 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,4 +1,24 @@ + + + android:pathData="M93.876,34.3C86.053,26.391 80.369,17.225 77.87,8.49 77.84,8.385 77.818,8.285 77.788,8.181L2.629,43.513c-1.404,0.66 -2.019,2.358 -1.372,3.791 0.472,1.046 1.485,1.663 2.545,1.663 0.392,0 0.79,-0.084 1.169,-0.263L74.045,16.235c-1.873,3.578 -2.997,7.611 -3.228,11.885L35.566,51.732c-1.294,0.866 -1.653,2.638 -0.805,3.957 0.538,0.836 1.431,1.29 2.344,1.29 0.526,0 1.06,-0.151 1.533,-0.469L71.189,34.707c1.4,8.11 6.135,15.044 12.715,19.285l-54.945,68.337c-0.981,1.22 -0.808,3.021 0.388,4.023 0.521,0.437 1.149,0.649 1.775,0.649 0.809,0 1.611,-0.357 2.166,-1.045L89.056,56.595c3.06,1.168 6.357,1.838 9.811,1.838 4.932,0 9.566,-1.312 13.601,-3.597L84.602,118.323c-0.633,1.44 0,3.131 1.41,3.777 0.372,0.17 0.76,0.25 1.144,0.25 1.07,0 2.092,-0.629 2.556,-1.691L120.402,50.739C111.642,48.416 102.042,42.555 93.876,34.3Z" + tools:ignore="VectorPath" /> diff --git a/app/src/main/res/drawable/ic_pass_active.xml b/app/src/main/res/drawable/ic_pass_active.xml index 0574beb3..8c9b5c22 100644 --- a/app/src/main/res/drawable/ic_pass_active.xml +++ b/app/src/main/res/drawable/ic_pass_active.xml @@ -1,3 +1,22 @@ + + + + + android:strokeColor="#00000000" + tools:ignore="VectorPath" /> + + android:strokeColor="#00000000" + tools:ignore="VectorPath" /> + + android:strokeColor="#00000000" + tools:ignore="VectorPath" /> + + android:pathData="M93.876,34.3C86.053,26.391 80.369,17.225 77.87,8.49 77.84,8.385 77.818,8.285 77.788,8.181L2.629,43.513c-1.404,0.66 -2.019,2.358 -1.372,3.791 0.472,1.046 1.485,1.663 2.545,1.663 0.392,0 0.79,-0.084 1.169,-0.263L74.045,16.235c-1.873,3.578 -2.997,7.611 -3.228,11.885L35.566,51.732c-1.294,0.866 -1.653,2.638 -0.805,3.957 0.538,0.836 1.431,1.29 2.344,1.29 0.526,0 1.06,-0.151 1.533,-0.469L71.189,34.707c1.4,8.11 6.135,15.044 12.715,19.285l-54.945,68.337c-0.981,1.22 -0.808,3.021 0.388,4.023 0.521,0.437 1.149,0.649 1.775,0.649 0.809,0 1.611,-0.357 2.166,-1.045L89.056,56.595c3.06,1.168 6.357,1.838 9.811,1.838 4.932,0 9.566,-1.312 13.601,-3.597L84.602,118.323c-0.633,1.44 0,3.131 1.41,3.777 0.372,0.17 0.76,0.25 1.144,0.25 1.07,0 2.092,-0.629 2.556,-1.691L120.402,50.739C111.642,48.416 102.042,42.555 93.876,34.3Z" + tools:ignore="VectorPath" /> diff --git a/app/src/main/res/drawable/ic_trans.xml b/app/src/main/res/drawable/ic_trans.xml index 551cf66d..981d3800 100644 --- a/app/src/main/res/drawable/ic_trans.xml +++ b/app/src/main/res/drawable/ic_trans.xml @@ -1,3 +1,22 @@ + + + + + + + + @@ -7,4 +25,4 @@ android:gravity="center" android:src="@drawable/splash_front" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 573b6d07..9d78f793 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,4 +1,22 @@ - + + + + - \ No newline at end of file + diff --git a/app/src/main/res/layout/card_pass.xml b/app/src/main/res/layout/card_pass.xml index e5b48269..1f92789a 100644 --- a/app/src/main/res/layout/card_pass.xml +++ b/app/src/main/res/layout/card_pass.xml @@ -1,5 +1,5 @@ + - \ No newline at end of file + diff --git a/app/src/main/res/layout/card_trans.xml b/app/src/main/res/layout/card_trans.xml index bd1872a1..7dda13c9 100644 --- a/app/src/main/res/layout/card_trans.xml +++ b/app/src/main/res/layout/card_trans.xml @@ -1,6 +1,6 @@ + - \ No newline at end of file + diff --git a/app/src/main/res/layout/dialog_pass_pref.xml b/app/src/main/res/layout/dialog_pass_pref.xml index 7b0f3422..48e9e617 100644 --- a/app/src/main/res/layout/dialog_pass_pref.xml +++ b/app/src/main/res/layout/dialog_pass_pref.xml @@ -1,4 +1,22 @@ - + + - \ No newline at end of file + diff --git a/app/src/main/res/layout/dialog_sat_entry.xml b/app/src/main/res/layout/dialog_sat_entry.xml index fbde448e..081f50da 100644 --- a/app/src/main/res/layout/dialog_sat_entry.xml +++ b/app/src/main/res/layout/dialog_sat_entry.xml @@ -1,4 +1,22 @@ - + + - \ No newline at end of file + diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml index df4b20c2..64bbe2c2 100644 --- a/app/src/main/res/layout/drawer_header.xml +++ b/app/src/main/res/layout/drawer_header.xml @@ -1,4 +1,22 @@ - + + + - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_pass_list.xml b/app/src/main/res/layout/fragment_pass_list.xml index dbae3559..5afe218b 100644 --- a/app/src/main/res/layout/fragment_pass_list.xml +++ b/app/src/main/res/layout/fragment_pass_list.xml @@ -1,5 +1,5 @@ + \ No newline at end of file + android:textSize="17sp" /> diff --git a/app/src/main/res/menu/drawer_menu.xml b/app/src/main/res/menu/drawer_menu.xml index 071c8029..01a3b951 100644 --- a/app/src/main/res/menu/drawer_menu.xml +++ b/app/src/main/res/menu/drawer_menu.xml @@ -1,6 +1,6 @@ + - \ No newline at end of file + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index eca70cfe..2bf5ece6 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,23 @@ - + + - \ No newline at end of file + diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml index f51f3dc0..98db8dfe 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -1,6 +1,6 @@ + #FFE082 #C0C0C0 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 53893000..530af984 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ + - \ No newline at end of file + diff --git a/build.gradle b/build.gradle index 4a87d80b..bf562464 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ /* - * LookingSat. Amateur radio & weather satellite tracker and passes calculator. - * Copyright (C) 2019 Arty Bishop (bishop.arty@gmail.com) + * Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. + * Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) * * 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 @@ -26,7 +26,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:3.5.3" + classpath 'com.android.tools.build:gradle:3.6.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.2.1" } @@ -44,7 +44,7 @@ task clean(type: Delete) { } ext { - material = '1.2.0-alpha04' + material = '1.2.0-alpha05' supportLib = '1.0.0' constraintLayout = '1.1.3' @@ -54,7 +54,7 @@ ext { navigation = '2.2.1' lifecycle = '2.2.0' - room = '2.2.3' + room = '2.2.4' retrofit = '2.6.2' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3d581013..e4c4e6b3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,25 @@ -#Wed Oct 16 17:05:20 BST 2019 +# +# Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. +# Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) +# +# 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 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip