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 00000000..6818eef2 Binary files /dev/null and b/app/src/main/res/drawable/splash_foreground.webp differ 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 - - + +