diff --git a/.gitignore b/.gitignore
index c58f7d6c..618fcb43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,10 +20,11 @@ migrate_working_dir/
# VS Code which you may wish to be included in version control, so this line
# is commented out by default.
#.vscode/
+.vscode/ # Ensuring .vscode is ignored
# Flutter/Dart/Pub related
# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
-pubspec.lock
+pubspec.lock # For a library, pubspec.lock should be ignored
**/doc/api/
.dart_tool/
@@ -32,3 +33,7 @@ build/
example/android/app/src/main/res/values/mapbox_access_token.xml
example/android/app/src/main/res/values/strings.xml
+
+# FVM Version Cache
+.fvm/
+.fvmrc
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..e5601501
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+ "dart.flutterSdkPath": ".fvm/versions/3.29.3"
+}
\ No newline at end of file
diff --git a/android/build.gradle b/android/build.gradle
index 9cf84ebb..564168ed 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,8 +2,8 @@ group 'com.eopeter.fluttermapboxnavigation'
version '1.0-SNAPSHOT'
buildscript {
- ext.kotlin_version = '1.7.10'
- ext.android_gradle_version = '7.4.2'
+ ext.kotlin_version = '1.7.22' // Updated Kotlin version
+ ext.android_gradle_version = '8.3.1'
repositories {
google()
mavenCentral()
@@ -55,14 +55,14 @@ apply plugin: 'kotlin-android'
android {
namespace 'com.eopeter.fluttermapboxnavigation'
- compileSdkVersion 33
+ compileSdkVersion 34 // Updated compileSdkVersion
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}
defaultConfig {
minSdkVersion 21
- targetSdkVersion 33
+ targetSdkVersion 34 // Updated targetSdkVersion
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
@@ -73,12 +73,12 @@ android {
}
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
+ sourceCompatibility JavaVersion.VERSION_17 // Updated Java version
+ targetCompatibility JavaVersion.VERSION_17 // Updated Java version
}
kotlinOptions {
- jvmTarget = '1.8'
+ jvmTarget = '17' // Updated Kotlin JVM target
}
buildFeatures{
@@ -91,7 +91,7 @@ dependencies {
implementation "com.mapbox.navigation:copilot:2.16.0"
implementation "com.mapbox.navigation:ui-app:2.16.0"
implementation "com.mapbox.navigation:ui-dropin:2.16.0"
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+ implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'com.jakewharton.timber:timber:4.7.1'
implementation 'com.google.code.gson:gson:2.8.9'
diff --git a/android/src/main/kotlin/com/eopeter/fluttermapboxnavigation/activity/NavigationActivity.kt b/android/src/main/kotlin/com/eopeter/fluttermapboxnavigation/activity/NavigationActivity.kt
index 5a977f9a..9b0c659a 100644
--- a/android/src/main/kotlin/com/eopeter/fluttermapboxnavigation/activity/NavigationActivity.kt
+++ b/android/src/main/kotlin/com/eopeter/fluttermapboxnavigation/activity/NavigationActivity.kt
@@ -84,7 +84,7 @@ class NavigationActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- setTheme(R.style.Theme_AppCompat_NoActionBar)
+ setTheme(R.style.NavigationActivityTheme)
binding = NavigationActivityBinding.inflate(layoutInflater)
setContentView(binding.root)
binding.navigationView.addListener(navigationStateListener)
diff --git a/android/src/main/kotlin/com/eopeter/fluttermapboxnavigation/factory/EmbeddedNavigationViewFactory.kt b/android/src/main/kotlin/com/eopeter/fluttermapboxnavigation/factory/EmbeddedNavigationViewFactory.kt
index 53126adb..8989fbe5 100644
--- a/android/src/main/kotlin/com/eopeter/fluttermapboxnavigation/factory/EmbeddedNavigationViewFactory.kt
+++ b/android/src/main/kotlin/com/eopeter/fluttermapboxnavigation/factory/EmbeddedNavigationViewFactory.kt
@@ -32,7 +32,7 @@ class EmbeddedNavigationViewFactory(
view.initialize()
- activity.setTheme(R.style.Theme_AppCompat_NoActionBar)
+ activity.setTheme(R.style.NavigationActivityTheme)
return view
}
diff --git a/android/src/main/res/values/styles.xml b/android/src/main/res/values/styles.xml
index 07af7315..6f117fbb 100644
--- a/android/src/main/res/values/styles.xml
+++ b/android/src/main/res/values/styles.xml
@@ -9,6 +9,10 @@
- @color/colorAccent
+
+