From f3692a1c9c20e5018c1e1db3523652369f1c0452 Mon Sep 17 00:00:00 2001 From: Chema Date: Fri, 19 Apr 2019 18:12:00 +0200 Subject: [PATCH 1/2] FIX: rename ios pod for not conflict with framework path --- ios/{onesignal.podspec => onesignalflutter.podspec} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename ios/{onesignal.podspec => onesignalflutter.podspec} (94%) diff --git a/ios/onesignal.podspec b/ios/onesignalflutter.podspec similarity index 94% rename from ios/onesignal.podspec rename to ios/onesignalflutter.podspec index 5caa808f..7a29a51d 100644 --- a/ios/onesignal.podspec +++ b/ios/onesignalflutter.podspec @@ -2,7 +2,7 @@ # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html # Pod::Spec.new do |s| - s.name = 'onesignal' + s.name = 'onesignalflutter' s.version = '1.0.5' s.summary = 'The OneSignal Flutter SDK' s.description = 'Allows you to easily add OneSignal to your flutter projects, to make sending and handling push notifications easy' @@ -17,4 +17,3 @@ Pod::Spec.new do |s| s.ios.deployment_target = '8.0' s.static_framework = true end - From fb4bd2da344db58f2073d314ff1e363556804673 Mon Sep 17 00:00:00 2001 From: Chema Robles Date: Sat, 20 Apr 2019 10:13:16 +0200 Subject: [PATCH 2/2] Refactor: rename internal (now Flutter app compiles) --- lib/{onesignal.dart => onesignalflutter.dart} | 12 ++++++------ lib/src/create_notification.dart | 6 +++--- lib/src/notification.dart | 4 ++-- lib/src/permission.dart | 6 +++--- lib/src/subscription.dart | 4 ++-- lib/src/utils.dart | 2 +- onesignal.iml => onesignalflutter.iml | 0 ...ignal_android.iml => onesignalflutter_android.iml | 0 pubspec.yaml | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) rename lib/{onesignal.dart => onesignalflutter.dart} (97%) rename onesignal.iml => onesignalflutter.iml (100%) rename onesignal_android.iml => onesignalflutter_android.iml (100%) diff --git a/lib/onesignal.dart b/lib/onesignalflutter.dart similarity index 97% rename from lib/onesignal.dart rename to lib/onesignalflutter.dart index a39c4e7f..3ba2d491 100644 --- a/lib/onesignal.dart +++ b/lib/onesignalflutter.dart @@ -1,11 +1,11 @@ import 'dart:async'; import 'package:flutter/services.dart'; -import 'package:onesignal/src/permission.dart'; -import 'package:onesignal/src/subscription.dart'; -import 'package:onesignal/src/defines.dart'; -import 'package:onesignal/src/utils.dart'; -import 'package:onesignal/src/notification.dart'; -import 'package:onesignal/src/create_notification.dart'; +import 'package:onesignalflutter/src/permission.dart'; +import 'package:onesignalflutter/src/subscription.dart'; +import 'package:onesignalflutter/src/defines.dart'; +import 'package:onesignalflutter/src/utils.dart'; +import 'package:onesignalflutter/src/notification.dart'; +import 'package:onesignalflutter/src/create_notification.dart'; export 'src/notification.dart'; export 'src/subscription.dart'; diff --git a/lib/src/create_notification.dart b/lib/src/create_notification.dart index 962d157a..6c59c36b 100644 --- a/lib/src/create_notification.dart +++ b/lib/src/create_notification.dart @@ -1,7 +1,7 @@ -import 'package:onesignal/src/utils.dart'; +import 'package:onesignalflutter/src/utils.dart'; import 'package:flutter/foundation.dart'; -import 'package:onesignal/src/notification.dart'; -import 'package:onesignal/onesignal.dart'; +import 'package:onesignalflutter/src/notification.dart'; +import 'package:onesignalflutter/onesignalflutter.dart'; /// The parameters & format to create push notifications is /// so different from receiving notifications that we represent diff --git a/lib/src/notification.dart b/lib/src/notification.dart index a13ed164..81a34931 100644 --- a/lib/src/notification.dart +++ b/lib/src/notification.dart @@ -1,5 +1,5 @@ -import 'package:onesignal/src/defines.dart'; -import 'package:onesignal/src/utils.dart'; +import 'package:onesignalflutter/src/defines.dart'; +import 'package:onesignalflutter/src/utils.dart'; import 'package:flutter/foundation.dart'; import 'dart:convert'; diff --git a/lib/src/permission.dart b/lib/src/permission.dart index d440f28e..0793c3af 100644 --- a/lib/src/permission.dart +++ b/lib/src/permission.dart @@ -1,6 +1,6 @@ -import 'package:onesignal/src/subscription.dart'; -import 'package:onesignal/src/defines.dart'; -import 'package:onesignal/src/utils.dart'; +import 'package:onesignalflutter/src/subscription.dart'; +import 'package:onesignalflutter/src/defines.dart'; +import 'package:onesignalflutter/src/utils.dart'; class OSPermissionState extends JSONStringRepresentable { bool hasPrompted; // iOS only diff --git a/lib/src/subscription.dart b/lib/src/subscription.dart index 081fc0a1..cebb6b17 100644 --- a/lib/src/subscription.dart +++ b/lib/src/subscription.dart @@ -1,4 +1,4 @@ -import 'package:onesignal/src/utils.dart'; +import 'package:onesignalflutter/src/utils.dart'; /// Represents the current user's subscription state with OneSignal class OSSubscriptionState extends JSONStringRepresentable { @@ -6,7 +6,7 @@ class OSSubscriptionState extends JSONStringRepresentable { /// programmatically disable notifications for this user bool userSubscriptionSetting; - /// A boolean paramerer that indicates if the user + /// A boolean parameter that indicates if the user /// is subscribed to your app with OneSignal /// This is only true if the `userId`, `pushToken`, and /// `userSubscriptionSetting` parameters are defined/true. diff --git a/lib/src/utils.dart b/lib/src/utils.dart index 1de2c645..054b8e2c 100644 --- a/lib/src/utils.dart +++ b/lib/src/utils.dart @@ -1,4 +1,4 @@ -import 'package:onesignal/src/defines.dart'; +import 'package:onesignalflutter/src/defines.dart'; import 'dart:convert'; // produces a string like this: 2018-07-23T17:56:30.951030 UTC-7:00 diff --git a/onesignal.iml b/onesignalflutter.iml similarity index 100% rename from onesignal.iml rename to onesignalflutter.iml diff --git a/onesignal_android.iml b/onesignalflutter_android.iml similarity index 100% rename from onesignal_android.iml rename to onesignalflutter_android.iml diff --git a/pubspec.yaml b/pubspec.yaml index 7b461469..79399b25 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,4 +1,4 @@ -name: onesignal +name: onesignalflutter description: OneSignal is a free push notification service for mobile apps. This plugin makes it easy to integrate your flutter app with OneSignal version: 1.1.0 author: Brad Hesse , Josh Kasten @@ -20,4 +20,4 @@ dev_dependencies: environment: sdk: ">=2.0.0-dev.28.0 <3.0.0" - flutter: ">=0.1.4 <2.0.0" \ No newline at end of file + flutter: ">=0.1.4 <2.0.0"