diff --git a/android/app/build.gradle b/android/app/build.gradle index 18133c1..a4aeaf5 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -46,8 +46,9 @@ flutter { dependencies { testImplementation 'junit:junit:4.12' + implementation 'com.google.firebase:firebase-core:16.0.1' androidTestImplementation 'com.android.support.test:runner:1.0.1' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' } -apply plugin: 'com.google.gms.google-services' \ No newline at end of file +apply plugin: 'com.google.gms.google-services' diff --git a/android/build.gradle b/android/build.gradle index 8385a03..e6f58d3 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -6,7 +6,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:3.0.1' - classpath 'com.google.gms:google-services:3.1.0' + classpath 'com.google.gms:google-services:4.0.1' } } @@ -23,6 +23,14 @@ subprojects { } subprojects { project.evaluationDependsOn(':app') + project.configurations.all { + resolutionStrategy.eachDependency { details -> + if (details.requested.group == 'com.android.support' + && !details.requested.name.contains('multidex') ) { + details.useVersion "26.1.0" + } + } + } } task clean(type: Delete) { diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 09c6d64..1405d71 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,135 +1,184 @@ PODS: - - Firebase/Auth (3.17.0): - - Firebase/Core - - FirebaseAuth (= 3.1.1) - - Firebase/Core (3.17.0): - - FirebaseAnalytics (= 3.9.0) - - FirebaseCore (= 3.6.0) - - Firebase/Database (3.17.0): - - Firebase/Core - - FirebaseDatabase (= 3.1.2) - - Firebase/Storage (3.17.0): - - Firebase/Core - - FirebaseStorage (= 1.1.0) + - Firebase/Auth (5.14.0): + - Firebase/CoreOnly + - FirebaseAuth (= 5.1.0) + - Firebase/Core (5.14.0): + - Firebase/CoreOnly + - FirebaseAnalytics (= 5.4.0) + - Firebase/CoreOnly (5.14.0): + - FirebaseCore (= 5.1.9) + - Firebase/Database (5.14.0): + - Firebase/CoreOnly + - FirebaseDatabase (= 5.0.4) + - Firebase/Storage (5.14.0): + - Firebase/CoreOnly + - FirebaseStorage (= 3.0.3) - firebase_analytics (0.0.1): - Firebase/Core - Flutter - firebase_auth (0.0.1): - Firebase/Auth - Firebase/Core - - FirebaseUI/Auth (~> 3.0) - - FirebaseUI/Google - Flutter - - Google/SignIn + - firebase_core (0.0.1): + - Firebase/Core + - Flutter - firebase_database (0.0.1): - Firebase/Database - Flutter - firebase_storage (0.0.1): - Firebase/Storage - Flutter - - FirebaseAnalytics (3.9.0): - - FirebaseCore (~> 3.6) - - FirebaseInstanceID (~> 1.0) - - GoogleToolboxForMac/NSData+zlib (~> 2.1) - - FirebaseAuth (3.1.1): - - FirebaseAnalytics (~> 3.7) - - GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1) + - FirebaseAnalytics (5.4.0): + - FirebaseCore (~> 5.1) + - FirebaseInstanceID (~> 3.3) + - GoogleAppMeasurement (= 5.4.0) + - GoogleUtilities/AppDelegateSwizzler (~> 5.2) + - GoogleUtilities/MethodSwizzler (~> 5.2) + - GoogleUtilities/Network (~> 5.2) + - "GoogleUtilities/NSData+zlib (~> 5.2)" + - nanopb (~> 0.3) + - FirebaseAuth (5.1.0): + - FirebaseAuthInterop (~> 1.0) + - FirebaseCore (~> 5.1) + - GoogleUtilities/Environment (~> 5.2) - GTMSessionFetcher/Core (~> 1.1) - - FirebaseCore (3.6.0): - - GoogleToolboxForMac/NSData+zlib (~> 2.1) - - FirebaseDatabase (3.1.2): - - FirebaseAnalytics (~> 3.7) - - FirebaseInstanceID (1.0.10): - - FirebaseCore (~> 3.6) - - FirebaseStorage (1.1.0): - - FirebaseAnalytics (~> 3.7) + - FirebaseAuthInterop (1.0.0) + - FirebaseCore (5.1.9): + - GoogleUtilities/Logger (~> 5.2) + - FirebaseDatabase (5.0.4): + - FirebaseAuthInterop (~> 1.0) + - FirebaseCore (~> 5.1) + - leveldb-library (~> 1.18) + - FirebaseInstanceID (3.3.0): + - FirebaseCore (~> 5.1) + - GoogleUtilities/Environment (~> 5.3) + - GoogleUtilities/UserDefaults (~> 5.3) + - FirebaseStorage (3.0.3): + - FirebaseAuthInterop (~> 1.0) + - FirebaseCore (~> 5.1) - GTMSessionFetcher/Core (~> 1.1) - - FirebaseUI/Auth (3.1.1): - - Firebase/Auth - - FirebaseUI/Google (3.1.1): - - FirebaseUI/Auth - - GoogleSignIn (~> 4.0) - Flutter (1.0.0) - - Google/Core (3.1.0): - - FirebaseAnalytics (~> 3.2) - - Google/SignIn (3.1.0): - - Google/Core - - GoogleSignIn (~> 4.0) - google_sign_in (0.0.1): - Flutter - GoogleSignIn (~> 4.0) - - GoogleSignIn (4.1.2): - - GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1) - - GoogleToolboxForMac/NSString+URLArguments (~> 2.1) - - GTMOAuth2 (~> 1.0) + - GoogleAppMeasurement (5.4.0): + - GoogleUtilities/AppDelegateSwizzler (~> 5.2) + - GoogleUtilities/MethodSwizzler (~> 5.2) + - GoogleUtilities/Network (~> 5.2) + - "GoogleUtilities/NSData+zlib (~> 5.2)" + - nanopb (~> 0.3) + - GoogleSignIn (4.4.0): + - "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)" + - "GoogleToolboxForMac/NSString+URLArguments (~> 2.1)" - GTMSessionFetcher/Core (~> 1.1) - - GoogleToolboxForMac/DebugUtils (2.1.3): - - GoogleToolboxForMac/Defines (= 2.1.3) - - GoogleToolboxForMac/Defines (2.1.3) - - GoogleToolboxForMac/NSData+zlib (2.1.3): - - GoogleToolboxForMac/Defines (= 2.1.3) - - GoogleToolboxForMac/NSDictionary+URLArguments (2.1.3): - - GoogleToolboxForMac/DebugUtils (= 2.1.3) - - GoogleToolboxForMac/Defines (= 2.1.3) - - GoogleToolboxForMac/NSString+URLArguments (= 2.1.3) - - GoogleToolboxForMac/NSString+URLArguments (2.1.3) - - GTMOAuth2 (1.1.6): - - GTMSessionFetcher (~> 1.1) - - GTMSessionFetcher (1.1.14): - - GTMSessionFetcher/Full (= 1.1.14) - - GTMSessionFetcher/Core (1.1.14) - - GTMSessionFetcher/Full (1.1.14): - - GTMSessionFetcher/Core (= 1.1.14) + - GoogleToolboxForMac/DebugUtils (2.1.4): + - GoogleToolboxForMac/Defines (= 2.1.4) + - GoogleToolboxForMac/Defines (2.1.4) + - "GoogleToolboxForMac/NSDictionary+URLArguments (2.1.4)": + - GoogleToolboxForMac/DebugUtils (= 2.1.4) + - GoogleToolboxForMac/Defines (= 2.1.4) + - "GoogleToolboxForMac/NSString+URLArguments (= 2.1.4)" + - "GoogleToolboxForMac/NSString+URLArguments (2.1.4)" + - GoogleUtilities/AppDelegateSwizzler (5.3.6): + - GoogleUtilities/Environment + - GoogleUtilities/Logger + - GoogleUtilities/Network + - GoogleUtilities/Environment (5.3.6) + - GoogleUtilities/Logger (5.3.6): + - GoogleUtilities/Environment + - GoogleUtilities/MethodSwizzler (5.3.6): + - GoogleUtilities/Logger + - GoogleUtilities/Network (5.3.6): + - GoogleUtilities/Logger + - "GoogleUtilities/NSData+zlib" + - GoogleUtilities/Reachability + - "GoogleUtilities/NSData+zlib (5.3.6)" + - GoogleUtilities/Reachability (5.3.6): + - GoogleUtilities/Logger + - GoogleUtilities/UserDefaults (5.3.6): + - GoogleUtilities/Logger + - GTMSessionFetcher/Core (1.2.1) - image_picker (0.0.1): - Flutter + - leveldb-library (1.20) + - nanopb (0.3.901): + - nanopb/decode (= 0.3.901) + - nanopb/encode (= 0.3.901) + - nanopb/decode (0.3.901) + - nanopb/encode (0.3.901) DEPENDENCIES: - - firebase_analytics (from `Pods/.symlinks/plugins/firebase_analytics-0.0.4/ios`) - - firebase_auth (from `Pods/.symlinks/plugins/firebase_auth-0.2.0/ios`) - - firebase_database (from `Pods/.symlinks/plugins/firebase_database-0.0.12/ios`) - - firebase_storage (from `Pods/.symlinks/plugins/firebase_storage-0.0.5/ios`) + - firebase_analytics (from `Pods/.symlinks/plugins/firebase_analytics-1.0.6/ios`) + - firebase_auth (from `Pods/.symlinks/plugins/firebase_auth-0.6.6/ios`) + - "firebase_core (from `Pods/.symlinks/plugins/firebase_core-0.2.5+1/ios`)" + - firebase_database (from `Pods/.symlinks/plugins/firebase_database-1.0.5/ios`) + - firebase_storage (from `Pods/.symlinks/plugins/firebase_storage-1.0.4/ios`) - Flutter (from `Pods/.symlinks/flutter/ios`) - - google_sign_in (from `Pods/.symlinks/plugins/google_sign_in-0.3.1/ios`) - - image_picker (from `Pods/.symlinks/plugins/image_picker-0.1.1/ios`) + - google_sign_in (from `Pods/.symlinks/plugins/google_sign_in-3.2.4/ios`) + - image_picker (from `Pods/.symlinks/plugins/image_picker-0.4.10/ios`) + +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - Firebase + - FirebaseAnalytics + - FirebaseAuth + - FirebaseAuthInterop + - FirebaseCore + - FirebaseDatabase + - FirebaseInstanceID + - FirebaseStorage + - GoogleAppMeasurement + - GoogleSignIn + - GoogleToolboxForMac + - GoogleUtilities + - GTMSessionFetcher + - leveldb-library + - nanopb EXTERNAL SOURCES: firebase_analytics: - :path: Pods/.symlinks/plugins/firebase_analytics-0.0.4/ios + :path: Pods/.symlinks/plugins/firebase_analytics-1.0.6/ios firebase_auth: - :path: Pods/.symlinks/plugins/firebase_auth-0.2.0/ios + :path: Pods/.symlinks/plugins/firebase_auth-0.6.6/ios + firebase_core: + :path: "Pods/.symlinks/plugins/firebase_core-0.2.5+1/ios" firebase_database: - :path: Pods/.symlinks/plugins/firebase_database-0.0.12/ios + :path: Pods/.symlinks/plugins/firebase_database-1.0.5/ios firebase_storage: - :path: Pods/.symlinks/plugins/firebase_storage-0.0.5/ios + :path: Pods/.symlinks/plugins/firebase_storage-1.0.4/ios Flutter: :path: Pods/.symlinks/flutter/ios google_sign_in: - :path: Pods/.symlinks/plugins/google_sign_in-0.3.1/ios + :path: Pods/.symlinks/plugins/google_sign_in-3.2.4/ios image_picker: - :path: Pods/.symlinks/plugins/image_picker-0.1.1/ios + :path: Pods/.symlinks/plugins/image_picker-0.4.10/ios SPEC CHECKSUMS: - Firebase: 4b66b5b59c43edac745b87f0c87e42cdd0279c13 - firebase_analytics: 8f2570c7175ac9e1138e0b6e3451860da0f76b5f - firebase_auth: 3bd59bb0b230427fd396ebccdf7511a79329ed7b - firebase_database: a5b2f9b0ebc0522135032c93000d0c1184116eb1 - firebase_storage: d160b0c01316d9c54e4c1d99e318cbbc638746d1 - FirebaseAnalytics: e5fe8486efc01bec33f6bf82e2fa9fce4b124052 - FirebaseAuth: cc8a1824170adbd351edb7f994490a3fb5c18be6 - FirebaseCore: 9691ee2ade70c098d7cf92440f4303f16d83ca75 - FirebaseDatabase: 05c96d7b43a7368dc91c07791adb49683e1738d1 - FirebaseInstanceID: b9eedd6846fb5e1f0f7279e1deaa7a7e4cf8392e - FirebaseStorage: a5c55b23741a49a72af8f30f95b3bb5ddbeda12d - FirebaseUI: 6e99ff95e369f5858232e4f65bff215458fe8469 + Firebase: 963d5685fae888a56d6d4d9cfce6b9c976958798 + firebase_analytics: fcc60a9de4b8e07aa5af8941303a7f5fe6e0383f + firebase_auth: 27a5a77a032d557c18f8e223aaf8ec1368f6cdbc + firebase_core: c96aa8b2fcf7f5167d32f22034f502f9304952b8 + firebase_database: dd62ab9f71967c9011ce2fd03a89e762dcc364df + firebase_storage: e34d30ff8bb57e691191b70e9d255ec2eba2351f + FirebaseAnalytics: c06f9d70577d79074214700a71fd5d39de5550fb + FirebaseAuth: 4a5cc5fc2d1721e509e24699b93ebc3d94b1e195 + FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc + FirebaseCore: 8f49b70f57ab5cbb032ef41d64992ded21606459 + FirebaseDatabase: 0621689f77528d62b47e1c06ca737c4c19275d1a + FirebaseInstanceID: e2fa4cb35ef5558c200f7f0ad8a53e212215f93e + FirebaseStorage: 3d22c041370593e639fba013d1eb698a8dae2881 Flutter: 9d0fac939486c9aba2809b7982dfdbb47a7b0296 - Google: 98da4b1a60ed0beb80a290387a28333406a1eb90 - google_sign_in: 4efa54380d5ef07e98a58fb24c8a7f9c51867222 - GoogleSignIn: d9ef55b10f0aa401a5de2747f59b725e4b9732ac - GoogleToolboxForMac: 2501e2ad72a52eb3dfe7bd9aee7dad11b858bd20 - GTMOAuth2: c77fe325e4acd453837e72d91e3b5f13116857b2 - GTMSessionFetcher: 390ea358e5a0d0133153806f744662dad933d06b + google_sign_in: cbeb57b96679823d14df6b2240b629b983a42d79 + GoogleAppMeasurement: 98b71f5e04142793729a5ef23e5b96651ff4b70f + GoogleSignIn: 7ff245e1a7b26d379099d3243a562f5747e23d39 + GoogleToolboxForMac: 91c824d21e85b31c2aae9bb011c5027c9b4e738f + GoogleUtilities: 95996bea7c7d9b8fb811b7507669a4a8762f80c7 + GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca image_picker: ee00aab0487cedc80a304085219503cc6d0f2e22 + leveldb-library: 08cba283675b7ed2d99629a4bc5fd052cd2bb6a5 + nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48 PODFILE CHECKSUM: 0420ab312a523ae0eecfb1fc19ea51dd82cc17c7 -COCOAPODS: 1.4.0 +COCOAPODS: 1.5.3 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 8130a7c..e1b9a5d 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -164,7 +164,6 @@ 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 232FB2E3EDFB2DB7CE2B85C1 /* [CP] Embed Pods Frameworks */, EBD043DFC7190E7593447FB3 /* [CP] Copy Pods Resources */, ); buildRules = ( @@ -228,24 +227,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 232FB2E3EDFB2DB7CE2B85C1 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${PODS_ROOT}/.symlinks/flutter/ios/Flutter.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -299,53 +280,10 @@ ); inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh", - "${PODS_ROOT}/FirebaseUI/FirebaseUIFrameworks/FirebaseAuthUI/Frameworks/FirebaseAuthUI.framework/FUIAuthPickerViewController.nib", - "${PODS_ROOT}/FirebaseUI/FirebaseUIFrameworks/FirebaseAuthUI/Frameworks/FirebaseAuthUI.framework/FUIAuthTableViewCell.nib", - "${PODS_ROOT}/FirebaseUI/FirebaseUIFrameworks/FirebaseAuthUI/Frameworks/FirebaseAuthUI.framework/FUIEmailEntryViewController.nib", - "${PODS_ROOT}/FirebaseUI/FirebaseUIFrameworks/FirebaseAuthUI/Frameworks/FirebaseAuthUI.framework/FUIPasswordRecoveryViewController.nib", - "${PODS_ROOT}/FirebaseUI/FirebaseUIFrameworks/FirebaseAuthUI/Frameworks/FirebaseAuthUI.framework/FUIPasswordSignInViewController.nib", - "${PODS_ROOT}/FirebaseUI/FirebaseUIFrameworks/FirebaseAuthUI/Frameworks/FirebaseAuthUI.framework/FUIPasswordSignUpViewController.nib", - "${PODS_ROOT}/FirebaseUI/FirebaseUIFrameworks/FirebaseAuthUI/Frameworks/FirebaseAuthUI.framework/FUIPasswordVerificationViewController.nib", - "${PODS_ROOT}/FirebaseUI/FirebaseUIFrameworks/FirebaseAuthUI/Frameworks/FirebaseAuthUI.framework/ic_email.png", - "${PODS_ROOT}/FirebaseUI/FirebaseUIFrameworks/FirebaseAuthUI/Frameworks/FirebaseAuthUI.framework/ic_email@2x.png", - "${PODS_ROOT}/FirebaseUI/FirebaseUIFrameworks/FirebaseAuthUI/Frameworks/FirebaseAuthUI.framework/ic_email@3x.png", - "${PODS_ROOT}/FirebaseUI/FirebaseUIFrameworks/FirebaseAuthUI/Frameworks/FirebaseAuthUI.framework/ic_visibility.png", - "${PODS_ROOT}/FirebaseUI/FirebaseUIFrameworks/FirebaseAuthUI/Frameworks/FirebaseAuthUI.framework/ic_visibility@2x.png", - "${PODS_ROOT}/FirebaseUI/FirebaseUIFrameworks/FirebaseAuthUI/Frameworks/FirebaseAuthUI.framework/ic_visibility@3x.png", - "${PODS_ROOT}/FirebaseUI/FirebaseUIFrameworks/FirebaseAuthUI/Frameworks/FirebaseAuthUI.framework/ic_visibility_off.png", - "${PODS_ROOT}/FirebaseUI/FirebaseUIFrameworks/FirebaseAuthUI/Frameworks/FirebaseAuthUI.framework/ic_visibility_off@2x.png", - "${PODS_ROOT}/FirebaseUI/FirebaseUIFrameworks/FirebaseAuthUI/Frameworks/FirebaseAuthUI.framework/ic_visibility_off@3x.png", - "${PODS_ROOT}/FirebaseUI/FirebaseUIFrameworks/FirebaseAuthUI/Frameworks/FirebaseAuthUI.framework/en.lproj", - "${PODS_ROOT}/FirebaseUI/FirebaseUIFrameworks/FirebaseGoogleAuthUI/Frameworks/FirebaseGoogleAuthUI.framework/ic_google.png", - "${PODS_ROOT}/FirebaseUI/FirebaseUIFrameworks/FirebaseGoogleAuthUI/Frameworks/FirebaseGoogleAuthUI.framework/ic_google@2x.png", - "${PODS_ROOT}/FirebaseUI/FirebaseUIFrameworks/FirebaseGoogleAuthUI/Frameworks/FirebaseGoogleAuthUI.framework/ic_google@3x.png", - "${PODS_ROOT}/FirebaseUI/FirebaseUIFrameworks/FirebaseGoogleAuthUI/Frameworks/FirebaseGoogleAuthUI.framework/en.lproj", - "${PODS_ROOT}/GTMOAuth2/Source/Touch/GTMOAuth2ViewTouch.xib", "${PODS_ROOT}/GoogleSignIn/Resources/GoogleSignIn.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FUIAuthPickerViewController.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FUIAuthTableViewCell.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FUIEmailEntryViewController.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FUIPasswordRecoveryViewController.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FUIPasswordSignInViewController.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FUIPasswordSignUpViewController.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FUIPasswordVerificationViewController.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ic_email.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ic_email@2x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ic_email@3x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ic_visibility.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ic_visibility@2x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ic_visibility@3x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ic_visibility_off.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ic_visibility_off@2x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ic_visibility_off@3x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/en.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ic_google.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ic_google@2x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ic_google@3x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GTMOAuth2ViewTouch.nib", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle", ); runOnlyForDeploymentPostprocessing = 0; diff --git a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..949b678 --- /dev/null +++ b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + BuildSystemType + Original + + diff --git a/lib/ChatScreen.dart b/lib/ChatScreen.dart index 66a38ab..26f7016 100644 --- a/lib/ChatScreen.dart +++ b/lib/ChatScreen.dart @@ -54,7 +54,7 @@ class ChatScreenState extends State { sort: (a, b) => b.key.compareTo(a.key), //comparing timestamp of messages to check which one would appear first itemBuilder: (_, DataSnapshot messageSnapshot, - Animation animation) { + Animation animation, int i) { return new ChatMessageListItem( messageSnapshot: messageSnapshot, animation: animation, @@ -122,17 +122,20 @@ class ChatScreenState extends State { ), onPressed: () async { await _ensureLoggedIn(); - File imageFile = await ImagePicker.pickImage(); + File imageFile = await ImagePicker.pickImage(source: ImageSource.camera); + int timestamp = new DateTime.now().millisecondsSinceEpoch; StorageReference storageReference = FirebaseStorage .instance .ref() .child("img_" + timestamp.toString() + ".jpg"); - StorageUploadTask uploadTask = - storageReference.put(imageFile); - Uri downloadUrl = (await uploadTask.future).downloadUrl; + StorageUploadTask uploadTask; + uploadTask = storageReference.putFile(imageFile); + await uploadTask.onComplete; + String downloadUrl = await uploadTask.lastSnapshot.ref.getDownloadURL(); + _sendMessage( - messageText: null, imageUrl: downloadUrl.toString()); + messageText: null, imageUrl: downloadUrl); }), ), new Flexible( diff --git a/pubspec.lock b/pubspec.lock index af5b173..980f1f7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,118 +1,76 @@ # Generated by pub # See https://www.dartlang.org/tools/pub/glossary#lockfile packages: - analyzer: - dependency: transitive - description: - name: analyzer - url: "https://pub.dartlang.org" - source: hosted - version: "0.31.1" - args: - dependency: transitive - description: - name: args - url: "https://pub.dartlang.org" - source: hosted - version: "1.4.2" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.0.6" - barback: - dependency: transitive - description: - name: barback - url: "https://pub.dartlang.org" - source: hosted - version: "0.15.2+15" + version: "2.0.8" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.0.4" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.1.1" - cli_util: - dependency: transitive - description: - name: cli_util - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.2+1" + version: "1.1.2" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.14.6" - convert: - dependency: transitive - description: - name: convert - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.1" - crypto: - dependency: transitive - description: - name: crypto - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.2+1" - csslib: - dependency: transitive - description: - name: csslib - url: "https://pub.dartlang.org" - source: hosted - version: "0.14.1" + version: "1.14.11" cupertino_icons: dependency: "direct main" description: name: cupertino_icons url: "https://pub.dartlang.org" source: hosted - version: "0.1.1" + version: "0.1.2" firebase_analytics: dependency: "direct main" description: name: firebase_analytics url: "https://pub.dartlang.org" source: hosted - version: "0.0.4" + version: "1.0.6" firebase_auth: dependency: "direct main" description: name: firebase_auth url: "https://pub.dartlang.org" source: hosted - version: "0.2.0" + version: "0.6.6" + firebase_core: + dependency: transitive + description: + name: firebase_core + url: "https://pub.dartlang.org" + source: hosted + version: "0.2.5+1" firebase_database: dependency: "direct main" description: name: firebase_database url: "https://pub.dartlang.org" source: hosted - version: "0.0.12" + version: "1.0.5" firebase_storage: dependency: "direct main" description: name: firebase_storage url: "https://pub.dartlang.org" source: hosted - version: "0.0.5" + version: "1.0.4" flutter: dependency: "direct main" description: flutter @@ -123,311 +81,109 @@ packages: description: flutter source: sdk version: "0.0.0" - front_end: - dependency: transitive - description: - name: front_end - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.0-alpha.9" - glob: - dependency: transitive - description: - name: glob - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.5" google_sign_in: dependency: "direct main" description: name: google_sign_in url: "https://pub.dartlang.org" source: hosted - version: "0.3.1" - html: - dependency: transitive - description: - name: html - url: "https://pub.dartlang.org" - source: hosted - version: "0.13.3" - http: - dependency: transitive - description: - name: http - url: "https://pub.dartlang.org" - source: hosted - version: "0.11.3+16" - http_multi_server: - dependency: transitive - description: - name: http_multi_server - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.4" - http_parser: - dependency: transitive - description: - name: http_parser - url: "https://pub.dartlang.org" - source: hosted - version: "3.1.1" + version: "3.2.4" image_picker: dependency: "direct main" description: name: image_picker url: "https://pub.dartlang.org" source: hosted - version: "0.1.1" - io: - dependency: transitive - description: - name: io - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.2+1" - isolate: - dependency: transitive - description: - name: isolate - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0" - js: - dependency: transitive - description: - name: js - url: "https://pub.dartlang.org" - source: hosted - version: "0.6.1" - kernel: - dependency: transitive - description: - name: kernel - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.0-alpha.9" - logging: - dependency: transitive - description: - name: logging - url: "https://pub.dartlang.org" - source: hosted - version: "0.11.3+1" + version: "0.4.10" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.1+4" + version: "0.12.3+1" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" - mime: - dependency: transitive - description: - name: mime - url: "https://pub.dartlang.org" - source: hosted - version: "0.9.6" - multi_server_socket: - dependency: transitive - description: - name: multi_server_socket - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.1" - node_preamble: - dependency: transitive - description: - name: node_preamble - url: "https://pub.dartlang.org" - source: hosted - version: "1.4.0" - package_config: - dependency: transitive - description: - name: package_config - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.3" - package_resolver: - dependency: transitive - description: - name: package_resolver - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.2" + version: "1.1.6" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.5.1" - plugin: - dependency: transitive - description: - name: plugin - url: "https://pub.dartlang.org" - source: hosted - version: "0.2.0+2" - pool: - dependency: transitive - description: - name: pool - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.4" - pub_semver: - dependency: transitive - description: - name: pub_semver - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.6" + version: "1.6.2" quiver: dependency: transitive description: name: quiver url: "https://pub.dartlang.org" source: hosted - version: "0.29.0+1" - shelf: - dependency: transitive - description: - name: shelf - url: "https://pub.dartlang.org" - source: hosted - version: "0.7.2" - shelf_packages_handler: - dependency: transitive - description: - name: shelf_packages_handler - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.3" - shelf_static: - dependency: transitive - description: - name: shelf_static - url: "https://pub.dartlang.org" - source: hosted - version: "0.2.7" - shelf_web_socket: - dependency: transitive - description: - name: shelf_web_socket - url: "https://pub.dartlang.org" - source: hosted - version: "0.2.2" + version: "2.0.1" sky_engine: dependency: transitive description: flutter source: sdk version: "0.0.99" - source_map_stack_trace: - dependency: transitive - description: - name: source_map_stack_trace - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.4" - source_maps: - dependency: transitive - description: - name: source_maps - url: "https://pub.dartlang.org" - source: hosted - version: "0.10.4" source_span: dependency: transitive description: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.4.0" + version: "1.4.1" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.9.2" + version: "1.9.3" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "1.6.4" + version: "1.6.8" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.0.2" + version: "1.0.4" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" - test: + version: "1.0.1" + test_api: dependency: transitive description: - name: test + name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.12.34" + version: "0.2.1" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.1.5" - utf: - dependency: transitive - description: - name: utf - url: "https://pub.dartlang.org" - source: hosted - version: "0.9.0+4" + version: "1.1.6" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.0.6" - watcher: - dependency: transitive - description: - name: watcher - url: "https://pub.dartlang.org" - source: hosted - version: "0.9.7+7" - web_socket_channel: - dependency: transitive - description: - name: web_socket_channel - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.7" - yaml: - dependency: transitive - description: - name: yaml - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.13" + version: "2.0.8" sdks: - dart: ">=2.0.0-dev.23.0 <=2.0.0-edge.0d5cf900b021bf5c9fa593ffa12b15bcd1cc5fe0" + dart: ">=2.0.0 <3.0.0" + flutter: ">=0.1.4 <2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 6a91ae3..a6392e8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,12 +4,12 @@ description: One-to-one chat and Firebase auth dependencies: flutter: sdk: flutter - image_picker: 0.1.1 - google_sign_in: 0.3.1 - firebase_analytics: 0.0.4 - firebase_auth: 0.2.0 - firebase_database: 0.0.12 - firebase_storage: 0.0.5 + image_picker: any + google_sign_in: any + firebase_analytics: any + firebase_auth: any + firebase_database: any + firebase_storage: any # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons.