From 31edec537897ae3e9e6f5716fb6c88e442be5667 Mon Sep 17 00:00:00 2001 From: Filip Hracek Date: Mon, 20 May 2019 15:59:51 -0700 Subject: [PATCH] Move scoped_model_counter to provider_counter (#82) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I used `flutter create` anew, so the project structure now has additional 2 `AndroidManifest.xml` files. Everything else stayed the same, so from git’s perspective, it’s just moved files. --- INDEX.md | 8 +++-- .../.gitignore | 0 .../.metadata | 4 +-- .../README.md | 12 ++++---- .../android/app/build.gradle | 6 ++-- .../android/app/src/debug/AndroidManifest.xml | 7 +++++ .../android/app/src/main/AndroidManifest.xml | 12 ++------ .../flutter/provider_counter}/MainActivity.kt | 2 +- .../main/res/drawable/launch_background.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../app/src/main/res/values/styles.xml | 0 .../app/src/profile/AndroidManifest.xml | 7 +++++ .../android/build.gradle | 0 .../android/gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.properties | 0 .../android/settings.gradle | 0 .../ios/Flutter/AppFrameworkInfo.plist | 0 .../ios/Flutter/Debug.xcconfig | 0 .../ios/Flutter/Release.xcconfig | 0 .../ios/Runner.xcodeproj/project.pbxproj | 10 ++----- .../contents.xcworkspacedata | 0 .../xcshareddata/xcschemes/Runner.xcscheme | 0 .../contents.xcworkspacedata | 0 .../xcshareddata/WorkspaceSettings.xcsettings | 0 .../ios/Runner/AppDelegate.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../Icon-App-1024x1024@1x.png | Bin .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin .../Icon-App-83.5x83.5@2x.png | Bin .../LaunchImage.imageset/Contents.json | 0 .../LaunchImage.imageset/LaunchImage.png | Bin .../LaunchImage.imageset/LaunchImage@2x.png | Bin .../LaunchImage.imageset/LaunchImage@3x.png | Bin .../LaunchImage.imageset/README.md | 0 .../Runner/Base.lproj/LaunchScreen.storyboard | 0 .../ios/Runner/Base.lproj/Main.storyboard | 0 .../ios/Runner/Info.plist | 2 +- .../ios/Runner/Runner-Bridging-Header.h | 0 .../lib/main.dart | 0 .../pubspec.lock | 28 +++++++++--------- .../pubspec.yaml | 6 ++-- .../test/widget_test.dart | 2 +- travis_script.sh | 2 +- 59 files changed, 57 insertions(+), 51 deletions(-) rename {scoped_model_counter => provider_counter}/.gitignore (100%) rename {scoped_model_counter => provider_counter}/.metadata (76%) rename {scoped_model_counter => provider_counter}/README.md (72%) rename {scoped_model_counter => provider_counter}/android/app/build.gradle (94%) create mode 100644 provider_counter/android/app/src/debug/AndroidManifest.xml rename {scoped_model_counter => provider_counter}/android/app/src/main/AndroidManifest.xml (80%) rename {scoped_model_counter/android/app/src/main/kotlin/io/flutter/scopedmodelcounter => provider_counter/android/app/src/main/kotlin/dev/flutter/provider_counter}/MainActivity.kt (88%) rename {scoped_model_counter => provider_counter}/android/app/src/main/res/drawable/launch_background.xml (100%) rename {scoped_model_counter => provider_counter}/android/app/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename {scoped_model_counter => provider_counter}/android/app/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename {scoped_model_counter => provider_counter}/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename {scoped_model_counter => provider_counter}/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {scoped_model_counter => provider_counter}/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {scoped_model_counter => provider_counter}/android/app/src/main/res/values/styles.xml (100%) create mode 100644 provider_counter/android/app/src/profile/AndroidManifest.xml rename {scoped_model_counter => provider_counter}/android/build.gradle (100%) rename {scoped_model_counter => provider_counter}/android/gradle.properties (100%) rename {scoped_model_counter => provider_counter}/android/gradle/wrapper/gradle-wrapper.properties (100%) rename {scoped_model_counter => provider_counter}/android/settings.gradle (100%) rename {scoped_model_counter => provider_counter}/ios/Flutter/AppFrameworkInfo.plist (100%) rename {scoped_model_counter => provider_counter}/ios/Flutter/Debug.xcconfig (100%) rename {scoped_model_counter => provider_counter}/ios/Flutter/Release.xcconfig (100%) rename {scoped_model_counter => provider_counter}/ios/Runner.xcodeproj/project.pbxproj (97%) rename {scoped_model_counter => provider_counter}/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename {scoped_model_counter => provider_counter}/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme (100%) rename {scoped_model_counter => provider_counter}/ios/Runner.xcworkspace/contents.xcworkspacedata (100%) rename {scoped_model_counter => provider_counter}/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/AppDelegate.swift (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/Base.lproj/LaunchScreen.storyboard (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/Base.lproj/Main.storyboard (100%) rename {scoped_model_counter => provider_counter}/ios/Runner/Info.plist (97%) rename {scoped_model_counter => provider_counter}/ios/Runner/Runner-Bridging-Header.h (100%) rename {scoped_model_counter => provider_counter}/lib/main.dart (100%) rename {scoped_model_counter => provider_counter}/pubspec.lock (93%) rename {scoped_model_counter => provider_counter}/pubspec.yaml (67%) rename {scoped_model_counter => provider_counter}/test/widget_test.dart (94%) mode change 100644 => 100755 travis_script.sh diff --git a/INDEX.md b/INDEX.md index 7c478a600..793a7dd50 100644 --- a/INDEX.md +++ b/INDEX.md @@ -49,10 +49,12 @@ start. A simple app showing three different approaches to deserializing JSON: hand-written constructors, `json_serializable`, and `built_value`. -#### [scoped_model_counter](scoped_model_counter) _(Flutter team)_ +#### [provider_counter](provider_counter) _(Flutter team)_ + +The simplest possible app (the counter) using `provider` +for state management. (This was previously known as `scoped_model_counter`, +and used `scoped_model` for state management.) -The simplest possible app (the counter) using `scoped_model` -for state management. ## UI diff --git a/scoped_model_counter/.gitignore b/provider_counter/.gitignore similarity index 100% rename from scoped_model_counter/.gitignore rename to provider_counter/.gitignore diff --git a/scoped_model_counter/.metadata b/provider_counter/.metadata similarity index 76% rename from scoped_model_counter/.metadata rename to provider_counter/.metadata index 460bc20bc..51ddb8ff3 100644 --- a/scoped_model_counter/.metadata +++ b/provider_counter/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: 5391447fae6209bb21a89e6a5a6583cac1af9b4b - channel: stable + revision: 7a4c33425ddd78c54aba07d86f3f9a4a0051769b + channel: beta project_type: app diff --git a/scoped_model_counter/README.md b/provider_counter/README.md similarity index 72% rename from scoped_model_counter/README.md rename to provider_counter/README.md index 1bfa742a7..1ce70b18c 100644 --- a/scoped_model_counter/README.md +++ b/provider_counter/README.md @@ -1,12 +1,12 @@ -# ScopedModel Counter +# Provider Counter -The starter Flutter application, but using ScopedModel to manage state. +The starter Flutter application, but using Provider to manage state. This app is a direct counterpart to the [simple counter application](https://flutter.io/docs/development/ui/widgets-intro#changing-widgets-in-response-to-input) that you get when you create a new Flutter project. That one uses a `StatefulWidget` to manage application state. The version in this repository uses a simple app state management approach, -`ScopedModel`. +`Provider`. It shows how you might deal with state that is modified from outside the app (for example, state synchronized over network) and which needs to be accessed and changed @@ -17,9 +17,9 @@ from different parts of your app. The only important part of the app is the `lib/main.dart` file. It has comments that will walk you through it. -For more information on the `scoped_model` package (where `ScopedModel` comes from), please -[see the package documentation](https://pub.dartlang.org/packages/scoped_model). +For more information on the `provider` package (where `Provider` comes from), please +[see the package documentation](https://pub.dartlang.org/packages/provider). For more information on state management in Flutter, and a list of other approaches, head over to the -[State management page at flutter.io](https://flutter.io/docs/development/data-and-backend/state-mgmt). +[State management page at flutter.dev](https://flutter.dev/docs/development/data-and-backend/state-mgmt). diff --git a/scoped_model_counter/android/app/build.gradle b/provider_counter/android/app/build.gradle similarity index 94% rename from scoped_model_counter/android/app/build.gradle rename to provider_counter/android/app/build.gradle index c73184574..9f0d8bf5c 100644 --- a/scoped_model_counter/android/app/build.gradle +++ b/provider_counter/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 27 + compileSdkVersion 28 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -38,9 +38,9 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "io.flutter.scopedmodelcounter" + applicationId "dev.flutter.provider_counter" minSdkVersion 16 - targetSdkVersion 27 + targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/provider_counter/android/app/src/debug/AndroidManifest.xml b/provider_counter/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 000000000..2f59b9d75 --- /dev/null +++ b/provider_counter/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/scoped_model_counter/android/app/src/main/AndroidManifest.xml b/provider_counter/android/app/src/main/AndroidManifest.xml similarity index 80% rename from scoped_model_counter/android/app/src/main/AndroidManifest.xml rename to provider_counter/android/app/src/main/AndroidManifest.xml index b9565a623..d535d460a 100644 --- a/scoped_model_counter/android/app/src/main/AndroidManifest.xml +++ b/provider_counter/android/app/src/main/AndroidManifest.xml @@ -1,11 +1,5 @@ - - - + package="dev.flutter.provider_counter"> + + diff --git a/scoped_model_counter/android/build.gradle b/provider_counter/android/build.gradle similarity index 100% rename from scoped_model_counter/android/build.gradle rename to provider_counter/android/build.gradle diff --git a/scoped_model_counter/android/gradle.properties b/provider_counter/android/gradle.properties similarity index 100% rename from scoped_model_counter/android/gradle.properties rename to provider_counter/android/gradle.properties diff --git a/scoped_model_counter/android/gradle/wrapper/gradle-wrapper.properties b/provider_counter/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from scoped_model_counter/android/gradle/wrapper/gradle-wrapper.properties rename to provider_counter/android/gradle/wrapper/gradle-wrapper.properties diff --git a/scoped_model_counter/android/settings.gradle b/provider_counter/android/settings.gradle similarity index 100% rename from scoped_model_counter/android/settings.gradle rename to provider_counter/android/settings.gradle diff --git a/scoped_model_counter/ios/Flutter/AppFrameworkInfo.plist b/provider_counter/ios/Flutter/AppFrameworkInfo.plist similarity index 100% rename from scoped_model_counter/ios/Flutter/AppFrameworkInfo.plist rename to provider_counter/ios/Flutter/AppFrameworkInfo.plist diff --git a/scoped_model_counter/ios/Flutter/Debug.xcconfig b/provider_counter/ios/Flutter/Debug.xcconfig similarity index 100% rename from scoped_model_counter/ios/Flutter/Debug.xcconfig rename to provider_counter/ios/Flutter/Debug.xcconfig diff --git a/scoped_model_counter/ios/Flutter/Release.xcconfig b/provider_counter/ios/Flutter/Release.xcconfig similarity index 100% rename from scoped_model_counter/ios/Flutter/Release.xcconfig rename to provider_counter/ios/Flutter/Release.xcconfig diff --git a/scoped_model_counter/ios/Runner.xcodeproj/project.pbxproj b/provider_counter/ios/Runner.xcodeproj/project.pbxproj similarity index 97% rename from scoped_model_counter/ios/Runner.xcodeproj/project.pbxproj rename to provider_counter/ios/Runner.xcodeproj/project.pbxproj index dbfb2aef8..374d8d7f6 100644 --- a/scoped_model_counter/ios/Runner.xcodeproj/project.pbxproj +++ b/provider_counter/ios/Runner.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; }; 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; @@ -39,7 +38,6 @@ /* Begin PBXFileReference section */ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; 3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; @@ -71,7 +69,6 @@ 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( - 2D5378251FAA1A9400D5DBA9 /* flutter_assets */, 3B80C3931E831B6300D905FE /* App.framework */, 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, 9740EEBA1CF902C7004384FC /* Flutter.framework */, @@ -187,7 +184,6 @@ 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */, 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, - 2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */, 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -323,7 +319,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = io.flutter.scopedModelCounter; + PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.providerCounter; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 4.0; VERSIONING_SYSTEM = "apple-generic"; @@ -451,7 +447,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = io.flutter.scopedModelCounter; + PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.providerCounter; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -479,7 +475,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = io.flutter.scopedModelCounter; + PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.providerCounter; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_SWIFT3_OBJC_INFERENCE = On; diff --git a/scoped_model_counter/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/provider_counter/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from scoped_model_counter/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to provider_counter/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/scoped_model_counter/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/provider_counter/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 100% rename from scoped_model_counter/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to provider_counter/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme diff --git a/scoped_model_counter/ios/Runner.xcworkspace/contents.xcworkspacedata b/provider_counter/ios/Runner.xcworkspace/contents.xcworkspacedata similarity index 100% rename from scoped_model_counter/ios/Runner.xcworkspace/contents.xcworkspacedata rename to provider_counter/ios/Runner.xcworkspace/contents.xcworkspacedata diff --git a/scoped_model_counter/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/provider_counter/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from scoped_model_counter/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to provider_counter/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/scoped_model_counter/ios/Runner/AppDelegate.swift b/provider_counter/ios/Runner/AppDelegate.swift similarity index 100% rename from scoped_model_counter/ios/Runner/AppDelegate.swift rename to provider_counter/ios/Runner/AppDelegate.swift diff --git a/scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json rename to provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png similarity index 100% rename from scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png rename to provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png diff --git a/scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png similarity index 100% rename from scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png rename to provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png diff --git a/scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png similarity index 100% rename from scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png rename to provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png diff --git a/scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png similarity index 100% rename from scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png rename to provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png diff --git a/scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png similarity index 100% rename from scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png rename to provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png diff --git a/scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png similarity index 100% rename from scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png rename to provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png diff --git a/scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png similarity index 100% rename from scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png rename to provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png diff --git a/scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png similarity index 100% rename from scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png rename to provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png diff --git a/scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png similarity index 100% rename from scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png rename to provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png diff --git a/scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png similarity index 100% rename from scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png rename to provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png diff --git a/scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png similarity index 100% rename from scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png rename to provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png diff --git a/scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png similarity index 100% rename from scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png rename to provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png diff --git a/scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png similarity index 100% rename from scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png rename to provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png diff --git a/scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png similarity index 100% rename from scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png rename to provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png diff --git a/scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png similarity index 100% rename from scoped_model_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png rename to provider_counter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png diff --git a/scoped_model_counter/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/provider_counter/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json similarity index 100% rename from scoped_model_counter/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json rename to provider_counter/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json diff --git a/scoped_model_counter/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/provider_counter/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png similarity index 100% rename from scoped_model_counter/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png rename to provider_counter/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png diff --git a/scoped_model_counter/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/provider_counter/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png similarity index 100% rename from scoped_model_counter/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png rename to provider_counter/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png diff --git a/scoped_model_counter/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/provider_counter/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png similarity index 100% rename from scoped_model_counter/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png rename to provider_counter/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png diff --git a/scoped_model_counter/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/provider_counter/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md similarity index 100% rename from scoped_model_counter/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md rename to provider_counter/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md diff --git a/scoped_model_counter/ios/Runner/Base.lproj/LaunchScreen.storyboard b/provider_counter/ios/Runner/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from scoped_model_counter/ios/Runner/Base.lproj/LaunchScreen.storyboard rename to provider_counter/ios/Runner/Base.lproj/LaunchScreen.storyboard diff --git a/scoped_model_counter/ios/Runner/Base.lproj/Main.storyboard b/provider_counter/ios/Runner/Base.lproj/Main.storyboard similarity index 100% rename from scoped_model_counter/ios/Runner/Base.lproj/Main.storyboard rename to provider_counter/ios/Runner/Base.lproj/Main.storyboard diff --git a/scoped_model_counter/ios/Runner/Info.plist b/provider_counter/ios/Runner/Info.plist similarity index 97% rename from scoped_model_counter/ios/Runner/Info.plist rename to provider_counter/ios/Runner/Info.plist index dfb6178d5..b39adff11 100644 --- a/scoped_model_counter/ios/Runner/Info.plist +++ b/provider_counter/ios/Runner/Info.plist @@ -11,7 +11,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - scoped_model_counter + provider_counter CFBundlePackageType APPL CFBundleShortVersionString diff --git a/scoped_model_counter/ios/Runner/Runner-Bridging-Header.h b/provider_counter/ios/Runner/Runner-Bridging-Header.h similarity index 100% rename from scoped_model_counter/ios/Runner/Runner-Bridging-Header.h rename to provider_counter/ios/Runner/Runner-Bridging-Header.h diff --git a/scoped_model_counter/lib/main.dart b/provider_counter/lib/main.dart similarity index 100% rename from scoped_model_counter/lib/main.dart rename to provider_counter/lib/main.dart diff --git a/scoped_model_counter/pubspec.lock b/provider_counter/pubspec.lock similarity index 93% rename from scoped_model_counter/pubspec.lock rename to provider_counter/pubspec.lock index aae08233c..9fd8ed41f 100644 --- a/scoped_model_counter/pubspec.lock +++ b/provider_counter/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.1.0" boolean_selector: dependency: transitive description: @@ -52,7 +52,7 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.3+1" + version: "0.12.5" meta: dependency: transitive description: @@ -73,21 +73,21 @@ packages: name: pedantic url: "https://pub.dartlang.org" source: hosted - version: "1.4.0" - quiver: - dependency: transitive + version: "1.5.0" + provider: + dependency: "direct main" description: - name: quiver + name: provider url: "https://pub.dartlang.org" source: hosted version: "2.0.1" - scoped_model: - dependency: "direct main" + quiver: + dependency: transitive description: - name: scoped_model + name: quiver url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "2.0.2" sky_engine: dependency: transitive description: flutter @@ -99,7 +99,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.5.4" + version: "1.5.5" stack_trace: dependency: transitive description: @@ -113,7 +113,7 @@ packages: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "1.6.8" + version: "2.0.0" string_scanner: dependency: transitive description: @@ -134,7 +134,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.2" + version: "0.2.4" typed_data: dependency: transitive description: @@ -150,4 +150,4 @@ packages: source: hosted version: "2.0.8" sdks: - dart: ">=2.1.0 <3.0.0" + dart: ">=2.2.0 <3.0.0" diff --git a/scoped_model_counter/pubspec.yaml b/provider_counter/pubspec.yaml similarity index 67% rename from scoped_model_counter/pubspec.yaml rename to provider_counter/pubspec.yaml index de6d3a6f7..bf40e9e0d 100644 --- a/scoped_model_counter/pubspec.yaml +++ b/provider_counter/pubspec.yaml @@ -1,8 +1,8 @@ -name: scoped_model_counter +name: provider_counter description: > - The starter Flutter application, but using ScopedModel to manage state. + The starter Flutter application, but using Provider to manage state. -version: 1.0.0+1 +version: 1.0.0 environment: sdk: ">=2.0.0-dev.68.0 <3.0.0" diff --git a/scoped_model_counter/test/widget_test.dart b/provider_counter/test/widget_test.dart similarity index 94% rename from scoped_model_counter/test/widget_test.dart rename to provider_counter/test/widget_test.dart index 28e3e150a..857320407 100644 --- a/scoped_model_counter/test/widget_test.dart +++ b/provider_counter/test/widget_test.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; -import 'package:scoped_model_counter/main.dart'; +import 'package:provider_counter/main.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async { diff --git a/travis_script.sh b/travis_script.sh old mode 100644 new mode 100755 index 36f30be2e..f53c7a95a --- a/travis_script.sh +++ b/travis_script.sh @@ -3,7 +3,7 @@ set -e declare -a PROJECT_NAMES=( "jsonexample" \ "shrine" \ - "scoped_model_counter" \ + "provider_counter" \ "veggieseasons" \ "place_tracker" \ "platform_view_swift" \