Skip to content

Commit eef1c13

Browse files
feat: Migrate to MapLibre
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
1 parent d927065 commit eef1c13

10 files changed

Lines changed: 472 additions & 226 deletions

File tree

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ dependencies {
310310
implementation 'com.github.yalantis:ucrop:2.2.11'
311311

312312
implementation 'io.github.elye:loaderviewlibrary:3.0.0'
313-
implementation 'org.osmdroid:osmdroid-android:6.1.20'
313+
implementation 'org.maplibre.compose:maplibre-compose:0.12.1'
314314
implementation ('fr.dudie:nominatim-api:3.4', {
315315
//noinspection DuplicatePlatformClasses
316316
exclude group: 'org.apache.httpcomponents', module: 'httpclient'
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"version": 8,
3+
"sources": {
4+
"osm": {
5+
"type": "raster",
6+
"tiles": ["https://tile.openstreetmap.org/{z}/{x}/{y}.png"],
7+
"tileSize": 256,
8+
"attribution": "© OpenStreetMap contributors"
9+
}
10+
},
11+
"layers": [
12+
{
13+
"id": "osm-tiles",
14+
"type": "raster",
15+
"source": "osm",
16+
"paint": {
17+
"raster-hue-rotate": 10,
18+
"raster-brightness-min": 0.0,
19+
"raster-brightness-max": 0.32,
20+
"raster-saturation": -0.65,
21+
"raster-contrast": 0.40
22+
}
23+
}
24+
]
25+
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"version": 8,
3+
"sources": {
4+
"osm": {
5+
"type": "raster",
6+
"tiles": ["https://tile.openstreetmap.org/{z}/{x}/{y}.png"],
7+
"tileSize": 256,
8+
"attribution": "© OpenStreetMap contributors"
9+
}
10+
},
11+
"layers": [
12+
{
13+
"id": "osm-tiles",
14+
"type": "raster",
15+
"source": "osm"
16+
}
17+
]
18+
}

app/src/main/java/com/nextcloud/talk/account/SwitchAccountActivity.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_BASE_URL
3131
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_IS_ACCOUNT_IMPORT
3232
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_TOKEN
3333
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_USERNAME
34-
import org.osmdroid.config.Configuration
3534
import java.net.CookieManager
3635
import javax.inject.Inject
3736

@@ -63,8 +62,6 @@ class SwitchAccountActivity : BaseActivity() {
6362
setupActionBar()
6463
initSystemBars()
6564

66-
Configuration.getInstance().load(context, PreferenceManager.getDefaultSharedPreferences(context))
67-
6865
handleIntent()
6966
}
7067

app/src/main/java/com/nextcloud/talk/location/GeocodingActivity.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import android.os.Bundle
1111
import androidx.activity.compose.setContent
1212
import androidx.compose.material3.MaterialTheme
1313
import androidx.lifecycle.ViewModelProvider
14-
import androidx.preference.PreferenceManager
1514
import autodagger.AutoInjector
1615
import com.nextcloud.talk.R
1716
import com.nextcloud.talk.activities.BaseActivity
@@ -43,9 +42,6 @@ class GeocodingActivity : BaseActivity() {
4342
super.onCreate(savedInstanceState)
4443
NextcloudTalkApplication.sharedApplication!!.componentApplication.inject(this)
4544

46-
org.osmdroid.config.Configuration.getInstance()
47-
.load(context, PreferenceManager.getDefaultSharedPreferences(context))
48-
4945
roomToken = intent.getStringExtra(BundleKeys.KEY_ROOM_TOKEN)!!
5046
chatApiVersion = intent.getIntExtra(BundleKeys.KEY_CHAT_API_VERSION, 1)
5147

app/src/main/java/com/nextcloud/talk/location/LocationPickerActivity.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import androidx.activity.compose.setContent
1313
import androidx.activity.result.contract.ActivityResultContracts
1414
import androidx.compose.material3.MaterialTheme
1515
import androidx.lifecycle.ViewModelProvider
16-
import androidx.preference.PreferenceManager
1716
import autodagger.AutoInjector
1817
import com.nextcloud.talk.R
1918
import com.nextcloud.talk.activities.BaseActivity
@@ -25,7 +24,6 @@ import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_CHAT_API_VERSION
2524
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_GEOCODING_RESULT
2625
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN
2726
import com.nextcloud.talk.viewmodels.LocationPickerViewModel
28-
import org.osmdroid.config.Configuration.getInstance
2927
import javax.inject.Inject
3028

3129
@AutoInjector(NextcloudTalkApplication::class)
@@ -82,8 +80,6 @@ class LocationPickerActivity : BaseActivity() {
8280
val email = getString(R.string.osm_geocoder_contact)
8381
viewModel.initGeocoder(baseUrl, email)
8482

85-
getInstance().load(context, PreferenceManager.getDefaultSharedPreferences(context))
86-
8783
onBackPressedDispatcher.addCallback(this, onBackPressedCallback)
8884

8985
val colorScheme = viewThemeUtils.getColorScheme(this)

0 commit comments

Comments
 (0)