From c9256b7800bce7e5eafdb6364631832568c3227b Mon Sep 17 00:00:00 2001 From: Sargun Vohra Date: Thu, 19 Dec 2024 17:32:33 -0600 Subject: [PATCH] refactor: move local styles to separate directory from data (#148) --- .gitattributes | 2 +- .../composeResources/files/{data => styles}/colorful.json | 0 .../composeResources/files/{data => styles}/eclipse.json | 0 .../kotlin/dev/sargunv/maplibrecompose/demoapp/util.kt | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) rename demo-app/src/commonMain/composeResources/files/{data => styles}/colorful.json (100%) rename demo-app/src/commonMain/composeResources/files/{data => styles}/eclipse.json (100%) diff --git a/.gitattributes b/.gitattributes index 10257d31..83c998d8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -demo-app/src/commonMain/composeResources/files/data/* linguist-vendored +demo-app/src/commonMain/composeResources/files/* linguist-vendored diff --git a/demo-app/src/commonMain/composeResources/files/data/colorful.json b/demo-app/src/commonMain/composeResources/files/styles/colorful.json similarity index 100% rename from demo-app/src/commonMain/composeResources/files/data/colorful.json rename to demo-app/src/commonMain/composeResources/files/styles/colorful.json diff --git a/demo-app/src/commonMain/composeResources/files/data/eclipse.json b/demo-app/src/commonMain/composeResources/files/styles/eclipse.json similarity index 100% rename from demo-app/src/commonMain/composeResources/files/data/eclipse.json rename to demo-app/src/commonMain/composeResources/files/styles/eclipse.json diff --git a/demo-app/src/commonMain/kotlin/dev/sargunv/maplibrecompose/demoapp/util.kt b/demo-app/src/commonMain/kotlin/dev/sargunv/maplibrecompose/demoapp/util.kt index b8b06561..68119fdc 100644 --- a/demo-app/src/commonMain/kotlin/dev/sargunv/maplibrecompose/demoapp/util.kt +++ b/demo-app/src/commonMain/kotlin/dev/sargunv/maplibrecompose/demoapp/util.kt @@ -32,9 +32,9 @@ private val REMOTE_STYLE_URIS = private val LOCAL_STYLE_PATHS = listOf( // from https://tiles.versatiles.org/assets/styles/colorful.json - "Colorful" to "files/data/colorful.json", + "Colorful" to "files/styles/colorful.json", // from https://tiles.versatiles.org/assets/styles/eclipse.json - "Eclipse" to "files/data/eclipse.json", + "Eclipse" to "files/styles/eclipse.json", ) val DEFAULT_STYLE = REMOTE_STYLE_URIS[0].second