Skip to content

Commit e62eb06

Browse files
authored
refactor: removed google maps (#2303)
* replaced Google maps with OpenStreetMaps in the Playstore build
1 parent 8903556 commit e62eb06

File tree

5 files changed

+3
-84
lines changed

5 files changed

+3
-84
lines changed

app/build.gradle

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,11 @@ android {
4040
debug {
4141
versionNameSuffix "Version: "
4242
resValue "string", "version", "${versionNameSuffix}${defaultConfig.versionName}"
43-
resValue "string", "google_maps_key", google_key
4443
}
4544
release {
4645
minifyEnabled false
4746
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
4847
resValue "string", "version", "${defaultConfig.versionName}"
49-
resValue "string", "google_maps_key", google_key
5048
if (LOCAL_KEY_PRESENT || TRAVIS_BUILD)
5149
signingConfig signingConfigs.release
5250
}
@@ -114,10 +112,9 @@ dependencies {
114112
annotationProcessor "com.jakewharton:butterknife-compiler:$rootProject.butterKnifeVersion"
115113

116114
// Map libraries
117-
fdroidImplementation "org.osmdroid:osmdroid-android:$rootProject.osmVersion"
118-
fdroidImplementation "org.osmdroid:osmdroid-mapsforge:$rootProject.mapsforgeVersion"
119-
fdroidImplementation "org.osmdroid:osmdroid-geopackage:$rootProject.geoPackageVersion"
120-
playstoreImplementation "com.google.android.gms:play-services-maps:$rootProject.googleMapsVersion"
115+
implementation "org.osmdroid:osmdroid-android:$rootProject.osmVersion"
116+
implementation "org.osmdroid:osmdroid-mapsforge:$rootProject.mapsforgeVersion"
117+
implementation "org.osmdroid:osmdroid-geopackage:$rootProject.geoPackageVersion"
121118

122119
implementation 'androidx.multidex:multidex:2.0.1'
123120
implementation "io.realm:android-adapters:$rootProject.realmAdapter"

app/src/fdroid/java/io/pslab/activity/MapsActivity.java renamed to app/src/main/java/io/pslab/activity/MapsActivity.java

File renamed without changes.

app/src/playstore/AndroidManifest.xml

Lines changed: 0 additions & 10 deletions
This file was deleted.

app/src/playstore/java/io/pslab/activity/MapsActivity.java

Lines changed: 0 additions & 59 deletions
This file was deleted.

app/src/playstore/res/layout/activity_google_maps.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)