diff --git a/.gitignore b/.gitignore index 9be459fc..a43b8bd0 100644 --- a/.gitignore +++ b/.gitignore @@ -53,4 +53,5 @@ docs/.jekyll-cache/ android/key.jks android/keys.json android/Gemfile.lock -lib/l10n_old \ No newline at end of file +lib/l10n_old +ios/Flutter/.last_build_id diff --git a/ios/Flutter/.last_build_id b/ios/Flutter/.last_build_id deleted file mode 100644 index 69eb9abc..00000000 --- a/ios/Flutter/.last_build_id +++ /dev/null @@ -1 +0,0 @@ -2f62b87544f34dc52357f3dbc4b36ac4 \ No newline at end of file diff --git a/ios/Podfile.lock b/ios/Podfile.lock index f55c9c12..a453b30d 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -140,13 +140,13 @@ PODS: - Flutter - "permission_handler (5.0.1+1)": - Flutter - - PromisesObjC (1.2.11) - - Protobuf (3.13.0) + - PromisesObjC (1.2.12) + - Protobuf (3.14.0) - receive_sharing_intent (0.0.1): - Flutter - - SDWebImage (5.9.5): - - SDWebImage/Core (= 5.9.5) - - SDWebImage/Core (5.9.5) + - SDWebImage (5.10.2): + - SDWebImage/Core (= 5.10.2) + - SDWebImage/Core (5.10.2) - share (0.0.1): - Flutter - shared_preferences (0.0.1): @@ -154,10 +154,10 @@ PODS: - sqflite (0.0.2): - Flutter - FMDB (>= 2.7.5) - - SQLCipher (4.4.1): - - SQLCipher/standard (= 4.4.1) - - SQLCipher/common (4.4.1) - - SQLCipher/standard (4.4.1): + - SQLCipher (4.4.2): + - SQLCipher/standard (= 4.4.2) + - SQLCipher/common (4.4.2) + - SQLCipher/standard (4.4.2): - SQLCipher/common - sqlite3 (3.32.3): - sqlite3/common (= 3.32.3) @@ -323,14 +323,14 @@ SPEC CHECKSUMS: package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c permission_handler: eac8e15b4a1a3fba55b761d19f3f4e6b005d15b6 - PromisesObjC: 8c196f5a328c2cba3e74624585467a557dcb482f - Protobuf: 3dac39b34a08151c6d949560efe3f86134a3f748 + PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97 + Protobuf: 0cde852566359049847168e51bd1c690e0f70056 receive_sharing_intent: c0d87310754e74c0f9542947e7cbdf3a0335a3b1 - SDWebImage: 0b2ba0d56479bf6a45ecddbfd5558bea93150d25 + SDWebImage: b969dcfc02c40a5da71eac0b03b8f1a0c794a86f share: 0b2c3e82132f5888bccca3351c504d0003b3b410 shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904 - SQLCipher: 0b81a39b21247c559c52c3bd2234808e626c008b + SQLCipher: 1ab0b9486a77d141e72e92ff30681926ed79c07a sqlite3: 8f7d2078ae27778699a622a94b853285793422a2 sqlite3_flutter_libs: 5651f8ff48e3b44d910863c4ea5916085b1b245f SwiftyGif: e466e86c660d343357ab944a819a101c4127cb40 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index d6e7af70..1f3a25ad 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -8,13 +8,12 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 3431DCDC0036CD76265EC1BA /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20BB13AAAED6EF90A4E2D6D6 /* Pods_Runner.framework */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - C11C1C33243DC67E009183F3 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C11C1C32243DC67E009183F3 /* GoogleService-Info.plist */; }; + AB0F2865DE230DE37373E0E0 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50DEFC207B70632D9C56ED78 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -31,16 +30,14 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 0D6BB33C96D6DA7087AFC472 /* 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 = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 20BB13AAAED6EF90A4E2D6D6 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 50DEFC207B70632D9C56ED78 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 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 = ""; }; - 74EAD5D7E9D617E0BD952672 /* 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 = ""; }; + 76737C9A857D5FD6D2634A3F /* 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 = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 7CF3E516437111FC1D2829B2 /* 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 = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -48,60 +45,8 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 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 = ""; }; - C10A2C1524681E4B00EC67DB /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/Main.strings; sourceTree = ""; }; - C10A2C1624681E4B00EC67DB /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/LaunchScreen.strings; sourceTree = ""; }; - C10A2C1724681E5300EC67DB /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Main.strings; sourceTree = ""; }; - C10A2C1824681E5300EC67DB /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/LaunchScreen.strings; sourceTree = ""; }; - C11C1C30243DC08E009183F3 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Main.strings; sourceTree = ""; }; - C11C1C31243DC08E009183F3 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/LaunchScreen.strings; sourceTree = ""; }; - C11C1C32243DC67E009183F3 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../../Desktop/GoogleService-Info.plist"; sourceTree = ""; }; - C11C1C34243DC6BC009183F3 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = ""; }; - C14BD718258CE38C000D4FE0 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Main.strings; sourceTree = ""; }; - C14BD719258CE38D000D4FE0 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/LaunchScreen.strings; sourceTree = ""; }; - C14BD71A258CE3DA000D4FE0 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Main.strings; sourceTree = ""; }; - C14BD71B258CE407000D4FE0 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/LaunchScreen.strings; sourceTree = ""; }; - C14BD71C258CE421000D4FE0 /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Main.strings; sourceTree = ""; }; - C14BD71D258CE421000D4FE0 /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/LaunchScreen.strings; sourceTree = ""; }; - C14BD71E258CE44C000D4FE0 /* hy */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hy; path = hy.lproj/Main.strings; sourceTree = ""; }; - C14BD71F258CE44C000D4FE0 /* hy */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hy; path = hy.lproj/LaunchScreen.strings; sourceTree = ""; }; - C14BD720258CE46B000D4FE0 /* eu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = eu; path = eu.lproj/Main.strings; sourceTree = ""; }; - C14BD721258CE46C000D4FE0 /* eu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = eu; path = eu.lproj/LaunchScreen.strings; sourceTree = ""; }; - C14BD722258CE47A000D4FE0 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Main.strings"; sourceTree = ""; }; - C14BD723258CE47A000D4FE0 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/LaunchScreen.strings"; sourceTree = ""; }; - C14BD724258CE491000D4FE0 /* eo */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = eo; path = eo.lproj/Main.strings; sourceTree = ""; }; - C14BD725258CE491000D4FE0 /* eo */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = eo; path = eo.lproj/LaunchScreen.strings; sourceTree = ""; }; - C14BD726258CE4A5000D4FE0 /* et */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = et; path = et.lproj/Main.strings; sourceTree = ""; }; - C14BD727258CE4A5000D4FE0 /* et */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = et; path = et.lproj/LaunchScreen.strings; sourceTree = ""; }; - C14BD728258CE4AE000D4FE0 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Main.strings; sourceTree = ""; }; - C14BD729258CE4AE000D4FE0 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/LaunchScreen.strings; sourceTree = ""; }; - C14BD72A258CE4F6000D4FE0 /* gl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = gl; path = gl.lproj/Main.strings; sourceTree = ""; }; - C14BD72B258CE4F6000D4FE0 /* gl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = gl; path = gl.lproj/LaunchScreen.strings; sourceTree = ""; }; - C14BD72C258CE51B000D4FE0 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Main.strings; sourceTree = ""; }; - C14BD72D258CE51B000D4FE0 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/LaunchScreen.strings; sourceTree = ""; }; - C14BD72E258CE530000D4FE0 /* hr-HR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "hr-HR"; path = "hr-HR.lproj/Main.strings"; sourceTree = ""; }; - C14BD72F258CE531000D4FE0 /* hr-HR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "hr-HR"; path = "hr-HR.lproj/LaunchScreen.strings"; sourceTree = ""; }; - C14BD730258CE557000D4FE0 /* nb-NO */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "nb-NO"; path = "nb-NO.lproj/Main.strings"; sourceTree = ""; }; - C14BD731258CE558000D4FE0 /* nb-NO */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "nb-NO"; path = "nb-NO.lproj/LaunchScreen.strings"; sourceTree = ""; }; - C14BD732258CE580000D4FE0 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/Main.strings; sourceTree = ""; }; - C14BD733258CE581000D4FE0 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/LaunchScreen.strings; sourceTree = ""; }; - C14BD734258CE5AE000D4FE0 /* ru-RU */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ru-RU"; path = "ru-RU.lproj/Main.strings"; sourceTree = ""; }; - C14BD735258CE5AF000D4FE0 /* ru-RU */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ru-RU"; path = "ru-RU.lproj/LaunchScreen.strings"; sourceTree = ""; }; - C14BD736258CE5C0000D4FE0 /* sv-SE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "sv-SE"; path = "sv-SE.lproj/Main.strings"; sourceTree = ""; }; - C14BD737258CE5C0000D4FE0 /* sv-SE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "sv-SE"; path = "sv-SE.lproj/LaunchScreen.strings"; sourceTree = ""; }; - C14BD738258CE5DA000D4FE0 /* sk-SK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "sk-SK"; path = "sk-SK.lproj/Main.strings"; sourceTree = ""; }; - C14BD739258CE5DA000D4FE0 /* sk-SK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "sk-SK"; path = "sk-SK.lproj/LaunchScreen.strings"; sourceTree = ""; }; - C14BD73A258CE5E3000D4FE0 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Main.strings; sourceTree = ""; }; - C14BD73B258CE5E3000D4FE0 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/LaunchScreen.strings; sourceTree = ""; }; - C14BD73C258CE5F0000D4FE0 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Main.strings; sourceTree = ""; }; - C14BD73D258CE5F0000D4FE0 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/LaunchScreen.strings; sourceTree = ""; }; - C14BD73E258CE627000D4FE0 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Main.strings; sourceTree = ""; }; - C14BD73F258CE627000D4FE0 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/LaunchScreen.strings; sourceTree = ""; }; - C14BD740258CE636000D4FE0 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Main.strings; sourceTree = ""; }; - C14BD741258CE636000D4FE0 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/LaunchScreen.strings; sourceTree = ""; }; - C14BD742258CE644000D4FE0 /* hu-HU */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "hu-HU"; path = "hu-HU.lproj/Main.strings"; sourceTree = ""; }; - C14BD743258CE644000D4FE0 /* hu-HU */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "hu-HU"; path = "hu-HU.lproj/LaunchScreen.strings"; sourceTree = ""; }; - C14BD744258CE652000D4FE0 /* vi-VN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "vi-VN"; path = "vi-VN.lproj/Main.strings"; sourceTree = ""; }; - C14BD745258CE652000D4FE0 /* vi-VN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "vi-VN"; path = "vi-VN.lproj/LaunchScreen.strings"; sourceTree = ""; }; + 9DB2F3524376810E74C799A8 /* 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 = ""; }; + EA246783222E02DD03959891 /* 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 */ /* Begin PBXFrameworksBuildPhase section */ @@ -109,13 +54,21 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3431DCDC0036CD76265EC1BA /* Pods_Runner.framework in Frameworks */, + AB0F2865DE230DE37373E0E0 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 075EE1BE25359E34308E0B78 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 50DEFC207B70632D9C56ED78 /* Pods_Runner.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -133,8 +86,8 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, - B1CBD607304EE58EAB51B4F9 /* Pods */, - DB4124C7BC8EAC2AD549756A /* Frameworks */, + E89DCAC000D371640E94E65B /* Pods */, + 075EE1BE25359E34308E0B78 /* Frameworks */, ); sourceTree = ""; }; @@ -149,13 +102,10 @@ 97C146F01CF9000F007C117D /* Runner */ = { isa = PBXGroup; children = ( - C11C1C34243DC6BC009183F3 /* Runner.entitlements */, - C11C1C32243DC67E009183F3 /* GoogleService-Info.plist */, 97C146FA1CF9000F007C117D /* Main.storyboard */, 97C146FD1CF9000F007C117D /* Assets.xcassets */, 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, 97C147021CF9000F007C117D /* Info.plist */, - 97C146F11CF9000F007C117D /* Supporting Files */, 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, @@ -164,31 +114,17 @@ path = Runner; sourceTree = ""; }; - 97C146F11CF9000F007C117D /* Supporting Files */ = { + E89DCAC000D371640E94E65B /* Pods */ = { isa = PBXGroup; children = ( + 76737C9A857D5FD6D2634A3F /* Pods-Runner.debug.xcconfig */, + EA246783222E02DD03959891 /* Pods-Runner.release.xcconfig */, + 9DB2F3524376810E74C799A8 /* Pods-Runner.profile.xcconfig */, ); - name = "Supporting Files"; - sourceTree = ""; - }; - B1CBD607304EE58EAB51B4F9 /* Pods */ = { - isa = PBXGroup; - children = ( - 7CF3E516437111FC1D2829B2 /* Pods-Runner.debug.xcconfig */, - 0D6BB33C96D6DA7087AFC472 /* Pods-Runner.release.xcconfig */, - 74EAD5D7E9D617E0BD952672 /* Pods-Runner.profile.xcconfig */, - ); + name = Pods; path = Pods; sourceTree = ""; }; - DB4124C7BC8EAC2AD549756A /* Frameworks */ = { - isa = PBXGroup; - children = ( - 20BB13AAAED6EF90A4E2D6D6 /* Pods_Runner.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -196,14 +132,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 7722B76BDFDDDFED2D30D773 /* [CP] Check Pods Manifest.lock */, + 8C9CCA7C5C45651F90C7BFDD /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 8E80E1A77C8DC095CBF8A4DB /* [CP] Embed Pods Frameworks */, + F9C8EE392B9AB471149C306E /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -221,48 +157,21 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 1020; - ORGANIZATIONNAME = "The Chromium Authors"; + ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; - DevelopmentTeam = 7VBF7CRD7Z; LastSwiftMigration = 1100; }; }; }; buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, Base, - de, - hu, - pl, - ja, - ar, - ca, - hy, - eu, - "zh-Hans", - eo, - et, - fr, - gl, - it, - "hr-HR", - "nb-NO", - pt, - "ru-RU", - "sv-SE", - "sk-SK", - es, - cs, - tr, - uk, - "hu-HU", - "vi-VN", ); mainGroup = 97C146E51CF9000F007C117D; productRefGroup = 97C146EF1CF9000F007C117D /* Products */; @@ -281,7 +190,6 @@ files = ( 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, - C11C1C33243DC67E009183F3 /* GoogleService-Info.plist in Resources */, 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, ); @@ -302,9 +210,9 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed\n/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin\n"; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 7722B76BDFDDDFED2D30D773 /* [CP] Check Pods Manifest.lock */ = { + 8C9CCA7C5C45651F90C7BFDD /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -326,86 +234,6 @@ 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; }; - 8E80E1A77C8DC095CBF8A4DB /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/DKImagePickerController/DKImagePickerController.framework", - "${BUILT_PRODUCTS_DIR}/DKPhotoGallery/DKPhotoGallery.framework", - "${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework", - "${PODS_ROOT}/../Flutter/Flutter.framework", - "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", - "${BUILT_PRODUCTS_DIR}/OLMKit/OLMKit.framework", - "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework", - "${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework", - "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", - "${BUILT_PRODUCTS_DIR}/SQLCipher/SQLCipher.framework", - "${BUILT_PRODUCTS_DIR}/SwiftyGif/SwiftyGif.framework", - "${BUILT_PRODUCTS_DIR}/android_path_provider/android_path_provider.framework", - "${BUILT_PRODUCTS_DIR}/disk_space/disk_space.framework", - "${BUILT_PRODUCTS_DIR}/file_picker/file_picker.framework", - "${BUILT_PRODUCTS_DIR}/flutter_keyboard_visibility/flutter_keyboard_visibility.framework", - "${BUILT_PRODUCTS_DIR}/flutter_local_notifications/flutter_local_notifications.framework", - "${BUILT_PRODUCTS_DIR}/flutter_olm/flutter_olm.framework", - "${BUILT_PRODUCTS_DIR}/flutter_secure_storage/flutter_secure_storage.framework", - "${BUILT_PRODUCTS_DIR}/flutter_sound/flutter_sound.framework", - "${BUILT_PRODUCTS_DIR}/image_picker/image_picker.framework", - "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", - "${BUILT_PRODUCTS_DIR}/native_imaging/native_imaging.framework", - "${BUILT_PRODUCTS_DIR}/open_file/open_file.framework", - "${BUILT_PRODUCTS_DIR}/package_info/package_info.framework", - "${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework", - "${BUILT_PRODUCTS_DIR}/receive_sharing_intent/receive_sharing_intent.framework", - "${BUILT_PRODUCTS_DIR}/share/share.framework", - "${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework", - "${BUILT_PRODUCTS_DIR}/sqlite3/sqlite3.framework", - "${BUILT_PRODUCTS_DIR}/sqlite3_flutter_libs/sqlite3_flutter_libs.framework", - "${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework", - "${BUILT_PRODUCTS_DIR}/webview_flutter/webview_flutter.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DKImagePickerController.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DKPhotoGallery.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OLMKit.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SQLCipher.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyGif.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/android_path_provider.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/disk_space.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_picker.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_keyboard_visibility.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_local_notifications.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_olm.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_secure_storage.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_sound.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/native_imaging.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/open_file.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/receive_sharing_intent.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/share.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqlite3.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqlite3_flutter_libs.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -420,6 +248,23 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; + F9C8EE392B9AB471149C306E /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -439,32 +284,6 @@ isa = PBXVariantGroup; children = ( 97C146FB1CF9000F007C117D /* Base */, - C11C1C30243DC08E009183F3 /* de */, - C10A2C1524681E4B00EC67DB /* hu */, - C10A2C1724681E5300EC67DB /* pl */, - C14BD718258CE38C000D4FE0 /* ja */, - C14BD71A258CE3DA000D4FE0 /* ar */, - C14BD71C258CE421000D4FE0 /* ca */, - C14BD71E258CE44C000D4FE0 /* hy */, - C14BD720258CE46B000D4FE0 /* eu */, - C14BD722258CE47A000D4FE0 /* zh-Hans */, - C14BD724258CE491000D4FE0 /* eo */, - C14BD726258CE4A5000D4FE0 /* et */, - C14BD728258CE4AE000D4FE0 /* fr */, - C14BD72A258CE4F6000D4FE0 /* gl */, - C14BD72C258CE51B000D4FE0 /* it */, - C14BD72E258CE530000D4FE0 /* hr-HR */, - C14BD730258CE557000D4FE0 /* nb-NO */, - C14BD732258CE580000D4FE0 /* pt */, - C14BD734258CE5AE000D4FE0 /* ru-RU */, - C14BD736258CE5C0000D4FE0 /* sv-SE */, - C14BD738258CE5DA000D4FE0 /* sk-SK */, - C14BD73A258CE5E3000D4FE0 /* es */, - C14BD73C258CE5F0000D4FE0 /* cs */, - C14BD73E258CE627000D4FE0 /* tr */, - C14BD740258CE636000D4FE0 /* uk */, - C14BD742258CE644000D4FE0 /* hu-HU */, - C14BD744258CE652000D4FE0 /* vi-VN */, ); name = Main.storyboard; sourceTree = ""; @@ -473,32 +292,6 @@ isa = PBXVariantGroup; children = ( 97C147001CF9000F007C117D /* Base */, - C11C1C31243DC08E009183F3 /* de */, - C10A2C1624681E4B00EC67DB /* hu */, - C10A2C1824681E5300EC67DB /* pl */, - C14BD719258CE38D000D4FE0 /* ja */, - C14BD71B258CE407000D4FE0 /* ar */, - C14BD71D258CE421000D4FE0 /* ca */, - C14BD71F258CE44C000D4FE0 /* hy */, - C14BD721258CE46C000D4FE0 /* eu */, - C14BD723258CE47A000D4FE0 /* zh-Hans */, - C14BD725258CE491000D4FE0 /* eo */, - C14BD727258CE4A5000D4FE0 /* et */, - C14BD729258CE4AE000D4FE0 /* fr */, - C14BD72B258CE4F6000D4FE0 /* gl */, - C14BD72D258CE51B000D4FE0 /* it */, - C14BD72F258CE531000D4FE0 /* hr-HR */, - C14BD731258CE558000D4FE0 /* nb-NO */, - C14BD733258CE581000D4FE0 /* pt */, - C14BD735258CE5AF000D4FE0 /* ru-RU */, - C14BD737258CE5C0000D4FE0 /* sv-SE */, - C14BD739258CE5DA000D4FE0 /* sk-SK */, - C14BD73B258CE5E3000D4FE0 /* es */, - C14BD73D258CE5F0000D4FE0 /* cs */, - C14BD73F258CE627000D4FE0 /* tr */, - C14BD741258CE636000D4FE0 /* uk */, - C14BD743258CE644000D4FE0 /* hu-HU */, - C14BD745258CE652000D4FE0 /* vi-VN */, ); name = LaunchScreen.storyboard; sourceTree = ""; @@ -510,7 +303,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -548,7 +340,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -563,9 +355,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = 7VBF7CRD7Z; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -577,45 +367,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-l\"c++\"", - "-l\"sqlite3\"", - "-framework", - "\"FMDB\"", - "-framework", - "\"Flutter\"", - "-framework", - "\"OLMKit\"", - "-framework", - "\"file_picker\"", - "-framework", - "\"flutter_local_notifications\"", - "-framework", - "\"flutter_secure_storage\"", - "-framework", - "\"flutter_sound\"", - "-framework", - "\"image_picker\"", - "-framework", - "\"open_file\"", - "-framework", - "\"path_provider\"", - "-framework", - "\"receive_sharing_intent\"", - "-framework", - "\"share\"", - "-framework", - "\"sqflite\"", - "-framework", - "\"url_launcher\"", - "-framework", - "\"webview_flutter\"", - "$(inherited)", - "-framework", - Flutter, - ); - PRODUCT_BUNDLE_IDENTIFIER = chat.fluffy.app; + PRODUCT_BUNDLE_IDENTIFIER = chat.fluffy.fluffychat; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -627,7 +379,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -671,7 +422,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -683,7 +434,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -721,7 +471,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -737,9 +487,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = 7VBF7CRD7Z; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -751,45 +499,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-l\"c++\"", - "-l\"sqlite3\"", - "-framework", - "\"FMDB\"", - "-framework", - "\"Flutter\"", - "-framework", - "\"OLMKit\"", - "-framework", - "\"file_picker\"", - "-framework", - "\"flutter_local_notifications\"", - "-framework", - "\"flutter_secure_storage\"", - "-framework", - "\"flutter_sound\"", - "-framework", - "\"image_picker\"", - "-framework", - "\"open_file\"", - "-framework", - "\"path_provider\"", - "-framework", - "\"receive_sharing_intent\"", - "-framework", - "\"share\"", - "-framework", - "\"sqflite\"", - "-framework", - "\"url_launcher\"", - "-framework", - "\"webview_flutter\"", - "$(inherited)", - "-framework", - Flutter, - ); - PRODUCT_BUNDLE_IDENTIFIER = chat.fluffy.app; + PRODUCT_BUNDLE_IDENTIFIER = chat.fluffy.fluffychat; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -804,9 +514,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = 7VBF7CRD7Z; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -818,45 +526,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-l\"c++\"", - "-l\"sqlite3\"", - "-framework", - "\"FMDB\"", - "-framework", - "\"Flutter\"", - "-framework", - "\"OLMKit\"", - "-framework", - "\"file_picker\"", - "-framework", - "\"flutter_local_notifications\"", - "-framework", - "\"flutter_secure_storage\"", - "-framework", - "\"flutter_sound\"", - "-framework", - "\"image_picker\"", - "-framework", - "\"open_file\"", - "-framework", - "\"path_provider\"", - "-framework", - "\"receive_sharing_intent\"", - "-framework", - "\"share\"", - "-framework", - "\"sqflite\"", - "-framework", - "\"url_launcher\"", - "-framework", - "\"webview_flutter\"", - "$(inherited)", - "-framework", - Flutter, - ); - PRODUCT_BUNDLE_IDENTIFIER = chat.fluffy.app; + PRODUCT_BUNDLE_IDENTIFIER = chat.fluffy.fluffychat; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/lib/app_config.dart b/lib/app_config.dart index f5b02e74..25088a77 100644 --- a/lib/app_config.dart +++ b/lib/app_config.dart @@ -1,3 +1,5 @@ +import 'dart:ui'; + abstract class AppConfig { static String _applicationName = 'FluffyChat'; static String get applicationName => _applicationName; @@ -8,6 +10,7 @@ abstract class AppConfig { static String jitsiInstance = 'https://meet.jit.si/'; static const bool allowOtherHomeservers = true; static const bool enableRegistration = true; + static const Color primaryColor = Color(0xFF5625BA); static String _privacyUrl = 'https://fluffychat.im/en/privacy.html'; static String get privacyUrl => _privacyUrl; static const String appId = 'im.fluffychat.FluffyChat'; diff --git a/lib/components/content_banner.dart b/lib/components/content_banner.dart index 314d45a0..102575d6 100644 --- a/lib/components/content_banner.dart +++ b/lib/components/content_banner.dart @@ -66,7 +66,6 @@ class ContentBanner extends StatelessWidget { alignment: Alignment.bottomRight, child: FloatingActionButton( mini: true, - backgroundColor: Theme.of(context).primaryColor, child: Icon(Icons.camera_alt_outlined), onPressed: onEdit, ), diff --git a/lib/components/matrix.dart b/lib/components/matrix.dart index 9ba33221..62786b96 100644 --- a/lib/components/matrix.dart +++ b/lib/components/matrix.dart @@ -19,7 +19,6 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:provider/provider.dart'; import 'package:universal_html/prefer_universal/html.dart' as html; -import 'package:url_launcher/url_launcher.dart'; import 'package:http/http.dart' as http; /*import 'package:fluffychat/views/chat.dart'; import 'package:fluffychat/app_config.dart'; @@ -33,7 +32,6 @@ import 'dialogs/key_verification_dialog.dart'; import '../utils/platform_infos.dart'; import '../app_config.dart'; import '../config/setting_keys.dart'; -import 'avatar.dart'; class Matrix extends StatefulWidget { static const String callNamespace = 'chat.fluffy.jitsi_call'; @@ -171,61 +169,6 @@ class MatrixState extends State { } } - void onJitsiCall(EventUpdate eventUpdate) { - final event = Event.fromJson( - eventUpdate.content, client.getRoomById(eventUpdate.roomID)); - if (DateTime.now().millisecondsSinceEpoch - - event.originServerTs.millisecondsSinceEpoch > - 1000 * 60 * 5) { - return; - } - final senderName = event.sender.calcDisplayname(); - final senderAvatar = event.sender.avatarUrl; - showDialog( - context: context, - builder: (context) => AlertDialog( - title: Text(L10n.of(context).videoCall), - content: Column( - mainAxisSize: MainAxisSize.min, - children: [ - ListTile( - contentPadding: EdgeInsets.all(0), - leading: Avatar(senderAvatar, senderName), - title: Text( - senderName, - style: TextStyle(fontSize: 18), - ), - subtitle: - event.room.isDirectChat ? null : Text(event.room.displayname), - ), - Divider(), - Row( - children: [ - Spacer(), - FloatingActionButton( - backgroundColor: Colors.red, - child: Icon(Icons.phone_missed_outlined), - onPressed: () => Navigator.of(context).pop(), - ), - Spacer(), - FloatingActionButton( - backgroundColor: Colors.green, - child: Icon(Icons.phone_outlined), - onPressed: () { - Navigator.of(context).pop(); - launch(event.body); - }, - ), - Spacer(), - ], - ), - ], - ), - ), - ); - return; - } - bool webHasFocus = true; void _showLocalNotification(EventUpdate eventUpdate) async { diff --git a/lib/config/themes.dart b/lib/config/themes.dart index f6dca7db..d6deed40 100644 --- a/lib/config/themes.dart +++ b/lib/config/themes.dart @@ -2,6 +2,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:fluffychat/utils/platform_infos.dart'; +import '../app_config.dart'; + abstract class FluffyThemes { static const double columnWidth = 360.0; @@ -29,7 +31,7 @@ abstract class FluffyThemes { primaryColorDark: Colors.white, primaryColorLight: Color(0xff121212), brightness: Brightness.light, - primaryColor: Color(0xFF5625BA), + primaryColor: AppConfig.primaryColor, backgroundColor: Colors.white, secondaryHeaderColor: Color(0xFFECECF2), scaffoldBackgroundColor: Colors.white, @@ -47,6 +49,10 @@ abstract class FluffyThemes { borderRadius: BorderRadius.circular(8.0), ), ), + floatingActionButtonTheme: FloatingActionButtonThemeData( + backgroundColor: AppConfig.primaryColor, + foregroundColor: Colors.white, + ), appBarTheme: AppBarTheme( brightness: Brightness.light, color: Colors.white, @@ -60,7 +66,7 @@ abstract class FluffyThemes { ), ); - static ThemeData dark = ThemeData.dark().copyWith( + static ThemeData dark = light.copyWith( primaryColorDark: Color(0xff121212), primaryColorLight: Colors.white, primaryColor: Color(0xFF8966CF), @@ -70,19 +76,6 @@ abstract class FluffyThemes { accentColor: Color(0xFFF5B4D2), secondaryHeaderColor: Color(0xff1D1D1D), textTheme: Typography.material2018().white.merge(fallback_text_theme), - snackBarTheme: SnackBarThemeData( - behavior: kIsWeb ? SnackBarBehavior.floating : SnackBarBehavior.fixed, - ), - dialogTheme: DialogTheme( - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(8.0), - ), - ), - popupMenuTheme: PopupMenuThemeData( - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(8.0), - ), - ), appBarTheme: AppBarTheme( brightness: Brightness.dark, color: Color(0xff1D1D1D), diff --git a/lib/views/chat_list.dart b/lib/views/chat_list.dart index 897c006d..b3a3a422 100644 --- a/lib/views/chat_list.dart +++ b/lib/views/chat_list.dart @@ -256,7 +256,6 @@ class _ChatListState extends State { ? null : FloatingActionButton( child: Icon(Icons.add_outlined), - backgroundColor: Theme.of(context).primaryColor, onPressed: () => AdaptivePageLayout.of(context) .pushNamedAndRemoveUntilIsFirst('/newprivatechat'), ), diff --git a/lib/views/new_group.dart b/lib/views/new_group.dart index 9e107693..b28f587e 100644 --- a/lib/views/new_group.dart +++ b/lib/views/new_group.dart @@ -73,8 +73,6 @@ class _NewGroupState extends State { ], ), floatingActionButton: FloatingActionButton( - foregroundColor: Colors.white, - backgroundColor: Theme.of(context).primaryColor, onPressed: () => submitAction(context), child: Icon(Icons.arrow_forward_outlined), ), diff --git a/lib/views/new_private_chat.dart b/lib/views/new_private_chat.dart index fd73559f..131cb45f 100644 --- a/lib/views/new_private_chat.dart +++ b/lib/views/new_private_chat.dart @@ -212,8 +212,6 @@ class _NewPrivateChatState extends State { floatingActionButton: FloatingActionButton( onPressed: () => submitAction(context), child: Icon(Icons.arrow_forward_outlined), - foregroundColor: Colors.white, - backgroundColor: Theme.of(context).primaryColor, ), ); } diff --git a/lib/views/settings_emotes.dart b/lib/views/settings_emotes.dart index 47c97cab..310f1bb7 100644 --- a/lib/views/settings_emotes.dart +++ b/lib/views/settings_emotes.dart @@ -181,7 +181,6 @@ class _EmotesSettingsState extends State { showSave = false; }); }, - backgroundColor: Theme.of(context).primaryColor, ) : null, body: StreamBuilder(