From 3e6ea7b80590a6ea7bc56ca88b6592e0b2e94a84 Mon Sep 17 00:00:00 2001 From: Patrice Tisserand Date: Thu, 13 Feb 2025 11:01:16 +0100 Subject: [PATCH] rollback ark_project and wallet_kit renaming --- docs/examples/mobile-wallet.mdx | 14 +++++++------- examples/nft_marketplace/lib/main.dart | 5 +++-- .../nft_marketplace/lib/screens/home_screen.dart | 4 ++-- examples/nft_marketplace/pubspec.yaml | 6 +++--- examples/wallet_app/lib/main.dart | 2 +- examples/wallet_app/lib/screens/home_screen.dart | 2 +- examples/wallet_app/pubspec.yaml | 2 +- packages/ark_project/example/ark_example.dart | 2 +- .../lib/{arkproject.dart => ark_project.dart} | 0 packages/ark_project/pubspec.yaml | 2 +- packages/wallet_kit/lib/widgets/nft_details.dart | 2 +- packages/wallet_kit/lib/widgets/nft_list.dart | 2 +- packages/wallet_kit/pubspec.yaml | 6 +++--- .../wallet_kit/test/utils/format_address_test.dart | 2 +- packages/wallet_kit/test/utils/group_by_test.dart | 2 +- 15 files changed, 27 insertions(+), 26 deletions(-) rename packages/ark_project/lib/{arkproject.dart => ark_project.dart} (100%) diff --git a/docs/examples/mobile-wallet.mdx b/docs/examples/mobile-wallet.mdx index a190574f..bfae0279 100644 --- a/docs/examples/mobile-wallet.mdx +++ b/docs/examples/mobile-wallet.mdx @@ -17,7 +17,7 @@ Run it locally with `flutter run` to make sure it is properly configured. 3. Add necessary dependencies ```bash -flutter pub add walletkit hive_flutter hooks_riverpod flutter_dotenv +flutter pub add wallet_kit hive_flutter hooks_riverpod flutter_dotenv ``` 4. Create a `.env` file in the root of your wallet_app project @@ -44,7 +44,7 @@ Here is the value for `starknet-devnet 0.2.0` 6. Update Android minimun SDK version -`secure_store` package used by `walletkit` require Android minimum SDK version set to at least 23, you need to modify `android/app/build.gradle`: +`secure_store` package used by `wallet_kit` require Android minimum SDK version set to at least 23, you need to modify `android/app/build.gradle`: ``` defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). @@ -93,13 +93,13 @@ Future main() async { } ``` -Now let's intialize `walletkit` and `hive` in our `main` function +Now let's intialize `wallet_kit` and `hive` in our `main` function ```dart import 'package:flutter/material.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:hive_flutter/hive_flutter.dart'; -import 'package:walletkit/wallet_kit.dart'; +import 'package:wallet_kit/wallet_kit.dart'; Future main() async { WidgetsFlutterBinding.ensureInitialized(); @@ -144,7 +144,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:hive_flutter/hive_flutter.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:walletkit/wallet_kit.dart'; +import 'package:wallet_kit/wallet_kit.dart'; import './screens/home_screen.dart'; @@ -195,12 +195,12 @@ class WalletApp extends HookConsumerWidget { } ``` -Create a `screens/` folder and add `home_screen.dart` file with a pre-built layout from `walletkit`, as well as `WalletSelector`, `AccountAddress`, `WalletBody` and `SendEthButton`: +Create a `screens/` folder and add `home_screen.dart` file with a pre-built layout from `wallet_kit`, as well as `WalletSelector`, `AccountAddress`, `WalletBody` and `SendEthButton`: ```dart import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:walletkit/wallet_kit.dart'; +import 'package:wallet_kit/wallet_kit.dart'; class HomeScreen extends HookConsumerWidget { const HomeScreen({super.key}); diff --git a/examples/nft_marketplace/lib/main.dart b/examples/nft_marketplace/lib/main.dart index e799b259..0b073d03 100644 --- a/examples/nft_marketplace/lib/main.dart +++ b/examples/nft_marketplace/lib/main.dart @@ -1,11 +1,12 @@ import 'package:flutter/material.dart'; + +import 'package:ark_project/ark_project.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:hive_flutter/hive_flutter.dart'; import 'package:nft_marketplace/config.dart'; import 'package:nft_marketplace/screens/home_screen.dart'; -import 'package:walletkit/wallet_kit.dart'; -import 'package:arkproject/arkproject.dart'; +import 'package:wallet_kit/wallet_kit.dart'; void main() async { await init(); diff --git a/examples/nft_marketplace/lib/screens/home_screen.dart b/examples/nft_marketplace/lib/screens/home_screen.dart index df6d2658..053fd0ca 100644 --- a/examples/nft_marketplace/lib/screens/home_screen.dart +++ b/examples/nft_marketplace/lib/screens/home_screen.dart @@ -1,10 +1,10 @@ -import 'package:arkproject/arkproject.dart'; +import 'package:ark_project/ark_project.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:nft_marketplace/config.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; -import 'package:walletkit/wallet_kit.dart'; +import 'package:wallet_kit/wallet_kit.dart'; part 'home_screen.g.dart'; diff --git a/examples/nft_marketplace/pubspec.yaml b/examples/nft_marketplace/pubspec.yaml index 34b631ce..3dd2ed72 100644 --- a/examples/nft_marketplace/pubspec.yaml +++ b/examples/nft_marketplace/pubspec.yaml @@ -1,5 +1,5 @@ name: nft_marketplace -description: "A new Flutter project." +description: "Starknet NFT marketplace example" # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. publish_to: "none" # Remove this line if you wish to publish to pub.dev @@ -28,11 +28,11 @@ environment: # the latest version available on pub.dev. To see which dependencies have newer # versions available, run `flutter pub outdated`. dependencies: - arkproject: ^0.2.0 + ark_project: ^0.2.0 starknet: ^0.1.2 starknet_provider: ^0.1.1+1 secure_store: ^0.1.2+1 - walletkit: ^0.1.0 + wallet_kit: ^0.1.0 flutter: sdk: flutter diff --git a/examples/wallet_app/lib/main.dart b/examples/wallet_app/lib/main.dart index adaa6b08..1576e43f 100644 --- a/examples/wallet_app/lib/main.dart +++ b/examples/wallet_app/lib/main.dart @@ -3,7 +3,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:hive_flutter/hive_flutter.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:walletkit/wallet_kit.dart'; +import 'package:wallet_kit/wallet_kit.dart'; import './screens/home_screen.dart'; diff --git a/examples/wallet_app/lib/screens/home_screen.dart b/examples/wallet_app/lib/screens/home_screen.dart index 8c105fa1..b79c9884 100644 --- a/examples/wallet_app/lib/screens/home_screen.dart +++ b/examples/wallet_app/lib/screens/home_screen.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:walletkit/wallet_kit.dart'; +import 'package:wallet_kit/wallet_kit.dart'; class HomeScreen extends HookConsumerWidget { const HomeScreen({super.key}); diff --git a/examples/wallet_app/pubspec.yaml b/examples/wallet_app/pubspec.yaml index a01003b8..55b2b41e 100644 --- a/examples/wallet_app/pubspec.yaml +++ b/examples/wallet_app/pubspec.yaml @@ -9,7 +9,7 @@ environment: dependencies: flutter: sdk: flutter - walletkit: ^0.1.0 + wallet_kit: ^0.1.0 cupertino_icons: ^1.0.2 hive_flutter: ^1.1.0 hooks_riverpod: ^2.6.1 diff --git a/packages/ark_project/example/ark_example.dart b/packages/ark_project/example/ark_example.dart index 62638ee7..cc919db1 100644 --- a/packages/ark_project/example/ark_example.dart +++ b/packages/ark_project/example/ark_example.dart @@ -1,4 +1,4 @@ -import 'package:arkproject/arkproject.dart'; +import 'package:ark_project/ark_project.dart'; import 'package:dotenv/dotenv.dart'; final env = DotEnv(includePlatformEnvironment: true)..load(); diff --git a/packages/ark_project/lib/arkproject.dart b/packages/ark_project/lib/ark_project.dart similarity index 100% rename from packages/ark_project/lib/arkproject.dart rename to packages/ark_project/lib/ark_project.dart diff --git a/packages/ark_project/pubspec.yaml b/packages/ark_project/pubspec.yaml index 94a43faa..3ec8978e 100644 --- a/packages/ark_project/pubspec.yaml +++ b/packages/ark_project/pubspec.yaml @@ -1,4 +1,4 @@ -name: arkproject +name: ark_project description: Ark SDK for Dart and Flutter apps. version: 0.2.0 repository: https://github.com/focustree/starknet.dart diff --git a/packages/wallet_kit/lib/widgets/nft_details.dart b/packages/wallet_kit/lib/widgets/nft_details.dart index fe7b6793..a1f1f08e 100644 --- a/packages/wallet_kit/lib/widgets/nft_details.dart +++ b/packages/wallet_kit/lib/widgets/nft_details.dart @@ -1,4 +1,4 @@ -import 'package:arkproject/arkproject.dart'; +import 'package:ark_project/ark_project.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; diff --git a/packages/wallet_kit/lib/widgets/nft_list.dart b/packages/wallet_kit/lib/widgets/nft_list.dart index 0d791573..034b49c0 100644 --- a/packages/wallet_kit/lib/widgets/nft_list.dart +++ b/packages/wallet_kit/lib/widgets/nft_list.dart @@ -1,4 +1,4 @@ -import 'package:arkproject/arkproject.dart'; +import 'package:ark_project/ark_project.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; diff --git a/packages/wallet_kit/pubspec.yaml b/packages/wallet_kit/pubspec.yaml index 7550a607..de49bbb0 100644 --- a/packages/wallet_kit/pubspec.yaml +++ b/packages/wallet_kit/pubspec.yaml @@ -1,5 +1,5 @@ -name: walletkit -description: A new Flutter package project. +name: wallet_kit +description: Wallet Kit. version: 0.1.0 homepage: "https://starknetdart.dev" @@ -8,7 +8,7 @@ environment: flutter: ">=1.17.0" dependencies: - arkproject: ^0.2.0 + ark_project: ^0.2.0 starknet: ^0.1.2 starknet_provider: ^0.1.1+1 secure_store: ^0.1.2+1 diff --git a/packages/wallet_kit/test/utils/format_address_test.dart b/packages/wallet_kit/test/utils/format_address_test.dart index 3923c2fd..cac9bc24 100644 --- a/packages/wallet_kit/test/utils/format_address_test.dart +++ b/packages/wallet_kit/test/utils/format_address_test.dart @@ -1,5 +1,5 @@ import 'package:flutter_test/flutter_test.dart'; -import 'package:walletkit/utils/index.dart'; +import 'package:wallet_kit/utils/index.dart'; void main() { test('formatAddress should format long addresses starting with "0x"', () { diff --git a/packages/wallet_kit/test/utils/group_by_test.dart b/packages/wallet_kit/test/utils/group_by_test.dart index 8315c11a..f80e40d5 100644 --- a/packages/wallet_kit/test/utils/group_by_test.dart +++ b/packages/wallet_kit/test/utils/group_by_test.dart @@ -1,5 +1,5 @@ import 'package:flutter_test/flutter_test.dart'; -import 'package:walletkit/utils/group_by.dart'; +import 'package:wallet_kit/utils/group_by.dart'; void main() { test('groupBy should group values by the given key', () {