removed unused references

Panagiotis Triantafyllou
Commit a8c1f71f9b2001e1017906cb28a6fed5bcceeaab a8c1f71f 1 parent 4c2eedbe
Showing 3 changed files with 2 additions and 52 deletions
warply_android_sdk/build.gradle
warply_android_sdk/src/main/java/ly/warp/sdk/io/models/Merchant.java
warply_android_sdk/src/main/java/ly/warp/sdk/utils/constants/WarpConstants.java
--- a/warply_android_sdk/build.gradle
View file @a8c1f71
+++ b/warply_android_sdk/build.gradle
View file @a8c1f71
@@ -52,14 +52,12 @@ dependencies {
     //------------------------------ Support -----------------------------//
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'androidx.cardview:cardview:1.0.0'
     api "androidx.security:security-crypto:1.1.0-alpha03"
     // For minSDK 23 use 1.0.0, for minSDK 21 use 1.1.0 that is currently in alpha
     api 'org.altbeacon:android-beacon-library:2.19.3'
-    api group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.21'
+    api 'io.reactivex.rxjava3:rxjava:3.1.8'
+    api 'io.reactivex.rxjava3:rxandroid:3.0.2'
     implementation 'com.google.android.material:material:1.5.0'
-    api group: 'com.google.zxing', name: 'core', version: '3.4.1'
-    api group: 'com.google.zxing', name: 'javase', version: '3.4.1'
     implementation 'org.greenrobot:eventbus:3.3.1'
     api 'com.google.guava:guava:30.1-android'
@@ -72,7 +70,6 @@ dependencies {
     //------------------------------ GMS -----------------------------//
     api 'com.google.android.gms:play-services-base:18.1.0'
     implementation 'com.google.android.gms:play-services-location:19.0.1'
-    implementation 'com.google.android.gms:play-services-maps:18.0.2'
     //------------------------------ Work Manager -----------------------------//
     api 'androidx.work:work-runtime:2.7.1'
@@ -86,8 +83,6 @@ dependencies {
     implementation 'com.huawei.hms:base:6.6.0.300'
     implementation 'com.huawei.hms:push:6.7.0.300'
     implementation 'com.huawei.hms:ads-identifier:3.4.56.300'
-    implementation 'com.huawei.hms:maps:6.9.0.300'
-    implementation 'com.huawei.hms:maps-basic:6.9.0.300'
     //------------------------------ SQLCipher -----------------------------//
     api "net.zetetic:android-database-sqlcipher:4.5.2"
@@ -110,27 +105,6 @@ task deleteJarLibrary(type: Delete) {
     delete 'jar/warply_android_sdk_v4.5.0.jar'
 }
-//from('build/intermediates/compile_library_classes/release/')
-
-//Old version
-// Gradle Tasks -> warply_android_sdk -> Tasks -> other -> createJarLibrary
-//task createJarLibrary(type: Copy) {
-//    from fileTree('build/intermediates/bundles/release/')
-//    into('jar/')
-//    include('classes.jar')
-//    rename('classes.jar', 'warply_android_sdk_v4.4.2.jar')
-//}
-
-// New version
-// Gradle -> warplyDemo -> libraries -> warply_android_sdk -> Run Configurations -> assembleRelease
-// When finished it copies the .jar into
-// warply_android_sdk -> build -> intermediates -> full_jar -> release/debug -> full.jar
-
-// 24 - Jan - 2022
-// Gradle -> warplyDemo -> libraries -> warply_android_sdk -> Tasks -> build -> build
-// When finished it copies the .aar into
-// warply_android_sdk -> build -> outputs -> aar -> warply_android_sdk-release.aar
-
 task createJarLibrary(type: Jar, dependsOn: 'assembleRelease') {
     from fileTree('build/intermediates/bundles/release/')
 }
--- a/warply_android_sdk/src/main/java/ly/warp/sdk/io/models/Merchant.java
View file @a8c1f71
+++ b/warply_android_sdk/src/main/java/ly/warp/sdk/io/models/Merchant.java
View file @a8c1f71
@@ -28,8 +28,6 @@ package ly.warp.sdk.io.models;
 import android.os.Parcel;
 import android.os.Parcelable;
-import com.google.android.gms.maps.model.LatLng;
-
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -133,7 +131,6 @@ public class Merchant implements Parcelable, Serializable {
     private JSONObject working_hours = new JSONObject();
     private JSONArray tags = new JSONArray();
     private JSONObject product = new JSONObject();
-    private LatLng coordinates;
     public Merchant() {
         this.address = "";
@@ -176,7 +173,6 @@ public class Merchant implements Parcelable, Serializable {
         this.working_hours = new JSONObject();
         this.tags = new JSONArray();
         this.product = new JSONObject();
-        coordinates = new LatLng(this.latitude, this.longitude);
     }
     public Merchant(boolean isUniversal) {
@@ -253,7 +249,6 @@ public class Merchant implements Parcelable, Serializable {
             this.working_hours = json.optJSONObject(WORKING_HOURS);
             this.tags = json.optJSONArray(TAGS);
             this.product = json.optJSONObject(PRODUCT);
-            coordinates = new LatLng(this.latitude, this.longitude);
         }
     }
@@ -342,7 +337,6 @@ public class Merchant implements Parcelable, Serializable {
         this.distance = source.readInt();
         this.default_shown = source.readByte() != 0;
         this.hidden = source.readByte() != 0;
-        this.coordinates = new LatLng(this.latitude, this.longitude);
     }
     @Override
@@ -381,7 +375,6 @@ public class Merchant implements Parcelable, Serializable {
         dest.writeInt(this.distance);
         dest.writeByte((byte) (this.default_shown ? 1 : 0));
         dest.writeByte((byte) (this.hidden ? 1 : 0));
-        dest.writeParcelable(coordinates, flags);
     }
     /**
@@ -790,10 +783,6 @@ public class Merchant implements Parcelable, Serializable {
         this.product = product;
     }
-    public void setCoordinates(LatLng coordinates) {
-        this.coordinates = coordinates;
-    }
-
     @Override
     public int describeContents() {
         return 0;
--- a/warply_android_sdk/src/main/java/ly/warp/sdk/utils/constants/WarpConstants.java
View file @a8c1f71
+++ b/warply_android_sdk/src/main/java/ly/warp/sdk/utils/constants/WarpConstants.java
View file @a8c1f71
@@ -25,9 +25,6 @@
 package ly.warp.sdk.utils.constants;
-import com.google.android.gms.maps.model.LatLng;
-import com.google.android.gms.maps.model.LatLngBounds;
-
 public class WarpConstants {
     /**
@@ -66,16 +63,6 @@ public class WarpConstants {
     public static final int RANDOM_MIN = 20;
     public static final int RANDOM_MAX = 60;
-    public static final LatLngBounds GREECE_BOUNDS = new LatLngBounds(
-            new LatLng(34.75261, 19.33079),
-            new LatLng(41.97761, 28.62522)
-    );
-
-    public static final com.huawei.hms.maps.model.LatLngBounds GREECE_BOUNDS_HUAWEI = new com.huawei.hms.maps.model.LatLngBounds(
-            new com.huawei.hms.maps.model.LatLng(34.75261, 19.33079),
-            new com.huawei.hms.maps.model.LatLng(41.97761, 28.62522)
-    );
-
     /* Result codes */
     public static final int RESULT_CODE_SUCCESS = 1;