Version 2.0.0

Author: mvanbeusekom

.metadata

@@ -0,0 +1,10 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: 035e0765cc575c3b455689c2402cce073d564fce
+  channel: master
+
+project_type: plugin

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.0.0
+* Move from swift to Objective-C and from Kotlin to Java
+
 ## 1.0.6
 
 * Fixes a small issue caused by compiling against master build of Flutter.

android/build.gradle

@@ -2,15 +2,13 @@ group 'com.baseflow.googleapiavailability'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.3.0'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.android.tools.build:gradle:3.3.1'
     }
 }
 
@@ -22,17 +20,13 @@ rootProject.allprojects {
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 28
 
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
@@ -41,6 +35,5 @@ android {
 
 dependencies {
     api 'com.google.android.gms:play-services-location:16.0.0'
-    implementation 'com.google.code.gson:gson:2.8.5'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
+    implementation 'androidx.annotation:annotation:1.0.1'
+}

android/src/main/java/com/baseflow/googleapiavailability/GoogleApiAvailabilityPlugin.java

@@ -0,0 +1,96 @@
+package com.baseflow.googleapiavailability;
+
+import android.app.Activity;
+
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.GoogleApiAvailability;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import androidx.annotation.IntDef;
+import io.flutter.plugin.common.MethodCall;
+import io.flutter.plugin.common.MethodChannel;
+import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
+import io.flutter.plugin.common.MethodChannel.Result;
+import io.flutter.plugin.common.PluginRegistry.Registrar;
+
+/**
+ * GoogleApiAvailabilityPlugin
+ */
+public class GoogleApiAvailabilityPlugin implements MethodCallHandler {
+  private static final int REQUEST_GOOGLE_PLAY_SERVICES = 1000;
+
+  //GOOGLE_PLAY_SERVICES_AVAILABILITY
+  private static final int GOOGLE_PLAY_SERVICES_AVAILABILITY_SUCCESS = 0;
+  private static final int GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_MISSING = 1;
+  private static final int GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_UPDATING = 2;
+  private static final int GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_VERSION_UPDATE_REQUIRED = 3;
+  private static final int GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_DISABLED = 4;
+  private static final int GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_INVALID = 5;
+  private static final int GOOGLE_PLAY_SERVICES_AVAILABILITY_NOT_AVAILABLE_ON_PLATFORM = 6;
+  private static final int GOOGLE_PLAY_SERVICES_AVAILABILITY_UNKNOWN = 7;
+
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({
+      GOOGLE_PLAY_SERVICES_AVAILABILITY_SUCCESS,
+      GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_MISSING,
+      GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_UPDATING,
+      GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_VERSION_UPDATE_REQUIRED,
+      GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_DISABLED,
+      GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_INVALID,
+      GOOGLE_PLAY_SERVICES_AVAILABILITY_NOT_AVAILABLE_ON_PLATFORM,
+      GOOGLE_PLAY_SERVICES_AVAILABILITY_UNKNOWN,
+  })
+  private @interface GooglePlayServicesAvailability {
+  }
+
+  public static void registerWith(Registrar registrar) {
+    final MethodChannel channel = new MethodChannel(registrar.messenger(), "flutter.baseflow.com/google_api_availability/methods");
+    channel.setMethodCallHandler(new GoogleApiAvailabilityPlugin(registrar.activity()));
+  }
+
+  private final Activity activity;
+
+  private GoogleApiAvailabilityPlugin(Activity activity) {
+    this.activity = activity;
+  }
+
+  @Override
+  public void onMethodCall(MethodCall call, Result result) {
+    if (call.method.equals("checkPlayServicesAvailability")) {
+      final Boolean showDialog = call.argument("showDialog");
+      GoogleApiAvailability googleApiAvailability = GoogleApiAvailability.getInstance();
+      final int connectionResult = googleApiAvailability.isGooglePlayServicesAvailable(activity);
+
+      if (showDialog != null && showDialog) {
+        googleApiAvailability.showErrorDialogFragment(activity, connectionResult, REQUEST_GOOGLE_PLAY_SERVICES);
+      }
+
+      final int availability = toPlayServiceAvailability(connectionResult);
+      result.success(availability);
+    } else {
+      result.notImplemented();
+    }
+  }
+
+  @GooglePlayServicesAvailability
+  private int toPlayServiceAvailability(int connectionResult) {
+    switch (connectionResult) {
+      case ConnectionResult.SUCCESS:
+        return GOOGLE_PLAY_SERVICES_AVAILABILITY_SUCCESS;
+      case ConnectionResult.SERVICE_MISSING:
+        return GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_MISSING;
+      case ConnectionResult.SERVICE_UPDATING:
+        return GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_UPDATING;
+      case ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED:
+        return GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_VERSION_UPDATE_REQUIRED;
+      case ConnectionResult.SERVICE_DISABLED:
+        return GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_DISABLED;
+      case ConnectionResult.SERVICE_INVALID:
+        return GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_INVALID;
+      default:
+        return GOOGLE_PLAY_SERVICES_AVAILABILITY_UNKNOWN;
+    }
+  }
+}

android/src/main/kotlin/com/baseflow/googleapiavailability/GoogleApiAvailabilityPlugin.kt

@@ -1,9 +1,70 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
 .DS_Store
-.dart_tool/
+.atom/
+.buildlog/
+.history
+.svn/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
 
+# Visual Studio Code related
+.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+.dart_tool/
+.flutter-plugins
 .packages
+.pub-cache/
 .pub/
+/build/
 
-build/
+# Android related
+**/android/**/gradle-wrapper.jar
+**/android/.gradle
+**/android/captures/
+**/android/gradlew
+**/android/gradlew.bat
+**/android/local.properties
+**/android/**/GeneratedPluginRegistrant.java
 
-.flutter-plugins
+# iOS/XCode related
+**/ios/**/*.mode1v3
+**/ios/**/*.mode2v3
+**/ios/**/*.moved-aside
+**/ios/**/*.pbxuser
+**/ios/**/*.perspectivev3
+**/ios/**/*sync/
+**/ios/**/.sconsign.dblite
+**/ios/**/.tags*
+**/ios/**/.vagrant/
+**/ios/**/DerivedData/
+**/ios/**/Icon?
+**/ios/**/Pods/
+**/ios/**/.symlinks/
+**/ios/**/profile
+**/ios/**/xcuserdata
+**/ios/.generated/
+**/ios/Flutter/App.framework
+**/ios/Flutter/Flutter.framework
+**/ios/Flutter/Generated.xcconfig
+**/ios/Flutter/app.flx
+**/ios/Flutter/app.zip
+**/ios/Flutter/flutter_assets/
+**/ios/ServiceDefinitions.json
+**/ios/Runner/GeneratedPluginRegistrant.*
+
+# Exceptions to above rules.
+!**/ios/**/default.mode1v3
+!**/ios/**/default.mode2v3
+!**/ios/**/default.pbxuser
+!**/ios/**/default.perspectivev3
+!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages

android/src/main/kotlin/com/baseflow/googleapiavailability/data/PlayServicesAvailability.kt

@@ -4,5 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: 9299c02cf708497d6f72edda8efae0bb8340660e
-  channel: beta
+  revision: 035e0765cc575c3b455689c2402cce073d564fce
+  channel: master
+
+project_type: app

android/src/main/kotlin/com/baseflow/googleapiavailability/utils/Codec.kt

@@ -4,5 +4,13 @@ Demonstrates how to use the google_api_availability plugin.
 
 ## Getting Started
 
-For help getting started with Flutter, view our online
-[documentation](https://flutter.io/).
+This project is a starting point for a Flutter application.
+
+A few resources to get you started if this is your first Flutter project:
+
+- [Lab: Write your first Flutter app](https://flutter.io/docs/get-started/codelab)
+- [Cookbook: Useful Flutter samples](https://flutter.io/docs/cookbook)
+
+For help getting started with Flutter, view our 
+[online documentation](https://flutter.io/docs), which offers tutorials, 
+samples, guidance on mobile development, and a full API reference.