Skip to content

Commit 7ff8d69

Browse files
hatemragabhatemragab
committed
update ios test flight
1 parent 6a8b83a commit 7ff8d69

24 files changed

+109
-100
lines changed

‎example/ios/Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ PODS:
4040
- Firebase/Messaging (8.9.0):
4141
- Firebase/CoreOnly
4242
- FirebaseMessaging (~> 8.9.0)
43-
- firebase_core (1.10.0):
43+
- firebase_core (1.10.2):
4444
- Firebase/CoreOnly (= 8.9.0)
4545
- Flutter
46-
- firebase_messaging (11.1.0):
46+
- firebase_messaging (11.2.0):
4747
- Firebase/Messaging (= 8.9.0)
4848
- firebase_core
4949
- Flutter
@@ -238,8 +238,8 @@ SPEC CHECKSUMS:
238238
DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
239239
file_picker: 3e6c3790de664ccf9b882732d9db5eaf6b8d4eb1
240240
Firebase: 13d8d96499e2635428d5bf0ec675df21f95d9a95
241-
firebase_core: f770e033e790657b3505f04be4cb24c482912f11
242-
firebase_messaging: 0c8d1a1732487db7f332fb65232053e93201e2fb
241+
firebase_core: 6d1a5e12a83b6d9419ecb8f2a53d876e7b4695da
242+
firebase_messaging: 4f7eab3f100c30d0544f5a6f6ca549f7f8c12705
243243
FirebaseCore: 599ee609343eaf4941bd188f85e3aa077ffe325b
244244
FirebaseCoreDiagnostics: 5daa63f1c1409d981a2d5007daa100b36eac6a34
245245
FirebaseInstallations: caa7c8e0d3e2345b8829d2fa9ca1b4dfbf2fcc85

‎example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
20831AF163FEC880909EABB5 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8563EBA5D0E4A090DCD98366 /* Pods_Runner.framework */; };
1212
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1313
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
14-
893E9D402728070D0068DDCD /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 893E9D3F2728070D0068DDCD /* GoogleService-Info.plist */; };
14+
8904A402275E09B500EC42B1 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8904A401275E09B500EC42B1 /* GoogleService-Info.plist */; };
1515
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1616
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1717
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
@@ -41,7 +41,8 @@
4141
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
4242
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
4343
8563EBA5D0E4A090DCD98366 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
44-
893E9D3F2728070D0068DDCD /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
44+
8904A401275E09B500EC42B1 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
45+
894AD232275E118C00AEFC81 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
4546
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
4647
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
4748
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -114,10 +115,11 @@
114115
97C146F01CF9000F007C117D /* Runner */ = {
115116
isa = PBXGroup;
116117
children = (
117-
893E9D3F2728070D0068DDCD /* GoogleService-Info.plist */,
118+
894AD232275E118C00AEFC81 /* Runner.entitlements */,
118119
97C146FA1CF9000F007C117D /* Main.storyboard */,
119120
97C146FD1CF9000F007C117D /* Assets.xcassets */,
120121
97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
122+
8904A401275E09B500EC42B1 /* GoogleService-Info.plist */,
121123
97C147021CF9000F007C117D /* Info.plist */,
122124
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
123125
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
@@ -192,7 +194,7 @@
192194
files = (
193195
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
194196
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
195-
893E9D402728070D0068DDCD /* GoogleService-Info.plist in Resources */,
197+
8904A402275E09B500EC42B1 /* GoogleService-Info.plist in Resources */,
196198
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
197199
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
198200
);
@@ -358,15 +360,16 @@
358360
buildSettings = {
359361
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
360362
CLANG_ENABLE_MODULES = YES;
363+
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
361364
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
362-
DEVELOPMENT_TEAM = NHF49WV7N9;
365+
DEVELOPMENT_TEAM = K5UP26B3W8;
363366
ENABLE_BITCODE = NO;
364367
INFOPLIST_FILE = Runner/Info.plist;
365368
LD_RUNPATH_SEARCH_PATHS = (
366369
"$(inherited)",
367370
"@executable_path/Frameworks",
368371
);
369-
PRODUCT_BUNDLE_IDENTIFIER = com.vchatsdktesting.app;
372+
PRODUCT_BUNDLE_IDENTIFIER = com.vchatsdk.app;
370373
PRODUCT_NAME = "$(TARGET_NAME)";
371374
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
372375
SWIFT_VERSION = 5.0;
@@ -487,15 +490,16 @@
487490
buildSettings = {
488491
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
489492
CLANG_ENABLE_MODULES = YES;
493+
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
490494
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
491-
DEVELOPMENT_TEAM = NHF49WV7N9;
495+
DEVELOPMENT_TEAM = K5UP26B3W8;
492496
ENABLE_BITCODE = NO;
493497
INFOPLIST_FILE = Runner/Info.plist;
494498
LD_RUNPATH_SEARCH_PATHS = (
495499
"$(inherited)",
496500
"@executable_path/Frameworks",
497501
);
498-
PRODUCT_BUNDLE_IDENTIFIER = com.vchatsdktesting.app;
502+
PRODUCT_BUNDLE_IDENTIFIER = com.vchatsdk.app;
499503
PRODUCT_NAME = "$(TARGET_NAME)";
500504
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
501505
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -510,15 +514,16 @@
510514
buildSettings = {
511515
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
512516
CLANG_ENABLE_MODULES = YES;
517+
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
513518
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
514-
DEVELOPMENT_TEAM = NHF49WV7N9;
519+
DEVELOPMENT_TEAM = K5UP26B3W8;
515520
ENABLE_BITCODE = NO;
516521
INFOPLIST_FILE = Runner/Info.plist;
517522
LD_RUNPATH_SEARCH_PATHS = (
518523
"$(inherited)",
519524
"@executable_path/Frameworks",
520525
);
521-
PRODUCT_BUNDLE_IDENTIFIER = com.vchatsdktesting.app;
526+
PRODUCT_BUNDLE_IDENTIFIER = com.vchatsdk.app;
522527
PRODUCT_NAME = "$(TARGET_NAME)";
523528
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
524529
SWIFT_VERSION = 5.0;
@@ -552,4 +557,4 @@
552557
/* End XCConfigurationList section */
553558
};
554559
rootObject = 97C146E61CF9000F007C117D /* Project object */;
555-
}
560+
}

‎example/ios/Runner/AppDelegate.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ import Flutter
88
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
99
) -> Bool {
1010
GeneratedPluginRegistrant.register(with: self)
11+
if #available(iOS 10.0, *) {
12+
UNUserNotificationCenter.current().delegate = self as? UNUserNotificationCenterDelegate
13+
}
1114
return super.application(application, didFinishLaunchingWithOptions: launchOptions)
1215
}
1316
}

‎example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png

-7.87 KB
Loading

‎example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png

-67 Bytes
Loading

‎example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png

-148 Bytes
Loading

‎example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png

-226 Bytes
Loading

‎example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png

-94 Bytes
Loading

‎example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png

-204 Bytes
Loading

‎example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png

-254 Bytes
Loading

‎example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png

-148 Bytes
Loading

‎example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png

-253 Bytes
Loading

‎example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png

-343 Bytes
Loading

‎example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png

-343 Bytes
Loading

‎example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png

-489 Bytes
Loading

‎example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png

-256 Bytes
Loading

‎example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png

-440 Bytes
Loading

‎example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png

-486 Bytes
Loading

‎example/ios/Runner/GoogleService-Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
<key>IS_SIGNIN_ENABLED</key>
3232
<true></true>
3333
<key>GOOGLE_APP_ID</key>
34-
<string>1:262378932091:ios:e6a8eadde36eae490d9fde</string>
34+
<string>1:262378932091:ios:bd79b43869543b5f0d9fde</string>
3535
</dict>
3636
</plist>

‎example/ios/Runner/Runner.entitlements

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>aps-environment</key>
6+
<string>development</string>
7+
</dict>
8+
</plist>

‎example/pubspec.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ flutter:
102102
flutter_icons:
103103
android: "ic_launcher"
104104
ios: true
105+
remove_alpha_ios: true
105106
image_path: "assets/icon.png"
106107

107108
flutter_intl:

‎lib/src/services/notification_service.dart

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'dart:async';
2+
import 'dart:io';
23

34
import 'package:firebase_messaging/firebase_messaging.dart';
45
import 'package:flutter/material.dart';
@@ -78,7 +79,7 @@ class NotificationService {
7879
sound: true,
7980
);
8081
FirebaseMessaging.onMessageOpenedApp.listen((message) async {
81-
try{
82+
try {
8283
if (message.notification != null) {
8384
final roomId = message.data['roomId'].toString();
8485
try {
@@ -88,18 +89,17 @@ class NotificationService {
8889

8990
Navigator.of(context).push(MaterialPageRoute(
9091
builder: (_) => MessageView(
91-
roomId: roomId,
92-
)));
92+
roomId: roomId,
93+
)));
9394
}
9495
} catch (err) {
9596
Helpers.vlog(err.toString());
9697
//
9798
}
9899
}
99-
}catch(err){
100+
} catch (err) {
100101
//
101102
}
102-
103103
});
104104

105105
await flutterLocalNotificationsPlugin
@@ -182,6 +182,10 @@ class NotificationService {
182182
required String msg,
183183
required int hashCode,
184184
required String roomId}) {
185+
if (Platform.isIOS) {
186+
return;
187+
}
188+
185189
unawaited(
186190
flutterLocalNotificationsPlugin.show(
187191
hashCode,
@@ -191,25 +195,5 @@ class NotificationService {
191195
android: androidNotificationDetails, iOS: iosNotificationDetails),
192196
payload: roomId),
193197
);
194-
195-
// flutterLocalNotificationsPlugin.cancel(roomId);
196-
197-
// BotToast.showSimpleNotification(
198-
// title: title.toString(),
199-
// onTap: () {
200-
// if (!RoomCubit.instance.isRoomOpen(roomId)) {
201-
// RoomCubit.instance.currentRoomId = roomId;
202-
//
203-
// Navigator.of(VChatAppService.to.navKey!.currentContext!)
204-
// .push(MaterialPageRoute(
205-
// builder: (_) => MessageView(
206-
// roomId: roomId,
207-
// )));
208-
// }
209-
// BotToast.cleanAll();
210-
// },
211-
// duration: const Duration(seconds: 5),
212-
// subTitle: msg.toString(),
213-
// );
214198
}
215199
}

‎lib/src/utils/custom_widgets/create_single_chat_dialog.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class CreateSingleChatDialog extends StatelessWidget {
1818
Widget build(BuildContext context) {
1919
if (Platform.isIOS) {
2020
return Material(
21+
color: Colors.transparent,
2122
child: CupertinoAlertDialog(
2223
title: titleTxt != null
2324
? titleTxt!.text

‎lib/src/utils/custom_widgets/custom_alert_dialog.dart

Lines changed: 66 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -157,75 +157,82 @@ class CustomAlert {
157157
required BuildContext context,
158158
bool dismissible = true,
159159
}) async {
160+
if (Platform.isIOS) {
161+
return showDialog(
162+
context: context,
163+
builder: (context) {
164+
return WillPopScope(
165+
onWillPop: () async {
166+
return dismissible;
167+
},
168+
child: CupertinoAlertDialog(
169+
title: title.text,
170+
content: Column(
171+
mainAxisSize: MainAxisSize.min,
172+
children: [
173+
const SizedBox(
174+
height: 10,
175+
),
176+
],
177+
),
178+
actions: [
179+
TextButton(
180+
onPressed: () => Navigator.pop(context, -1),
181+
child: VChatAppService.instance
182+
.getTrans(context)
183+
.cancel()
184+
.text,
185+
),
186+
TextButton(
187+
onPressed: () => Navigator.pop(context, 1),
188+
child: VChatAppService.instance.getTrans(context).oK().text,
189+
),
190+
],
191+
),
192+
);
193+
});
194+
}
195+
160196
return await showGeneralDialog(
161197
barrierColor: Colors.black.withOpacity(0.5),
162198
transitionBuilder: (context, a1, a2, widget) {
163199
return WillPopScope(
164200
onWillPop: () async {
165201
return dismissible;
166202
},
167-
child: Platform.isIOS
168-
? CupertinoAlertDialog(
169-
title: title.text,
170-
content: Column(
171-
mainAxisSize: MainAxisSize.min,
172-
children: [
173-
const SizedBox(
174-
height: 10,
175-
),
176-
],
177-
),
178-
actions: [
179-
TextButton(
180-
onPressed: () => Navigator.pop(context, -1),
181-
child: VChatAppService.instance
182-
.getTrans(context)
183-
.cancel()
184-
.text,
185-
),
186-
TextButton(
187-
onPressed: () => Navigator.pop(context, 1),
188-
child:
189-
VChatAppService.instance.getTrans(context).oK().text,
203+
child: Transform.scale(
204+
scale: a1.value,
205+
child: Opacity(
206+
opacity: a1.value,
207+
child: AlertDialog(
208+
clipBehavior: Clip.antiAliasWithSaveLayer,
209+
title: title.text,
210+
contentPadding: EdgeInsets.zero
211+
.copyWith(top: 8, bottom: 5, left: 10, right: 10),
212+
content: Column(
213+
mainAxisSize: MainAxisSize.min,
214+
children: [
215+
const SizedBox(
216+
height: 10,
190217
),
191218
],
192-
)
193-
: Transform.scale(
194-
scale: a1.value,
195-
child: Opacity(
196-
opacity: a1.value,
197-
child: AlertDialog(
198-
clipBehavior: Clip.antiAliasWithSaveLayer,
199-
title: title.text,
200-
contentPadding: EdgeInsets.zero
201-
.copyWith(top: 8, bottom: 5, left: 10, right: 10),
202-
content: Column(
203-
mainAxisSize: MainAxisSize.min,
204-
children: [
205-
const SizedBox(
206-
height: 10,
207-
),
208-
],
209-
),
210-
actions: [
211-
TextButton(
212-
onPressed: () => Navigator.pop(context, -1),
213-
child: VChatAppService.instance
214-
.getTrans(context)
215-
.cancel()
216-
.text,
217-
),
218-
TextButton(
219-
onPressed: () => Navigator.pop(context, 1),
220-
child: VChatAppService.instance
221-
.getTrans(context)
222-
.oK()
223-
.text,
224-
),
225-
],
226-
),
227-
),
228219
),
220+
actions: [
221+
TextButton(
222+
onPressed: () => Navigator.pop(context, -1),
223+
child: VChatAppService.instance
224+
.getTrans(context)
225+
.cancel()
226+
.text,
227+
),
228+
TextButton(
229+
onPressed: () => Navigator.pop(context, 1),
230+
child: VChatAppService.instance.getTrans(context).oK().text,
231+
),
232+
],
233+
),
234+
),
235+
),
229236
);
230237
},
231238
transitionDuration: const Duration(milliseconds: 250),

0 commit comments

Comments
 (0)