Added splash screen. Minor refactoring.

This commit is contained in:
Arty Bishop committed 2019-12-26 20:46:12 +00:00
1 parent 0d5c84ef43
commit fe7ee3cb03
10 files changed
+48 -34

No files matched your search

@@ -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()
@@ -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)
@@ -92,22 +92,19 @@ class TransAdapter : RecyclerView.Adapter<TransAdapter.TransHolder>() {
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)
)
}
}
@@ -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<SatPos>) {