Geocoder excluded but extracted.

app/build.gradle

@@ -80,4 +80,5 @@ dependencies {
     compile project(':panoramiobindings')
     compile project(':urbanexplorerutils')
     compile project(':wikibinding')
+    // compile project(':googleutils')
 }

app/src/main/java/pl/tpolgrabia/urbanexplorer/callbacks/geocoder/GeocodedLocationCallback.java

@@ -3,12 +3,13 @@ package pl.tpolgrabia.urbanexplorer.callbacks.geocoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.tpolgrabia.urbanexplorer.fragments.HomeFragment;
-import pl.tpolgrabia.urbanexplorerutils.callbacks.LocationGeoCoderCallback;
+//import pl.tpolgrabia.urbanexplorerutils.callbacks.LocationGeoCoderCallback;
 
 /**
  * Created by tpolgrabia on 21.09.16.
  */
-public class GeocodedLocationCallback implements LocationGeoCoderCallback {
+public class GeocodedLocationCallback {
+    // implements LocationGeoCoderCallback {
     private static final Logger lg = LoggerFactory.getLogger(GeocodedLocationCallback.class);
     private HomeFragment homeFragment;
 
@@ -16,7 +17,7 @@ public class GeocodedLocationCallback implements LocationGeoCoderCallback {
         this.homeFragment = homeFragment;
     }
 
-    @Override
+    // @Override
     public void callback(int code, String message, String googleStatus, String geocodedLocation) {
         lg.debug("Geocoded result code {}, message {}, status: {}, value {}",
             code, message, googleStatus, geocodedLocation);

app/src/main/java/pl/tpolgrabia/urbanexplorer/callbacks/wiki/WikiLocationGeoCoderCallback.java

@@ -7,7 +7,8 @@ import pl.tpolgrabia.urbanexplorer.fragments.WikiLocationsFragment;
 /**
  * Created by tpolgrabia on 24.09.16.
  */
-public class WikiLocationGeoCoderCallback implements pl.tpolgrabia.urbanexplorerutils.callbacks.LocationGeoCoderCallback {
+public class WikiLocationGeoCoderCallback {
+    // implements LocationGeoCoderCallback {
     private static final Logger lg = LoggerFactory.getLogger(WikiLocationGeoCoderCallback.class);
     private WikiLocationsFragment wikiLocationsFragment;
 
@@ -15,7 +16,7 @@ public class WikiLocationGeoCoderCallback implements pl.tpolgrabia.urbanexplorer
         this.wikiLocationsFragment = wikiLocationsFragment;
     }
 
-    @Override
+    // @Override
     public void callback(int code, String message, String googleStatus, String geocodedLocation) {
         lg.debug("Geocoded result code {}, message {}, status: {}, value {}",
             code, message, googleStatus, geocodedLocation);

app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/HomeFragment.java

@@ -15,6 +15,7 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+// import pl.tpolgrabia.googleutils.utils.GeocoderUtils;
 import pl.tpolgrabia.panoramiobindings.utils.PanoramioUtils;
 import pl.tpolgrabia.urbanexplorer.AppConstants;
 import pl.tpolgrabia.urbanexplorer.MainActivity;
@@ -54,7 +55,7 @@ public class HomeFragment extends Fragment  {
     private ArrayList<PanoramioImageInfo> photos;
     private boolean noMorePhotos;
     private String currentGeocodedLocation;
-    private GeocoderUtils geocoderUtils;
+    // private GeocoderUtils geocoderUtils;
 
     public HomeFragment() {
         // Required empty public constructor
@@ -77,7 +78,7 @@ public class HomeFragment extends Fragment  {
         final StandardLocationListener locationCallback = mainActivity.getLocationCallback();
         locationCallback.addCallback(new PanoramioLocationCallback(this));
         locationCallback.addProviderCallback(new PanoramioProviderCallback(this));
-        geocoderUtils = new GeocoderUtils(getActivity(), AppConstants.GOOGLE_API_KEY);
+        //geocoderUtils = new GeocoderUtils(getActivity(), AppConstants.GOOGLE_API_KEY);
     }
 
     public void updateGeocodedLocation() {
@@ -93,10 +94,10 @@ public class HomeFragment extends Fragment  {
             return;
         }
 
-        geocoderUtils.getGeoCodedLocation(
+//        geocoderUtils.getGeoCodedLocation(
-            currLocation.getLatitude(),
+//            currLocation.getLatitude(),
-            currLocation.getLongitude(),
+//            currLocation.getLongitude(),
-            new GeocodedLocationCallback(this));
+//            new GeocodedLocationCallback(this));
 
     }
 

app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/WikiLocationsFragment.java

@@ -44,7 +44,7 @@ public class WikiLocationsFragment extends Fragment {
     private ArrayList<WikiAppObject> appObjects = new ArrayList<>();
     private int lastFetchSize = -1;
     private String currentGeocodedLocation;
-    private GeocoderUtils geocoderUtils;
+    //private GeocoderUtils geocoderUtils;
 
     public WikiLocationsFragment() {
         // Required empty public constructor
@@ -61,7 +61,7 @@ public class WikiLocationsFragment extends Fragment {
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         appObjects = WikiCacheUtils.loadWikiObjectsFromCache(getActivity(), savedInstanceState);
-        geocoderUtils = new GeocoderUtils(getActivity(), AppConstants.GOOGLE_API_KEY);
+        // geocoderUtils = new GeocoderUtils(getActivity(), AppConstants.GOOGLE_API_KEY);
     }
 
     @Override
@@ -126,7 +126,7 @@ public class WikiLocationsFragment extends Fragment {
     }
 
     private void updateGeocodedLocation() {
-        geocoderUtils.getGeoCodedLocation(new WikiLocationGeoCoderCallback(this));
+        // geocoderUtils.getGeoCodedLocation(new WikiLocationGeoCoderCallback(this));
     }
 
     public void updateLocationInfo() {

googleutils/.gitignore

@@ -0,0 +1 @@
+/build

googleutils/build.gradle

@@ -0,0 +1,35 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 24
+    buildToolsVersion "24.0.2"
+
+    defaultConfig {
+        minSdkVersion 16
+        targetSdkVersion 24
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    testCompile 'junit:junit:4.12'
+    compile 'com.android.support:appcompat-v7:24.2.1'
+
+    compile 'org.slf4j:slf4j-api:1.7.21'
+    compile 'com.github.tony19:logback-android-core:1.1.1-6'
+    compile('com.github.tony19:logback-android-classic:1.1.1-6') {
+        // workaround issue #73
+        exclude group: 'com.google.android', module: 'android'
+    }
+
+    compile 'com.googlecode.android-query:android-query:0.25.9'
+    compile project(path: ':urbanexplorerutils')
+}

googleutils/proguard-rules.pro

@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /home/tpolgrabia/bin/android-sdk-linux/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

googleutils/src/androidTest/java/pl/tpolgrabia/googleutils/ApplicationTest.java

@@ -0,0 +1,13 @@
+package pl.tpolgrabia.googleutils;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+    public ApplicationTest() {
+        super(Application.class);
+    }
+}

googleutils/src/main/AndroidManifest.xml

@@ -0,0 +1,11 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="pl.tpolgrabia.googleutils">
+
+    <application android:allowBackup="true"
+                 android:label="@string/app_name"
+                 android:supportsRtl="true"
+    >
+
+    </application>
+
+</manifest>

googleutils/src/main/java/pl/tpolgrabia/googleutils/callback/LocationGeoCoderCallback.java

@@ -1,4 +1,4 @@
-package pl.tpolgrabia.urbanexplorerutils.callbacks;
+package pl.tpolgrabia.googleutils.callback;
 
 /**
  * Created by Tomasz Półgrabia <tomasz.polgrabia@unicredit.eu> (c310702) on 20.09.2016.

googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/GeocoderUtils.java

@@ -1,4 +1,4 @@
-package pl.tpolgrabia.urbanexplorer.utils;
+package pl.tpolgrabia.googleutils.utils;
 
 import android.content.Context;
 import android.location.Location;
@@ -9,10 +9,8 @@ import org.json.JSONArray;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import pl.tpolgrabia.urbanexplorerutils.callbacks.LocationGeoCoderCallback;
+import pl.tpolgrabia.googleutils.callback.LocationGeoCoderCallback;
-import pl.tpolgrabia.urbanexplorerutils.constants.UtilConstants;
 import pl.tpolgrabia.urbanexplorerutils.utils.LocationUtils;
-import pl.tpolgrabia.wikibinding.utils.WikiUtils;
 
 /**
  * Created by tpolgrabia on 26.09.16.

googleutils/src/main/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">GoogleUtils</string>
+</resources>

googleutils/src/test/java/pl/tpolgrabia/googleutils/ExampleUnitTest.java

@@ -0,0 +1,15 @@
+package pl.tpolgrabia.googleutils;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * To work on unit tests, switch the Test Artifact in the Build Variants view.
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}

settings.gradle

@@ -1 +1 @@
-include ':app', ':panoramiobindings', ':urbanexplorerutils', ':wikibinding'
+include ':app', ':panoramiobindings', ':urbanexplorerutils', ':wikibinding', ':googleutils'

wikibinding/src/main/java/pl/tpolgrabia/wikibinding/utils/WikiUtils.java

@@ -13,7 +13,6 @@ import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import pl.tpolgrabia.urbanexplorerutils.callbacks.LocationGeoCoderCallback;
 import pl.tpolgrabia.wikibinding.callback.WikiAppResponseCallback;
 import pl.tpolgrabia.wikibinding.callback.WikiResponseCallback;
 import pl.tpolgrabia.wikibinding.callback.WikiStatus;