Skip to content

Commit

Permalink
Migrate ios and android packages
Browse files Browse the repository at this point in the history
Changed method channel to "dev.fluttercommunity.arcgi_map_sdk"
  • Loading branch information
passsy committed Nov 18, 2023
1 parent 72a9166 commit 9c072bf
Show file tree
Hide file tree
Showing 64 changed files with 116 additions and 115 deletions.
2 changes: 1 addition & 1 deletion arcgis_map/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies:
(Android) In `<app>/android/app/proguard-rules.pro` add:

```
-keep class esri.arcgis.flutter_plugin.** { *; }
-keep class dev.fluttercommunity.arcgis_map_sdk.** { *; }
```
Expand Down
2 changes: 1 addition & 1 deletion arcgis_map/lib/src/arcgis_map.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import 'dart:async';
import 'dart:io';

import 'package:arcgis_map/src/arcgis_map_controller.dart';
import 'package:arcgis_map_ios/arcgis_map_ios.dart';
import 'package:arcgis_map_sdk_android/arcgis_map_sdk_android.dart';
import 'package:arcgis_map_sdk_ios/arcgis_map_sdk_ios.dart';
import 'package:arcgis_map_sdk_platform_interface/arcgis_map_sdk_platform_interface.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart';
Expand Down
4 changes: 2 additions & 2 deletions arcgis_map/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ environment:
flutter: ">=3.10.0"

dependencies:
arcgis_map_ios: ^0.7.5
arcgis_map_sdk_ios: ^0.7.5
arcgis_map_sdk_android: ^0.7.5
arcgis_map_sdk_platform_interface: ^1.0.0
arcgis_map_sdk_web: ^0.7.5
Expand All @@ -26,7 +26,7 @@ flutter:
android:
default_package: arcgis_map_sdk_android
ios:
default_package: arcgis_map_ios
default_package: arcgis_map_sdk_ios
web:
default_package: arcgis_map_sdk_web

Expand Down
4 changes: 2 additions & 2 deletions arcgis_map/pubspec_overrides.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
dependency_overrides:
arcgis_map_sdk_android:
path: ../arcgis_map_sdk_android
arcgis_map_ios:
path: ../arcgis_map_ios
arcgis_map_sdk_ios:
path: ../arcgis_map_sdk_ios
arcgis_map_sdk_method_channel:
path: ../arcgis_map_sdk_method_channel
arcgis_map_sdk_platform_interface:
Expand Down
1 change: 0 additions & 1 deletion arcgis_map_ios/lib/arcgis_map_ios.dart

This file was deleted.

2 changes: 1 addition & 1 deletion arcgis_map_sdk_android/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
group 'esri.arcgis.flutter_plugin'
group 'dev.fluttercommunity.arcgis_map_sdk_android'
version '1.0-SNAPSHOT'

buildscript {
Expand Down
2 changes: 1 addition & 1 deletion arcgis_map_sdk_android/android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rootProject.name = 'arcgis_map'
rootProject.name = 'arcgis_map_sdk_android'
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="esri.arcgis.flutter_plugin">
package="dev.fluttercommunity.arcgis_map_sdk_android">

<uses-permission android:name="android.permission.INTERNET" />
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package esri.arcgis.flutter_plugin
package dev.fluttercommunity.arcgis_map_sdk_android

import io.flutter.embedding.engine.plugins.FlutterPlugin

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package esri.arcgis.flutter_plugin
package dev.fluttercommunity.arcgis_map_sdk_android

import android.content.Context
import android.view.LayoutInflater
Expand All @@ -16,11 +16,11 @@ import com.esri.arcgisruntime.mapping.view.AnimationCurve
import com.esri.arcgisruntime.mapping.view.GraphicsOverlay
import com.esri.arcgisruntime.mapping.view.MapView
import com.google.gson.reflect.TypeToken
import esri.arcgis.flutter_plugin.model.AnimationOptions
import esri.arcgis.flutter_plugin.model.ArcgisMapOptions
import esri.arcgis.flutter_plugin.model.LatLng
import esri.arcgis.flutter_plugin.model.ViewPadding
import esri.arcgis.flutter_plugin.util.GraphicsParser
import dev.fluttercommunity.arcgis_map_sdk_android.model.AnimationOptions
import dev.fluttercommunity.arcgis_map_sdk_android.model.ArcgisMapOptions
import dev.fluttercommunity.arcgis_map_sdk_android.model.LatLng
import dev.fluttercommunity.arcgis_map_sdk_android.model.ViewPadding
import dev.fluttercommunity.arcgis_map_sdk_android.util.GraphicsParser
import io.flutter.plugin.common.BinaryMessenger
import io.flutter.plugin.common.EventChannel
import io.flutter.plugin.common.MethodCall
Expand Down Expand Up @@ -50,7 +50,7 @@ internal class ArcgisMapView(
private lateinit var zoomStreamHandler: ZoomStreamHandler
private lateinit var centerPositionStreamHandler: CenterPositionStreamHandler

private val methodChannel = MethodChannel(binaryMessenger, "esri.arcgis.flutter_plugin/$viewId")
private val methodChannel = MethodChannel(binaryMessenger, "dev.fluttercommunity.arcgis_map_sdk/$viewId")

override fun getView(): View = view

Expand Down Expand Up @@ -124,10 +124,10 @@ internal class ArcgisMapView(
zoomStreamHandler = ZoomStreamHandler()
centerPositionStreamHandler = CenterPositionStreamHandler()

EventChannel(binaryMessenger, "esri.arcgis.flutter_plugin/$viewId/zoom")
EventChannel(binaryMessenger, "dev.fluttercommunity.arcgis_map_sdk/$viewId/zoom")
.setStreamHandler(zoomStreamHandler)

EventChannel(binaryMessenger, "esri.arcgis.flutter_plugin/$viewId/centerPosition")
EventChannel(binaryMessenger, "dev.fluttercommunity.arcgis_map_sdk/$viewId/centerPosition")
.setStreamHandler(centerPositionStreamHandler)
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package esri.arcgis.flutter_plugin
package dev.fluttercommunity.arcgis_map_sdk_android

import android.content.Context
import esri.arcgis.flutter_plugin.model.ArcgisMapOptions
import dev.fluttercommunity.arcgis_map_sdk_android.model.ArcgisMapOptions
import io.flutter.embedding.engine.FlutterEngine
import io.flutter.plugin.common.BinaryMessenger
import io.flutter.plugin.common.StandardMessageCodec
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package esri.arcgis.flutter_plugin
package dev.fluttercommunity.arcgis_map_sdk_android

import esri.arcgis.flutter_plugin.model.LatLng
import dev.fluttercommunity.arcgis_map_sdk_android.model.LatLng
import io.flutter.plugin.common.EventChannel

class CenterPositionStreamHandler : EventChannel.StreamHandler {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package esri.arcgis.flutter_plugin
package dev.fluttercommunity.arcgis_map_sdk_android

import io.flutter.plugin.common.EventChannel

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package esri.arcgis.flutter_plugin.model
package dev.fluttercommunity.arcgis_map_sdk_android.model

import com.esri.arcgisruntime.mapping.view.AnimationCurve

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package esri.arcgis.flutter_plugin.model
package dev.fluttercommunity.arcgis_map_sdk_android.model

import com.esri.arcgisruntime.mapping.BasemapStyle

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package esri.arcgis.flutter_plugin.model
package dev.fluttercommunity.arcgis_map_sdk_android.model

import com.esri.arcgisruntime.geometry.Point
import com.esri.arcgisruntime.geometry.SpatialReferences
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package esri.arcgis.flutter_plugin.model
package dev.fluttercommunity.arcgis_map_sdk_android.model

import android.graphics.Color
import kotlin.math.roundToInt
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package esri.arcgis.flutter_plugin.model
package dev.fluttercommunity.arcgis_map_sdk_android.model

class ViewPadding(
val left: Double,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package esri.arcgis.flutter_plugin.model.symbol
package dev.fluttercommunity.arcgis_map_sdk_android.model.symbol

data class PictureMarkerSymbolPayload(
val url: String,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package dev.fluttercommunity.arcgis_map_sdk_android.model.symbol

import dev.fluttercommunity.arcgis_map_sdk_android.model.MapColor

data class SimpleFillSymbolPayload(
val fillColor: MapColor,
val outlineColor: MapColor,
val outlineWidth: Double,
)
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package esri.arcgis.flutter_plugin.model.symbol
package dev.fluttercommunity.arcgis_map_sdk_android.model.symbol

import com.esri.arcgisruntime.symbology.SimpleLineSymbol
import esri.arcgis.flutter_plugin.model.MapColor
import dev.fluttercommunity.arcgis_map_sdk_android.model.MapColor

data class SimpleLineSymbolPayload(
val color: MapColor?,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package esri.arcgis.flutter_plugin.model.symbol
package dev.fluttercommunity.arcgis_map_sdk_android.model.symbol

import esri.arcgis.flutter_plugin.model.MapColor
import dev.fluttercommunity.arcgis_map_sdk_android.model.MapColor

data class SimpleMarkerSymbolPayload(
val color: MapColor,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package esri.arcgis.flutter_plugin
package dev.fluttercommunity.arcgis_map_sdk_android

import com.esri.arcgisruntime.mapping.BasemapStyle
import com.esri.arcgisruntime.mapping.view.AnimationCurve
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package esri.arcgis.flutter_plugin.util
package dev.fluttercommunity.arcgis_map_sdk_android.util

import com.esri.arcgisruntime.geometry.PointCollection
import com.esri.arcgisruntime.geometry.Polygon
import com.esri.arcgisruntime.geometry.Polyline
import com.esri.arcgisruntime.mapping.view.Graphic
import com.esri.arcgisruntime.symbology.*
import esri.arcgis.flutter_plugin.model.LatLng
import esri.arcgis.flutter_plugin.model.symbol.PictureMarkerSymbolPayload
import esri.arcgis.flutter_plugin.model.symbol.SimpleFillSymbolPayload
import esri.arcgis.flutter_plugin.model.symbol.SimpleLineSymbolPayload
import esri.arcgis.flutter_plugin.model.symbol.SimpleMarkerSymbolPayload
import esri.arcgis.flutter_plugin.model.toAGSPoint
import esri.arcgis.flutter_plugin.parseToClass
import dev.fluttercommunity.arcgis_map_sdk_android.model.LatLng
import dev.fluttercommunity.arcgis_map_sdk_android.model.symbol.PictureMarkerSymbolPayload
import dev.fluttercommunity.arcgis_map_sdk_android.model.symbol.SimpleFillSymbolPayload
import dev.fluttercommunity.arcgis_map_sdk_android.model.symbol.SimpleLineSymbolPayload
import dev.fluttercommunity.arcgis_map_sdk_android.model.symbol.SimpleMarkerSymbolPayload
import dev.fluttercommunity.arcgis_map_sdk_android.model.toAGSPoint
import dev.fluttercommunity.arcgis_map_sdk_android.parseToClass

class GraphicsParser {

Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion arcgis_map_sdk_android/lib/arcgis_map_sdk_android.dart
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export 'src/android_arcgis_map_plugin.dart';
export 'src/arcgis_map_sdk_android_plugin.dart';
2 changes: 1 addition & 1 deletion arcgis_map_sdk_android/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ flutter:
implements: arcgis_map
platforms:
android:
package: esri.arcgis.flutter_plugin
package: dev.fluttercommunity.arcgis_map_sdk_android
pluginClass: ArcgisMapPlugin
dartPluginClass: AndroidArcgisMapPlugin
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#import "ArcgisMapPlugin.h"

#if __has_include(<arcgis_map_ios/arcgis_map_ios-Swift.h>)
#if __has_include(<arcgis_map_sdk_ios/arcgis_map_sdk_ios-Swift.h>)

#import <arcgis_map_ios/arcgis_map_ios-Swift.h>
#import <arcgis_map_sdk_ios/arcgis_map_sdk_ios-Swift.h>

#else
// Support project import fallback if the generated compatibility header
// is not copied when this plugin is created as a library.
// https://forums.swift.org/t/swift-static-libraries-dont-copy-generated-objective-c-header/19816
#import "arcgis_map_ios-Swift.h"
#import "arcgis_map_sdk_ios-Swift.h"
#endif

@implementation ArcgisMapPlugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@ class ArcgisMapView: NSObject, FlutterPlatformView {
binaryMessenger messenger: FlutterBinaryMessenger
) {
methodChannel = FlutterMethodChannel(
name: "esri.arcgis.flutter_plugin/\(viewId)",
name: "dev.fluttercommunity.arcgis_map_sdk/\(viewId)",
binaryMessenger: messenger
)
zoomEventChannel = FlutterEventChannel(
name: "esri.arcgis.flutter_plugin/\(viewId)/zoom",
name: "dev.fluttercommunity.arcgis_map_sdk/\(viewId)/zoom",
binaryMessenger: messenger
)
zoomEventChannel.setStreamHandler(zoomStreamHandler)
centerPositionEventChannel = FlutterEventChannel(
name: "esri.arcgis.flutter_plugin/\(viewId)/centerPosition",
name: "dev.fluttercommunity.arcgis_map_sdk/\(viewId)/centerPosition",
binaryMessenger: messenger
)
centerPositionEventChannel.setStreamHandler(centerPositionStreamHandler)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// CenterPositionStreamHandler.swift
// arcgis_map_ios
// arcgis_map_sdk_ios
//
// Created by Tarek Tolba on 06/02/2023.
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// GraphicsParser.swift
// arcgis_map_ios
// arcgis_map_sdk_ios
//
// Created by Julian Bissekkou on 09.12.22.
//
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// AnimationOptions.swift
// arcgis_map_ios
// arcgis_map_sdk_ios
//
// Created by Julian Bissekkou on 01.12.22.
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// ArcgisMapOptions.swift
// arcgis_map
// arcgis_map_sdk_ios
//
// Created by Julian Bissekkou on 10.10.22.
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// LatLng.swift
// arcgis_map
// arcgis_map_sdk_ios
//
// Created by Julian Bissekkou on 10.10.22.
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// ViewPadding.swift
// arcgis_map
// arcgis_map_sdk_ios
//
// Created by Julian Bissekkou on 10.10.22.
//
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public class SwiftArcgisMapPlugin: NSObject, FlutterPlugin {

let instance = SwiftArcgisMapPlugin()
let channel = FlutterMethodChannel(
name: "esri.arcgis.flutter_plugin",
name: "dev.fluttercommunity.arcgis_map_sdk",
binaryMessenger: registrar.messenger()
)
registrar.addMethodCallDelegate(instance, channel: channel)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// ZoomStreamHandler.swift
// arcgis_map_ios
// arcgis_map_sdk_ios
//
// Created by Julian Bissekkou on 30.11.22.
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#
# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html.
# Run `pod lib lint arcgis_map_ios.podspec` to validate before publishing.
# Run `pod lib lint arcgis_map_sdk_ios.podspec` to validate before publishing.
#
Pod::Spec.new do |s|
s.name = 'arcgis_map_ios'
s.name = 'arcgis_map_sdk_ios'
s.version = '0.0.1'
s.summary = 'A new Flutter project.'
s.description = <<-DESC
Expand Down
1 change: 1 addition & 0 deletions arcgis_map_sdk_ios/lib/arcgis_map_sdk_ios.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export 'src/arcgis_map_sdk_ios_plugin.dart';
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: arcgis_map_ios
name: arcgis_map_sdk_ios
description: Esri ArcGIS Flutter iOS implementation.
version: 0.7.6
repository: https://github.com/fluttercommunity/arcgis_map
Expand Down
File renamed without changes.
Loading

0 comments on commit 9c072bf

Please sign in to comment.