Skip to content
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

[SDK-#] update DGis SDK to 12.0.0 #224

Merged
merged 3 commits into from
Aug 19, 2024
Merged

[SDK-#] update DGis SDK to 12.0.0 #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc47b22
[SDK-#] update DGis SDK to 12.0.0
Aug 15, 2024
e2d7798
[SDK-#] update DGis SDK to 12.0.0
Sameri11 Aug 19, 2024
04319f8
lint fixes
Sameri11 Aug 19, 2024
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
2 changes: 1 addition & 1 deletion app/src/debug/java/ru/dgis/sdk/demo/Logging.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ru.dgis.sdk.demo

import ru.dgis.sdk.LogSink
import ru.dgis.sdk.platform.LogSink

fun createLogSink(): LogSink? {
return null
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/ru/dgis/sdk/demo/GenericMapActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import ru.dgis.sdk.map.Gesture
import ru.dgis.sdk.map.GestureManager
import ru.dgis.sdk.map.Map
import ru.dgis.sdk.map.MapView
import ru.dgis.sdk.map.MyLocationController
import ru.dgis.sdk.map.MyLocationControllerSettings
import ru.dgis.sdk.map.MyLocationMapObjectSource

class GenericMapActivity : AppCompatActivity() {
Expand Down Expand Up @@ -64,7 +64,7 @@ class GenericMapActivity : AppCompatActivity() {

mapSource = MyLocationMapObjectSource(
sdkContext,
MyLocationController(BearingSource.MAGNETIC)
MyLocationControllerSettings(BearingSource.MAGNETIC)
)
map.addSource(mapSource)

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/ru/dgis/sdk/demo/Initialization.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package ru.dgis.sdk.demo

import ru.dgis.sdk.Context
import ru.dgis.sdk.DGis
import ru.dgis.sdk.LogLevel
import ru.dgis.sdk.LogOptions
import ru.dgis.sdk.platform.LogLevel
import ru.dgis.sdk.platform.LogOptions

fun initializeDGis(appContext: android.content.Context): Context {
return DGis.initialize(
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/ru/dgis/sdk/demo/vm/NavigationViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import ru.dgis.sdk.map.Map
import ru.dgis.sdk.map.MapObjectManager
import ru.dgis.sdk.map.Marker
import ru.dgis.sdk.map.MarkerOptions
import ru.dgis.sdk.map.MyLocationController
import ru.dgis.sdk.map.MyLocationControllerSettings
import ru.dgis.sdk.map.MyLocationMapObjectSource
import ru.dgis.sdk.map.RouteEditorSource
import ru.dgis.sdk.map.RouteMapObject
Expand Down Expand Up @@ -141,7 +141,7 @@ class NavigationViewModel(
private fun initLocationSource() {
MyLocationMapObjectSource(
sdkContext,
MyLocationController(BearingSource.SATELLITE)
MyLocationControllerSettings(BearingSource.SATELLITE)
).also {
map.addSource(it)
closeables.add(it)
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ taskTree = "2.1.1"
undercouch-download = "5.4.0"
ktlint = "11.5.0"

dgis-sdk = "10.7.0"
dgis-sdk = "12.0.0"

appcompat = "1.6.1"
constraintlayout = "2.1.4"
Expand Down
Loading