removed mapbox implementation

Ichchhie · Feb 27, 2020 · 1e7055f · 1e7055f
1 parent 83bea5e
commit 1e7055f
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 135 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -32,14 +32,5 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
     //toaster library
-    implementation 'com.github.Ichchhie:Toaster-Library:0.7.0'
-
-    implementation ('com.mapbox.mapboxsdk:mapbox-android-sdk:8.6.2'){
-        exclude group: 'group_name', module: 'module_name'
-    }
-
-    implementation 'com.mapbox.mapboxsdk:mapbox-android-navigation:0.42.5'
-//    implementation 'com.mapbox.mapboxsdk:mapbox-android-navigation-ui:0.42.5'
-    //graphhopper navigation
-//    implementation 'com.graphhopper.navigation:navigation-android:0.1.0'
+    implementation 'com.github.Ichchhie:Toaster-Library:0.8.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.kathmandulivinglabs.osmnavigationapp">
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:targetApi="n">
         <activity android:name="com.kathmandulivinglabs.osmnavigationapp.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/app/src/main/java/com/kathmandulivinglabs/osmnavigationapp/MainActivity.java b/app/src/main/java/com/kathmandulivinglabs/osmnavigationapp/MainActivity.java
@@ -3,53 +3,26 @@
 import android.os.Bundle;
 import android.util.Log;
 
-import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.kathmandulivinglabs.navigationlibrary.models.Geocode;
 import com.kathmandulivinglabs.navigationlibrary.models.Geometry;
 import com.kathmandulivinglabs.navigationlibrary.models.Place;
-import com.kathmandulivinglabs.navigationlibrary.services.Baato;
 import com.kathmandulivinglabs.navigationlibrary.services.BaatoReverseGeoCodeService;
 import com.kathmandulivinglabs.navigationlibrary.services.ToasterMessage;
 import com.kathmandulivinglabs.navigationlibrary.utilities.BaatoUtil;
-import com.mapbox.api.directions.v5.models.DirectionsResponse;
-import com.mapbox.api.directions.v5.models.DirectionsRoute;
-import com.mapbox.geojson.Point;
-import com.mapbox.mapboxsdk.Mapbox;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.location.LocationComponent;
-import com.mapbox.mapboxsdk.location.modes.CameraMode;
-import com.mapbox.mapboxsdk.location.modes.RenderMode;
-import com.mapbox.mapboxsdk.maps.MapView;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
-import com.mapbox.mapboxsdk.maps.Style;
-import com.mapbox.services.android.navigation.v5.navigation.NavigationRoute;
 
 import java.util.List;
 
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
-public class MainActivity extends AppCompatActivity implements OnMapReadyCallback,
-        MapboxMap.OnMapLongClickListener{
+public class MainActivity extends AppCompatActivity {
 
     private static final String TAG = "apple";
-    private MapboxMap mapboxMap;
-    private MapView mapView;
-    private NavigationRoute navigationMapRoute;
     String encoded = "wv{gD_`lhOQvAO^c@h@Yj@IZKhADXj@|ABrAElB@NLLp@LHFDJJvDb@pBx@~B`AjBBP@fCArBW|KSxEQbHGbAYhBKVmA`C}A`EuBrGcAxC}@hBA^BJb@`@dBr@tBbAh@RdDbBs@fCYxAmBnKy@`F_Gj[]zBS~AWjDC~AA|BBbBj@|JpB~YRrDbAjONlDD~AAbCuArj@o@nSkB~w@CzB{@x\\e@rLa@jN@zBO|DE|EQjBKp@W~@Sf@o@dAs@x@i@d@_@RkAj@_AP_AJmCDkBD}IDoFF_ETc@@iARyAf@UKa@_@YKk@KuBGu@Kq@MkA[k@SsB{@wCwAgAo@g@SsDiBa@OcJmE{IcEiAm@kJmEmAc@U?QA[IUK]EmI_@wBCk@Dm@FiCt@k@ViNvJ_BlAcAj@{@Xc@JuALsGN{@F_@Da@NeAn@WXWb@]fAIf@Al@Bt@`AvKVhDDpAMjB[jASb@yAzBiAvAuCfEYxAe@SmE}AsGeA_FiBwG_CsB_@sGq@{AWcA]eASuC{@g@IiDs@_BWy@FiG`BqCx@sFvA{JlC_APq@DqA?[CcAOgCg@qFqAgGkA{@Gk@@i@Dg@Je@NmAl@_^~R^p@lAlAdAv@^T~Al@t@l@F?b@MjChANBl@ATIDCFl@APNH?Ho@`CTf@HJ`@FJN?Je@fA[d@CJBJHJ@POv@HPFVd@ZBJAJa@v@bAf@JjAw@`@yAf@s@d@SHQAAf@c@C@p@YAm@R?n@SPkAPAB?|@g@HCLaAB";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Mapbox.getInstance(this, getString(R.string.mapbox_access_token));
         setContentView(R.layout.activity_main);
-        mapView = findViewById(R.id.mapView);
-        mapView.onCreate(savedInstanceState);
-        mapView.getMapAsync(this);
         ToasterMessage.s(this, "Hello Good Morning");
         Geometry geometry = BaatoUtil.getGeoJsonFromEncodedPolyLine(encoded);
         new BaatoReverseGeoCodeService(this)
@@ -59,7 +32,9 @@ protected void onCreate(Bundle savedInstanceState) {
                 .withListener(new BaatoReverseGeoCodeService.BaatoReverseGeoCodeRequestListener() {
                     @Override
                     public void onSuccess(List<Place> places) {
-                        Log.d(TAG, "onSuccess:reverse " + places.toString());
+                        Log.d(TAG, "onSuccess: " + places.size());
+                        for (Place place : places)
+                            Log.d(TAG, "onSuccess:reverse " + place);
                     }
 
                     @Override
@@ -68,79 +43,6 @@ public void onFailed(Throwable error) {
                     }
                 })
                 .doReverseGeoCode();
-//        Log.d(TAG, "onCreate: " + Baato.search(Constants.TOKEN, "chardhunga").toString());
-//        NavigationRoute.builder(this)
-//                .accessToken(Mapbox.getAccessToken())
-//                .origin(Point.fromLngLat(85.4278774, 27.6721352))
-//                .destination(Point.fromLngLat(85.3346386, 27.7340328))
-//                .alternatives(true)
-//                .build()
-//                .getRoute(this);
-//        Log.d("hello", "onCreate: " + geometry.coordinates);
-    }
-
-    @Override
-    public boolean onMapLongClick(@NonNull LatLng point) {
-        return false;
-    }
-
-    @Override
-    public void onMapReady(@NonNull MapboxMap mapboxMap) {
-        this.mapboxMap = mapboxMap;
-        mapboxMap.setStyle(Style.MAPBOX_STREETS, style -> {
-//            initializeLocationComponent(mapboxMap);
-//            navigationMapRoute = new NavigationMapRoute(null, mapView, mapboxMap);
-            mapboxMap.addOnMapLongClickListener(this);
-//            Snackbar.make(mapView, "Long press to select route", Snackbar.LENGTH_SHORT).show();
-        });
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        mapView.onResume();
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        mapView.onStart();
-//        if (navigationMapRoute != null) {
-//            navigationMapRoute.onStart();
-//        }
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        mapView.onStop();
-//        if (navigationMapRoute != null) {
-//            navigationMapRoute.onStop();
-//        }
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        mapView.onPause();
-    }
-
-    @Override
-    public void onLowMemory() {
-        super.onLowMemory();
-        mapView.onLowMemory();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        mapView.onDestroy();
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        mapView.onSaveInstanceState(outState);
     }
 
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -6,10 +6,10 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <com.mapbox.mapboxsdk.maps.MapView
-        android:id="@+id/mapView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:mapbox_cameraZoom="12" />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:text="Hello, Welcome to our demo app" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">178.128.59.143</domain>
+    </domain-config>
+</network-security-config>
diff --git a/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/services/Baato.java b/toasterlibrary/src/main/java/com/kathmandulivinglabs/navigationlibrary/services/Baato.java
diff --git a/...n/java/com/kathmandulivinglabs/navigationlibrary/services/BaatoReverseGeoCodeService.java b/...n/java/com/kathmandulivinglabs/navigationlibrary/services/BaatoReverseGeoCodeService.java
@@ -48,13 +48,16 @@ public BaatoReverseGeoCodeService setAccessToken(@NonNull String accessToken) {
     }
 
     /**
-     * Set the query to search.
+     * Set the geocode to search.
      */
     public BaatoReverseGeoCodeService setGeoCode(@NonNull Geocode geoCode) {
         this.geocode = geoCode;
         return this;
     }
 
+    /**
+     * Set the radius to search.
+     */
     public BaatoReverseGeoCodeService setRadius(@NonNull int radius) {
         this.radius = radius;
         return this;