diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/CreditsFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/AboutFragment.kt
similarity index 62%
rename from app/src/main/java/com/rtbishop/look4sat/ui/CreditsFragment.kt
rename to app/src/main/java/com/rtbishop/look4sat/ui/AboutFragment.kt
index c696d824..99aa2c1d 100644
--- a/app/src/main/java/com/rtbishop/look4sat/ui/CreditsFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/AboutFragment.kt
@@ -20,19 +20,35 @@
package com.rtbishop.look4sat.ui
import android.os.Bundle
+import android.text.method.LinkMovementMethod
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import android.widget.TextView
import androidx.fragment.app.Fragment
+import com.rtbishop.look4sat.BuildConfig
import com.rtbishop.look4sat.R
-class CreditsFragment : Fragment() {
+class AboutFragment : Fragment() {
+
+ private lateinit var textVersion: TextView
+ private lateinit var textThanks: TextView
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
- return inflater.inflate(R.layout.fragment_credits, container, false)
+ return inflater.inflate(R.layout.fragment_about, container, false)
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+
+ textVersion = view.findViewById(R.id.about_title_version)
+ textThanks = view.findViewById(R.id.about_thanks_to)
+
+ 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 1768c81d..062d7e2f 100644
--- a/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt
@@ -93,7 +93,7 @@ class MainActivity : AppCompatActivity() {
drawerBtnExit = header.findViewById(R.id.drawer_btn_exit)
appBarConfig = AppBarConfiguration(
- setOf(R.id.nav_pass_list, R.id.nav_map_view, R.id.nav_credits, R.id.nav_about),
+ setOf(R.id.nav_pass_list, R.id.nav_map_view, R.id.nav_settings, R.id.nav_about),
drawerLayout
)
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
index 6aff33d0..012377e5 100644
--- a/app/src/main/res/drawable/ic_about.xml
+++ b/app/src/main/res/drawable/ic_about.xml
@@ -1,9 +1,28 @@
+
+
diff --git a/app/src/main/res/drawable/ic_credits.xml b/app/src/main/res/drawable/ic_credits.xml
deleted file mode 100644
index f99519bf..00000000
--- a/app/src/main/res/drawable/ic_credits.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_sputnik.xml b/app/src/main/res/drawable/ic_sputnik.xml
index fd5675fa..79545b41 100644
--- a/app/src/main/res/drawable/ic_sputnik.xml
+++ b/app/src/main/res/drawable/ic_sputnik.xml
@@ -23,9 +23,9 @@
android:viewportWidth="128"
android:viewportHeight="128">
diff --git a/app/src/main/res/drawable/worldmap_light.webp b/app/src/main/res/drawable/worldmap_light.webp
deleted file mode 100644
index 4f4c8f5c..00000000
Binary files a/app/src/main/res/drawable/worldmap_light.webp and /dev/null differ
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
new file mode 100644
index 00000000..2247287c
--- /dev/null
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_credits.xml b/app/src/main/res/layout/fragment_credits.xml
deleted file mode 100644
index 1d83d912..00000000
--- a/app/src/main/res/layout/fragment_credits.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/src/main/res/menu/drawer_menu.xml b/app/src/main/res/menu/drawer_menu.xml
index cc2d0142..071c8029 100644
--- a/app/src/main/res/menu/drawer_menu.xml
+++ b/app/src/main/res/menu/drawer_menu.xml
@@ -1,4 +1,23 @@
+
+
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index f47f21d6..3cc00ea9 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -1,4 +1,23 @@
+
+
-
-
-
-
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1c9659a3..4c5816bb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,6 +19,7 @@
Look4Sat
+ Version: %s
L∞king \n4Sat…
Latitude:
@@ -38,7 +39,6 @@
Polar View
World Map View
Settings
- Credits
About the App
Select satellites to track…
@@ -122,6 +122,34 @@
Press this button to select the satellites you wish to track
+
+ Amateur radio & weather satellites passes calculator for Android
+ Big thanks:
+ — To you for installing and using this app!
+ \nMay your sky always be clear! \n
+
+ \n— To David A. B. Johnson, G4DPZ, the author of
+ predict4java library which this app is using for all the SGP4 model calculations. \n
+
+ \n— To Dave Moten for creating the mavenized fork
+ of predict4java which made it super easy to integrate the library in the app. Predict4java
+ is available under the
+ GNU GPLv2 license. \n
+
+ \n— To Alexandru Csete, OZ9AEC,
+ for his amazing Gpredict program which inspired the creation of Look4Sat. \n
+
+ \n— To Guys from Square for creating an amazing set of libraries (OkHttp, Okio, Retrofit)
+ and for making them available under the
+ Apache-2.0 license. \n
+
+ \n— To Guys from Google and AOSP for making the best mobile OS available nowadays, for their
+ Google Play Services, Gson and Dagger2 libs. \n
+
+ \nThis application comes with absolutely no warranty. See the
+ GNU GPLv2 for details.
+
+
Yes
No
OK
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 26d63e4f..7f6499c9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -129,4 +129,26 @@
- 2dp
+
+
+
+
+
+