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

feature : Replaced Google maps with open street maps #2303

Merged
merged 4 commits into from
Jan 18, 2022
Merged

feature : Replaced Google maps with open street maps #2303

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e02080
replaced Google maps with OpenStreetMaps in the Playstore build
dependabot[bot] Jan 15, 2022
23c39ef
Merge branch 'fossasia:development' into development
apoorva-raj Jan 18, 2022
9c9a5cb
Minor changes
apoorva-raj Jan 18, 2022
7c134db
Merge https://github.com/apoorva-raj/pslab-android into development
apoorva-raj Jan 18, 2022
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
11 changes: 5 additions & 6 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ android {
debug {
versionNameSuffix "Version: "
resValue "string", "version", "${versionNameSuffix}${defaultConfig.versionName}"
resValue "string", "google_maps_key", google_key
//resValue "string", "google_maps_key", google_key
CloudyPadmal marked this conversation as resolved.
Show resolved Hide resolved
}
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
resValue "string", "version", "${defaultConfig.versionName}"
resValue "string", "google_maps_key", google_key
//resValue "string", "google_maps_key", google_key
if (LOCAL_KEY_PRESENT || TRAVIS_BUILD)
signingConfig signingConfigs.release
}
Expand Down Expand Up @@ -114,10 +114,9 @@ dependencies {
annotationProcessor "com.jakewharton:butterknife-compiler:$rootProject.butterKnifeVersion"

// Map libraries
fdroidImplementation "org.osmdroid:osmdroid-android:$rootProject.osmVersion"
fdroidImplementation "org.osmdroid:osmdroid-mapsforge:$rootProject.mapsforgeVersion"
fdroidImplementation "org.osmdroid:osmdroid-geopackage:$rootProject.geoPackageVersion"
playstoreImplementation "com.google.android.gms:play-services-maps:$rootProject.googleMapsVersion"
implementation "org.osmdroid:osmdroid-android:$rootProject.osmVersion"
implementation "org.osmdroid:osmdroid-mapsforge:$rootProject.mapsforgeVersion"
implementation "org.osmdroid:osmdroid-geopackage:$rootProject.geoPackageVersion"

implementation 'androidx.multidex:multidex:2.0.1'
implementation "io.realm:android-adapters:$rootProject.realmAdapter"
Expand Down
0 .../java/io/pslab/activity/MapsActivity.java → .../java/io/pslab/activity/MapsActivity.java
View file
Open in desktop
File renamed without changes.
10 changes: 0 additions & 10 deletions app/src/playstore/AndroidManifest.xml
View file
Open in desktop

This file was deleted.

59 changes: 0 additions & 59 deletions app/src/playstore/java/io/pslab/activity/MapsActivity.java
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions app/src/playstore/res/layout/activity_google_maps.xml
View file
Open in desktop

This file was deleted.