From b91a7c1ff86b28b99d63321697e17a1537639846 Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Tue, 24 Nov 2020 14:36:11 +0000 Subject: [PATCH] Finished splash activity and UI --- .../look4sat/ui/splash/SplashActivity.kt | 11 ++-- ...SecondFragment.kt => SplashPosFragment.kt} | 2 +- ...{FirstFragment.kt => SplashTleFragment.kt} | 2 +- .../look4sat/ui/splash/ThirdFragment.kt | 6 -- app/src/main/res/drawable/ic_next.xml | 9 ++- app/src/main/res/drawable/ic_satellite.xml | 23 +++++++ app/src/main/res/layout/activity_splash.xml | 7 +-- app/src/main/res/layout/fragment_first.xml | 20 ------ app/src/main/res/layout/fragment_second.xml | 20 ------ .../main/res/layout/fragment_splash_pos.xml | 63 +++++++++++++++++++ .../main/res/layout/fragment_splash_tle.xml | 63 +++++++++++++++++++ app/src/main/res/layout/fragment_third.xml | 20 ------ app/src/main/res/values-ru/strings.xml | 7 +++ app/src/main/res/values/strings.xml | 8 +++ app/src/main/res/values/styles.xml | 18 ++++++ 15 files changed, 196 insertions(+), 83 deletions(-) rename app/src/main/java/com/rtbishop/look4sat/ui/splash/{SecondFragment.kt => SplashPosFragment.kt} (63%) rename app/src/main/java/com/rtbishop/look4sat/ui/splash/{FirstFragment.kt => SplashTleFragment.kt} (63%) delete mode 100644 app/src/main/java/com/rtbishop/look4sat/ui/splash/ThirdFragment.kt create mode 100644 app/src/main/res/drawable/ic_satellite.xml delete mode 100644 app/src/main/res/layout/fragment_first.xml delete mode 100644 app/src/main/res/layout/fragment_second.xml create mode 100644 app/src/main/res/layout/fragment_splash_pos.xml create mode 100644 app/src/main/res/layout/fragment_splash_tle.xml delete mode 100644 app/src/main/res/layout/fragment_third.xml diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/splash/SplashActivity.kt b/app/src/main/java/com/rtbishop/look4sat/ui/splash/SplashActivity.kt index 69512a1d..ef03f6fc 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/splash/SplashActivity.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/splash/SplashActivity.kt @@ -16,7 +16,7 @@ import javax.inject.Inject @AndroidEntryPoint class SplashActivity : FragmentActivity() { - private val pagesCount = 3 + private val pagesCount = 2 @Inject lateinit var prefsManager: PrefsManager @@ -41,7 +41,7 @@ class SplashActivity : FragmentActivity() { } } }) -// isUserInputEnabled = false + isUserInputEnabled = false } splashNext.setOnClickListener { if (splashPager.currentItem < pagesCount - 1) splashPager.currentItem++ @@ -62,10 +62,9 @@ class SplashActivity : FragmentActivity() { override fun createFragment(position: Int): Fragment { return when (position) { - 0 -> FirstFragment() - 1 -> SecondFragment() - 2 -> ThirdFragment() - else -> FirstFragment() + 0 -> SplashTleFragment() + 1 -> SplashPosFragment() + else -> SplashTleFragment() } } } diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/splash/SecondFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/splash/SplashPosFragment.kt similarity index 63% rename from app/src/main/java/com/rtbishop/look4sat/ui/splash/SecondFragment.kt rename to app/src/main/java/com/rtbishop/look4sat/ui/splash/SplashPosFragment.kt index 2aef8aa6..1ed7a917 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/splash/SecondFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/splash/SplashPosFragment.kt @@ -3,4 +3,4 @@ package com.rtbishop.look4sat.ui.splash import androidx.fragment.app.Fragment import com.rtbishop.look4sat.R -class SecondFragment: Fragment(R.layout.fragment_second) \ No newline at end of file +class SplashPosFragment : Fragment(R.layout.fragment_splash_pos) \ No newline at end of file diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/splash/FirstFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/splash/SplashTleFragment.kt similarity index 63% rename from app/src/main/java/com/rtbishop/look4sat/ui/splash/FirstFragment.kt rename to app/src/main/java/com/rtbishop/look4sat/ui/splash/SplashTleFragment.kt index fbfd0da8..78f3a35d 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/splash/FirstFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/splash/SplashTleFragment.kt @@ -3,4 +3,4 @@ package com.rtbishop.look4sat.ui.splash import androidx.fragment.app.Fragment import com.rtbishop.look4sat.R -class FirstFragment : Fragment(R.layout.fragment_first) \ No newline at end of file +class SplashTleFragment: Fragment(R.layout.fragment_splash_tle) \ No newline at end of file diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/splash/ThirdFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/splash/ThirdFragment.kt deleted file mode 100644 index 9025a18b..00000000 --- a/app/src/main/java/com/rtbishop/look4sat/ui/splash/ThirdFragment.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.rtbishop.look4sat.ui.splash - -import androidx.fragment.app.Fragment -import com.rtbishop.look4sat.R - -class ThirdFragment : Fragment(R.layout.fragment_third) \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_next.xml b/app/src/main/res/drawable/ic_next.xml index 702e70c5..7e6b405c 100644 --- a/app/src/main/res/drawable/ic_next.xml +++ b/app/src/main/res/drawable/ic_next.xml @@ -2,9 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24" - android:tint="?attr/colorControlNormal"> - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_satellite.xml b/app/src/main/res/drawable/ic_satellite.xml new file mode 100644 index 00000000..dc199a4b --- /dev/null +++ b/app/src/main/res/drawable/ic_satellite.xml @@ -0,0 +1,23 @@ + + + + + + + diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index 6f4c5aa9..041b9ad0 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -9,8 +9,8 @@ @@ -19,9 +19,8 @@ android:id="@+id/splashNext" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="76dp" + android:layout_marginBottom="48dp" android:contentDescription="@string/placeholder" - app:fabSize="mini" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/fragment_first.xml b/app/src/main/res/layout/fragment_first.xml deleted file mode 100644 index 9a732ff5..00000000 --- a/app/src/main/res/layout/fragment_first.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_second.xml b/app/src/main/res/layout/fragment_second.xml deleted file mode 100644 index 36bc1528..00000000 --- a/app/src/main/res/layout/fragment_second.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_splash_pos.xml b/app/src/main/res/layout/fragment_splash_pos.xml new file mode 100644 index 00000000..9314eba8 --- /dev/null +++ b/app/src/main/res/layout/fragment_splash_pos.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_splash_tle.xml b/app/src/main/res/layout/fragment_splash_tle.xml new file mode 100644 index 00000000..24f5c189 --- /dev/null +++ b/app/src/main/res/layout/fragment_splash_tle.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_third.xml b/app/src/main/res/layout/fragment_third.xml deleted file mode 100644 index a54a46fe..00000000 --- a/app/src/main/res/layout/fragment_third.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index e365f374..b8cd29e7 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -66,6 +66,13 @@ Использовать компас Показывать время пролета по UTC + Look4Sat использует двухстрочный набор элементов TLE + для вычисления положения спутников. Со временем TLE теряют точность, рекомендуется + их обновлять примерно раз в неделю. Это можно сделать через меню "Спутники" + Look4Sat нужно знать местоположение, чтобы корректно рассчитывать + орбиты и пролёты спутников относительно него. Пожалуйста, установите позицию + (GPS, Локатор QTH) через меню "Настройки" + Версия: %s Трекер спутников для Android Угостить кофе diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ce49ea84..6792b3fa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -85,6 +85,14 @@ Show pass time in UTC Use sensors to rotate PolarView + Two-Line Element set + Look4Sat uses a TLE set to compute the position of + the satellites. The TLE data looses precision over time, so it is recommended to update + it weekly via the buttons in the Satellites tab + Look4Sat needs to know your position to deliver the accurate + passes predictions. Please set the position using the buttons (GPS, QTH Locator) + in the Settings tab + Version: %s Satellite tracker for Android GitHub diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 2e9a84b4..93ac9100 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -33,6 +33,24 @@ @style/Snackbar.Text + + + + + +