Moved the code from activity to ViewModel. Minor layout updates.

2019-10-30 23:20:16 +00:00 · 2019-10-30 23:20:16 +00:00 · dc62d660a8
commit dc62d660a8
--- a/app/src/main/java/com/rtbishop/lookingsat/repo/Repository.kt
+++ b/app/src/main/java/com/rtbishop/lookingsat/repo/Repository.kt
@ -1,9 +1,7 @@
 package com.rtbishop.lookingsat.repo

-import android.util.Log
 import com.rtbishop.lookingsat.api.RemoteDataSource
 import com.rtbishop.lookingsat.db.LocalDataSource
-import java.io.IOException
 import java.io.InputStream

 class Repository(
@ -15,11 +13,7 @@ class Repository(
    }

    suspend fun updateTransmittersDatabase() {
-        try {
-            localSource.insertTransmitters(remoteSource.fetchTransmittersList())
-        } catch (exception: IOException) {
-            Log.d(this.javaClass.simpleName, exception.toString())
-        }
+        localSource.insertTransmitters(remoteSource.fetchTransmittersList())
    }

    suspend fun getTransmittersForSat(id: Int): List<Transmitter> {
--- a/app/src/main/java/com/rtbishop/lookingsat/ui/MainActivity.kt
+++ b/app/src/main/java/com/rtbishop/lookingsat/ui/MainActivity.kt
@ -2,10 +2,8 @@ package com.rtbishop.lookingsat.ui

 import android.Manifest
 import android.content.Intent
-import android.content.SharedPreferences
 import android.content.pm.ActivityInfo
 import android.content.pm.PackageManager
-import android.location.Location
 import android.net.Uri
 import android.os.Bundle
 import android.os.CountDownTimer
@ -21,7 +19,6 @@ import androidx.appcompat.widget.Toolbar
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
-import androidx.core.content.edit
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.lifecycle.ViewModelProviders
 import androidx.navigation.findNavController
@ -29,28 +26,23 @@ import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.navigateUp
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
-import androidx.preference.PreferenceManager
-import com.google.android.gms.location.FusedLocationProviderClient
-import com.google.android.gms.location.LocationServices
 import com.google.android.material.navigation.NavigationView
 import com.rtbishop.lookingsat.R
 import com.rtbishop.lookingsat.vm.MainViewModel
 import java.util.*
 import java.util.concurrent.TimeUnit

-const val LOCATION_REQ = 101
-const val LOCATION_PERM = Manifest.permission.ACCESS_FINE_LOCATION
-const val GRANTED = PackageManager.PERMISSION_GRANTED
-const val GITHUB_URL = "https://github.com/rt-bishop/LookingSat"
-
 class MainActivity : AppCompatActivity() {

+    private val permLocationCode = 101
+    private val permLocation = Manifest.permission.ACCESS_FINE_LOCATION
+    private val permGranted = PackageManager.PERMISSION_GRANTED
+    private val githubUrl = "https://github.com/rt-bishop/LookingSat"
+
    private lateinit var appBarConfig: AppBarConfiguration
    private lateinit var viewModel: MainViewModel
    private lateinit var timerLayout: ConstraintLayout
    private lateinit var timeToAos: TextView
-    private lateinit var fusedLocationClient: FusedLocationProviderClient
-    private lateinit var preferences: SharedPreferences
    private lateinit var drawerLat: TextView
    private lateinit var drawerLon: TextView
    private lateinit var drawerHeight: TextView
@ -61,39 +53,31 @@ class MainActivity : AppCompatActivity() {
        super.onCreate(savedInstanceState)
        setContentView(R.layout.activity_main)
        setupComponents()
-        setupNavigation()
+        setupDrawer()
        setupTimer()
-        updateDrawerValues()
+        updateLocation()
    }

    private fun setupComponents() {
        viewModel = ViewModelProviders.of(this).get(MainViewModel::class.java)
-        fusedLocationClient = LocationServices.getFusedLocationProviderClient(this)
-        preferences = PreferenceManager.getDefaultSharedPreferences(this)
        timerLayout = findViewById(R.id.timer_layout)
        timeToAos = findViewById(R.id.time_to_aos)
-    }

-    private fun setupNavigation() {
        val toolbar: Toolbar = findViewById(R.id.toolbar)
        setSupportActionBar(toolbar)

        val drawerLayout: DrawerLayout = findViewById(R.id.drawer_layout)
        val navView: NavigationView = findViewById(R.id.nav_view)
        val header = navView.getHeaderView(0)
+
        drawerLat = header.findViewById(R.id.drawer_lat_value)
        drawerLon = header.findViewById(R.id.drawer_lon_value)
        drawerHeight = header.findViewById(R.id.drawer_height_value)
        drawerSubTitle = header.findViewById(R.id.drawer_link)
        drawerGetLocation = header.findViewById(R.id.drawer_get_location)
-        val navController = findNavController(R.id.nav_host)

-        appBarConfig = AppBarConfiguration(
-            setOf(
-                R.id.nav_sky,
-                R.id.nav_single_sat
-            ), drawerLayout
-        )
+        val navController = findNavController(R.id.nav_host)
+        appBarConfig = AppBarConfiguration(setOf(R.id.nav_sky, R.id.nav_single_sat), drawerLayout)
        setupActionBarWithNavController(navController, appBarConfig)
        navView.setupWithNavController(navController)

@ -113,22 +97,23 @@ class MainActivity : AppCompatActivity() {
                }
            }
        }
+    }

-        drawerSubTitle.setOnClickListener {
-            openGitHub()
-        }
+    private fun setupDrawer() {
+        drawerSubTitle.setOnClickListener { goToGithub() }

-        drawerGetLocation.startAnimation(
-            AnimationUtils.loadAnimation(
-                this,
-                R.anim.pulse
-            )
-        )
+        drawerGetLocation.startAnimation(AnimationUtils.loadAnimation(this, R.anim.pulse))
        drawerGetLocation.setOnClickListener {
            it.isEnabled = false
            updateLocation()
            it.postDelayed({ it.isEnabled = true }, 3600)
        }
+
+        viewModel.gsp.observe(this, androidx.lifecycle.Observer { gsp ->
+            drawerLat.text = String.format("%.4f", gsp.latitude)
+            drawerLon.text = String.format("%.4f", gsp.longitude)
+            drawerHeight.text = String.format("%.1fm", gsp.heightAMSL)
+        })
    }

    private fun setupTimer() {
@ -158,69 +143,31 @@ class MainActivity : AppCompatActivity() {
    }

    private fun updateLocation() {
-        if (ContextCompat.checkSelfPermission(
-                this,
-                LOCATION_PERM
-            ) != GRANTED
-        ) {
-            if (ActivityCompat.shouldShowRequestPermissionRationale(
-                    this,
-                    LOCATION_PERM
-                )
-            ) {
+        if (ContextCompat.checkSelfPermission(this, permLocation) != permGranted) {
+            if (ActivityCompat.shouldShowRequestPermissionRationale(this, permLocation)) {
                Toast.makeText(this, "Missing permissions", Toast.LENGTH_LONG).show()
            } else {
-                ActivityCompat.requestPermissions(
-                    this, arrayOf(LOCATION_PERM),
-                    LOCATION_REQ
-                )
+                ActivityCompat.requestPermissions(this, arrayOf(permLocation), permLocationCode)
            }
        } else {
-            getPreciseLocation()
+            viewModel.updateLocation()
        }
    }

-    private fun getPreciseLocation() {
-        fusedLocationClient.lastLocation.addOnSuccessListener { location: Location? ->
-            val lat = location?.latitude ?: 51.5074
-            val lon = location?.longitude ?: 0.1278
-            val height = location?.altitude ?: 48.0
-
-            preferences.edit {
-                putDouble("LATITUDE", lat)
-                putDouble("LONGITUDE", lon)
-                putDouble("HEIGHT", height)
-                apply()
-            }
-            updateDrawerValues()
-            Toast.makeText(this, "Location was set", Toast.LENGTH_SHORT).show()
-        }
-    }
-
-    private fun updateDrawerValues() {
-        val lat = preferences.getDouble("LATITUDE", 51.5074)
-        val lon = preferences.getDouble("LONGITUDE", 0.1278)
-        val height = preferences.getDouble("HEIGHT", 48.0)
-
-        drawerLat.text = String.format("%.4f", lat)
-        drawerLon.text = String.format("%.4f", lon)
-        drawerHeight.text = String.format("%.1fm", height)
-    }
-
-    private fun openGitHub() {
-        val intentGitHub = Intent(Intent.ACTION_VIEW, Uri.parse(GITHUB_URL))
+    private fun goToGithub() {
+        val intentGitHub = Intent(Intent.ACTION_VIEW, Uri.parse(githubUrl))
        startActivity(intentGitHub)
    }

-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
-    ) {
-        when (requestCode) {
-            LOCATION_REQ -> {
-                if (grantResults.isNotEmpty() && grantResults[0] == GRANTED) {
-                    getPreciseLocation()
+    private fun exit() {
+        finish()
+    }
+
+    override fun onRequestPermissionsResult(reqCode: Int, perms: Array<out String>, res: IntArray) {
+        when (reqCode) {
+            permLocationCode -> {
+                if (res.isNotEmpty() && res[0] == permGranted) {
+                    viewModel.updateLocation()
                }
            }
        }
@ -238,19 +185,8 @@ class MainActivity : AppCompatActivity() {

    override fun onOptionsItemSelected(item: MenuItem): Boolean {
        when (item.itemId) {
-            R.id.fetch_trans -> Toast.makeText(this, "Fetch transmit", Toast.LENGTH_SHORT).show()
-            R.id.save_to_db -> Toast.makeText(this, "Saving to DB", Toast.LENGTH_SHORT).show()
-            R.id.load_from_db -> Toast.makeText(this, "Loading from DB", Toast.LENGTH_SHORT).show()
-            R.id.fetch_tle -> Toast.makeText(this, "Fetching TLE", Toast.LENGTH_SHORT).show()
-            R.id.load_tle -> Toast.makeText(this, "Loading TLE", Toast.LENGTH_SHORT).show()
-            R.id.action_exit -> finish()
+            R.id.menu_refresh -> Toast.makeText(this, "Refresh", Toast.LENGTH_SHORT).show()
        }
        return super.onOptionsItemSelected(item)
    }
-}
-
-fun SharedPreferences.Editor.putDouble(key: String, double: Double): SharedPreferences.Editor =
-    putLong(key, java.lang.Double.doubleToRawLongBits(double))
-
-fun SharedPreferences.getDouble(key: String, default: Double) =
-    java.lang.Double.longBitsToDouble(getLong(key, java.lang.Double.doubleToRawLongBits(default)))
+}
--- a/app/src/main/java/com/rtbishop/lookingsat/vm/MainViewModel.kt
+++ b/app/src/main/java/com/rtbishop/lookingsat/vm/MainViewModel.kt
@ -1,11 +1,76 @@
 package com.rtbishop.lookingsat.vm

 import android.app.Application
+import android.content.Context
+import android.content.SharedPreferences
+import android.location.Location
+import android.widget.Toast
+import androidx.core.content.edit
 import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import androidx.preference.PreferenceManager
+import com.github.amsacode.predict4java.GroundStationPosition
+import com.google.android.gms.location.LocationServices
 import com.rtbishop.lookingsat.Injector
 import com.rtbishop.lookingsat.repo.Repository
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import java.io.IOException

 class MainViewModel(application: Application) : AndroidViewModel(application) {

-    private var repository: Repository = Injector.provideRepository(application)
-}
+    private val repository: Repository = Injector.provideRepository(application)
+    private val preferences = PreferenceManager.getDefaultSharedPreferences(application)
+    private val fusedLocationClient = LocationServices.getFusedLocationProviderClient(application)
+    private val _gsp = MutableLiveData<GroundStationPosition>()
+    val gsp: LiveData<GroundStationPosition> = _gsp
+
+    fun updateLocation() {
+        fusedLocationClient.lastLocation.addOnSuccessListener { location: Location? ->
+            val lat = location?.latitude ?: 51.5074
+            val lon = location?.longitude ?: 0.1278
+            val height = location?.altitude ?: 48.0
+
+            preferences.edit {
+                putDouble("LATITUDE", lat)
+                putDouble("LONGITUDE", lon)
+                putDouble("HEIGHT", height)
+                apply()
+            }
+            _gsp.postValue(GroundStationPosition(lat, lon, height))
+        }
+    }
+
+    fun updateTwoLineElementFile() {
+        val fileName = "tles.txt"
+        viewModelScope.launch(Dispatchers.IO) {
+            try {
+                getApplication<Application>().openFileOutput(fileName, Context.MODE_PRIVATE).use {
+                    it.write(repository.fetchTleStream().readBytes())
+                }
+                Toast.makeText(getApplication(), "TLE file was updated", Toast.LENGTH_SHORT).show()
+            } catch (exception: IOException) {
+                Toast.makeText(getApplication(), "Could not update TLE", Toast.LENGTH_SHORT).show()
+            }
+        }
+    }
+
+    fun updateTransmittersDatabase() {
+        viewModelScope.launch(Dispatchers.IO) {
+            try {
+                repository.updateTransmittersDatabase()
+                Toast.makeText(getApplication(), "", Toast.LENGTH_SHORT).show()
+            } catch (exception: IOException) {
+                Toast.makeText(getApplication(), "", Toast.LENGTH_SHORT).show()
+            }
+        }
+    }
+}
+
+fun SharedPreferences.Editor.putDouble(key: String, double: Double): SharedPreferences.Editor =
+    putLong(key, java.lang.Double.doubleToRawLongBits(double))
+
+fun SharedPreferences.getDouble(key: String, default: Double) =
+    java.lang.Double.longBitsToDouble(getLong(key, java.lang.Double.doubleToRawLongBits(default)))
--- a/app/src/main/res/drawable/ic_refresh.xml
+++ b/app/src/main/res/drawable/ic_refresh.xml
@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z" />
+</vector>
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@ -18,16 +18,16 @@
            <androidx.constraintlayout.widget.ConstraintLayout
                android:id="@+id/timer_layout"
                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp">
+                android:layout_height="wrap_content">

                <TextView
                    android:id="@+id/time_to_aos"
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
                    android:gravity="center"
                    android:text="@string/next_aos_pattern"
-                    android:textSize="32sp"
+                    android:textSize="30sp"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintEnd_toEndOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
--- a/app/src/main/res/menu/main_menu.xml
+++ b/app/src/main/res/menu/main_menu.xml
@ -1,21 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
    <item
-        android:id="@+id/fetch_trans"
-        android:title="@string/menu_fetch_transmitters" />
-    <item
-        android:id="@+id/save_to_db"
-        android:title="@string/menu_save_to_db" />
-    <item
-        android:id="@+id/load_from_db"
-        android:title="@string/menu_load_from_db" />
-    <item
-        android:id="@+id/fetch_tle"
-        android:title="@string/menu_fetch_tle" />
-    <item
-        android:id="@+id/load_tle"
-        android:title="@string/menu_load_tle" />
-    <item
-        android:id="@+id/action_exit"
-        android:title="@string/menu_exit" />
+        android:id="@+id/menu_refresh"
+        android:icon="@drawable/ic_refresh"
+        android:title="@string/menu_refresh"
+        app:showAsAction="always" />
 </menu>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -19,12 +19,7 @@
    <string name="height">Height AMSL: </string>
    <string name="height_def">48.0m</string>

-    <string name="menu_fetch_transmitters">Fetch Transmitters</string>
-    <string name="menu_save_to_db">Save to DB</string>
-    <string name="menu_load_from_db">Load from DB</string>
-    <string name="menu_fetch_tle">Fetch TLE</string>
-    <string name="menu_load_tle">Load TLE</string>
-    <string name="menu_exit">Exit</string>
+    <string name="menu_refresh">Refresh</string>

    <string name="next_aos_pattern">AOS in %02d:%02d:%02d</string>
    <string name="drawer_locator">Drawer Locator</string>