mirror/EVMap
1
0
Fork 0
mirror of https://github.com/ev-map/EVMap.git synced 2026-05-19 12:26:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Android Auto: Add permission screen, add selection between nearby and favorites

Browse Source
This commit is contained in:
Johan von Forstner
2021-01-01 17:03:28 +01:00
committed by johan12345
parent ffb0b77f37
commit 04e6f63cd7
6 changed files with 288 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/google/AndroidManifest.xml
View File

@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
package="net.vonforst.evmap">
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-sdk tools:overrideLibrary="com.google.android.libraries.car.app" />
@@ -36,5 +36,7 @@
android:name=".auto.CarLocationService"
android:foregroundServiceType="location"
android:enabled="true" />
<activity android:name=".auto.PermissionActivity" />
</application>
</manifest>

233
app/src/google/java/net/vonforst/evmap/auto/CarAppService.kt
View File

@@ -1,11 +1,15 @@
package net.vonforst.evmap.auto
import android.Manifest
import android.content.*
import android.content.pm.PackageManager
import android.graphics.Bitmap
import android.graphics.drawable.BitmapDrawable
import android.location.Location
import android.net.Uri
import android.os.Bundle
import android.os.IBinder
import android.os.ResultReceiver
import android.text.SpannableStringBuilder
import android.text.Spanned
import androidx.core.content.ContextCompat
@@ -32,6 +36,7 @@ import net.vonforst.evmap.api.availability.getAvailability
import net.vonforst.evmap.api.goingelectric.ChargeLocation
import net.vonforst.evmap.api.goingelectric.GoingElectricApi
import net.vonforst.evmap.api.nameForPlugType
import net.vonforst.evmap.storage.AppDatabase
import net.vonforst.evmap.ui.availabilityText
import net.vonforst.evmap.ui.getMarkerTint
import net.vonforst.evmap.utils.distanceBetween
@@ -39,9 +44,17 @@ import java.time.Duration
import java.time.ZonedDateTime
import kotlin.math.roundToInt
interface LocationAwareScreen {
fun updateLocation(location: Location)
}
class CarAppService : com.google.android.libraries.car.app.CarAppService(), LifecycleObserver {
private lateinit var mapScreen: MapScreen
var mapScreen: LocationAwareScreen? = null
set(value) {
field = value
location?.let { value?.updateLocation(it) }
}
private var location: Location? = null
private var locationService: CarLocationService? = null
private val serviceConnection = object : ServiceConnection {
@@ -60,23 +73,35 @@ class CarAppService : com.google.android.libraries.car.app.CarAppService(), Life
private val locationReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
val location = intent.getParcelableExtra(CarLocationService.EXTRA_LOCATION) as Location?
if (location != null) {
val mapScreen = this@CarAppService.mapScreen
if (location != null && mapScreen != null) {
mapScreen.updateLocation(location)
}
this@CarAppService.location = location
}
}
override fun onCreate() {
mapScreen = MapScreen(carContext)
lifecycle.addObserver(this)
}
override fun onCreateScreen(intent: Intent): Screen {
return mapScreen
return if (locationPermissionGranted()) {
WelcomeScreen(carContext, this)
} else {
PermissionScreen(carContext, this)
}
}
private fun locationPermissionGranted() =
ContextCompat.checkSelfPermission(
carContext,
Manifest.permission.ACCESS_FINE_LOCATION
) == PackageManager.PERMISSION_GRANTED
@OnLifecycleEvent(Lifecycle.Event.ON_START)
private fun bindLocationService() {
fun bindLocationService() {
if (!locationPermissionGranted()) return
bindService(
Intent(this, CarLocationService::class.java),
serviceConnection,
@@ -104,7 +129,118 @@ class CarAppService : com.google.android.libraries.car.app.CarAppService(), Life
}
}
class MapScreen(ctx: CarContext) : Screen(ctx) {
/**
* Welcome screen with selection between favorites and nearby chargers
*/
class WelcomeScreen(ctx: CarContext, val cas: CarAppService) : Screen(ctx), LocationAwareScreen {
private var location: Location? = null
override fun getTemplate(): Template {
cas.mapScreen = this
return PlaceListMapTemplate.builder().apply {
setTitle(carContext.getString(R.string.app_name))
location?.let {
setAnchor(Place.builder(LatLng.create(it)).build())
}
setItemList(ItemList.builder().apply {
addItem(Row.builder()
.setTitle(carContext.getString(R.string.auto_chargers_closeby))
.setImage(
CarIcon.builder(
IconCompat.createWithResource(
carContext,
R.drawable.ic_address
)
)
.setTint(CarColor.DEFAULT).build()
)
.setIsBrowsable(true)
.setOnClickListener {
screenManager.push(MapScreen(carContext, cas, favorites = false))
}
.build())
addItem(Row.builder()
.setTitle(carContext.getString(R.string.auto_favorites))
.setImage(
CarIcon.builder(
IconCompat.createWithResource(
carContext,
R.drawable.ic_fav
)
)
.setTint(CarColor.DEFAULT).build()
)
.setIsBrowsable(true)
.setOnClickListener {
screenManager.push(MapScreen(carContext, cas, favorites = true))
}
.build())
}.build())
setCurrentLocationEnabled(true)
setHeaderAction(Action.APP_ICON)
build()
}.build()
}
override fun updateLocation(location: Location) {
this.location = location
invalidate()
}
}
/**
* Screen to grant location permission
*/
class PermissionScreen(ctx: CarContext, val cas: CarAppService) : Screen(ctx) {
override fun getTemplate(): Template {
return MessageTemplate.builder(carContext.getString(R.string.auto_location_permission_needed))
.setTitle(carContext.getString(R.string.app_name))
.setHeaderAction(Action.APP_ICON)
.setActions(listOf(
Action.builder()
.setTitle(carContext.getString(R.string.grant_on_phone))
.setBackgroundColor(CarColor.PRIMARY)
.setOnClickListener(ParkedOnlyOnClickListener.create {
val intent = Intent(carContext, PermissionActivity::class.java)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.putExtra(
PermissionActivity.EXTRA_RESULT_RECEIVER,
object : ResultReceiver(null) {
override fun onReceiveResult(
resultCode: Int,
resultData: Bundle?
) {
if (resultData!!.getBoolean(PermissionActivity.RESULT_GRANTED)) {
cas.bindLocationService()
screenManager.push(WelcomeScreen(carContext, cas))
}
}
})
carContext.startActivity(intent)
CarToast.makeText(
carContext,
R.string.opened_on_phone,
CarToast.LENGTH_LONG
).show()
})
.build(),
Action.builder()
.setTitle(carContext.getString(R.string.cancel))
.setOnClickListener {
cas.stopSelf()
}
.build(),
))
.build()
}
}
/**
* Main map screen showing either nearby chargers or favorites
*/
class MapScreen(ctx: CarContext, val cas: CarAppService, val favorites: Boolean = false) :
Screen(ctx), LocationAwareScreen {
private var location: Location? = null
private var lastUpdateLocation: Location? = null
private var chargers: List<ChargeLocation>? = null
@@ -119,8 +255,17 @@ class MapScreen(ctx: CarContext) : Screen(ctx) {
private val maxRows = 6
override fun getTemplate(): Template {
cas.mapScreen = this
return PlaceListMapTemplate.builder().apply {
setTitle("EVMap")
setTitle(
carContext.getString(
if (favorites) {
R.string.auto_favorites
} else {
R.string.auto_chargers_closeby
}
)
)
location?.let {
setAnchor(Place.builder(LatLng.create(it)).build())
} ?: setIsLoading(true)
@@ -129,11 +274,19 @@ class MapScreen(ctx: CarContext) : Screen(ctx) {
chargerList.forEach { charger ->
builder.addItem(formatCharger(charger))
}
builder.setNoItemsMessage(carContext.getString(R.string.auto_no_chargers_found))
builder.setNoItemsMessage(
carContext.getString(
if (favorites) {
R.string.auto_no_favorites_found
} else {
R.string.auto_no_chargers_found
}
)
)
setItemList(builder.build())
} ?: setIsLoading(true)
setCurrentLocationEnabled(true)
setHeaderAction(Action.APP_ICON)
setHeaderAction(Action.BACK)
build()
}.build()
}
@@ -195,7 +348,7 @@ class MapScreen(ctx: CarContext) : Screen(ctx) {
}.build()
}
fun updateLocation(location: Location) {
override fun updateLocation(location: Location) {
this.location = location
if (lastUpdateLocation == null) invalidate()
@@ -206,8 +359,23 @@ class MapScreen(ctx: CarContext) : Screen(ctx) {
lastUpdateLocation = location
// update displayed chargers
lifecycleScope.launch {
// load chargers
loadChargers(location)
}
}
private val db = AppDatabase.getInstance(carContext)
private fun loadChargers(location: Location) {
lifecycleScope.launch {
// load chargers
if (favorites) {
chargers = db.chargeLocationsDao().getAllChargeLocationsAsync().sortedBy {
distanceBetween(
location.latitude, location.longitude,
it.coordinates.lat, it.coordinates.lng
)
}
} else {
val response = api.getChargepointsRadius(
location.latitude,
location.longitude,
@@ -216,31 +384,31 @@ class MapScreen(ctx: CarContext) : Screen(ctx) {
)
chargers =
response.body()?.chargelocations?.filterIsInstance(ChargeLocation::class.java)
}
// remove outdated availabilities
availabilities = availabilities.filter {
Duration.between(
it.value.first,
ZonedDateTime.now()
) > availabilityUpdateThreshold
}.toMutableMap()
// remove outdated availabilities
availabilities = availabilities.filter {
Duration.between(
it.value.first,
ZonedDateTime.now()
) > availabilityUpdateThreshold
}.toMutableMap()
// update availabilities
chargers?.take(maxRows)?.map {
lifecycleScope.async {
// update only if not yet stored
if (!availabilities.containsKey(it.id)) {
val date = ZonedDateTime.now()
val availability = getAvailability(it).data
if (availability != null) {
availabilities[it.id] = date to availability
}
// update availabilities
chargers?.take(maxRows)?.map {
lifecycleScope.async {
// update only if not yet stored
if (!availabilities.containsKey(it.id)) {
val date = ZonedDateTime.now()
val availability = getAvailability(it).data
if (availability != null) {
availabilities[it.id] = date to availability
}
}
}?.awaitAll()
}
}?.awaitAll()
invalidate()
}
invalidate()
}
}
}
@@ -340,7 +508,6 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
R.string.opened_on_phone,
CarToast.LENGTH_LONG
).show()
// TODO: pass options to open this specific charger
})
.build()
)

72
app/src/google/java/net/vonforst/evmap/auto/PermissionActivity.kt Normal file
View File

@@ -0,0 +1,72 @@
package net.vonforst.evmap.auto
import android.Manifest
import android.app.Activity
import android.content.pm.PackageManager
import android.os.Bundle
import android.os.ResultReceiver
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat
class PermissionActivity : Activity() {
companion object {
const val EXTRA_RESULT_RECEIVER = "result_receiver";
const val RESULT_GRANTED = "granted"
}
private lateinit var resultReceiver: ResultReceiver
private val permissions = arrayOf(Manifest.permission.ACCESS_FINE_LOCATION)
private val requestCode = 1
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
if (intent != null) {
resultReceiver = intent.getParcelableExtra(EXTRA_RESULT_RECEIVER)!!
if (!hasPermissions(permissions)) {
ActivityCompat.requestPermissions(this, permissions, requestCode)
} else {
onComplete(
requestCode,
permissions,
intArrayOf(PackageManager.PERMISSION_GRANTED)
)
}
} else {
finish()
}
}
private fun onComplete(requestCode: Int, permissions: Array<String>?, grantResults: IntArray) {
val bundle = Bundle()
bundle.putBoolean(
RESULT_GRANTED,
grantResults.all { it == PackageManager.PERMISSION_GRANTED })
resultReceiver.send(requestCode, bundle)
finish()
}
private fun hasPermissions(permissions: Array<String>): Boolean {
var result = true
for (permission in permissions) {
if (ContextCompat.checkSelfPermission(
this,
permission
) != PackageManager.PERMISSION_GRANTED
) {
result = false
break
}
}
return result
}
override fun onRequestPermissionsResult(
requestCode: Int,
permissions: Array<String>,
grantResults: IntArray
) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults)
onComplete(requestCode, permissions, grantResults)
}
}

5
app/src/google/res/values-de/values.xml
View File

@@ -7,6 +7,11 @@
<string name="donations_info" formatted="false">Findest du EVMap nützlich? Unterstütze die Weiterentwicklung der App mit einer Spende an den Entwickler.\n\nGoogle zieht von der Spende 30% Gebühren ab.</string>
<string name="auto_location_service">EVMap läuft unter Android Auto und nutzt dafür deinen Standort.</string>
<string name="auto_no_chargers_found">Keine Ladestationen in der Nähe gefunden</string>
<string name="auto_no_favorites_found">Keine Favoriten gefunden</string>
<string name="open_in_app">In App öffnen</string>
<string name="opened_on_phone">Auf dem Telefon geöffnet</string>
<string name="auto_location_permission_needed">Um EVMap auf Android Auto zu nutzen, braucht die App Zugriff auf deinen Standort.</string>
<string name="grant_on_phone">Auf Telefon zulassen</string>
<string name="auto_chargers_closeby">In der Nähe</string>
<string name="auto_favorites">Favoriten</string>
</resources>

5
app/src/google/res/values/values.xml
View File

@@ -12,6 +12,11 @@
<string name="donations_info" formatted="false">Do you find EVMap useful? Support its development by sending a donation to the developer.\n\nGoogle takes 30% off every donation.</string>
<string name="auto_location_service">EVMap is running on Android Auto and using your location.</string>
<string name="auto_no_chargers_found">No nearby chargers found</string>
<string name="auto_no_favorites_found">No favorites found</string>
<string name="open_in_app">Open in app</string>
<string name="opened_on_phone">Opened on phone</string>
<string name="auto_location_permission_needed">To run EVMap on Android Auto, you need to grant access to your location.</string>
<string name="grant_on_phone">Grant on phone</string>
<string name="auto_chargers_closeby">Nearby chargers</string>
<string name="auto_favorites">Favorites</string>
</resources>

3
app/src/main/java/net/vonforst/evmap/storage/ChargeLocationsDao.kt
View File

@@ -14,4 +14,7 @@ interface ChargeLocationsDao {
@Query("SELECT * FROM chargelocation")
fun getAllChargeLocations(): LiveData<List<ChargeLocation>>
@Query("SELECT * FROM chargelocation")
suspend fun getAllChargeLocationsAsync(): List<ChargeLocation>
}