RD-972: Add reference style and variants (#15)

sasaprodribaba · web-flow · commit 7507adaf2dec · 2025-06-16T14:28:55.000+02:00
diff --git a/Examples/MapTilerMobileDemo/MapTilerSDK/build.gradle.kts b/Examples/MapTilerMobileDemo/MapTilerSDK/build.gradle.kts
@@ -19,7 +19,7 @@ android {
             isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
         }
     }
@@ -39,4 +39,4 @@ dependencies {
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.2.1")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
-}
+}
diff --git a/Examples/MapTilerMobileDemo/app/build.gradle.kts b/Examples/MapTilerMobileDemo/app/build.gradle.kts
@@ -23,7 +23,7 @@ android {
             isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
         }
     }
@@ -58,4 +58,4 @@ dependencies {
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
 //    implementation(libs.maptilersdk)
-}
+}
diff --git a/Examples/MapTilerMobileDemo/app/src/main/java/com/maptilerdemo/maptilermobiledemo/MainActivity.kt b/Examples/MapTilerMobileDemo/app/src/main/java/com/maptilerdemo/maptilermobiledemo/MainActivity.kt
@@ -22,7 +22,7 @@ class MainActivity : ComponentActivity() {
                 Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
                     Greeting(
                         name = "Android",
-                        modifier = Modifier.padding(innerPadding)
+                        modifier = Modifier.padding(innerPadding),
                     )
                 }
             }
@@ -31,10 +31,13 @@ class MainActivity : ComponentActivity() {
 }
 
 @Composable
-fun Greeting(name: String, modifier: Modifier = Modifier) {
+fun Greeting(
+    name: String,
+    modifier: Modifier = Modifier,
+) {
     Text(
         text = "Hello $name!",
-        modifier = modifier
+        modifier = modifier,
     )
 }
 
@@ -44,4 +47,4 @@ fun GreetingPreview() {
     MapTilerMobileDemoTheme {
         Greeting("Android")
     }
-}
+}
diff --git a/Examples/MapTilerMobileDemo/app/src/main/java/com/maptilerdemo/maptilermobiledemo/ui/theme/Color.kt b/Examples/MapTilerMobileDemo/app/src/main/java/com/maptilerdemo/maptilermobiledemo/ui/theme/Color.kt
@@ -8,4 +8,4 @@ val Pink80 = Color(0xFFEFB8C8)
 
 val Purple40 = Color(0xFF6650a4)
 val PurpleGrey40 = Color(0xFF625b71)
-val Pink40 = Color(0xFF7D5260)
+val Pink40 = Color(0xFF7D5260)
diff --git a/Examples/MapTilerMobileDemo/app/src/main/java/com/maptilerdemo/maptilermobiledemo/ui/theme/Theme.kt b/Examples/MapTilerMobileDemo/app/src/main/java/com/maptilerdemo/maptilermobiledemo/ui/theme/Theme.kt
@@ -1,6 +1,5 @@
 package com.maptilerdemo.maptilermobiledemo.ui.theme
 
-import android.app.Activity
 import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme
@@ -11,17 +10,18 @@ import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 
-private val DarkColorScheme = darkColorScheme(
-    primary = Purple80,
-    secondary = PurpleGrey80,
-    tertiary = Pink80
-)
-
-private val LightColorScheme = lightColorScheme(
-    primary = Purple40,
-    secondary = PurpleGrey40,
-    tertiary = Pink40
+private val DarkColorScheme =
+    darkColorScheme(
+        primary = Purple80,
+        secondary = PurpleGrey80,
+        tertiary = Pink80,
+    )
 
+private val LightColorScheme =
+    lightColorScheme(
+        primary = Purple40,
+        secondary = PurpleGrey40,
+        tertiary = Pink40,
     /* Other default colors to override
     background = Color(0xFFFFFBFE),
     surface = Color(0xFFFFFBFE),
@@ -30,29 +30,30 @@ private val LightColorScheme = lightColorScheme(
     onTertiary = Color.White,
     onBackground = Color(0xFF1C1B1F),
     onSurface = Color(0xFF1C1B1F),
-    */
-)
+     */
+    )
 
 @Composable
 fun MapTilerMobileDemoTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
     // Dynamic color is available on Android 12+
     dynamicColor: Boolean = true,
-    content: @Composable () -> Unit
+    content: @Composable () -> Unit,
 ) {
-    val colorScheme = when {
-        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
-            val context = LocalContext.current
-            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
-        }
+    val colorScheme =
+        when {
+            dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
+                val context = LocalContext.current
+                if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+            }
 
-        darkTheme -> DarkColorScheme
-        else -> LightColorScheme
-    }
+            darkTheme -> DarkColorScheme
+            else -> LightColorScheme
+        }
 
     MaterialTheme(
         colorScheme = colorScheme,
         typography = Typography,
-        content = content
+        content = content,
     )
-}
+}
diff --git a/Examples/MapTilerMobileDemo/app/src/main/java/com/maptilerdemo/maptilermobiledemo/ui/theme/Type.kt b/Examples/MapTilerMobileDemo/app/src/main/java/com/maptilerdemo/maptilermobiledemo/ui/theme/Type.kt
@@ -7,14 +7,16 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp
 
 // Set of Material typography styles to start with
-val Typography = Typography(
-    bodyLarge = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 16.sp,
-        lineHeight = 24.sp,
-        letterSpacing = 0.5.sp
-    )
+val Typography =
+    Typography(
+        bodyLarge =
+            TextStyle(
+                fontFamily = FontFamily.Default,
+                fontWeight = FontWeight.Normal,
+                fontSize = 16.sp,
+                lineHeight = 24.sp,
+                letterSpacing = 0.5.sp,
+            ),
     /* Other default text styles to override
     titleLarge = TextStyle(
         fontFamily = FontFamily.Default,
@@ -30,5 +32,5 @@ val Typography = Typography(
         lineHeight = 16.sp,
         letterSpacing = 0.5.sp
     )
-    */
-)
+     */
+    )
diff --git a/Examples/MapTilerMobileDemo/build.gradle.kts b/Examples/MapTilerMobileDemo/build.gradle.kts
@@ -3,4 +3,4 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.compose) apply false
-}
+}
diff --git a/MapTilerSDK/src/main/java/com/maptiler/maptilersdk/MTConfig.kt b/MapTilerSDK/src/main/java/com/maptiler/maptilersdk/MTConfig.kt
@@ -67,9 +67,7 @@ object MTConfig {
     /**
      * Returns the MapTiler API key.
      */
-    fun getAPIKey(): String {
-        return this.apiKey
-    }
+    fun getAPIKey(): String = this.apiKey
 
     /**
      * Sets the caching mechanism.
@@ -108,9 +106,7 @@ object MTConfig {
     /**
      * Returns the unit of measurement.
      */
-    fun getUnit(): MTUnit {
-        return this.unit
-    }
+    fun getUnit(): MTUnit = this.unit
 
     /**
      * Sets the telemetry.
diff --git a/MapTilerSDK/src/main/java/com/maptiler/maptilersdk/bridge/MTBridge.kt b/MapTilerSDK/src/main/java/com/maptiler/maptilersdk/bridge/MTBridge.kt
@@ -20,7 +20,5 @@ internal sealed class MTBridge(
         const val STYLE_OBJECT: JSString = "MapStyle"
     }
 
-    suspend fun execute(command: MTCommand): MTBridgeReturnType? {
-        return executor?.execute(command)
-    }
+    suspend fun execute(command: MTCommand): MTBridgeReturnType? = executor?.execute(command)
 }
diff --git a/MapTilerSDK/src/main/java/com/maptiler/maptilersdk/bridge/MTBridgeReturnType.kt b/MapTilerSDK/src/main/java/com/maptiler/maptilersdk/bridge/MTBridgeReturnType.kt
@@ -7,22 +7,30 @@
 package com.maptiler.maptilersdk.bridge
 
 internal sealed class MTBridgeReturnType {
-    data class StringValue(val value: String) : MTBridgeReturnType()
+    data class StringValue(
+        val value: String,
+    ) : MTBridgeReturnType()
 
-    data class DoubleValue(val value: Double) : MTBridgeReturnType()
+    data class DoubleValue(
+        val value: Double,
+    ) : MTBridgeReturnType()
 
-    data class BoolValue(val value: Boolean) : MTBridgeReturnType()
+    data class BoolValue(
+        val value: Boolean,
+    ) : MTBridgeReturnType()
 
-    data class StringDoubleDict(val value: Map<String, Double>) : MTBridgeReturnType()
+    data class StringDoubleDict(
+        val value: Map<String, Double>,
+    ) : MTBridgeReturnType()
 
     data object UnsupportedType : MTBridgeReturnType()
 
     data object Null : MTBridgeReturnType()
 
     companion object {
         @Throws(MTError.InvalidResultType::class)
-        fun from(value: Any?): MTBridgeReturnType {
-            return when (value) {
+        fun from(value: Any?): MTBridgeReturnType =
+            when (value) {
                 is String -> StringValue(value)
                 is Double -> DoubleValue(value)
                 is Boolean -> BoolValue(value)
@@ -40,6 +48,5 @@ internal sealed class MTBridgeReturnType {
                 null -> Null
                 else -> throw MTError.InvalidResultType(description = value.toString())
             }
-        }
     }
 }
diff --git a/MapTilerSDK/src/main/java/com/maptiler/maptilersdk/bridge/MTError.kt b/MapTilerSDK/src/main/java/com/maptiler/maptilersdk/bridge/MTError.kt
@@ -22,28 +22,36 @@ sealed class MTError : Exception() {
      *
      * @param body Exception details.
      */
-    data class ExceptionError(val body: MTException) : MTError()
+    data class ExceptionError(
+        val body: MTException,
+    ) : MTError()
 
     /**
      * Method execution returned an invalid result.
      *
      * @param description Debug description of the return type.
      */
-    data class InvalidResultType(val description: String) : MTError()
+    data class InvalidResultType(
+        val description: String,
+    ) : MTError()
 
     /**
      * Method execution returned unsupported type.
      *
      * @param description Debug description of the command that returned unsupported type.
      */
-    data class UnsupportedReturnType(val description: String) : MTError()
+    data class UnsupportedReturnType(
+        val description: String,
+    ) : MTError()
 
     /**
      * Method execution resulted in an unknown error.
      *
      * @param description  Debug description of error.
      */
-    data class Unknown(val description: String) : MTError()
+    data class Unknown(
+        val description: String,
+    ) : MTError()
 
     /**
      * Method execution halted. Bridge and/or Map are not loaded.
diff --git a/MapTilerSDK/src/main/java/com/maptiler/maptilersdk/logging/MTLogLevel.kt b/MapTilerSDK/src/main/java/com/maptiler/maptilersdk/logging/MTLogLevel.kt
@@ -23,23 +23,23 @@ sealed class MTLogLevel {
     /**
      * All logs will be printed.
      */
-    data class Debug(val verbose: Boolean = false) : MTLogLevel()
+    data class Debug(
+        val verbose: Boolean = false,
+    ) : MTLogLevel()
 
-    override fun equals(other: Any?): Boolean {
-        return when {
+    override fun equals(other: Any?): Boolean =
+        when {
             this === other -> true
             this is None && other is None -> true
             this is Info && other is Info -> true
             this is Debug && other is Debug -> this.verbose == other.verbose
             else -> false
         }
-    }
 
-    override fun hashCode(): Int {
-        return when (this) {
+    override fun hashCode(): Int =
+        when (this) {
             is None -> 0
             is Info -> 1
             is Debug -> 2 + verbose.hashCode()
         }
-    }
 }
diff --git a/MapTilerSDK/src/main/java/com/maptiler/maptilersdk/map/MTMapCameraHelper.kt b/MapTilerSDK/src/main/java/com/maptiler/maptilersdk/map/MTMapCameraHelper.kt
diff --git a/MapTilerSDK/src/main/java/com/maptiler/maptilersdk/map/style/MTMapReferenceStyle.kt b/MapTilerSDK/src/main/java/com/maptiler/maptilersdk/map/style/MTMapReferenceStyle.kt
diff --git a/MapTilerSDK/src/main/java/com/maptiler/maptilersdk/map/style/MTMapStyleVariant.kt b/MapTilerSDK/src/main/java/com/maptiler/maptilersdk/map/style/MTMapStyleVariant.kt

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ android {`
`19`	`19`	`isMinifyEnabled = false`
`20`	`20`	`proguardFiles(`
`21`	`21`	`getDefaultProguardFile("proguard-android-optimize.txt"),`
`22`		`- "proguard-rules.pro"`
	`22`	`+ "proguard-rules.pro",`
`23`	`23`	`)`
`24`	`24`	`}`
`25`	`25`	`}`
`@@ -39,4 +39,4 @@ dependencies {`
`39`	`39`	`testImplementation("junit:junit:4.13.2")`
`40`	`40`	`androidTestImplementation("androidx.test.ext:junit:1.2.1")`
`41`	`41`	`androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")`
`42`		`-}`
	`42`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ android {`
`23`	`23`	`isMinifyEnabled = false`
`24`	`24`	`proguardFiles(`
`25`	`25`	`getDefaultProguardFile("proguard-android-optimize.txt"),`
`26`		`- "proguard-rules.pro"`
	`26`	`+ "proguard-rules.pro",`
`27`	`27`	`)`
`28`	`28`	`}`
`29`	`29`	`}`
`@@ -58,4 +58,4 @@ dependencies {`
`58`	`58`	`debugImplementation(libs.androidx.ui.tooling)`
`59`	`59`	`debugImplementation(libs.androidx.ui.test.manifest)`
`60`	`60`	`// implementation(libs.maptilersdk)`
`61`		`-}`
	`61`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class MainActivity : ComponentActivity() {`
`22`	`22`	`Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->`
`23`	`23`	`Greeting(`
`24`	`24`	`name = "Android",`
`25`		`- modifier = Modifier.padding(innerPadding)`
	`25`	`+ modifier = Modifier.padding(innerPadding),`
`26`	`26`	`)`
`27`	`27`	`}`
`28`	`28`	`}`
`@@ -31,10 +31,13 @@ class MainActivity : ComponentActivity() {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`@Composable`
`34`		`-fun Greeting(name: String, modifier: Modifier = Modifier) {`
	`34`	`+fun Greeting(`
	`35`	`+ name: String,`
	`36`	`+ modifier: Modifier = Modifier,`
	`37`	`+) {`
`35`	`38`	`Text(`
`36`	`39`	`text = "Hello $name!",`
`37`		`- modifier = modifier`
	`40`	`+ modifier = modifier,`
`38`	`41`	`)`
`39`	`42`	`}`
`40`	`43`
`@@ -44,4 +47,4 @@ fun GreetingPreview() {`
`44`	`47`	`MapTilerMobileDemoTheme {`
`45`	`48`	`Greeting("Android")`
`46`	`49`	`}`
`47`		`-}`
	`50`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,5 @@ internal sealed class MTBridge(`
`20`	`20`	`const val STYLE_OBJECT: JSString = "MapStyle"`
`21`	`21`	`}`
`22`	`22`
`23`		`- suspend fun execute(command: MTCommand): MTBridgeReturnType? {`
`24`		`- return executor?.execute(command)`
`25`		`- }`
	`23`	`+ suspend fun execute(command: MTCommand): MTBridgeReturnType? = executor?.execute(command)`
`26`	`24`	`}`