Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/on_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
- uses: subosito/flutter-action@v2
with:
channel: 'stable'
- run: ./am deps
- run: ./am format --verify

test:
Expand Down
2 changes: 2 additions & 0 deletions am_sidekick/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ build/

# Directory created by dartdoc
doc/api/
# Lock dependencies for deterministic builds on all systems
!pubspec.lock
58 changes: 33 additions & 25 deletions am_sidekick/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ packages:
dependency: transitive
description:
name: archive
sha256: "7b875fd4a20b165a3084bd2d210439b22ebc653f21cea4842729c0c30c82596b"
sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
url: "https://pub.dev"
source: hosted
version: "3.4.9"
version: "3.6.1"
args:
dependency: transitive
description:
Expand Down Expand Up @@ -53,10 +53,10 @@ packages:
dependency: transitive
description:
name: boolean_selector
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
url: "https://pub.dev"
source: hosted
version: "2.1.1"
version: "2.1.2"
characters:
dependency: transitive
description:
Expand Down Expand Up @@ -109,10 +109,10 @@ packages:
dependency: transitive
description:
name: cli_util
sha256: b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7
sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19
url: "https://pub.dev"
source: hosted
version: "0.4.0"
version: "0.4.1"
clock:
dependency: transitive
description:
Expand Down Expand Up @@ -261,10 +261,10 @@ packages:
dependency: transitive
description:
name: http_multi_server
sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8
url: "https://pub.dev"
source: hosted
version: "3.2.1"
version: "3.2.2"
http_parser:
dependency: transitive
description:
Expand Down Expand Up @@ -325,10 +325,10 @@ packages:
dependency: "direct dev"
description:
name: lint
sha256: "77b3777e8e9adca8e942da1e835882ae3248dfa00488a2ebbdbc1f1a4aa3f4a7"
sha256: d758a5211fce7fd3f5e316f804daefecdc34c7e53559716125e6da7388ae8565
url: "https://pub.dev"
source: hosted
version: "2.2.0"
version: "2.3.0"
logging:
dependency: transitive
description:
Expand Down Expand Up @@ -365,10 +365,10 @@ packages:
dependency: transitive
description:
name: mime
sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e
sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a"
url: "https://pub.dev"
source: hosted
version: "1.0.4"
version: "1.0.6"
node_preamble:
dependency: transitive
description:
Expand All @@ -389,18 +389,18 @@ packages:
dependency: transitive
description:
name: path
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev"
source: hosted
version: "1.8.3"
version: "1.9.0"
pointycastle:
dependency: transitive
description:
name: pointycastle
sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c"
sha256: "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe"
url: "https://pub.dev"
source: hosted
version: "3.7.3"
version: "3.9.1"
pool:
dependency: transitive
description:
Expand Down Expand Up @@ -453,10 +453,10 @@ packages:
dependency: transitive
description:
name: quiver
sha256: b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47
sha256: ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2
url: "https://pub.dev"
source: hosted
version: "3.2.1"
version: "3.2.2"
random_string:
dependency: transitive
description:
Expand Down Expand Up @@ -525,10 +525,10 @@ packages:
dependency: "direct main"
description:
name: sidekick_core
sha256: "323611a8527b7094ffc4691d6a288de1d187dd017e18e62db7a6165fcc36db77"
sha256: "3b08ee513dbcd7b97b2813ab24aee0e8f37d77b7548d4e72332420e67ab252dc"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.1.3"
source_map_stack_trace:
dependency: transitive
description:
Expand Down Expand Up @@ -669,18 +669,26 @@ packages:
dependency: transitive
description:
name: watcher
sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104"
url: "https://pub.dev"
source: hosted
version: "1.1.1"
web:
dependency: transitive
description:
name: web
sha256: "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05"
url: "https://pub.dev"
source: hosted
version: "1.1.0"
version: "0.4.2"
web_socket_channel:
dependency: transitive
description:
name: web_socket_channel
sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b
sha256: "939ab60734a4f8fa95feacb55804fa278de28bdeef38e616dc08e44a84adea23"
url: "https://pub.dev"
source: hosted
version: "2.4.0"
version: "2.4.3"
webkit_inspection_protocol:
dependency: transitive
description:
Expand Down Expand Up @@ -714,4 +722,4 @@ packages:
source: hosted
version: "2.1.1"
sdks:
dart: ">=3.2.0 <3.999.0"
dart: ">=3.2.6 <3.999.0"
6 changes: 3 additions & 3 deletions am_sidekick/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ version: 0.0.1
publish_to: none

environment:
sdk: ">=3.2.0 <4.0.0"
sdk: ">=3.2.6 <4.0.0"

executables:
main:

dependencies:
dcli: ^2.2.3
sidekick_core: ^2.1.0
sidekick_core: ^2.1.3
yaml_edit: ^2.0.3

dev_dependencies:
lint: ^2.0.1

# generated code, do not edit this manually
sidekick:
cli_version: 2.1.0
cli_version: 2.1.3
3 changes: 0 additions & 3 deletions arcgis_map_sdk/lib/arcgis_map_sdk.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// ignore: unnecessary_library_directive
library arcgis_map;

export 'package:arcgis_map_sdk/src/arcgis_location_display.dart';
export 'package:arcgis_map_sdk/src/arcgis_map_controller.dart';
export 'package:arcgis_map_sdk/src/arcgis_map_sdk.dart';
Expand Down
8 changes: 4 additions & 4 deletions arcgis_map_sdk/lib/src/arcgis_map_controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class ArcgisMapController {
void Function(dynamic)? onPressed,
String? url,
void Function(double)? getZoom,
}) async {
}) {
return ArcgisMapPlatform.instance.addFeatureLayer(
options,
data,
Expand All @@ -62,7 +62,7 @@ class ArcgisMapController {
required String layerId,
required GraphicsLayerOptions options,
void Function(dynamic)? onPressed,
}) async {
}) {
return ArcgisMapPlatform.instance.addGraphicsLayer(
options,
mapId,
Expand All @@ -75,7 +75,7 @@ class ArcgisMapController {
required String layerId,
required String url,
required SceneLayerOptions options,
}) async {
}) {
return ArcgisMapPlatform.instance.addSceneLayer(
options: options,
layerId: layerId,
Expand Down Expand Up @@ -300,7 +300,7 @@ class ArcgisMapController {
ArcgisMapPlatform.instance.addViewPadding(mapId, padding);
}

Future<void> toggleBaseMap({required BaseMap baseMap}) async {
Future<void> toggleBaseMap({required BaseMap baseMap}) {
return ArcgisMapPlatform.instance.toggleBaseMap(mapId, baseMap);
}

Expand Down
6 changes: 3 additions & 3 deletions arcgis_map_sdk/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ maintainer: Matthaios Saitakis (@MatthaiosSait), Stefan Schaller (@stefanschalle
Pascal Welsch (@passsy), Max Peters (@maxpeters)

environment:
sdk: ">=3.0.0 <4.0.0"
flutter: ">=3.10.0"
sdk: ">=3.2.0 <4.0.0"
flutter: ">=3.16.0"

dependencies:
arcgis_map_sdk_android: ^0.8.0
Expand All @@ -18,7 +18,7 @@ dependencies:
sdk: flutter

dev_dependencies:
lint: ^2.0.0
lint: ^2.8.0

flutter:
plugin:
Expand Down
6 changes: 3 additions & 3 deletions arcgis_map_sdk_android/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ repository: https://github.com/fluttercommunity/arcgis_map_sdk
maintainer: Stefan Schaller (@stefanschaller), Julian Bissekkou (@JulianBissekkou)

environment:
sdk: ">=3.0.0 <4.0.0"
flutter: ">=3.10.0"
sdk: ">=3.2.0 <4.0.0"
flutter: ">=3.16.0"

dependencies:
arcgis_map_sdk_method_channel: ^0.8.0
Expand All @@ -16,7 +16,7 @@ dependencies:
sdk: flutter

dev_dependencies:
lint: ^2.0.0
lint: ^2.8.0

flutter:
plugin:
Expand Down
6 changes: 3 additions & 3 deletions arcgis_map_sdk_ios/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ repository: https://github.com/fluttercommunity/arcgis_map_sdk
maintainer: Stefan Schaller (@stefanschaller), Julian Bissekkou (@JulianBissekkou)

environment:
sdk: ">=3.0.0 <4.0.0"
flutter: ">=3.10.0"
sdk: ">=3.2.0 <4.0.0"
flutter: ">=3.16.0"

dependencies:
arcgis_map_sdk_method_channel: ^0.8.0
Expand All @@ -16,7 +16,7 @@ dependencies:
sdk: flutter

dev_dependencies:
lint: ^2.0.0
lint: ^2.8.0

flutter:
plugin:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class MethodChannelArcgisMapPlugin extends ArcgisMapPlatform {
int mapId,
void Function(double)? getZoom,
String layerId,
) async {
) {
throw UnimplementedError('addFeatureLayer() has not been implemented.');
}

Expand All @@ -43,7 +43,8 @@ class MethodChannelArcgisMapPlugin extends ArcgisMapPlatform {

@override
Future<void> setAutoPanMode(String autoPanMode, int mapId) {
return _methodChannelBuilder(mapId).invokeMethod("set_auto_pan_mode", autoPanMode);
return _methodChannelBuilder(mapId)
.invokeMethod("set_auto_pan_mode", autoPanMode);
}

@override
Expand Down Expand Up @@ -121,7 +122,7 @@ class MethodChannelArcgisMapPlugin extends ArcgisMapPlatform {
required int mapId,
required String featureLayerId,
required List<Graphic> data,
}) async {
}) {
throw UnimplementedError('addFeatureLayer() has not been implemented.');
}

Expand Down Expand Up @@ -165,7 +166,7 @@ class MethodChannelArcgisMapPlugin extends ArcgisMapPlatform {
AnimationOptions? animationOptions,
int? threeDHeading,
int? threeDTilt,
}) async {
}) {
return _methodChannelBuilder(mapId).invokeMethod<bool>(
"move_camera",
{
Expand Down Expand Up @@ -196,7 +197,7 @@ class MethodChannelArcgisMapPlugin extends ArcgisMapPlatform {
required int lodFactor,
required int mapId,
AnimationOptions? animationOptions,
}) async {
}) {
return _methodChannelBuilder(mapId).invokeMethod<bool>(
"zoom_in",
{"lodFactor": lodFactor},
Expand All @@ -208,15 +209,15 @@ class MethodChannelArcgisMapPlugin extends ArcgisMapPlatform {
required int lodFactor,
required int mapId,
AnimationOptions? animationOptions,
}) async {
}) {
return _methodChannelBuilder(mapId).invokeMethod<bool>(
"zoom_out",
{"lodFactor": lodFactor},
).then((value) => value!);
}

@override
Future<void> retryLoad(int mapId) async {
Future<void> retryLoad(int mapId) {
return _methodChannelBuilder(mapId).invokeMethod("retryLoad");
}

Expand Down
10 changes: 5 additions & 5 deletions arcgis_map_sdk_method_channel/lib/src/model_extension.dart
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ extension on MeshSymbol3D {
{
'type': 'fill',
'material': {
'color': [color.red, color.green, color.blue, colorOpacity],
'color': [color.r, color.g, color.b, colorOpacity],
},
},
],
Expand Down Expand Up @@ -174,10 +174,10 @@ Map<String, Object?>? _colorToJson(Color? color) {
if (color == null) return null;

return {
'red': color.red,
'green': color.green,
'blue': color.blue,
'opacity': color.opacity,
'red': (color.r * 255).round(),
'green': (color.g * 255).round(),
'blue': (color.b * 255).round(),
'opacity': color.a,
};
}

Expand Down
Loading