From fe7ee3cb03e3161151728048bcf3a2fb9151fc32 Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Thu, 26 Dec 2019 20:14:31 +0000 Subject: [PATCH] Added splash screen. Minor refactoring. --- app/src/main/AndroidManifest.xml | 2 +- .../rtbishop/lookingsat/ui/MainActivity.kt | 1 + .../com/rtbishop/lookingsat/ui/SkyFragment.kt | 2 +- .../rtbishop/lookingsat/ui/TransAdapter.kt | 9 +++------ .../lookingsat/ui/WorldMapFragment.kt | 15 ++++++++++++--- app/src/main/res/drawable/splash_drawable.xml | 10 ++++++++++ .../main/res/drawable/splash_foreground.webp | Bin 0 -> 22684 bytes app/src/main/res/layout/drawer_header.xml | 18 ++++++------------ app/src/main/res/values/strings.xml | 17 +++++++++-------- app/src/main/res/values/styles.xml | 8 +++++--- 10 files changed, 48 insertions(+), 34 deletions(-) create mode 100644 app/src/main/res/drawable/splash_drawable.xml create mode 100644 app/src/main/res/drawable/splash_foreground.webp diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b73ea7d9..e5ae2df8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,7 +18,7 @@ android:name=".ui.MainActivity" android:configChanges="orientation|screenSize" android:label="@string/app_name" - android:theme="@style/AppTheme.NoActionBar"> + android:theme="@style/AppTheme.Splash"> diff --git a/app/src/main/java/com/rtbishop/lookingsat/ui/MainActivity.kt b/app/src/main/java/com/rtbishop/lookingsat/ui/MainActivity.kt index 61c81cd2..78afa06b 100644 --- a/app/src/main/java/com/rtbishop/lookingsat/ui/MainActivity.kt +++ b/app/src/main/java/com/rtbishop/lookingsat/ui/MainActivity.kt @@ -66,6 +66,7 @@ class MainActivity : AppCompatActivity() { private lateinit var appBarConfig: AppBarConfiguration override fun onCreate(savedInstanceState: Bundle?) { + setTheme(R.style.AppTheme) super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) setupComponents() diff --git a/app/src/main/java/com/rtbishop/lookingsat/ui/SkyFragment.kt b/app/src/main/java/com/rtbishop/lookingsat/ui/SkyFragment.kt index b241c950..be8a09a9 100644 --- a/app/src/main/java/com/rtbishop/lookingsat/ui/SkyFragment.kt +++ b/app/src/main/java/com/rtbishop/lookingsat/ui/SkyFragment.kt @@ -107,7 +107,7 @@ class SkyFragment : Fragment() { selectionList.forEach { this[it] = true } } val builder = AlertDialog.Builder(activity as MainActivity) - builder.setTitle(getString(R.string.title_select_sat)) + builder.setTitle(getString(R.string.dialog_select_sat)) .setMultiChoiceItems(tleNameArray, tleCheckedArray) { _, which, isChecked -> if (isChecked) selectionList.add(which) else if (selectionList.contains(which)) selectionList.remove(which) diff --git a/app/src/main/java/com/rtbishop/lookingsat/ui/TransAdapter.kt b/app/src/main/java/com/rtbishop/lookingsat/ui/TransAdapter.kt index 052ded8c..4c8ebd2e 100644 --- a/app/src/main/java/com/rtbishop/lookingsat/ui/TransAdapter.kt +++ b/app/src/main/java/com/rtbishop/lookingsat/ui/TransAdapter.kt @@ -92,22 +92,19 @@ class TransAdapter : RecyclerView.Adapter() { if (transmitter.mode != null) { mode.text = - String.format( - context.getString(R.string.pattern_trans_mode), - transmitter.mode - ) + String.format(context.getString(R.string.pattern_trans_mode), transmitter.mode) } else { mode.text = context.getString(R.string.no_mode) } if (transmitter.isInverted) { inverted.text = String.format( context.getString(R.string.pattern_trans_inverted), - context.getString(R.string.yes) + context.getString(R.string.btn_yes) ) } else { inverted.text = String.format( context.getString(R.string.pattern_trans_inverted), - context.getString(R.string.no) + context.getString(R.string.btn_no) ) } } diff --git a/app/src/main/java/com/rtbishop/lookingsat/ui/WorldMapFragment.kt b/app/src/main/java/com/rtbishop/lookingsat/ui/WorldMapFragment.kt index c5fbe560..bb1045d3 100644 --- a/app/src/main/java/com/rtbishop/lookingsat/ui/WorldMapFragment.kt +++ b/app/src/main/java/com/rtbishop/lookingsat/ui/WorldMapFragment.kt @@ -93,7 +93,11 @@ class WorldMapFragment : Fragment() { ) } else { fab.setOnClickListener { - Toast.makeText(mainActivity, "No satellites were shortlisted", Toast.LENGTH_SHORT) + Toast.makeText( + mainActivity, + getString(R.string.no_selected_sat), + Toast.LENGTH_SHORT + ) .show() } } @@ -107,7 +111,7 @@ class WorldMapFragment : Fragment() { } val builder = AlertDialog.Builder(mainActivity) - builder.setTitle("Select Sat to track") + builder.setTitle(getString(R.string.dialog_show_track)) .setSingleChoiceItems(tleNameArray, checkedItem) { dialog, which -> checkedItem = which selectedSat = tleMainList[selectionList[which]] @@ -173,7 +177,12 @@ class WorldMapFragment : Fragment() { val cx = lon * degLon val cy = lat * degLat cvs.drawCircle(cx, cy, scale * 2, txtPaint) - cvs.drawText("GSP", cx - txtPaint.textSize, cy - txtPaint.textSize, txtPaint) + cvs.drawText( + context.getString(R.string.map_gsp), + cx - txtPaint.textSize, + cy - txtPaint.textSize, + txtPaint + ) } private fun drawGroundTrack(cvs: Canvas, degLon: Float, degLat: Float, list: List) { diff --git a/app/src/main/res/drawable/splash_drawable.xml b/app/src/main/res/drawable/splash_drawable.xml new file mode 100644 index 00000000..90586d92 --- /dev/null +++ b/app/src/main/res/drawable/splash_drawable.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/splash_foreground.webp b/app/src/main/res/drawable/splash_foreground.webp new file mode 100644 index 0000000000000000000000000000000000000000..6818eef2b1a086bb70b393bc32634466824f22d3 GIT binary patch literal 22684 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml index bcbb9057..ab2dd1aa 100644 --- a/app/src/main/res/layout/drawer_header.xml +++ b/app/src/main/res/layout/drawer_header.xml @@ -9,9 +9,10 @@ - - + app:layout_constraintStart_toStartOf="@+id/drawer_title" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b0b531b0..d6326adc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,8 +1,7 @@ - LookingSat - L∞king - S@t + Look4Sat + L∞king \n4Sat… Latitude: 51.5074 @@ -18,6 +17,7 @@ Sky at a Glance Radar View World Map View + Settings Credits About the App @@ -35,8 +35,11 @@ OK Cancel Clear All + No + Yes - Select satellites to track + Select satellites to track + Show ground track for… Ground station position settings Latitude @@ -65,13 +68,11 @@ tleFile.txt tleSelection - No - Yes - Mode: Null Uplink: Null Downlink: Null No transmitters found for this Satellite + No satellites were shortlisted ARGOS-3 A-DCS 465.9875MHz Downlink: 465.9875 MHz @@ -88,7 +89,7 @@ Downlink: %.4f MHz Downlink: %.4f - %.4f MHz + GSP Nasa Map Placeholder - Settings diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 1f5a1288..e0251e14 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -10,14 +10,16 @@ @color/darkOnLight @color/lightOnDark @color/lightOnDark - - + +