Rebased from master

app/build.gradle

@@ -66,11 +66,8 @@ dependencies {
     implementation "androidx.appcompat:appcompat:$appCompat"
     implementation "androidx.legacy:legacy-support-v4:$supportLib"
     implementation "androidx.constraintlayout:constraintlayout:$constraintLayout"
-
     implementation "androidx.core:core-ktx:$ktx"
     implementation "androidx.preference:preference:$preference"
-
-    // architecture components
     implementation "androidx.navigation:navigation-fragment-ktx:$navigation"
     implementation "androidx.navigation:navigation-runtime-ktx:$navigation"
     implementation "androidx.navigation:navigation-ui-ktx:$navigation"
@@ -78,24 +75,22 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle"
-
-    // room
     implementation "androidx.room:room-runtime:$room"
     implementation "androidx.room:room-ktx:$room"
     kapt "androidx.room:room-compiler:$room"
 
-    // retrofit
+    implementation "com.google.dagger:dagger:$dagger"
+    kapt "com.google.dagger:dagger-compiler:$dagger"
+
     implementation "com.squareup.retrofit2:retrofit:$retrofit"
     implementation "com.squareup.retrofit2:converter-gson:$retrofit"
     implementation "com.squareup.okhttp3:okhttp:$okhttp"
 
-    //dagger
-    implementation "com.google.dagger:dagger:$dagger"
-    kapt "com.google.dagger:dagger-compiler:$dagger"
-
-    // predict4java
-    implementation "com.github.davidmoten:predict4java:$predict4java"
-
-    // openStreetMaps
     implementation "org.osmdroid:osmdroid-android:$openStreetMap"
+    implementation "org.osmdroid:osmdroid-mapsforge:$openStreetMap"
+    implementation "org.mapsforge:mapsforge-map-android:$mapsForge"
+    implementation "org.mapsforge:mapsforge-map:$mapsForge"
+    implementation "org.mapsforge:mapsforge-themes:$mapsForge"
+
+    implementation "com.github.davidmoten:predict4java:$predict4java"
 }