Renamed project from 'flutter_geolocator' to 'geolocator'

README.md

@@ -1,4 +1,4 @@
-# [WIP] Flutter Geolocator Plugin
+# Flutter Geolocator Plugin
 
 A Flutter plugin which provides easy access to the platform specific location services ([FusedLocationProviderClient](https://developers.google.com/android/reference/com/google/android/gms/location/FusedLocationProviderClient) on Android and [CLLocationManager](https://developer.apple.com/documentation/corelocation/cllocationmanager) on iOS). 
 
@@ -17,7 +17,7 @@ To use this plugin, add `flutter_geolocator` as a [dependency in your pubspec.ya
 
 On Android you'll need to add the `ACCESS_COARSE_LOCATION` and `ACCESS_FINE_LOCATION` permissions to your Android Manifest. Todo so open the AndroidManifest.xml file and add the following two lines as direct children of the `<manifest>` tag:
 
-```
+``` xml
 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 ```
@@ -26,14 +26,14 @@ On Android you'll need to add the `ACCESS_COARSE_LOCATION` and `ACCESS_FINE_LOCA
 
 On iOS you'll need to add the `NSLocationWhenInUseUsageDescription` to your Info.plist file in order to access the device's location. Simply open your Info.plist file and add the following:
 
-```
+``` xml
 <key>NSLocationWhenInUseUsageDescription</key>
 <string>This app needs access to location when open.</string>
 ```
 
 If you would like to access the device's location when your App is running in the background, you should also add the `NSLocationAlwaysAndWhenInUseUsageDescription` (if your App support iOS 10 or earlier you should also add the key `NSLocationAlwaysUsageDescription`) key to your Info.plist file:
 
-```
+``` xml
 <key>NSLocationAlwaysUsageDescription</key>
 <string>This app needs access to location when in the background.</string>
 <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>

android/.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

android/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>flutter_geolocator</name>
+	<comment>Project geolocator created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

android/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,2 @@
+connection.project.dir=
+eclipse.preferences.version=1

android/build.gradle

@@ -1,4 +1,4 @@
-group 'com.baseflow.fluttergeolocator'
+group 'com.baseflow.flutter'
 version '1.0-SNAPSHOT'
 
 buildscript {

android/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.baseflow.fluttergeolocator">
+  package="com.baseflow.flutter">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

android/src/main/java/com/baseflow/fluttergeolocator/FlutterGeolocatorPlugin.java → android/src/main/java/com/baseflow/flutter/GeolocatorPlugin.java

@@ -1,4 +1,4 @@
-package com.baseflow.fluttergeolocator;
+package com.baseflow.flutter;
 
 import android.Manifest;
 import android.content.IntentSender;
@@ -34,9 +34,9 @@
 import java.util.Map;
 
 /**
- * FlutterGeolocatorPlugin
+ * GeolocatorPlugin
  */
-public class FlutterGeolocatorPlugin implements MethodCallHandler, EventChannel.StreamHandler {
+public class GeolocatorPlugin implements MethodCallHandler, EventChannel.StreamHandler {
 
   private static final String LOG_TAG = "baseflow.com/geolocator";
   private static final String METHOD_CHANNEL_NAME = "flutter.baseflow.com/geolocator/methods";
@@ -55,7 +55,7 @@ public class FlutterGeolocatorPlugin implements MethodCallHandler, EventChannel.
   private EventChannel.EventSink mEventSink;
   private Result mResult;
 
-  private FlutterGeolocatorPlugin(PluginRegistry.Registrar registrar){
+  private GeolocatorPlugin(PluginRegistry.Registrar registrar){
     this.mRegistrar = registrar;
 
     mFusedLocationClient = LocationServices.getFusedLocationProviderClient(mRegistrar.activity());
@@ -76,7 +76,7 @@ private FlutterGeolocatorPlugin(PluginRegistry.Registrar registrar){
    * Plugin registration.
    */
   public static void registerWith(Registrar registrar) {
-    FlutterGeolocatorPlugin geolocatorPlugin = new FlutterGeolocatorPlugin(registrar);
+    GeolocatorPlugin geolocatorPlugin = new GeolocatorPlugin(registrar);
 
     final MethodChannel methodChannel = new MethodChannel(registrar.messenger(), METHOD_CHANNEL_NAME);
     final EventChannel eventChannel = new EventChannel(registrar.messenger(), EVENT_CHANNEL_NAME);

android/src/main/java/com/baseflow/fluttergeolocator/LocationMapper.java → android/src/main/java/com/baseflow/flutter/LocationMapper.java

@@ -1,4 +1,4 @@
-package com.baseflow.fluttergeolocator;
+package com.baseflow.flutter;
 
 import android.location.Location;
 import android.os.Build;

example/android/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>android</name>
+	<comment>Project android created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

example/android/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,2 @@
+connection.project.dir=
+eclipse.preferences.version=1

example/android/app/.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>

example/android/app/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>app</name>
+	<comment>Project app created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

example/android/app/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,2 @@
+connection.project.dir=..
+eclipse.preferences.version=1

example/ios/Runner.xcodeproj/project.pbxproj

@@ -273,12 +273,12 @@
 			inputPaths = (
 				"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
 				"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
-				"${BUILT_PRODUCTS_DIR}/flutter_geolocator/flutter_geolocator.framework",
+				"${BUILT_PRODUCTS_DIR}/geolocator/geolocator.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_geolocator.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/geolocator.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;

example/lib/main.dart

@@ -2,8 +2,8 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_geolocator/flutter_geolocator.dart';
-import 'package:flutter_geolocator/models/position.dart';
+import 'package:geolocator/geolocator.dart';
+import 'package:geolocator/models/position.dart';
 
 void main() => runApp(new MyApp());
 
@@ -13,7 +13,7 @@ class MyApp extends StatefulWidget {
 }
 
 class _MyAppState extends State<MyApp> {
-  FlutterGeolocator _geolocator = new FlutterGeolocator();
+  Geolocator _geolocator = new Geolocator();
   Position _position;
   StreamSubscription<Position> _positionSubscription;
 

example/pubspec.yaml

@@ -1,5 +1,5 @@
-name: flutter_geolocator_example
-description: Demonstrates how to use the flutter_geolocator plugin.
+name: geolocator_example
+description: Demonstrates how to use the geolocator plugin.
 
 dependencies:
   flutter:
@@ -13,7 +13,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
 
-  flutter_geolocator:
+  geolocator:
     path: ../
 
 # For information on the generic Dart part of this file, see the

example/test/widget_test.dart

@@ -7,7 +7,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'package:flutter_geolocator_example/main.dart';
+import 'package:geolocator_example/main.dart';
 
 void main() {
   testWidgets('Verify Platform version', (WidgetTester tester) async {

geolocator.code-workspace

@@ -0,0 +1,11 @@
+{
+	"folders": [
+		{
+			"path": "example"
+		},
+		{
+			"path": "."
+		}
+	],
+	"settings": {}
+}

ios/Classes/GeolocatorPlugin.h

@@ -0,0 +1,4 @@
+#import <Flutter/Flutter.h>
+
+@interface GeolocatorPlugin : NSObject<FlutterPlugin>
+@end

ios/Classes/GeolocatorPlugin.m

@@ -0,0 +1,8 @@
+#import "GeolocatorPlugin.h"
+#import <geolocator/geolocator-Swift.h>
+
+@implementation GeolocatorPlugin
++ (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
+  [SwiftGeolocatorPlugin registerWithRegistrar:registrar];
+}
+@end

ios/Classes/SwiftFlutterGeolocatorPlugin.swift → ios/Classes/SwiftGeolocatorPlugin.swift

@@ -2,7 +2,7 @@ import Flutter
 import UIKit
 import CoreLocation
 
-public class SwiftFlutterGeolocatorPlugin: NSObject, FlutterStreamHandler, FlutterPlugin, CLLocationManagerDelegate {
+public class SwiftGeolocatorPlugin: NSObject, FlutterStreamHandler, FlutterPlugin, CLLocationManagerDelegate {
     private static let METHOD_CHANNEL_NAME = "flutter.baseflow.com/geolocator/methods"
     private static let EVENT_CHANNEL_NAME = "flutter.baseflow.com/geolocator/events"
 
@@ -13,7 +13,7 @@ public class SwiftFlutterGeolocatorPlugin: NSObject, FlutterStreamHandler, Flutt
     public static func register(with registrar: FlutterPluginRegistrar) {
         let methodChannel = FlutterMethodChannel(name: METHOD_CHANNEL_NAME, binaryMessenger: registrar.messenger())
         let eventsChannel = FlutterEventChannel(name: EVENT_CHANNEL_NAME, binaryMessenger: registrar.messenger())
-        let instance = SwiftFlutterGeolocatorPlugin()
+        let instance = SwiftGeolocatorPlugin()
 
         registrar.addMethodCallDelegate(instance, channel: methodChannel)
         eventsChannel.setStreamHandler(instance)

ios/flutter_geolocator.podspec → ios/geolocator.podspec

@@ -2,15 +2,15 @@
 # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
 #
 Pod::Spec.new do |s|
-  s.name             = 'flutter_geolocator'
+  s.name             = 'geolocator'
   s.version          = '0.0.1'
-  s.summary          = 'Geolocation plugin for Flutter (based on the excellent Geolocator plugin for Xamarin by James Montemagno)'
+  s.summary          = 'Geolocation plugin for Flutter'
   s.description      = <<-DESC
-Geolocation plugin for Flutter (based on the excellent Geolocator plugin for Xamarin by James Montemagno)
+Geolocation plugin for Flutter
                        DESC
-  s.homepage         = 'http://example.com'
+  s.homepage         = 'http://github.com/BaseflowIT/flutter-geolocator'
   s.license          = { :file => '../LICENSE' }
-  s.author           = { 'Your Company' => 'email@example.com' }
+  s.author           = { 'Baseflow' => 'hello@baseflow.com' }
   s.source           = { :path => '.' }
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'

lib/flutter_geolocator.dart → lib/geolocator.dart

@@ -5,22 +5,22 @@ import 'package:meta/meta.dart';
 import 'models/position.dart';
 
 /// Provides easy access to the platform specific location services (CLLocationManager on iOS and FusedLocationProviderClient on Android)
-class FlutterGeolocator {
-  factory FlutterGeolocator() {
+class Geolocator {
+  factory Geolocator() {
     if (_instance == null) {
       final MethodChannel methodChannel =
           const MethodChannel('flutter.baseflow.com/geolocator/methods');
       final EventChannel eventChannel =
           const EventChannel('flutter.baseflow.com/geolocator/events');
-      _instance = new FlutterGeolocator.private(methodChannel, eventChannel);
+      _instance = new Geolocator.private(methodChannel, eventChannel);
     }
     return _instance;
   }
 
   @visibleForTesting
-  FlutterGeolocator.private(this._methodChannel, this._eventChannel);
+  Geolocator.private(this._methodChannel, this._eventChannel);
 
-  static FlutterGeolocator _instance;
+  static Geolocator _instance;
 
   final MethodChannel _methodChannel;
   final EventChannel _eventChannel;

pubspec.yaml

@@ -1,5 +1,5 @@
-name: flutter_geolocator
-description: Geolocation plugin for Flutter (based on the excellent Geolocator plugin for Xamarin by James Montemagno)
+name: geolocator
+description: Geolocation plugin for Flutter
 version: 0.0.1
 author: Baseflow
 homepage: https://baseflow.com
@@ -19,8 +19,8 @@ dev_dependencies:
 # The following section is specific to Flutter.
 flutter:
   plugin:
-    androidPackage: com.baseflow.fluttergeolocator
-    pluginClass: FlutterGeolocatorPlugin
+    androidPackage: com.baseflow.flutter
+    pluginClass: GeolocatorPlugin
 
   # To add assets to your plugin package, add an assets section, like this:
   # assets:

test/geolocator_test.dart

@@ -3,14 +3,14 @@ import 'dart:async';
 import 'package:async/async.dart';
 import 'package:flutter/services.dart';
 import 'package:mockito/mockito.dart';
-import 'package:flutter_geolocator/flutter_geolocator.dart';
-import 'package:flutter_geolocator/models/position.dart';
+import 'package:geolocator/geolocator.dart';
+import 'package:geolocator/models/position.dart';
 import 'package:test/test.dart';
 
 void main() {
   MockMethodChannel _methodChannel;
   MockEventChannel _eventChannel;
-  FlutterGeolocator _geolocator;
+  Geolocator _geolocator;
 
   const Map<String, double> _mockPosition = const <String, double> {
     'latitude' : 52.561270, 
@@ -73,7 +73,7 @@ void main() {
   setUp(() {
     _methodChannel = new MockMethodChannel();
     _eventChannel = new MockEventChannel();
-    _geolocator = new FlutterGeolocator.private(_methodChannel, _eventChannel);
+    _geolocator = new Geolocator.private(_methodChannel, _eventChannel);
   });
 
   test('Retrieve the current position', () async {

test/position_test.dart

@@ -1,4 +1,4 @@
-import 'package:flutter_geolocator/models/position.dart';
+import 'package:geolocator/models/position.dart';
 import 'package:test/test.dart';
 
 void main() {