mirror
/
meshtastic-android
kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

refactor(map): use `getBitmapFromVectorDrawable` 

from BonusPack for `myLocationOverlay` icons
pull/712/head
andrekir 2023-09-04 18:29:19 -03:00
rodzic ae949ad784
commit b25bdb6ff8
1 zmienionych plików z 5 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
app/src/main/java/com/geeksville/mesh/ui/map/MapFragment.kt
Wyświetl plik

@ -32,7 +32,6 @@ import androidx.compose.ui.platform.ViewCompositionStrategy
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.viewinterop.AndroidView import androidx.compose.ui.viewinterop.AndroidView
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.core.graphics.drawable.toBitmap
import androidx.fragment.app.activityViewModels import androidx.fragment.app.activityViewModels
import androidx.lifecycle.viewmodel.compose.viewModel import androidx.lifecycle.viewmodel.compose.viewModel
import com.geeksville.mesh.BuildConfig import com.geeksville.mesh.BuildConfig
@ -66,6 +65,7 @@ import com.google.accompanist.themeadapter.appcompat.AppCompatTheme
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import org.osmdroid.bonuspack.utils.BonusPackHelper.getBitmapFromVectorDrawable
import org.osmdroid.config.Configuration import org.osmdroid.config.Configuration
import org.osmdroid.events.MapEventsReceiver import org.osmdroid.events.MapEventsReceiver
import org.osmdroid.events.MapListener import org.osmdroid.events.MapListener
@ -152,12 +152,12 @@ fun MapView(model: UIViewModel = viewModel()) {
myLocationOverlay = MyLocationNewOverlay(this).apply { myLocationOverlay = MyLocationNewOverlay(this).apply {
enableMyLocation() enableMyLocation()
enableFollowLocation() enableFollowLocation()
AppCompatResources.getDrawable(context, R.drawable.ic_map_location_dot_24)?.let { getBitmapFromVectorDrawable(context, R.drawable.ic_map_location_dot_24)?.let {
setPersonIcon(it.toBitmap()) setPersonIcon(it)
setPersonAnchor(0.5f, 0.5f) setPersonAnchor(0.5f, 0.5f)
} }
AppCompatResources.getDrawable(context, R.drawable.ic_map_navigation_24)?.let { getBitmapFromVectorDrawable(context, R.drawable.ic_map_navigation_24)?.let {
setDirectionIcon(it.toBitmap()) setDirectionIcon(it)
setDirectionAnchor(0.5f, 0.5f) setDirectionAnchor(0.5f, 0.5f)
} }
} }