diff --git a/app/build.gradle b/app/build.gradle index 184cd7bbd..fddcd50c7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,6 +25,8 @@ android { targetSdkVersion 28 minSdkVersion 16 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + resValue 'string', 'mapbox_key', project.hasProperty('tasks_mapbox_key') ? tasks_mapbox_key : '' + resValue 'string', 'google_key', project.hasProperty('tasks_google_key') ? tasks_google_key : '' javaCompileOptions { annotationProcessorOptions { @@ -44,14 +46,10 @@ android { buildTypes { debug { - resValue 'string', "mapbox_key", project.hasProperty('tasks_mapbox_key') ? tasks_mapbox_key : '' - resValue 'string', "google_key", project.hasProperty('tasks_google_key') ? tasks_google_key : '' multiDexEnabled true testCoverageEnabled true } release { - resValue 'string', "mapbox_key", tasks_mapbox_key - resValue 'string', "google_key", tasks_google_key minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.pro' signingConfig signingConfigs.release @@ -175,6 +173,8 @@ dependencies { // https://groups.google.com/forum/#!topic/guava-announce/Km82fZG68Sw exclude group: 'com.google.guava', module: 'listenablefuture' } + implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:7.3.0' + implementation'com.mapbox.mapboxsdk:mapbox-sdk-services:4.5.0' googleplayImplementation 'com.crashlytics.sdk.android:crashlytics:2.9.9' googleplayImplementation "com.google.firebase:firebase-core:16.0.7" @@ -184,8 +184,6 @@ dependencies { googleplayImplementation 'com.google.android.libraries.places:places:1.0.0' googleplayImplementation 'com.google.android.gms:play-services-maps:16.1.0' googleplayImplementation 'androidx.appcompat:appcompat:1.0.2' - googleplayImplementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:7.3.0' - googleplayImplementation 'com.mapbox.mapboxsdk:mapbox-sdk-services:4.5.0' amazonImplementation "com.google.android.gms:play-services-analytics:16.0.7" diff --git a/app/src/generic/java/org/tasks/gtasks/PlayServices.java b/app/src/generic/java/org/tasks/gtasks/PlayServices.java index 62f2d0b59..28ec2ba07 100644 --- a/app/src/generic/java/org/tasks/gtasks/PlayServices.java +++ b/app/src/generic/java/org/tasks/gtasks/PlayServices.java @@ -7,6 +7,7 @@ import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposables; import javax.inject.Inject; import org.tasks.drive.DriveLoginActivity; +import org.tasks.location.LocationPickerActivity; import org.tasks.play.AuthResultHandler; public class PlayServices { @@ -37,4 +38,8 @@ public class PlayServices { public Disposable check(MainActivity mainActivity) { return Disposables.empty(); } + + public Disposable checkMaps(LocationPickerActivity locationPickerActivity) { + return Disposables.empty(); + } } diff --git a/app/src/generic/java/org/tasks/location/GoogleMapFragment.java b/app/src/generic/java/org/tasks/location/GoogleMapFragment.java new file mode 100644 index 000000000..692d6b4ce --- /dev/null +++ b/app/src/generic/java/org/tasks/location/GoogleMapFragment.java @@ -0,0 +1,28 @@ +package org.tasks.location; + +import android.content.Context; +import androidx.fragment.app.FragmentManager; +import java.util.List; +import org.tasks.data.Place; + +public class GoogleMapFragment implements MapFragment { + + public GoogleMapFragment(Context context) {} + + @Override + public void init(FragmentManager fragmentManager, MapFragmentCallback callback, boolean dark) {} + + @Override + public MapPosition getMapPosition() { + return null; + } + + @Override + public void movePosition(MapPosition mapPosition, boolean animate) {} + + @Override + public void setMarkers(List places) {} + + @Override + public void showMyLocation() {} +} diff --git a/app/src/generic/java/org/tasks/location/GooglePlacesSearchProvider.java b/app/src/generic/java/org/tasks/location/GooglePlacesSearchProvider.java new file mode 100644 index 000000000..c89a6e99a --- /dev/null +++ b/app/src/generic/java/org/tasks/location/GooglePlacesSearchProvider.java @@ -0,0 +1,29 @@ +package org.tasks.location; + +import android.content.Context; +import android.os.Bundle; +import java.util.List; +import org.tasks.Callback; +import org.tasks.data.Place; + +public class GooglePlacesSearchProvider implements PlaceSearchProvider { + + public GooglePlacesSearchProvider(Context context) {} + + @Override + public void restoreState(Bundle savedInstanceState) {} + + @Override + public void saveState(Bundle outState) {} + + @Override + public void search( + String query, + MapPosition bias, + Callback> onSuccess, + Callback onError) {} + + @Override + public void fetch( + PlaceSearchResult placeSearchResult, Callback onSuccess, Callback onError) {} +} diff --git a/app/src/generic/java/org/tasks/location/PlacePicker.java b/app/src/generic/java/org/tasks/location/PlacePicker.java deleted file mode 100644 index b298ce354..000000000 --- a/app/src/generic/java/org/tasks/location/PlacePicker.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.tasks.location; - -import android.app.Activity; -import android.content.Context; -import android.content.Intent; -import org.tasks.data.Location; -import org.tasks.preferences.Preferences; - -public class PlacePicker { - - public static Intent getIntent(Activity activity) { - return null; - } - - public static Location getPlace(Context context, Intent data, Preferences preferences) { - return null; - } -} diff --git a/app/src/googleplay/AndroidManifest.xml b/app/src/googleplay/AndroidManifest.xml index 49caf22cd..58f00bb66 100644 --- a/app/src/googleplay/AndroidManifest.xml +++ b/app/src/googleplay/AndroidManifest.xml @@ -28,8 +28,6 @@ android:name="com.google.android.geo.API_KEY" android:value="@string/google_key"/> - - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9242719b7..99fcaecd0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -109,6 +109,8 @@ android:taskAffinity="" android:theme="@style/TranslucentDialog"/> + + { - if (location != null) { - map.movePosition( - new MapPosition(location.getLatitude(), location.getLongitude(), 15f), animate); + LocationEngineProvider.getBestLocationEngine(this) + .getLastLocation( + new LocationEngineCallback() { + @Override + public void onSuccess(LocationEngineResult result) { + Location location = result.getLastLocation(); + if (location != null) { + map.movePosition( + new MapPosition(location.getLatitude(), location.getLongitude(), 15f), + animate); + } + } + + @Override + public void onFailure(@NonNull Exception exception) { + toaster.longToast(exception.getMessage()); } }); } diff --git a/app/src/googleplay/java/org/tasks/location/LocationPickerAdapter.java b/app/src/main/java/org/tasks/location/LocationPickerAdapter.java similarity index 100% rename from app/src/googleplay/java/org/tasks/location/LocationPickerAdapter.java rename to app/src/main/java/org/tasks/location/LocationPickerAdapter.java diff --git a/app/src/googleplay/java/org/tasks/location/LocationSearchAdapter.java b/app/src/main/java/org/tasks/location/LocationSearchAdapter.java similarity index 100% rename from app/src/googleplay/java/org/tasks/location/LocationSearchAdapter.java rename to app/src/main/java/org/tasks/location/LocationSearchAdapter.java diff --git a/app/src/googleplay/java/org/tasks/location/MapboxMapFragment.java b/app/src/main/java/org/tasks/location/MapboxMapFragment.java similarity index 100% rename from app/src/googleplay/java/org/tasks/location/MapboxMapFragment.java rename to app/src/main/java/org/tasks/location/MapboxMapFragment.java diff --git a/app/src/googleplay/java/org/tasks/location/MapboxSearchProvider.java b/app/src/main/java/org/tasks/location/MapboxSearchProvider.java similarity index 100% rename from app/src/googleplay/java/org/tasks/location/MapboxSearchProvider.java rename to app/src/main/java/org/tasks/location/MapboxSearchProvider.java diff --git a/app/src/googleplay/java/org/tasks/location/PlacePicker.java b/app/src/main/java/org/tasks/location/PlacePicker.java similarity index 100% rename from app/src/googleplay/java/org/tasks/location/PlacePicker.java rename to app/src/main/java/org/tasks/location/PlacePicker.java diff --git a/app/src/googleplay/java/org/tasks/location/PlaceSearchProvider.java b/app/src/main/java/org/tasks/location/PlaceSearchProvider.java similarity index 100% rename from app/src/googleplay/java/org/tasks/location/PlaceSearchProvider.java rename to app/src/main/java/org/tasks/location/PlaceSearchProvider.java diff --git a/app/src/googleplay/java/org/tasks/location/PlaceSearchResult.java b/app/src/main/java/org/tasks/location/PlaceSearchResult.java similarity index 100% rename from app/src/googleplay/java/org/tasks/location/PlaceSearchResult.java rename to app/src/main/java/org/tasks/location/PlaceSearchResult.java diff --git a/app/src/googleplay/java/org/tasks/location/PlaceSearchViewModel.java b/app/src/main/java/org/tasks/location/PlaceSearchViewModel.java similarity index 100% rename from app/src/googleplay/java/org/tasks/location/PlaceSearchViewModel.java rename to app/src/main/java/org/tasks/location/PlaceSearchViewModel.java diff --git a/app/src/googleplay/res/drawable/ic_map_marker_select_red_48dp.xml b/app/src/main/res/drawable/ic_map_marker_select_red_48dp.xml similarity index 100% rename from app/src/googleplay/res/drawable/ic_map_marker_select_red_48dp.xml rename to app/src/main/res/drawable/ic_map_marker_select_red_48dp.xml diff --git a/app/src/googleplay/res/layout/row_place.xml b/app/src/main/res/layout/row_place.xml similarity index 100% rename from app/src/googleplay/res/layout/row_place.xml rename to app/src/main/res/layout/row_place.xml diff --git a/app/src/googleplay/res/raw/mapstyle_night.json b/app/src/main/res/raw/mapstyle_night.json similarity index 100% rename from app/src/googleplay/res/raw/mapstyle_night.json rename to app/src/main/res/raw/mapstyle_night.json