diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 86b46ef5fc..6dcf75f239 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 54; + objectVersion = 60; objects = { /* Begin PBXBuildFile section */ @@ -86,6 +86,7 @@ C1005C45261071B5002F4F32 /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1005C44261071B5002F4F32 /* ShareViewController.swift */; }; C1005C4C261071B5002F4F32 /* Twake Share.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = C1005C42261071B5002F4F32 /* Twake Share.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; C149567C25C7274F00A16396 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C149567B25C7274F00A16396 /* GoogleService-Info.plist */; }; + E388818A944B178F69E4431D /* Pods_Twake_Share.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB50B9422955BF92FC0FEB3C /* Pods_Twake_Share.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -270,6 +271,8 @@ 1B6C59111A74FF0BB750A10A /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 216064C73ECC2AECB9F0A1FA /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 3D818CE626126D8D1C67A3C9 /* Pods-Twake Share.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Twake Share.release.xcconfig"; path = "Target Support Files/Pods-Twake Share/Pods-Twake Share.release.xcconfig"; sourceTree = ""; }; + 48F3E70A44AA65D69E70C12D /* Pods-Twake Share.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Twake Share.profile.xcconfig"; path = "Target Support Files/Pods-Twake Share/Pods-Twake Share.profile.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; @@ -281,12 +284,14 @@ 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; B16AB66899BBD65C9BFB2599 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + BD7FC81DBDE4B0D093DEFFCB /* Pods-Twake Share.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Twake Share.debug.xcconfig"; path = "Target Support Files/Pods-Twake Share/Pods-Twake Share.debug.xcconfig"; sourceTree = ""; }; C1005C42261071B5002F4F32 /* Twake Share.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "Twake Share.appex"; sourceTree = BUILT_PRODUCTS_DIR; }; C1005C44261071B5002F4F32 /* ShareViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareViewController.swift; sourceTree = ""; }; C1005C49261071B5002F4F32 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; C1005C53261072D4002F4F32 /* Twake Share.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Twake Share.entitlements"; sourceTree = ""; }; C149567B25C7274F00A16396 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; C149567D25C7276200A16396 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = ""; }; + DB50B9422955BF92FC0FEB3C /* Pods_Twake_Share.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Twake_Share.framework; sourceTree = BUILT_PRODUCTS_DIR; }; FDBA7311CF00074CB7786C33 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -320,6 +325,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + E388818A944B178F69E4431D /* Pods_Twake_Share.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -452,6 +458,7 @@ isa = PBXGroup; children = ( B16AB66899BBD65C9BFB2599 /* Pods_Runner.framework */, + DB50B9422955BF92FC0FEB3C /* Pods_Twake_Share.framework */, ); name = Frameworks; sourceTree = ""; @@ -524,6 +531,9 @@ 1B6C59111A74FF0BB750A10A /* Pods-Runner.debug.xcconfig */, FDBA7311CF00074CB7786C33 /* Pods-Runner.release.xcconfig */, 216064C73ECC2AECB9F0A1FA /* Pods-Runner.profile.xcconfig */, + BD7FC81DBDE4B0D093DEFFCB /* Pods-Twake Share.debug.xcconfig */, + 3D818CE626126D8D1C67A3C9 /* Pods-Twake Share.release.xcconfig */, + 48F3E70A44AA65D69E70C12D /* Pods-Twake Share.profile.xcconfig */, ); path = Pods; sourceTree = ""; @@ -589,6 +599,7 @@ isa = PBXNativeTarget; buildConfigurationList = C1005C51261071B5002F4F32 /* Build configuration list for PBXNativeTarget "Twake Share" */; buildPhases = ( + 265995452BC4DC2D49CADCC6 /* [CP] Check Pods Manifest.lock */, C1005C3E261071B5002F4F32 /* Sources */, C1005C3F261071B5002F4F32 /* Frameworks */, C1005C40261071B5002F4F32 /* Resources */, @@ -663,9 +674,9 @@ mainGroup = 97C146E51CF9000F007C117D; packageReferences = ( 06EA9CA02B21CFC000351529 /* XCRemoteSwiftPackageReference "DTCoreText" */, - 06EA9CA32B21D09D00351529 /* XCRemoteSwiftPackageReference "DeviceKit.git" */, + 06EA9CA32B21D09D00351529 /* XCRemoteSwiftPackageReference "DeviceKit" */, 06EA9CA62B21D13300351529 /* XCRemoteSwiftPackageReference "matrix-rust-components-swift" */, - 06EA9CA92B21D17200351529 /* XCLocalSwiftPackageReference "DesignKit" */, + 06EA9CA92B21D17200351529 /* XCLocalSwiftPackageReference "NSE/DesignKit" */, 06EA9CAC2B21D2CA00351529 /* XCRemoteSwiftPackageReference "LRUCache" */, 06EA9CAF2B21D2FE00351529 /* XCRemoteSwiftPackageReference "KeychainAccess" */, 06EA9CB22B21D33700351529 /* XCRemoteSwiftPackageReference "Kingfisher" */, @@ -716,6 +727,28 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 265995452BC4DC2D49CADCC6 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Twake Share-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -997,9 +1030,11 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = NSE/NSE.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = KUT463DS29; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = KUT463DS29; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; @@ -1019,6 +1054,7 @@ PRODUCT_BUNDLE_IDENTIFIER = app.twake.ios.chat.nse; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = chat.nse.ext.development.profile; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; SWIFT_EMIT_LOC_STRINGS = YES; @@ -1039,10 +1075,12 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = NSE/NSE.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_IDENTITY = "Apple Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = KUT463DS29; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = KUT463DS29; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; @@ -1061,6 +1099,7 @@ PRODUCT_BUNDLE_IDENTIFIER = app.twake.ios.chat.nse; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = chat.nse.ext.distribution.profile; SKIP_INSTALL = YES; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; @@ -1080,9 +1119,11 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = NSE/NSE.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = KUT463DS29; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = KUT463DS29; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; @@ -1101,6 +1142,7 @@ PRODUCT_BUNDLE_IDENTIFIER = app.twake.ios.chat.nse; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = chat.nse.ext.development.profile; SKIP_INSTALL = YES; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; @@ -1168,10 +1210,12 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; CUSTOM_GROUP_ID = group.app.twake.ios.chat; - DEVELOPMENT_TEAM = KUT463DS29; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = KUT463DS29; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1190,7 +1234,8 @@ MARKETING_VERSION = 0.32.1; PRODUCT_BUNDLE_IDENTIFIER = app.twake.ios.chat; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE_SPECIFIER = chat.development.profile; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = chat.development.profile; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; @@ -1315,10 +1360,12 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; CUSTOM_GROUP_ID = group.app.twake.ios.chat; - DEVELOPMENT_TEAM = KUT463DS29; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = KUT463DS29; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1337,7 +1384,8 @@ MARKETING_VERSION = 0.32.1; PRODUCT_BUNDLE_IDENTIFIER = app.twake.ios.chat; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE_SPECIFIER = chat.development.profile; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = chat.development.profile; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -1353,11 +1401,13 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_IDENTITY = "Apple Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; CUSTOM_GROUP_ID = group.app.twake.ios.chat; - DEVELOPMENT_TEAM = KUT463DS29; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = KUT463DS29; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1376,7 +1426,8 @@ MARKETING_VERSION = 0.32.1; PRODUCT_BUNDLE_IDENTIFIER = app.twake.ios.chat; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE_SPECIFIER = chat.distribution.profile; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = chat.distribution.profile; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; @@ -1385,6 +1436,7 @@ }; C1005C4E261071B5002F4F32 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = BD7FC81DBDE4B0D093DEFFCB /* Pods-Twake Share.debug.xcconfig */; buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -1394,10 +1446,12 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = "Twake Share/Twake Share.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; CUSTOM_GROUP_ID = group.app.twake.ios.chat; - DEVELOPMENT_TEAM = KUT463DS29; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = KUT463DS29; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = "Twake Share/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 14.4; @@ -1411,7 +1465,8 @@ MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = app.twake.ios.chat.share; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE_SPECIFIER = chat.share.ext.development.profile; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = chat.share.ext.development.profile; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -1422,6 +1477,7 @@ }; C1005C4F261071B5002F4F32 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 3D818CE626126D8D1C67A3C9 /* Pods-Twake Share.release.xcconfig */; buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -1430,11 +1486,13 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = "Twake Share/Twake Share.entitlements"; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_IDENTITY = "Apple Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; CUSTOM_GROUP_ID = group.app.twake.ios.chat; - DEVELOPMENT_TEAM = KUT463DS29; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = KUT463DS29; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = "Twake Share/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 14.4; @@ -1447,7 +1505,8 @@ MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = app.twake.ios.chat.share; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE_SPECIFIER = chat.share.ext.distribution.profile; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = chat.share.ext.distribution.profile; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1456,6 +1515,7 @@ }; C1005C50261071B5002F4F32 /* Profile */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 48F3E70A44AA65D69E70C12D /* Pods-Twake Share.profile.xcconfig */; buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -1465,10 +1525,12 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = "Twake Share/Twake Share.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; CUSTOM_GROUP_ID = group.app.twake.ios.chat; - DEVELOPMENT_TEAM = KUT463DS29; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = KUT463DS29; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = "Twake Share/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 14.4; @@ -1481,7 +1543,8 @@ MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = app.twake.ios.chat.share; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE_SPECIFIER = chat.share.ext.development.profile; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = chat.share.ext.development.profile; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1534,7 +1597,7 @@ /* End XCConfigurationList section */ /* Begin XCLocalSwiftPackageReference section */ - 06EA9CA92B21D17200351529 /* XCLocalSwiftPackageReference "DesignKit" */ = { + 06EA9CA92B21D17200351529 /* XCLocalSwiftPackageReference "NSE/DesignKit" */ = { isa = XCLocalSwiftPackageReference; relativePath = NSE/DesignKit; }; @@ -1573,7 +1636,7 @@ version = 1.6.26; }; }; - 06EA9CA32B21D09D00351529 /* XCRemoteSwiftPackageReference "DeviceKit.git" */ = { + 06EA9CA32B21D09D00351529 /* XCRemoteSwiftPackageReference "DeviceKit" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/devicekit/DeviceKit.git"; requirement = { @@ -1638,7 +1701,7 @@ }; 06EA9CA42B21D09D00351529 /* DeviceKit */ = { isa = XCSwiftPackageProductDependency; - package = 06EA9CA32B21D09D00351529 /* XCRemoteSwiftPackageReference "DeviceKit.git" */; + package = 06EA9CA32B21D09D00351529 /* XCRemoteSwiftPackageReference "DeviceKit" */; productName = DeviceKit; }; 06EA9CA72B21D13300351529 /* MatrixRustSDK */ = { diff --git a/lib/pages/search/recent_item_widget.dart b/lib/pages/search/recent_item_widget.dart index 7a30637d99..e534414a1f 100644 --- a/lib/pages/search/recent_item_widget.dart +++ b/lib/pages/search/recent_item_widget.dart @@ -30,18 +30,15 @@ class RecentItemWidget extends StatelessWidget { borderRadius: BorderRadius.circular(AppConfig.borderRadius), clipBehavior: Clip.hardEdge, color: Colors.transparent, - child: Padding( - padding: RecentItemStyle.paddingRecentItem, - child: Theme( - data: ThemeData( - splashColor: Colors.transparent, - highlightColor: Colors.transparent, - ), - child: ListTile( - contentPadding: EdgeInsets.zero, - title: _buildInformationWidget(context), - onTap: onTap, - ), + child: Theme( + data: ThemeData( + splashColor: Colors.transparent, + highlightColor: Colors.transparent, + ), + child: ListTile( + contentPadding: RecentItemStyle.paddingRecentItem, + title: _buildInformationWidget(context), + onTap: onTap, ), ), ); @@ -100,6 +97,7 @@ class _GroupChatInformation extends StatelessWidget { mxContent: recentChatPresentationSearch.getAvatarUriByMatrixId( client: client, ), + size: RecentItemStyle.avatarSize, ), ), const SizedBox(width: 8), @@ -186,6 +184,7 @@ class _DirectChatInformation extends StatelessWidget { mxContent: recentChatPresentationSearch.getAvatarUriByMatrixId( client: client, ), + size: RecentItemStyle.avatarSize, ), ), const SizedBox(width: 8), @@ -242,13 +241,10 @@ class _ContactInformation extends StatelessWidget { FutureBuilder( future: contactPresentationSearch.getProfile(client), builder: (context, snapshot) { - return SizedBox( - width: RecentItemStyle.avatarSize, - height: RecentItemStyle.avatarSize, - child: Avatar( - mxContent: snapshot.data?.avatarUrl, - name: contactPresentationSearch.displayName, - ), + return Avatar( + mxContent: snapshot.data?.avatarUrl, + name: contactPresentationSearch.displayName, + size: RecentItemStyle.avatarSize, ); }, ), diff --git a/lib/pages/search/recent_item_widget_style.dart b/lib/pages/search/recent_item_widget_style.dart index cdfd6d4a25..020e8c65fb 100644 --- a/lib/pages/search/recent_item_widget_style.dart +++ b/lib/pages/search/recent_item_widget_style.dart @@ -1,7 +1,10 @@ import 'package:flutter/material.dart'; class RecentItemStyle { - static EdgeInsetsGeometry get paddingRecentItem => - const EdgeInsets.symmetric(vertical: 8); - static double get avatarSize => 48.0; + static EdgeInsetsGeometry get paddingRecentItem => const EdgeInsets.symmetric( + horizontal: 8, + vertical: 4, + ); + + static double get avatarSize => 56.0; } diff --git a/lib/pages/search/search_view_style.dart b/lib/pages/search/search_view_style.dart index 1844a01315..cfcd34b3bb 100644 --- a/lib/pages/search/search_view_style.dart +++ b/lib/pages/search/search_view_style.dart @@ -3,16 +3,19 @@ import 'package:linagora_design_flutter/colors/linagora_ref_colors.dart'; class SearchViewStyle { static double get toolbarHeightSearch => 56.0; + static double get toolbarHeightOfSliverAppBar => 44.0; static EdgeInsetsGeometry get paddingRecentChatsHeaders => const EdgeInsets.symmetric(horizontal: 16); + static EdgeInsetsGeometry get paddingLeadingAppBar => const EdgeInsetsDirectional.only(end: 8, start: 8); + static EdgeInsetsGeometry get contentPaddingAppBar => const EdgeInsets.all(12.0); - static EdgeInsetsGeometry get paddingRecentChats => - const EdgeInsets.symmetric(horizontal: 16, vertical: 8); + + static EdgeInsetsGeometry get paddingRecentChats => const EdgeInsets.all(8); static const double paddingBackButton = 8.0;