Skip to content

Commit

Permalink
upgrade sdk version
Browse files Browse the repository at this point in the history 
modify ui
  • Loading branch information
@chyiiiiiiiiiiii
chyiiiiiiiiiiii committed Jan 31, 2023
1 parent fcd7075 commit bcce5b9
Show file tree
Hide file tree
Showing 20 changed files with 174 additions and 96 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@
.packages
.pub/

pubspec.lock

build/
2 changes: 1 addition & 1 deletion example/ios/Podfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 7368163408c647b7eb699d0d788ba6718e18fb8d

COCOAPODS: 1.11.2
COCOAPODS: 1.11.3
4 changes: 3 additions & 1 deletion example/ios/Runner.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 51;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -199,6 +199,7 @@
/* Begin PBXShellScriptBuildPhase section */
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
Expand Down Expand Up @@ -235,6 +236,7 @@
};
9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
Expand Down
2 changes: 2 additions & 0 deletions example/ios/Runner/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,7 @@
<false/>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
</dict>
</plist>
60 changes: 40 additions & 20 deletions example/lib/main.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ class MyApp extends StatefulWidget {
}

class _MyAppState extends State<MyApp> {
static const String androidChannelKey =
"eyJzZXR0aW5nc191cmwiOiJodHRwczovL2hhbmFtaWhlbHAuemVuZGVzay5jb20vbW9iaWxlX3Nka19hcGkvc2V0dGluZ3MvMDFGR0tDRTlSNEFLWDBGOUc2Sk04Mk5RQU0uanNvbiJ9";
static const String iosChannelKey =
"eyJzZXR0aW5nc191cmwiOiJodHRwczovL2hhbmFtaWhlbHAuemVuZGVzay5jb20vbW9iaWxlX3Nka19hcGkvc2V0dGluZ3MvMDFGR1BGVFQ1Q1hFRjdRWVkwUkg2R0JYS0MuanNvbiJ9";
static const String androidChannelKey = "your android key";
static const String iosChannelKey = "your iOS key";

final List<String> channelMessages = [];

bool isLogin = false;
int unreadMessageCount = 0;

@override
Expand All @@ -34,7 +34,7 @@ class _MyAppState extends State<MyApp> {

@override
Widget build(BuildContext context) {
var message = channelMessages.join("\n");
final message = channelMessages.join("\n");

return MaterialApp(
home: Scaffold(
Expand All @@ -52,21 +52,29 @@ class _MyAppState extends State<MyApp> {
),
ElevatedButton(
onPressed: () => ZendeskMessaging.initialize(
androidChannelKey: androidChannelKey,
iosChannelKey: iosChannelKey),
androidChannelKey: androidChannelKey,
iosChannelKey: iosChannelKey,
),
child: const Text("Initialize"),
),
ElevatedButton(
if (isLogin) ...[
ElevatedButton(
onPressed: () => ZendeskMessaging.show(),
child: const Text("Show messaging")),
ElevatedButton(
child: const Text("Show messaging"),
),
ElevatedButton(
onPressed: () => _getUnreadMessageCount(),
child: const Text("Count unread messages")),
child: Text('Get unread message count - $unreadMessageCount'),
),
],
ElevatedButton(
onPressed: () => _login(), child: const Text("Login")),
onPressed: () => _login(),
child: const Text("Login"),
),
ElevatedButton(
onPressed: () => ZendeskMessaging.logoutUser(),
child: const Text("Logout")),
onPressed: () => _logout(),
child: const Text("Logout"),
),
],
),
),
Expand All @@ -79,17 +87,29 @@ class _MyAppState extends State<MyApp> {
// You can attach local observer when calling some methods to be notified when ready
ZendeskMessaging.loginUserCallbacks(
jwt: "my_jwt",
onSuccess: (id, externalId) => setState(() =>
channelMessages.add("Login observer SUCCESS: $id, $externalId")),
onFailure: () =>
setState(() => channelMessages.add("Login observer FAILURE !")),
onSuccess: (id, externalId) => setState(() {
channelMessages.add("Login observer - SUCCESS: $id, $externalId");
isLogin = true;
}),
onFailure: () => setState(() {
channelMessages.add("Login observer - FAILURE!");
isLogin = false;
}),
);
}

void _logout() {
ZendeskMessaging.logoutUser();
setState(() {
isLogin = false;
});
}

void _getUnreadMessageCount() async {
final messageCount = await ZendeskMessaging.getUnreadMessageCount();
setState(() {
if (mounted) {
unreadMessageCount = messageCount;
});
setState(() {});
}
}
}
95 changes: 61 additions & 34 deletions example/pubspec.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,49 +5,56 @@ packages:
dependency: transitive
description:
name: async
url: "https://pub.dartlang.org"
sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
url: "https://pub.dev"
source: hosted
version: "2.9.0"
version: "2.10.0"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
url: "https://pub.dartlang.org"
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.1.1"
characters:
dependency: transitive
description:
name: characters
url: "https://pub.dartlang.org"
sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
url: "https://pub.dev"
source: hosted
version: "1.2.1"
clock:
dependency: transitive
description:
name: clock
url: "https://pub.dartlang.org"
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
url: "https://pub.dev"
source: hosted
version: "1.1.1"
collection:
dependency: transitive
description:
name: collection
url: "https://pub.dartlang.org"
sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
url: "https://pub.dev"
source: hosted
version: "1.16.0"
version: "1.17.0"
cupertino_icons:
dependency: "direct main"
description:
name: cupertino_icons
url: "https://pub.dartlang.org"
sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be
url: "https://pub.dev"
source: hosted
version: "1.0.5"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
url: "https://pub.dev"
source: hosted
version: "1.3.1"
flutter:
Expand All @@ -59,47 +66,61 @@ packages:
dependency: "direct dev"
description:
name: flutter_lints
url: "https://pub.dartlang.org"
sha256: b543301ad291598523947dc534aaddc5aaad597b709d2426d3a0e0d44c5cb493
url: "https://pub.dev"
source: hosted
version: "1.0.4"
flutter_test:
dependency: "direct dev"
description: flutter
source: sdk
version: "0.0.0"
js:
dependency: transitive
description:
name: js
sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
url: "https://pub.dev"
source: hosted
version: "0.6.5"
lints:
dependency: transitive
description:
name: lints
url: "https://pub.dartlang.org"
sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c
url: "https://pub.dev"
source: hosted
version: "1.0.1"
matcher:
dependency: transitive
description:
name: matcher
url: "https://pub.dartlang.org"
sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
url: "https://pub.dev"
source: hosted
version: "0.12.12"
version: "0.12.13"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
url: "https://pub.dartlang.org"
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
url: "https://pub.dev"
source: hosted
version: "0.1.5"
version: "0.2.0"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
url: "https://pub.dev"
source: hosted
version: "1.8.0"
path:
dependency: transitive
description:
name: path
url: "https://pub.dartlang.org"
sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
url: "https://pub.dev"
source: hosted
version: "1.8.2"
sky_engine:
Expand All @@ -111,58 +132,64 @@ packages:
dependency: transitive
description:
name: source_span
url: "https://pub.dartlang.org"
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
url: "https://pub.dev"
source: hosted
version: "1.9.0"
version: "1.9.1"
stack_trace:
dependency: transitive
description:
name: stack_trace
url: "https://pub.dartlang.org"
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.11.0"
stream_channel:
dependency: transitive
description:
name: stream_channel
url: "https://pub.dartlang.org"
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.1.1"
string_scanner:
dependency: transitive
description:
name: string_scanner
url: "https://pub.dartlang.org"
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
url: "https://pub.dev"
source: hosted
version: "1.1.1"
version: "1.2.0"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
url: "https://pub.dev"
source: hosted
version: "1.2.1"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
url: "https://pub.dev"
source: hosted
version: "0.4.12"
version: "0.4.16"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
url: "https://pub.dev"
source: hosted
version: "2.1.2"
version: "2.1.4"
zendesk_messaging:
dependency: "direct main"
description:
path: ".."
relative: true
source: path
version: "2.7.0"
version: "2.7.2"
sdks:
dart: ">=2.18.1 <3.0.0"
flutter: ">=2.18.1"
dart: ">=2.19.0 <4.0.0"
2 changes: 1 addition & 1 deletion example/pubspec.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: Demonstrates how to use the zendesk_messaging plugin.
publish_to: 'none' # Remove this line if you wish to publish to pub.dev

environment:
sdk: '>=2.18.1 <3.0.0'
sdk: '>=2.19.0 <3.0.0'

# Dependencies specify other packages that your package needs in order to work.
# To automatically upgrade your package dependencies to the latest versions
Expand Down
Binary file removed lib/kotlin-reflect-sources.jar
View file
Binary file not shown.
Binary file removed lib/kotlin-reflect.jar
View file
Binary file not shown.
Binary file removed lib/kotlin-stdlib-jdk7-sources.jar
View file
Binary file not shown.
Binary file removed lib/kotlin-stdlib-jdk7.jar
View file
Binary file not shown.
Binary file removed lib/kotlin-stdlib-jdk8-sources.jar
View file
Binary file not shown.
Binary file removed lib/kotlin-stdlib-jdk8.jar
View file
Binary file not shown.
Binary file removed lib/kotlin-stdlib-sources.jar
View file
Binary file not shown.
Binary file removed lib/kotlin-stdlib.jar
View file
Binary file not shown.
Binary file removed lib/kotlin-test-sources.jar
View file
Binary file not shown.
Binary file removed lib/kotlin-test.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion lib/zendesk_messaging.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ class ZendeskMessaging {
}
}

/// Check if the Zendesk SDK for Android and iOS is already initialized
/// Check if the Zendesk SDK for Android and iOS is already initialized
static Future<bool> isInitialized() async {
try {
return await _channel.invokeMethod(
Expand Down
Loading

0 comments on commit bcce5b9

Please sign in to comment.