Skip to content

Commit 811d529

Browse files
pjleonard37Release SDK bot for Maps SDK team
authored and
github-actions[bot]
committed
Replace non-Standard styles with Standard and appropriate configs (#5384)
https://mapbox.atlassian.net/browse/MAPSIOS-1882 This PR updates our examples to use the Standard style with configurations applied to match their previous styles as much as possible. Now, the only examples left that use classic styles need them for a specific reason (QRF, layer placement, image asset in a specific style, etc.). cc @mapbox/maps-android --------- Co-authored-by: Release SDK bot for Maps SDK team <[email protected]> GitOrigin-RevId: 817eb5e67dccfe14b6c58d39bd6d7cce7163fe87
1 parent 2fae0f2 commit 811d529

File tree

53 files changed

+332
-184
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+332
-184
lines changed

‎app/src/main/java/com/mapbox/maps/testapp/examples/BasicLocationPulsingCircleActivity.kt‎

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import android.os.Bundle
55
import android.view.Menu
66
import android.view.MenuItem
77
import androidx.appcompat.app.AppCompatActivity
8+
import com.mapbox.bindgen.Value
89
import com.mapbox.maps.CameraOptions
910
import com.mapbox.maps.MapboxMap
1011
import com.mapbox.maps.Style
@@ -24,8 +25,12 @@ class BasicLocationPulsingCircleActivity : AppCompatActivity() {
2425

2526
private lateinit var mapboxMap: MapboxMap
2627
private lateinit var locationPermissionHelper: LocationPermissionHelper
27-
private var lastStyleUri = Style.DARK
28+
private var lastStyleTheme = StyleTheme.DARK
2829
private lateinit var binding: ActivityLocationLayerBasicPulsingCircleBinding
30+
private enum class StyleTheme {
31+
LIGHT,
32+
DARK
33+
}
2934

3035
override fun onCreate(savedInstanceState: Bundle?) {
3136
super.onCreate(savedInstanceState)
@@ -45,9 +50,7 @@ class BasicLocationPulsingCircleActivity : AppCompatActivity() {
4550
private fun onMapReady() {
4651
mapboxMap.loadStyle(
4752
Style.STANDARD
48-
) {
49-
lastStyleUri = it.styleURI
50-
}
53+
)
5154
}
5255

5356
override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -59,7 +62,7 @@ class BasicLocationPulsingCircleActivity : AppCompatActivity() {
5962
override fun onOptionsItemSelected(item: MenuItem): Boolean {
6063
when (item.itemId) {
6164
R.id.action_map_style_change -> {
62-
loadNewStyle()
65+
toggleMapStyle()
6366
return true
6467
}
6568
R.id.action_component_disable -> {
@@ -93,11 +96,32 @@ class BasicLocationPulsingCircleActivity : AppCompatActivity() {
9396
}
9497
}
9598

96-
private fun loadNewStyle() {
97-
val styleUrl = if (lastStyleUri == Style.DARK) Style.LIGHT else Style.DARK
98-
mapboxMap.loadStyle(
99-
styleUrl
100-
) { lastStyleUri = styleUrl }
99+
private fun toggleMapStyle() {
100+
if (lastStyleTheme == StyleTheme.DARK) {
101+
binding.mapView.mapboxMap.setStyleImportConfigProperty(
102+
"basemap",
103+
"theme",
104+
Value.valueOf("monochrome")
105+
)
106+
binding.mapView.mapboxMap.setStyleImportConfigProperty(
107+
"basemap",
108+
"lightPreset",
109+
Value.valueOf("day")
110+
)
111+
lastStyleTheme = StyleTheme.LIGHT
112+
} else {
113+
binding.mapView.mapboxMap.setStyleImportConfigProperty(
114+
"basemap",
115+
"theme",
116+
Value.valueOf("monochrome")
117+
)
118+
binding.mapView.mapboxMap.setStyleImportConfigProperty(
119+
"basemap",
120+
"lightPreset",
121+
Value.valueOf("night")
122+
)
123+
lastStyleTheme = StyleTheme.DARK
124+
}
101125
}
102126

103127
override fun onRequestPermissionsResult(

‎app/src/main/java/com/mapbox/maps/testapp/examples/CircleLayerClusteringActivity.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import android.os.Bundle
55
import android.widget.Toast
66
import androidx.appcompat.app.AppCompatActivity
77
import androidx.core.content.ContextCompat
8+
import com.mapbox.bindgen.Value
89
import com.mapbox.geojson.Point
910
import com.mapbox.maps.CameraOptions
1011
import com.mapbox.maps.MapView
@@ -41,7 +42,7 @@ class CircleLayerClusteringActivity : AppCompatActivity() {
4142
val mapboxMap = mapView.mapboxMap
4243

4344
mapboxMap.loadStyle(
44-
styleExtension = style(Style.LIGHT) {
45+
styleExtension = style(Style.STANDARD) {
4546
+transition {
4647
duration(0)
4748
delay(0)
@@ -55,6 +56,7 @@ class CircleLayerClusteringActivity : AppCompatActivity() {
5556
.zoom(3.0)
5657
.build()
5758
)
59+
mapboxMap.setStyleImportConfigProperty("basemap", "theme", Value.valueOf("monochrome"))
5860

5961
addClusteredGeoJsonSource(it)
6062

‎app/src/main/java/com/mapbox/maps/testapp/examples/DSLStylingActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class DSLStylingActivity : AppCompatActivity(), OnMapClickListener {
5353
mapboxMap.setCamera(
5454
cameraOptions {
5555
center(Point.fromLngLat(-122.40276277449118, 37.79608281254676))
56-
zoom(15.7)
56+
zoom(4.0)
5757
bearing(359.63)
5858
pitch(60.0)
5959
}

‎app/src/main/java/com/mapbox/maps/testapp/examples/FragmentBackStackActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class FragmentBackStackActivity : AppCompatActivity() {
5757
}
5858

5959
private fun initMap(mapboxMap: MapboxMap) {
60-
mapboxMap.loadStyle(Style.SATELLITE)
60+
mapboxMap.loadStyle(Style.STANDARD_SATELLITE)
6161
}
6262

6363
private fun handleClick() {

‎app/src/main/java/com/mapbox/maps/testapp/examples/IconPropertyActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class IconPropertyActivity : AppCompatActivity() {
2626
setContentView(binding.root)
2727

2828
binding.mapView.mapboxMap.loadStyle(
29-
styleExtension = style(Style.OUTDOORS) {
29+
styleExtension = style(Style.STANDARD) {
3030
// Add icons from the U.S. National Parks Service to the map's style.
3131
+image(RESTROOMS, BitmapFactory.decodeResource(resources, R.drawable.nps_restrooms))
3232
+image(TRAIL_HEAD, BitmapFactory.decodeResource(resources, R.drawable.nps_trailhead))

‎app/src/main/java/com/mapbox/maps/testapp/examples/ImageSourceActivity.kt‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.mapbox.maps.testapp.examples
22

33
import android.os.Bundle
44
import androidx.appcompat.app.AppCompatActivity
5+
import com.mapbox.bindgen.Value
56
import com.mapbox.maps.Style
67
import com.mapbox.maps.extension.style.layers.generated.rasterLayer
78
import com.mapbox.maps.extension.style.sources.generated.ImageSource
@@ -22,7 +23,7 @@ class ImageSourceActivity : AppCompatActivity() {
2223
val map = binding.mapView.mapboxMap
2324

2425
map.loadStyle(
25-
style(style = Style.DARK) {
26+
style(style = Style.STANDARD) {
2627
+imageSource(ID_IMAGE_SOURCE) {
2728
coordinates(
2829
listOf(
@@ -33,11 +34,15 @@ class ImageSourceActivity : AppCompatActivity() {
3334
)
3435
)
3536
}
36-
+rasterLayer(ID_IMAGE_LAYER, ID_IMAGE_SOURCE) {}
37+
+rasterLayer(ID_IMAGE_LAYER, ID_IMAGE_SOURCE) {
38+
rasterEmissiveStrength(1.0)
39+
}
3740
}
3841
) {
3942
val imageSource: ImageSource = it.getSourceAs(ID_IMAGE_SOURCE)!!
4043
imageSource.updateImage(bitmapFromDrawableRes(R.drawable.miami_beach))
44+
map.setStyleImportConfigProperty("basemap", "theme", Value.valueOf("monochrome"))
45+
map.setStyleImportConfigProperty("basemap", "lightPreset", Value.valueOf("night"))
4146
}
4247
}
4348

‎app/src/main/java/com/mapbox/maps/testapp/examples/LegacyOfflineActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,6 @@ class LegacyOfflineActivity : AppCompatActivity() {
108108
private const val TAG = "Offline"
109109
private const val zoom = 16.0
110110
private val point: Point = Point.fromLngLat(57.818901, 20.071357)
111-
private const val styleUrl = Style.SATELLITE
111+
private const val styleUrl = Style.STANDARD_SATELLITE
112112
}
113113
}

‎app/src/main/java/com/mapbox/maps/testapp/examples/LocationComponentActivity.kt‎

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import android.view.Menu
66
import android.view.MenuItem
77
import android.widget.Toast
88
import androidx.appcompat.app.AppCompatActivity
9+
import com.mapbox.bindgen.Value
910
import com.mapbox.maps.CameraOptions
1011
import com.mapbox.maps.ImageHolder
1112
import com.mapbox.maps.MapboxExperimental
@@ -35,7 +36,7 @@ import java.lang.ref.WeakReference
3536
@OptIn(MapboxExperimental::class)
3637
class LocationComponentActivity : AppCompatActivity() {
3738

38-
private var lastStyleUri = Style.DARK
39+
private var lastStyleTheme = StyleTheme.DARK
3940
private lateinit var locationPermissionHelper: LocationPermissionHelper
4041
private val onIndicatorPositionChangedListener = OnIndicatorPositionChangedListener {
4142
// Jump to the current indicator position
@@ -44,6 +45,10 @@ class LocationComponentActivity : AppCompatActivity() {
4445
binding.mapView.gestures.focalPoint = binding.mapView.mapboxMap.pixelForCoordinate(it)
4546
}
4647
private lateinit var binding: ActivityLocationComponentBinding
48+
private enum class StyleTheme {
49+
LIGHT,
50+
DARK
51+
}
4752

4853
override fun onCreate(savedInstanceState: Bundle?) {
4954
super.onCreate(savedInstanceState)
@@ -239,9 +244,30 @@ class LocationComponentActivity : AppCompatActivity() {
239244
}
240245

241246
private fun toggleMapStyle() {
242-
val styleUrl = if (lastStyleUri == Style.DARK) Style.LIGHT else Style.DARK
243-
binding.mapView.mapboxMap.loadStyle(styleUrl) {
244-
lastStyleUri = styleUrl
247+
if (lastStyleTheme == StyleTheme.DARK) {
248+
binding.mapView.mapboxMap.setStyleImportConfigProperty(
249+
"basemap",
250+
"theme",
251+
Value.valueOf("monochrome")
252+
)
253+
binding.mapView.mapboxMap.setStyleImportConfigProperty(
254+
"basemap",
255+
"lightPreset",
256+
Value.valueOf("day")
257+
)
258+
lastStyleTheme = StyleTheme.LIGHT
259+
} else {
260+
binding.mapView.mapboxMap.setStyleImportConfigProperty(
261+
"basemap",
262+
"theme",
263+
Value.valueOf("monochrome")
264+
)
265+
binding.mapView.mapboxMap.setStyleImportConfigProperty(
266+
"basemap",
267+
"lightPreset",
268+
Value.valueOf("night")
269+
)
270+
lastStyleTheme = StyleTheme.DARK
245271
}
246272
}
247273

‎app/src/main/java/com/mapbox/maps/testapp/examples/MapOverlayActivity.kt‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.os.Bundle
44
import androidx.appcompat.app.AppCompatActivity
55
import androidx.core.content.ContextCompat
66
import androidx.core.graphics.drawable.toBitmap
7+
import com.mapbox.bindgen.Value
78
import com.mapbox.geojson.Feature
89
import com.mapbox.geojson.FeatureCollection
910
import com.mapbox.geojson.Point
@@ -44,7 +45,7 @@ class MapOverlayActivity : AppCompatActivity(), OnMapClickListener {
4445

4546
mapboxMap = binding.mapView.mapboxMap
4647
mapboxMap.loadStyle(
47-
styleExtension = style(Style.LIGHT) {
48+
styleExtension = style(Style.STANDARD) {
4849
+geoJsonSource(sourceId) {
4950
featureCollection(
5051
FeatureCollection.fromFeatures(
@@ -68,7 +69,10 @@ class MapOverlayActivity : AppCompatActivity(), OnMapClickListener {
6869
iconOffset(listOf(0.0, -9.0))
6970
}
7071
}
71-
) { mapboxMap.addOnMapClickListener(this@MapOverlayActivity) }
72+
) {
73+
mapboxMap.addOnMapClickListener(this@MapOverlayActivity)
74+
mapboxMap.setStyleImportConfigProperty("basemap", "theme", Value.valueOf("monochrome"))
75+
}
7276
mapOverlayPlugin = binding.mapView.mapboxOverlay
7377
.apply {
7478
registerMapOverlayCoordinatesProvider(provider)

‎app/src/main/java/com/mapbox/maps/testapp/examples/MapViewCustomizationActivity.kt‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,18 @@ import androidx.appcompat.app.AppCompatActivity
66
import com.mapbox.common.MapboxOptions
77
import com.mapbox.common.TileStore
88
import com.mapbox.geojson.Point
9-
import com.mapbox.maps.*
10-
import com.mapbox.maps.plugin.*
9+
import com.mapbox.maps.CameraOptions
10+
import com.mapbox.maps.ConstrainMode
11+
import com.mapbox.maps.GlyphsRasterizationMode
12+
import com.mapbox.maps.GlyphsRasterizationOptions
13+
import com.mapbox.maps.MapInitOptions
14+
import com.mapbox.maps.MapOptions
15+
import com.mapbox.maps.MapView
16+
import com.mapbox.maps.Style
17+
import com.mapbox.maps.TileStoreUsageMode
18+
import com.mapbox.maps.applyDefaultParams
19+
import com.mapbox.maps.mapsOptions
20+
import com.mapbox.maps.plugin.Plugin
1121
import com.mapbox.maps.plugin.Plugin.Companion.MAPBOX_ATTRIBUTION_PLUGIN_ID
1222
import com.mapbox.maps.plugin.Plugin.Companion.MAPBOX_LOGO_PLUGIN_ID
1323
import com.mapbox.maps.testapp.databinding.ActivityMapViewCustomizationBinding
@@ -39,8 +49,8 @@ class MapViewCustomizationActivity : AppCompatActivity() {
3949
setContentView(binding.root)
4050

4151
// all options provided in xml file - so we just load style
42-
// But you can also add your style to the map layout with xml attribute `app:mapbox_styleUri="mapbox://styles/mapbox/dark-v11"`
43-
binding.mapView.mapboxMap.loadStyle(Style.DARK)
52+
// But you can also add your style to the map layout with xml attribute `app:mapbox_styleUri="mapbox://styles/mapbox/standard"`
53+
binding.mapView.mapboxMap.loadStyle(Style.STANDARD)
4454
configureMapViewFromCode()
4555

4656
// Reset to original state
@@ -81,7 +91,7 @@ class MapViewCustomizationActivity : AppCompatActivity() {
8191

8292
// set MapInitOptions together with desired style
8393
val mapInitOptions =
84-
MapInitOptions(this, mapOptions, plugins, initialCameraOptions, true, Style.SATELLITE)
94+
MapInitOptions(this, mapOptions, plugins, initialCameraOptions, true, Style.STANDARD_SATELLITE)
8595

8696
// create view programmatically and add to root layout
8797
customMapView = MapView(this, mapInitOptions)

0 commit comments

Comments
 (0)