Skip to content

Commit

Permalink
Rename arcgis_map_web 100%
Browse files Browse the repository at this point in the history
  • Loading branch information
MatthaiosSait committed Nov 17, 2023
1 parent 8584ec3 commit 749d6e0
Show file tree
Hide file tree
Showing 23 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion am_sidekick/lib/src/arcgis_map_project.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class ArcgisMapProject {
)!;

DartPackage get arcgisMapWeb =>
DartPackage.fromDirectory(root.directory('arcgis_map_web'))!;
DartPackage.fromDirectory(root.directory('arcgis_map_sdk_web'))!;

DartPackage get arcgisMapAndroid =>
DartPackage.fromDirectory(root.directory('arcgis_map_android'))!;
Expand Down
2 changes: 1 addition & 1 deletion am_sidekick/lib/src/commands/generate_arcgis_webpack.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class GenerateArcgisWebpack extends Command {
Future<void> run() async {
final root = afProject.root;
final arcgisWebpackPath = root.directory('arcgis_webpack').path;
final arcgisMapWebPath = root.directory('arcgis_map_web').path;
final arcgisMapWebPath = root.directory('arcgis_map_sdk_web').path;
print('Root path: $arcgisWebpackPath');

/// Check if NPM is installed
Expand Down
4 changes: 2 additions & 2 deletions arcgis_map/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
arcgis_map_android: ^0.7.5
arcgis_map_ios: ^0.7.5
arcgis_map_sdk_platform_interface: ^1.0.0
arcgis_map_web: ^0.7.5
arcgis_map_sdk_web: ^0.7.5
flutter:
sdk: flutter

Expand All @@ -28,7 +28,7 @@ flutter:
ios:
default_package: arcgis_map_ios
web:
default_package: arcgis_map_web
default_package: arcgis_map_sdk_web

topics:
- map
Expand Down
4 changes: 2 additions & 2 deletions arcgis_map/pubspec_overrides.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ dependency_overrides:
path: ../arcgis_map_sdk_method_channel
arcgis_map_sdk_platform_interface:
path: ../arcgis_map_sdk_platform_interface
arcgis_map_web:
path: ../arcgis_map_web
arcgis_map_sdk_web:
path: ../arcgis_map_sdk_web
4 changes: 2 additions & 2 deletions arcgis_map_sdk_web/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ArcgisMap for Web

[![Flutter Community: arcgis_map_web](https://fluttercommunity.dev/_github/header/arcgis_map_web)](https://github.com/fluttercommunity/community)
[![Flutter Community: arcgis_map_sdk_web](https://fluttercommunity.dev/_github/header/arcgis_map_sdk_web)](https://github.com/fluttercommunity/community)

[![pub package](https://img.shields.io/pub/v/arcgis_map_web.svg)](https://pub.dev/packages/arcgis_map_web)
[![pub package](https://img.shields.io/pub/v/arcgis_map_sdk_web.svg)](https://pub.dev/packages/arcgis_map_sdk_web)

Web implementation of [`arcgis_map`](https://pub.dev/packages/arcgis_map).
4 changes: 2 additions & 2 deletions arcgis_map_sdk_web/lib/arcgis_map_web_js.dart
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@JS()
library arcgis_map_web;
library arcgis_map_sdk_web;

import 'dart:async';
import 'dart:js_util';

import 'package:js/js.dart';

export 'package:arcgis_map_web/src/arcgis_map_web.dart';
export 'package:arcgis_map_sdk_web/src/arcgis_map_sdk_web.dart';

@JS("JSON.stringify")
external dynamic jsonStringify(dynamic value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'dart:html';
import 'dart:js';

import 'package:arcgis_map_sdk_platform_interface/arcgis_map_sdk_platform_interface.dart';
import 'package:arcgis_map_web/src/arcgis_map_web_controller.dart';
import 'package:arcgis_map_sdk_web/src/arcgis_map_web_controller.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_web_plugins/flutter_web_plugins.dart';
Expand All @@ -19,14 +19,14 @@ class ArcgisMapWeb extends ArcgisMapPlatform {
..addEventListener("load", (event) => _hasScriptLoaded.complete())
// ignore: unsafe_html
..src =
"assets/packages/arcgis_map_web/assets/arcgis_js_api_custom_build/main.js";
"assets/packages/arcgis_map_sdk_web/assets/arcgis_js_api_custom_build/main.js";

document.head!.append(script);

final link = LinkElement()
..type = "text/css"
..href =
"assets/packages/arcgis_map_web/assets/css_overrides/override_outline.css"
"assets/packages/arcgis_map_sdk_web/assets/css_overrides/override_outline.css"
..rel = "stylesheet";

document.head!.append(link);
Expand Down Expand Up @@ -284,7 +284,7 @@ class ArcgisMapWeb extends ArcgisMapPlatform {
/// https://developers.arcgis.com/javascript/latest/es-modules/#managing-assets-locally
// ignore: avoid_dynamic_calls
context["esri"]["core"]["config"]["assetsPath"] =
"/assets/packages/arcgis_map_web/assets/arcgis_js_api_custom_build/assets";
"/assets/packages/arcgis_map_sdk_web/assets/arcgis_js_api_custom_build/assets";
});

final mapController = ArcgisMapWebController(
Expand Down
12 changes: 6 additions & 6 deletions arcgis_map_sdk_web/lib/src/arcgis_map_web_controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import 'dart:js_util';
import 'dart:ui' as ui;

import 'package:arcgis_map_sdk_platform_interface/arcgis_map_sdk_platform_interface.dart';
import 'package:arcgis_map_web/arcgis_map_web_js.dart';
import 'package:arcgis_map_web/src/components/esri_map.dart';
import 'package:arcgis_map_web/src/components/map_view.dart';
import 'package:arcgis_map_web/src/components/scene_view.dart';
import 'package:arcgis_map_web/src/layer_controller.dart';
import 'package:arcgis_map_web/src/model_extension.dart';
import 'package:arcgis_map_sdk_web/arcgis_map_web_js.dart';
import 'package:arcgis_map_sdk_web/src/components/esri_map.dart';
import 'package:arcgis_map_sdk_web/src/components/map_view.dart';
import 'package:arcgis_map_sdk_web/src/components/scene_view.dart';
import 'package:arcgis_map_sdk_web/src/layer_controller.dart';
import 'package:arcgis_map_sdk_web/src/model_extension.dart';
import 'package:async/async.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
Expand Down
2 changes: 1 addition & 1 deletion arcgis_map_sdk_web/lib/src/components/attribution.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "dart:js_util" as js_util;

import 'package:arcgis_map_web/arcgis_map_web_js.dart';
import 'package:arcgis_map_sdk_web/arcgis_map_web_js.dart';

/// The attribution attached to the map view
class Attribution {
Expand Down
4 changes: 2 additions & 2 deletions arcgis_map_sdk_web/lib/src/components/esri_map.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "dart:js_util" as js_util;
import 'package:arcgis_map_web/arcgis_map_web_js.dart';
import 'package:arcgis_map_web/src/components/vector_layer.dart';
import 'package:arcgis_map_sdk_web/arcgis_map_web_js.dart';
import 'package:arcgis_map_sdk_web/src/components/vector_layer.dart';

class EsriMap {
const EsriMap();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'dart:convert' show json;
import 'package:arcgis_map_web/arcgis_map_web_js.dart';
import 'package:arcgis_map_sdk_web/arcgis_map_web_js.dart';

Map<String, dynamic> jsNativeObjectToMap(dynamic jsObject) =>
json.decode(jsonStringify(jsObject) as String) as Map<String, dynamic>;
2 changes: 1 addition & 1 deletion arcgis_map_sdk_web/lib/src/components/map_view.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "dart:js_util" as js_util;
import 'package:arcgis_map_sdk_platform_interface/arcgis_map_sdk_platform_interface.dart';
import 'package:arcgis_map_web/arcgis_map_web_js.dart';
import 'package:arcgis_map_sdk_web/arcgis_map_web_js.dart';

class MapView {
JsMapView init({
Expand Down
2 changes: 1 addition & 1 deletion arcgis_map_sdk_web/lib/src/components/scene_view.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "dart:js_util" as js_util;
import 'package:arcgis_map_sdk_platform_interface/arcgis_map_sdk_platform_interface.dart';
import 'package:arcgis_map_web/arcgis_map_web_js.dart';
import 'package:arcgis_map_sdk_web/arcgis_map_web_js.dart';

class SceneView {
JsSceneView init({
Expand Down
2 changes: 1 addition & 1 deletion arcgis_map_sdk_web/lib/src/components/vector_layer.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:arcgis_map_web/arcgis_map_web_js.dart';
import 'package:arcgis_map_sdk_web/arcgis_map_web_js.dart';
import 'package:js/js_util.dart';

class VectorLayer {
Expand Down
10 changes: 5 additions & 5 deletions arcgis_map_sdk_web/lib/src/layer_controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import 'dart:html' hide VoidCallback;
import 'dart:js_util';

import 'package:arcgis_map_sdk_platform_interface/arcgis_map_sdk_platform_interface.dart';
import 'package:arcgis_map_web/arcgis_map_web_js.dart';
import 'package:arcgis_map_web/src/components/attribution.dart';
import 'package:arcgis_map_web/src/components/js_helper_functions.dart';
import 'package:arcgis_map_web/src/components/vector_layer.dart';
import 'package:arcgis_map_web/src/model_extension.dart';
import 'package:arcgis_map_sdk_web/arcgis_map_web_js.dart';
import 'package:arcgis_map_sdk_web/src/components/attribution.dart';
import 'package:arcgis_map_sdk_web/src/components/js_helper_functions.dart';
import 'package:arcgis_map_sdk_web/src/components/vector_layer.dart';
import 'package:arcgis_map_sdk_web/src/model_extension.dart';
import 'package:async/async.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart';
Expand Down
2 changes: 1 addition & 1 deletion arcgis_map_sdk_web/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: arcgis_map_web
name: arcgis_map_sdk_web
description: Esri ArcGIS Flutter web implementation.
version: 0.7.5
repository: https://github.com/fluttercommunity/arcgis_map
Expand Down
4 changes: 2 additions & 2 deletions arcgis_webpack/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Allows lazy loading
## Build using Sidekick

The preferred way to build/generate the **_arcgis_webpack_** asset files is to use Sidekick. The new generated files
will be automatically copied to the **_arcgis_map_web_** package and . Run `./am gen:arcgis-webpack` to generate the
will be automatically copied to the **_arcgis_map_sdk_web_** package and . Run `./am gen:arcgis-webpack` to generate the
files.

For more information run `./am --help`.
Expand All @@ -19,4 +19,4 @@ npm run build

### Generated output files

Output files will be generated directly into `../arcgis_map_web/assets/arcgis_js_api_custom_build` folder.
Output files will be generated directly into `../arcgis_map_sdk_web/assets/arcgis_js_api_custom_build` folder.
2 changes: 1 addition & 1 deletion arcgis_webpack/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const ArcGISPlugin = require("@arcgis/webpack-plugin");
const path = require("path");
const TerserPlugin = require('terser-webpack-plugin');
const rimraf = require('rimraf');
const outputPath = "../arcgis_map_web/assets/arcgis_js_api_custom_build";
const outputPath = "../arcgis_map_sdk_web/assets/arcgis_js_api_custom_build";

module.exports = {
mode: 'production',
Expand Down
2 changes: 1 addition & 1 deletion example/.gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
packages/arcgis_map_web/assets/arcgis_js_api_custom_build/** linguist-generated=true
packages/arcgis_map_sdk_web/assets/arcgis_js_api_custom_build/** linguist-generated=true
4 changes: 2 additions & 2 deletions example/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ In your app's pubspec.yaml dependencies, add e.g. for web:
url: https://github.com/fluttercommunity/arcgis_map.git
path: arcgis_map
ref: main
arcgis_map_web:
arcgis_map_sdk_web:
git:
url: https://github.com/fluttercommunity/arcgis_map.git
path: arcgis_map_web
path: arcgis_map_sdk_web
ref: main
```

Expand Down
4 changes: 2 additions & 2 deletions example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ packages:
relative: true
source: path
version: "1.0.0"
arcgis_map_web:
arcgis_map_sdk_web:
dependency: "direct main"
description:
path: "../arcgis_map_web"
path: "../arcgis_map_sdk_web"
relative: true
source: path
version: "0.7.5"
Expand Down
4 changes: 2 additions & 2 deletions example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ dependencies:
url: https://github.com/fluttercommunity/arcgis_map.git
path: arcgis_map_sdk_platform_interface
ref: v0.7.5
arcgis_map_web:
arcgis_map_sdk_web:
git:
url: https://github.com/fluttercommunity/arcgis_map.git
path: arcgis_map_web
path: arcgis_map_sdk_web
ref: v0.7.5

cupertino_icons: ^1.0.0
Expand Down
4 changes: 2 additions & 2 deletions example/pubspec_overrides.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ dependency_overrides:
path: ../arcgis_map_sdk_method_channel
arcgis_map_sdk_platform_interface:
path: ../arcgis_map_sdk_platform_interface
arcgis_map_web:
path: ../arcgis_map_web
arcgis_map_sdk_web:
path: ../arcgis_map_sdk_web

0 comments on commit 749d6e0

Please sign in to comment.