Skip to content

Maps: Fixed map flickering issue. #3866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DaVinci9196 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Maps: Fixed map flickering issue. #3866

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions play-services-maps/core/hms/src/main/kotlin/org/microg/gms/maps/hms/GoogleMap.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ package org.microg.gms.maps.hms
import android.Manifest
import android.content.Context
import android.content.pm.PackageManager
import android.content.res.Configuration
import android.graphics.Bitmap
import android.location.Location
import android.os.*
Expand Down Expand Up @@ -116,6 +117,7 @@ class GoogleMapImpl(private val context: Context, var options: GoogleMapOptions)
private var isAddLocationCallback: Boolean = false
private var lastLocation: Location? = null
private var myLocationChangeListener: IOnMyLocationChangeListener? = null
private var appliedMapStyle: Pair<String?, Int>? = null

private val locationService by lazy { LocationServices.getFusedLocationProviderClient(context) }
private val locationCallback = LocationListener { location ->
Expand Down Expand Up @@ -346,11 +348,14 @@ class GoogleMapImpl(private val context: Context, var options: GoogleMapOptions)

override fun setMapStyle(options: MapStyleOptions?): Boolean {
Log.d(TAG, "setMapStyle: ")
val bool = options?.toHms(mapContext).let {
val style = options?.json to (mapContext.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK)
if (style == appliedMapStyle) return true
val success = options?.toHms(mapContext).let {
map?.setMapStyle(it)
}
Log.d(TAG, "setMapStyle: bool: $bool")
return true == bool
Log.d(TAG, "setMapStyle: bool: $success")
if (success == true) appliedMapStyle = style
return success == true
}

override fun setMinZoomPreference(minZoom: Float) = afterInitialize {
Expand Down Expand Up @@ -852,6 +857,7 @@ class GoogleMapImpl(private val context: Context, var options: GoogleMapOptions)
if (this.map != null && initialized) return

loaded = true
appliedMapStyle = null
this.map = map

map.setOnCameraIdleListener {
Expand Down
Loading