diff --git a/mingle/ios/Runner.xcodeproj/project.pbxproj b/mingle/ios/Runner.xcodeproj/project.pbxproj index ac8b3bb..7321b6d 100644 --- a/mingle/ios/Runner.xcodeproj/project.pbxproj +++ b/mingle/ios/Runner.xcodeproj/project.pbxproj @@ -516,12 +516,14 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = "$(inherited)"; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 4.1.0; - DEVELOPMENT_TEAM = LPUW5AZU9U; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = LPUW5AZU9U; ENABLE_BITCODE = NO; - FLUTTER_BUILD_NAME = 5.0.0; - FLUTTER_BUILD_NUMBER = 5.0.0; + FLUTTER_BUILD_NAME = 5.0.2; + FLUTTER_BUILD_NUMBER = 5.0.2; INFOPLIST_FILE = Runner/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -531,6 +533,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.teamingle.mingle; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = dev_profile; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -716,12 +719,14 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = "$(inherited)"; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 4.1.0; - DEVELOPMENT_TEAM = LPUW5AZU9U; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = LPUW5AZU9U; ENABLE_BITCODE = NO; - FLUTTER_BUILD_NAME = 5.0.0; - FLUTTER_BUILD_NUMBER = 5.0.0; + FLUTTER_BUILD_NAME = 5.0.2; + FLUTTER_BUILD_NUMBER = 5.0.2; INFOPLIST_FILE = Runner/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -731,6 +736,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.teamingle.mingle; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = dev_profile; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -748,12 +754,14 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = "$(inherited)"; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 4.1.0; - DEVELOPMENT_TEAM = LPUW5AZU9U; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = LPUW5AZU9U; ENABLE_BITCODE = NO; - FLUTTER_BUILD_NAME = 5.0.0; - FLUTTER_BUILD_NUMBER = 5.0.0; + FLUTTER_BUILD_NAME = 5.0.2; + FLUTTER_BUILD_NUMBER = 5.0.2; INFOPLIST_FILE = Runner/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -763,6 +771,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.teamingle.mingle; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = dev_profile; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/mingle/lib/timetable/repository/friend_repository.dart b/mingle/lib/timetable/repository/friend_repository.dart index bb13c5f..55c6f51 100644 --- a/mingle/lib/timetable/repository/friend_repository.dart +++ b/mingle/lib/timetable/repository/friend_repository.dart @@ -84,9 +84,9 @@ class AddFriendDto { @JsonSerializable() class GenerateCodeDto { - String friendDisplayName; + String myDisplayName; - GenerateCodeDto({required this.friendDisplayName}); + GenerateCodeDto({required this.myDisplayName}); Map toJson() => _$GenerateCodeDtoToJson(this); } diff --git a/mingle/lib/timetable/repository/friend_repository.g.dart b/mingle/lib/timetable/repository/friend_repository.g.dart index 1bd566e..66af7f3 100644 --- a/mingle/lib/timetable/repository/friend_repository.g.dart +++ b/mingle/lib/timetable/repository/friend_repository.g.dart @@ -19,12 +19,12 @@ Map _$AddFriendDtoToJson(AddFriendDto instance) => GenerateCodeDto _$GenerateCodeDtoFromJson(Map json) => GenerateCodeDto( - friendDisplayName: json['friendDisplayName'] as String, + myDisplayName: json['myDisplayName'] as String, ); Map _$GenerateCodeDtoToJson(GenerateCodeDto instance) => { - 'friendDisplayName': instance.friendDisplayName, + 'myDisplayName': instance.myDisplayName, }; ChangeFriendNameDto _$ChangeFriendNameDtoFromJson(Map json) => diff --git a/mingle/lib/timetable/view/timetable_tab_screen.dart b/mingle/lib/timetable/view/timetable_tab_screen.dart index 0b7c005..4d3189e 100644 --- a/mingle/lib/timetable/view/timetable_tab_screen.dart +++ b/mingle/lib/timetable/view/timetable_tab_screen.dart @@ -1250,9 +1250,10 @@ class _TimeTableHomeScreenState extends ConsumerState { } Future secondShareCodeModal() async { - print(friendDisplayName); - String code = (await ref.watch(friendRepositoryProvider).generateCode( - GenerateCodeDto(friendDisplayName: friendDisplayName))) + print("friendDisplayName: $friendDisplayName"); + String code = (await ref + .watch(friendRepositoryProvider) + .generateCode(GenerateCodeDto(myDisplayName: friendDisplayName))) .code; return showModalBottomSheet( backgroundColor: Colors.transparent, diff --git a/mingle/pubspec.lock b/mingle/pubspec.lock index fb325bf..4462b1f 100644 --- a/mingle/pubspec.lock +++ b/mingle/pubspec.lock @@ -538,10 +538,10 @@ packages: dependency: "direct main" description: name: flutter_local_notifications - sha256: "55b9b229307a10974b26296ff29f2e132256ba4bd74266939118eaefa941cb00" + sha256: c500d5d9e7e553f06b61877ca6b9c8b92c570a4c8db371038702e8ce57f8a50f url: "https://pub.dev" source: hosted - version: "16.3.3" + version: "17.2.2" flutter_local_notifications_linux: dependency: transitive description: diff --git a/mingle/pubspec.yaml b/mingle/pubspec.yaml index 688e30c..c9512cf 100644 --- a/mingle/pubspec.yaml +++ b/mingle/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 5.0.1+50 +version: 5.0.2+51 environment: sdk: ">=3.4.0 <5.0.0" @@ -58,7 +58,7 @@ dependencies: page_transition: "^2.1.0" intl: ^0.19.0 flutter_linkify: ^6.0.0 - flutter_local_notifications: ^16.3.2 + flutter_local_notifications: ^17.2.2 firebase_core: ^2.7.0 firebase_messaging: ^14.7.16 firebase_core_platform_interface: ^5.0.0