Skip to content

Commit e33f01c

Browse files
hgarciaalbertohgarciaalberto
committed
Rebase to main branch, update dependencies and migrate code to compose
1 parent 6dc59bf commit e33f01c

File tree

7 files changed

+448
-103
lines changed

7 files changed

+448
-103
lines changed

‎tomtom-navigation-core-examples/.gitignore‎

Lines changed: 278 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,278 @@
1+
# Created by https://www.toptal.com/developers/gitignore/api/android,androidstudio,macos,gradle,firebase,kotlin,git,bitrise,jenv
2+
# Edit at https://www.toptal.com/developers/gitignore?templates=android,androidstudio,macos,gradle,firebase,kotlin,git,bitrise,jenv
3+
4+
### Android ###
5+
# Gradle files
6+
.gradle/
7+
build/
8+
9+
# Local configuration file (sdk path, etc)
10+
local.properties
11+
12+
# Log/OS Files
13+
*.log
14+
15+
# Android Studio generated files and folders
16+
captures/
17+
.externalNativeBuild/
18+
.cxx/
19+
*.apk
20+
output.json
21+
22+
# IntelliJ
23+
*.iml
24+
.idea/
25+
misc.xml
26+
deploymentTargetDropDown.xml
27+
render.experimental.xml
28+
29+
# Keystore files
30+
*.jks
31+
*.keystore
32+
33+
# Google Services (e.g. APIs or Firebase)
34+
google-services.json
35+
firebase.json
36+
37+
# Android Profiling
38+
*.hprof
39+
40+
### Android Patch ###
41+
gen-external-apklibs
42+
43+
# Replacement of .externalNativeBuild directories introduced
44+
# with Android Studio 3.5.
45+
46+
### Bitrise ###
47+
.bitrise.secrets.yml
48+
49+
### Firebase ###
50+
.idea
51+
**/node_modules/*
52+
**/.firebaserc
53+
54+
### Firebase Patch ###
55+
.runtimeconfig.json
56+
.firebase/
57+
58+
### Git ###
59+
# Created by git for backups. To disable backups in Git:
60+
# $ git config --global mergetool.keepBackup false
61+
*.orig
62+
63+
# Created by git when using merge tools for conflicts
64+
*.BACKUP.*
65+
*.BASE.*
66+
*.LOCAL.*
67+
*.REMOTE.*
68+
*_BACKUP_*.txt
69+
*_BASE_*.txt
70+
*_LOCAL_*.txt
71+
*_REMOTE_*.txt
72+
73+
### JEnv ###
74+
# JEnv local Java version configuration file
75+
.java-version
76+
77+
# Used by previous versions of JEnv
78+
.jenv-version
79+
80+
### Kotlin ###
81+
# Compiled class file
82+
*.class
83+
84+
# Log file
85+
86+
# BlueJ files
87+
*.ctxt
88+
89+
# Mobile Tools for Java (J2ME)
90+
.mtj.tmp/
91+
92+
# Package Files #
93+
*.jar
94+
*.war
95+
*.nar
96+
*.ear
97+
*.zip
98+
*.tar.gz
99+
*.rar
100+
101+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
102+
hs_err_pid*
103+
replay_pid*
104+
105+
### macOS ###
106+
# General
107+
.DS_Store
108+
.AppleDouble
109+
.LSOverride
110+
111+
# Icon must end with two \r
112+
Icon
113+
114+
115+
# Thumbnails
116+
._*
117+
118+
# Files that might appear in the root of a volume
119+
.DocumentRevisions-V100
120+
.fseventsd
121+
.Spotlight-V100
122+
.TemporaryItems
123+
.Trashes
124+
.VolumeIcon.icns
125+
.com.apple.timemachine.donotpresent
126+
127+
# Directories potentially created on remote AFP share
128+
.AppleDB
129+
.AppleDesktop
130+
Network Trash Folder
131+
Temporary Items
132+
.apdisk
133+
134+
### macOS Patch ###
135+
# iCloud generated files
136+
*.icloud
137+
138+
### Gradle ###
139+
.gradle
140+
**/build/
141+
!src/**/build/
142+
143+
# Ignore Gradle GUI config
144+
gradle-app.setting
145+
146+
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
147+
!gradle-wrapper.jar
148+
149+
# Avoid ignore Gradle wrappper properties
150+
!gradle-wrapper.properties
151+
152+
# Cache of project
153+
.gradletasknamecache
154+
155+
# Eclipse Gradle plugin generated files
156+
# Eclipse Core
157+
.project
158+
# JDT-specific (Eclipse Java Development Tools)
159+
.classpath
160+
161+
### Gradle Patch ###
162+
# Java heap dump
163+
164+
### AndroidStudio ###
165+
# Covers files to be ignored for android development using Android Studio.
166+
167+
# Built application files
168+
*.ap_
169+
*.aab
170+
171+
# Files for the ART/Dalvik VM
172+
*.dex
173+
174+
# Java class files
175+
176+
# Generated files
177+
bin/
178+
gen/
179+
out/
180+
181+
# Gradle files
182+
183+
# Signing files
184+
.signing/
185+
186+
# Local configuration file (sdk path, etc)
187+
188+
# Proguard folder generated by Eclipse
189+
proguard/
190+
191+
# Log Files
192+
193+
# Android Studio
194+
/*/build/
195+
/*/local.properties
196+
/*/out
197+
/*/*/build
198+
/*/*/production
199+
.navigation/
200+
*.ipr
201+
*~
202+
*.swp
203+
204+
# Keystore files
205+
206+
# Google Services (e.g. APIs or Firebase)
207+
# google-services.json
208+
209+
# Android Patch
210+
211+
# External native build folder generated in Android Studio 2.2 and later
212+
.externalNativeBuild
213+
214+
# NDK
215+
obj/
216+
217+
# IntelliJ IDEA
218+
*.iws
219+
/out/
220+
221+
# User-specific configurations
222+
.idea/caches/
223+
.idea/libraries/
224+
.idea/shelf/
225+
.idea/workspace.xml
226+
.idea/tasks.xml
227+
.idea/.name
228+
.idea/compiler.xml
229+
.idea/copyright/profiles_settings.xml
230+
.idea/encodings.xml
231+
.idea/misc.xml
232+
.idea/modules.xml
233+
.idea/scopes/scope_settings.xml
234+
.idea/dictionaries
235+
.idea/vcs.xml
236+
.idea/jsLibraryMappings.xml
237+
.idea/datasources.xml
238+
.idea/dataSources.ids
239+
.idea/sqlDataSources.xml
240+
.idea/dynamic.xml
241+
.idea/uiDesigner.xml
242+
.idea/assetWizardSettings.xml
243+
.idea/gradle.xml
244+
.idea/jarRepositories.xml
245+
.idea/navEditor.xml
246+
247+
# Legacy Eclipse project files
248+
.cproject
249+
.settings/
250+
251+
# Mobile Tools for Java (J2ME)
252+
253+
# Package Files #
254+
255+
# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
256+
257+
## Plugin-specific files:
258+
259+
# mpeltonen/sbt-idea plugin
260+
.idea_modules/
261+
262+
# JIRA plugin
263+
atlassian-ide-plugin.xml
264+
265+
# Mongo Explorer plugin
266+
.idea/mongoSettings.xml
267+
268+
# Crashlytics plugin (for Android Studio and IntelliJ)
269+
com_crashlytics_export_strings.xml
270+
crashlytics.properties
271+
crashlytics-build.properties
272+
fabric.properties
273+
274+
### AndroidStudio Patch ###
275+
276+
!/gradle/wrapper/gradle-wrapper.jar
277+
278+
# End of https://www.toptal.com/developers/gitignore/api/android,androidstudio,macos,gradle,firebase,kotlin,git,bitrise,jenv

‎tomtom-navigation-core-examples/gradle/libs.versions.toml‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
[versions]
22
androidx_compat = "1.6.1"
33
androidx_constraintlayout = "2.1.4"
4+
androidx_activityCompose = "1.8.2"
5+
androidx_composeBom = "2023.10.01"
46
default_world_map = "45424"
57
tomtom_sdk = "0.46.0"
68

@@ -23,12 +25,39 @@ defaultMap = { module = "com.tomtom.sdk.datamanagement.nds:default-world-map", v
2325
navigationOnline = { module = "com.tomtom.sdk.navigation:navigation-online", version.ref = "tomtom_sdk" }
2426
routePlannerOnline = { module = "com.tomtom.sdk.routing:route-planner-online", version.ref = "tomtom_sdk" }
2527
routeReplannerOnline = { module = "com.tomtom.sdk.navigation:route-replanner-online", version.ref = "tomtom_sdk" }
28+
androidxActivityCompose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidx_activityCompose" }
29+
compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidx_composeBom" }
30+
compose-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
31+
compose-material-icons-core = { group = "androidx.compose.material", name = "material-icons-core" }
32+
compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" }
33+
compose-material3 = { group = "androidx.compose.material3", name = "material3" }
34+
compose-material3-window-size = { group = "androidx.compose.material3", name = "material3-window-size-class" }
35+
compose-runtime-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata" }
36+
compose-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
37+
compose-ui = { group = "androidx.compose.ui", name = "ui" }
38+
compose-viewbinding = { group = "androidx.compose.ui", name = "ui-viewbinding" }
2639

2740
[bundles]
28-
androidCommon = ["androidXCompat", "androidXConstraintLayout"]
41+
androidCommon = [
42+
"androidXCompat",
43+
"androidXConstraintLayout",
44+
"androidxActivityCompose",
45+
]
46+
47+
androidCompose = [
48+
"compose-graphics",
49+
"compose-material-icons-core",
50+
"compose-material-icons-extended",
51+
"compose-material3",
52+
"compose-material3-window-size",
53+
"compose-runtime-livedata",
54+
"compose-tooling-preview",
55+
"compose-ui",
56+
"compose-viewbinding",
57+
]
2958

3059
[plugins]
3160
androidApplication = { id = "com.android.application", version = "8.2.1" }
3261
androidLibrary = { id = "com.android.library", version = "8.2.1" }
33-
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version = "1.8.22"}
62+
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version = "1.9.22"}
3463

‎tomtom-navigation-core-examples/usecase/build.gradle.kts‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ plugins {
1616

1717
android {
1818
namespace = "com.example.usecase"
19-
compileSdk = 33
19+
compileSdk = 34
2020

2121
defaultConfig {
2222
minSdk = 24
23-
targetSdk = 33
23+
targetSdk = 34
2424
versionCode = 1
2525
versionName = "1.0"
2626
buildConfigField("String", "TOMTOM_API_KEY", "\"${extra["tomtomApiKey"].toString()}\"")
@@ -36,9 +36,14 @@ android {
3636
jvmTarget = "1.8"
3737
}
3838

39+
composeOptions {
40+
kotlinCompilerExtensionVersion = "1.5.8"
41+
}
42+
3943
buildFeatures {
4044
viewBinding = true
4145
buildConfig = true
46+
compose = true
4247
}
4348
}
4449

@@ -55,4 +60,8 @@ dependencies {
5560

5661
// Android dependencies.
5762
implementation(libs.bundles.androidCommon)
63+
64+
// Compose
65+
implementation(platform(libs.compose.bom))
66+
implementation(libs.bundles.androidCompose)
5867
}

‎tomtom-navigation-core-examples/usecase/src/main/AndroidManifest.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,19 @@
1313
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
1414
xmlns:tools="http://schemas.android.com/tools">
1515

16+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
1617
<!-- Always include this permission -->
1718
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
1819
<!-- Include only if your app benefits from precise location access. -->
1920
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
2021

2122
<application
2223
android:label="Navigation App"
23-
tools:targetApi="33"
24+
tools:targetApi="34"
2425
android:theme="@style/Theme.App">
2526

2627
<activity
27-
android:name=".MainActivity"
28+
android:name=".BasicNavigationCompose"
2829
android:exported="true">
2930

3031
<intent-filter>

0 commit comments

Comments
 (0)