mirror of
https://github.com/meshtastic/Meshtastic-Android.git
synced 2026-03-24 00:33:14 -04:00
map kinda works
This commit is contained in:
@@ -1,8 +1,11 @@
|
||||
package com.geeksville.mesh.ui
|
||||
|
||||
import android.app.Activity
|
||||
import android.app.Application
|
||||
import android.os.Bundle
|
||||
import androidx.compose.Composable
|
||||
import androidx.compose.onCommit
|
||||
import androidx.ui.core.ContextAmbient
|
||||
import androidx.ui.core.Text
|
||||
import androidx.ui.fakeandroidview.AndroidView
|
||||
import androidx.ui.layout.Column
|
||||
import androidx.ui.material.MaterialTheme
|
||||
@@ -11,9 +14,49 @@ import com.geeksville.android.Logging
|
||||
import com.geeksville.mesh.R
|
||||
import com.geeksville.mesh.model.UIState
|
||||
import com.mapbox.mapboxsdk.maps.MapView
|
||||
import com.mapbox.mapboxsdk.maps.Style
|
||||
|
||||
object mapLog : Logging
|
||||
|
||||
|
||||
/**
|
||||
* mapbox requires this, until compose has a nicer way of doing it, do it here
|
||||
*/
|
||||
private val mapLifecycleCallbacks = object : Application.ActivityLifecycleCallbacks {
|
||||
var view: MapView? = null
|
||||
|
||||
override fun onActivityPaused(activity: Activity) {
|
||||
view!!.onPause()
|
||||
}
|
||||
|
||||
override fun onActivityStarted(activity: Activity) {
|
||||
view!!.onStart()
|
||||
}
|
||||
|
||||
override fun onActivityDestroyed(activity: Activity) {
|
||||
view!!.onDestroy()
|
||||
}
|
||||
|
||||
override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
|
||||
view!!.onSaveInstanceState(outState)
|
||||
}
|
||||
|
||||
override fun onActivityStopped(activity: Activity) {
|
||||
view!!.onStop()
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when the Activity calls [super.onCreate()][Activity.onCreate].
|
||||
*/
|
||||
override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
|
||||
}
|
||||
|
||||
override fun onActivityResumed(activity: Activity) {
|
||||
view!!.onResume()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Composable
|
||||
fun MapContent() {
|
||||
analyticsScreen(name = "map")
|
||||
@@ -21,13 +64,30 @@ fun MapContent() {
|
||||
val typography = MaterialTheme.typography()
|
||||
val context = ContextAmbient.current
|
||||
|
||||
onCommit(AppStatus.currentScreen) {
|
||||
onDispose {
|
||||
// We no longer care about activity lifecycle
|
||||
(context.applicationContext as Application).unregisterActivityLifecycleCallbacks(
|
||||
mapLifecycleCallbacks
|
||||
)
|
||||
mapLifecycleCallbacks.view = null
|
||||
}
|
||||
}
|
||||
|
||||
Column {
|
||||
Text("hi")
|
||||
AndroidView(R.layout.map_view) { view ->
|
||||
view as MapView
|
||||
view.onCreate(UIState.savedInstanceState)
|
||||
view.getMapAsync {
|
||||
mapLog.info("In getmap")
|
||||
|
||||
mapLifecycleCallbacks.view = view
|
||||
(context.applicationContext as Application).registerActivityLifecycleCallbacks(
|
||||
mapLifecycleCallbacks
|
||||
)
|
||||
|
||||
view.getMapAsync { map ->
|
||||
map.setStyle(Style.OUTDOORS) {
|
||||
// Map is set up and the style has loaded. Now you can add data or make other map adjustments
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user