From 5eae2f95191fd669b699394d06820e1a973814a6 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Tue, 11 Aug 2020 09:22:14 +0300 Subject: [PATCH] fix merge issues --- ios/Podfile.lock | 12 +++++++++++- lib/widgets/shared/card_with_bg_widget.dart | 2 -- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 70b9d103..cddfd571 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -33,7 +33,11 @@ PODS: - Flutter - shared_preferences_web (0.0.1): - Flutter + - speech_to_text (0.0.1): + - Flutter + - Try - SwiftProtobuf (1.9.0) + - Try (2.1.1) - url_launcher (0.0.1): - Flutter - url_launcher_macos (0.0.1): @@ -58,6 +62,7 @@ DEPENDENCIES: - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`) - shared_preferences_macos (from `.symlinks/plugins/shared_preferences_macos/ios`) - shared_preferences_web (from `.symlinks/plugins/shared_preferences_web/ios`) + - speech_to_text (from `.symlinks/plugins/speech_to_text/ios`) - url_launcher (from `.symlinks/plugins/url_launcher/ios`) - url_launcher_macos (from `.symlinks/plugins/url_launcher_macos/ios`) - url_launcher_web (from `.symlinks/plugins/url_launcher_web/ios`) @@ -69,6 +74,7 @@ SPEC REPOS: - OpenTok - Reachability - SwiftProtobuf + - Try EXTERNAL SOURCES: barcode_scan: @@ -99,6 +105,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/shared_preferences_macos/ios" shared_preferences_web: :path: ".symlinks/plugins/shared_preferences_web/ios" + speech_to_text: + :path: ".symlinks/plugins/speech_to_text/ios" url_launcher: :path: ".symlinks/plugins/url_launcher/ios" url_launcher_macos: @@ -125,11 +133,13 @@ SPEC CHECKSUMS: shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087 shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9 + speech_to_text: b43a7d99aef037bd758ed8e45d79bbac035d2dfe SwiftProtobuf: ecbec1be9036d15655f6b3443a1c4ea693c97932 + Try: 5ef669ae832617b3cee58cb2c6f99fb767a4ff96 url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313 url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c PODFILE CHECKSUM: 649616dc336b3659ac6b2b25159d8e488e042b69 -COCOAPODS: 1.9.3 +COCOAPODS: 1.10.0.beta.1 diff --git a/lib/widgets/shared/card_with_bg_widget.dart b/lib/widgets/shared/card_with_bg_widget.dart index 39468b83..a2bb0cfe 100644 --- a/lib/widgets/shared/card_with_bg_widget.dart +++ b/lib/widgets/shared/card_with_bg_widget.dart @@ -1,6 +1,4 @@ -import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/providers/project_provider.dart'; -import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; import 'package:provider/provider.dart';