diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/InfoFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/InfoFragment.kt
index 7c0a0100..6f646dd2 100644
--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/InfoFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/InfoFragment.kt
@@ -36,14 +36,18 @@ class InfoFragment : Fragment(R.layout.fragment_info) {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
FragmentInfoBinding.bind(view).apply {
- version.text = String.format(getString(R.string.app_version), BuildConfig.VERSION_NAME)
- btnGithub.setOnClickListener {
+ infoVersion.text =
+ String.format(getString(R.string.info_version), BuildConfig.VERSION_NAME)
+ infoGithub.setOnClickListener {
gotoUrl("https://github.com/rt-bishop/Look4Sat/")
}
- btnFdroid.setOnClickListener {
+ infoFdroid.setOnClickListener {
gotoUrl("https://f-droid.org/en/packages/com.rtbishop.look4sat/")
}
- message.movementMethod = LinkMovementMethod.getInstance()
+ infoBmc.setOnClickListener {
+ gotoUrl("https://www.buymeacoffee.com/rtbishop")
+ }
+ infoThanks.movementMethod = LinkMovementMethod.getInstance()
}
}
diff --git a/app/src/main/res/drawable/ic_bmc.xml b/app/src/main/res/drawable/ic_bmc.xml
new file mode 100644
index 00000000..cce090aa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bmc.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_info.xml b/app/src/main/res/layout/fragment_info.xml
index d9fa0327..faf01c75 100644
--- a/app/src/main/res/layout/fragment_info.xml
+++ b/app/src/main/res/layout/fragment_info.xml
@@ -29,20 +29,20 @@
android:layout_height="wrap_content">
+ app:layout_constraintTop_toTopOf="@+id/infoTitle" />
+ app:layout_constraintTop_toBottomOf="@+id/infoTitle" />
+ app:layout_constraintTop_toBottomOf="@+id/infoVersion" />
+ app:layout_constraintTop_toBottomOf="@+id/infoSubtitle" />
+ app:layout_constraintStart_toEndOf="@+id/infoGithub" />
+
+
+ app:layout_constraintTop_toBottomOf="@+id/infoBmc" />
+ app:layout_constraintEnd_toEndOf="@+id/infoThanks"
+ app:layout_constraintStart_toStartOf="@+id/infoThanks"
+ app:layout_constraintTop_toBottomOf="@+id/infoThanks" />
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index ecd4e138..9b3ab585 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -18,8 +18,6 @@
-->
- Версия: %s
-
Да
Нет
Отмена
@@ -68,8 +66,10 @@
Использовать компас
Показывать время пролета по UTC
- Трекер спутников для Android
- Огромное спасибо:
+ Версия: %s
+ Трекер спутников для Android
+ Угостить кофе
+ Огромное спасибо:
\n— Вам за использование этого приложения! \nЖелаю всегда чистого неба над головой!
\n— David A. B. Johnson и
Dave Moten за работу над библиотекой predict4java и
@@ -82,6 +82,6 @@
SatNOGS, API и базу данных с огромным количеством информации о спутниках.
\n— Square за библиотеки OkHttp, Retrofit, Moshi и доступ
к ним по лицензии Apache-2.0
- Это ПО поставляется без гарантий.
+ Это ПО поставляется без гарантий.
Подробности в лицензии GNU GPLv2
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ecfd978d..0689c3f2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,15 +19,12 @@
Look4Sat
- Version: %s
Placeholder
No
Yes
Cancel
Update
- GitHub
- F-Droid
Satellites
Passes
@@ -88,8 +85,12 @@
Show pass time in UTC
Use sensors to rotate PolarView
- Satellite tracker for Android
- Huge thanks to:
+ Version: %s
+ Satellite tracker for Android
+ GitHub
+ F-Droid
+ Buy me a coffee
+ 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
@@ -103,6 +104,6 @@
\n— Square for epic OkHttp, Retrofit and Moshi libs
available under the Apache-2.0 license.
- This application comes with absolutely no warranty. See the
+ This application comes with absolutely no warranty. See the
GNU GPLv2 for details.
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3d172c08..76fbc9e1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -32,4 +32,14 @@
- 0dp
+
+
diff --git a/build.gradle b/build.gradle
index 9aa83a62..b1a86783 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ buildscript {
gradle_plugin_version = '1.4.10'
material_version = '1.2.1'
constraint_layout_version = '2.0.2'
- navigation_version = '2.3.0'
+ navigation_version = '2.3.1'
preference_version = '1.1.1'
room_version = '2.2.5'
hilt_version = '2.29.1-alpha'