UPDATE Flutter Site Plugin

Author: cagdasmer

flutter-hms-location/CHANGELOG.md

@@ -1,6 +1,7 @@
-## 5.0.0+301
+## 5.0.0+301 
 
-* Upgrade HMS Location Android SDK to 5.0.0.301.
+* Added the getNavigationContextState function.
+* Added the enableLogger and disableLogger methods.
 
 ## 4.0.4+1/4.0.4+300
 

flutter-hms-site/.docs/homeScreen.png

@@ -1,3 +1,12 @@
+## 5.0.1+300
+
+* Added the **siteSearchActivity** method.
+* Added the **SearchIntent** class to start site search activity.
+* Added the **SearchFilter** class, which is used in a SearchIntent object as **filter**.
+* Added the **streetNumber** attribute in the **AddressDetail** class, which is used for setting or obtaining the street number of a place.
+* Added the **HwLocationType** class, which contains constants of Huawei POI types.
+* Added the **enableLogger** and **disableLogger** methods.
+
 ## 4.0.4
 
 * Initial release.

flutter-hms-site/CHANGELOG.md

@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.6.0'
     }
 }
 
@@ -25,15 +25,24 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 29
+    buildToolsVersion "29.0.3"
 
     defaultConfig {
         minSdkVersion 19
+        targetSdkVersion 29
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     lintOptions {
         disable 'InvalidPackage'
     }
 }
 
 dependencies {
-    implementation 'com.huawei.hms:site:4.0.3.300'
+    implementation 'com.huawei.hms:site:5.0.1.300'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation "androidx.recyclerview:recyclerview-selection:1.0.0"
 }

flutter-hms-site/README.md

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

flutter-hms-site/android/build.gradle

@@ -1,3 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.huawei.hms.flutter.site">
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>

flutter-hms-site/android/gradle/wrapper/gradle-wrapper.properties

@@ -16,53 +16,93 @@
 
 package com.huawei.hms.flutter.site;
 
+import android.app.Activity;
 import android.content.Context;
 import android.net.Uri;
+
 import androidx.annotation.NonNull;
+
 import com.huawei.agconnect.config.AGConnectServicesConfig;
-import com.huawei.hms.flutter.site.handlers.MethodCallHandlerImpl;
+import com.huawei.hms.flutter.site.constants.Channel;
+import com.huawei.hms.flutter.site.handlers.ActivityAwareMethodCallHandlerImpl;
 import com.huawei.hms.site.api.SearchService;
 import com.huawei.hms.site.api.SearchServiceFactory;
 
-import com.google.gson.Gson;
-
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
+import io.flutter.embedding.engine.plugins.activity.ActivityAware;
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.PluginRegistry.Registrar;
 
-public class SitePlugin implements FlutterPlugin {
-    private Gson mGson;
-    private MethodChannel mMethodChannel;
-    private SearchService mSearchService;
-    private MethodChannel.MethodCallHandler mMethodCallHandler;
+public class SitePlugin implements FlutterPlugin, ActivityAware {
+    private SearchService searchService;
+    private MethodChannel methodChannel;
+    private ActivityAwareMethodCallHandlerImpl methodCallHandler;
 
-    public static void registerWith(Registrar registrar) {
+    public static void registerWith(final Registrar registrar) {
         final SitePlugin instance = new SitePlugin();
+        final Activity activity = registrar.activity();
+        final Context context = registrar.context();
+
+        // When context is available
+        // searchService and methodChannel are instantiated
         instance.onAttachedToEngine(registrar.context(), registrar.messenger());
+
+        // When activity is available
+        // methodCallHandler is instantiated
+        instance.methodCallHandler = new ActivityAwareMethodCallHandlerImpl(activity, instance.searchService,
+            instance.getApiKey(context));
+        instance.methodChannel.setMethodCallHandler(instance.methodCallHandler);
+    }
+
+    private String getApiKey(Context context) {
+        final String rawApiKey = AGConnectServicesConfig.fromContext(context).getString("client/api_key");
+        return Uri.encode(rawApiKey);
+    }
+
+    private void onAttachedToEngine(final Context context, final BinaryMessenger messenger) {
+        searchService = SearchServiceFactory.create(context, getApiKey(context));
+        methodChannel = new MethodChannel(messenger, Channel.METHOD_SEARCH_SERVICE);
+    }
+
+    private void onDetachedFromEngine() {
+        searchService = null;
+        methodChannel = null;
     }
 
     @Override
-    public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
+    public void onAttachedToEngine(@NonNull final FlutterPluginBinding binding) {
         onAttachedToEngine(binding.getApplicationContext(), binding.getBinaryMessenger());
     }
 
     @Override
-    public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
-        mMethodChannel.setMethodCallHandler(null);
-        mMethodCallHandler = null;
-        mMethodChannel = null;
-        mSearchService = null;
-        mGson = null;
+    public void onDetachedFromEngine(@NonNull final FlutterPluginBinding binding) {
+        onDetachedFromEngine();
     }
 
-    private void onAttachedToEngine(Context context, BinaryMessenger messenger) {
-        final String apiKey = AGConnectServicesConfig.fromContext(context).getString("client/api_key");
-        final String encodedApiKey = Uri.encode(apiKey);
-        mGson = new Gson();
-        mSearchService = SearchServiceFactory.create(context, encodedApiKey);
-        mMethodChannel = new MethodChannel(messenger, "com.huawei.hms.flutter.site/method");
-        mMethodCallHandler = new MethodCallHandlerImpl(mSearchService, mGson);
-        mMethodChannel.setMethodCallHandler(mMethodCallHandler);
+    @Override
+    public void onAttachedToActivity(@NonNull final ActivityPluginBinding binding) {
+        final Activity activity = binding.getActivity();
+        methodCallHandler = new ActivityAwareMethodCallHandlerImpl(activity, searchService,
+            getApiKey(activity.getApplicationContext()));
+        methodChannel.setMethodCallHandler(methodCallHandler);
+        binding.addActivityResultListener(methodCallHandler);
+    }
+
+    @Override
+    public void onDetachedFromActivityForConfigChanges() {
+        onDetachedFromActivity();
+    }
+
+    @Override
+    public void onReattachedToActivityForConfigChanges(@NonNull final ActivityPluginBinding binding) {
+        onAttachedToActivity(binding);
+    }
+
+    @Override
+    public void onDetachedFromActivity() {
+        methodChannel.setMethodCallHandler(null);
+        methodCallHandler = null;
     }
 }