diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies deleted file mode 100644 index b4fed6b4a..000000000 --- a/.flutter-plugins-dependencies +++ /dev/null @@ -1 +0,0 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"adhara_socket_io","path":"C:\\\\Users\\\\deand\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\adhara_socket_io-0.4.2+1\\\\","dependencies":[]},{"name":"connectivity","path":"C:\\\\Users\\\\deand\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\connectivity-0.4.9\\\\","dependencies":[]},{"name":"file_picker","path":"C:\\\\Users\\\\deand\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\file_picker-1.13.3\\\\","dependencies":[]},{"name":"fluttertoast","path":"C:\\\\Users\\\\deand\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\fluttertoast-7.0.1\\\\","dependencies":[]},{"name":"path_provider","path":"C:\\\\Users\\\\deand\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.10\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\Users\\\\deand\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences-0.5.7+3\\\\","dependencies":[]},{"name":"sqflite","path":"C:\\\\Users\\\\deand\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\sqflite-1.3.0+2\\\\","dependencies":[]}],"android":[{"name":"adhara_socket_io","path":"C:\\\\Users\\\\deand\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\adhara_socket_io-0.4.2+1\\\\","dependencies":[]},{"name":"connectivity","path":"C:\\\\Users\\\\deand\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\connectivity-0.4.9\\\\","dependencies":[]},{"name":"file_picker","path":"C:\\\\Users\\\\deand\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\file_picker-1.13.3\\\\","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"flutter_plugin_android_lifecycle","path":"C:\\\\Users\\\\deand\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_plugin_android_lifecycle-1.0.8\\\\","dependencies":[]},{"name":"fluttertoast","path":"C:\\\\Users\\\\deand\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\fluttertoast-7.0.1\\\\","dependencies":[]},{"name":"path_provider","path":"C:\\\\Users\\\\deand\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.10\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\Users\\\\deand\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences-0.5.7+3\\\\","dependencies":[]},{"name":"sqflite","path":"C:\\\\Users\\\\deand\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\sqflite-1.3.0+2\\\\","dependencies":[]}],"macos":[{"name":"adhara_socket_io","path":"C:\\\\Users\\\\deand\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\adhara_socket_io-0.4.2+1\\\\","dependencies":[]},{"name":"connectivity_macos","path":"C:\\\\Users\\\\deand\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\connectivity_macos-0.1.0+3\\\\","dependencies":[]},{"name":"path_provider_macos","path":"C:\\\\Users\\\\deand\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_macos-0.0.4+3\\\\","dependencies":[]},{"name":"shared_preferences_macos","path":"C:\\\\Users\\\\deand\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_macos-0.0.1+9\\\\","dependencies":[]},{"name":"sqflite","path":"C:\\\\Users\\\\deand\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\sqflite-1.3.0+2\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\deand\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-0.0.1+1\\\\","dependencies":[]}],"windows":[],"web":[{"name":"connectivity_for_web","path":"C:\\\\Users\\\\deand\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\connectivity_for_web-0.3.1\\\\","dependencies":[]},{"name":"fluttertoast","path":"C:\\\\Users\\\\deand\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\fluttertoast-7.0.1\\\\","dependencies":[]},{"name":"shared_preferences_web","path":"C:\\\\Users\\\\deand\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_web-0.1.2+7\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"adhara_socket_io","dependencies":[]},{"name":"connectivity","dependencies":["connectivity_macos","connectivity_for_web"]},{"name":"connectivity_for_web","dependencies":[]},{"name":"connectivity_macos","dependencies":[]},{"name":"file_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"fluttertoast","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]}],"date_created":"2020-09-07 12:59:47.482720","version":"1.20.3"} \ No newline at end of file diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig index 592ceee85..ec97fc6f3 100644 --- a/ios/Flutter/Debug.xcconfig +++ b/ios/Flutter/Debug.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig index 592ceee85..c4855bfe2 100644 --- a/ios/Flutter/Release.xcconfig +++ b/ios/Flutter/Release.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" diff --git a/ios/Podfile b/ios/Podfile new file mode 100644 index 000000000..1e8c3c90a --- /dev/null +++ b/ios/Podfile @@ -0,0 +1,41 @@ +# Uncomment this line to define a global platform for your project +# platform :ios, '9.0' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_ios_podfile_setup + +target 'Runner' do + use_frameworks! + use_modular_headers! + + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) + end +end diff --git a/lib/controllers/activity_controller.dart b/lib/controllers/activity_controller.dart index 7bc7ef78e..0f460af0e 100644 --- a/lib/controllers/activity_controller.dart +++ b/lib/controllers/activity_controller.dart @@ -3,11 +3,10 @@ import 'package:talawa/model/activity.dart'; import 'package:talawa/model/user.dart'; import 'package:talawa/view_models/vm_add_activity.dart'; import 'package:talawa/views/pages/home_page.dart'; -import 'package:talawa/views/widgets/_widgets.dart'; + import 'package:http/http.dart' as http; import 'package:flutter/material.dart'; import 'dart:convert'; -import 'package:talawa/utils/globals.dart'; import 'note_controller.dart'; diff --git a/lib/controllers/note_controller.dart b/lib/controllers/note_controller.dart index 90ff61fe6..8c70d0c7b 100644 --- a/lib/controllers/note_controller.dart +++ b/lib/controllers/note_controller.dart @@ -2,10 +2,10 @@ import 'package:adhara_socket_io/adhara_socket_io.dart'; import 'package:flutter/cupertino.dart'; import 'package:sqflite/sqflite.dart'; import 'package:talawa/model/note.dart'; -import 'package:talawa/utils/globals.dart'; import 'package:talawa/views/widgets/chat_message.dart'; class NoteController with ChangeNotifier { + // ignore: todo //TODO: Refactor code such that the current user id is easily accessible across more than one provider int currentUserId; SocketIO socket; diff --git a/lib/main.dart b/lib/main.dart index b06af57cf..43b6059fd 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -8,7 +8,7 @@ import 'package:talawa/views/pages/_pages.dart'; import 'package:talawa/utils/uidata.dart'; import 'package:talawa/views/pages/login_signup/login_page.dart'; -import 'package:talawa/views/pages/newsfeed/newsfeed.dart'; + import 'package:talawa/views/pages/organization/profile_page.dart'; import 'controllers/auth_controller.dart'; diff --git a/lib/views/pages/newsfeed.dart b/lib/views/pages/newsfeed.dart index 16e1273a4..805ec4fcc 100644 --- a/lib/views/pages/newsfeed.dart +++ b/lib/views/pages/newsfeed.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:graphql_flutter/graphql_flutter.dart'; + import 'package:lipsum/lipsum.dart' as lipsum; import 'dart:math'; import 'package:persistent_bottom_nav_bar/persistent-tab-view.dart'; @@ -54,7 +54,7 @@ class _NewsFeedState extends State { subtitle: Text(list2[index]), trailing: Container( width: 80, - child: Image.asset(UIData.shoppingImage), + child: Image.asset(UIData.shoppingImage), )), Padding( padding: EdgeInsets.all(10), @@ -78,7 +78,6 @@ class _NewsFeedState extends State { ], ), ); - }) - ); + })); } } diff --git a/pubspec.lock b/pubspec.lock index 9914c2f3a..e7cd3494f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -14,14 +14,14 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.4.2" + version: "2.5.0" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" carousel_slider: dependency: "direct main" description: @@ -35,28 +35,28 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.1.0" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.1.3" + version: "1.2.0" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.1.0" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.14.13" + version: "1.15.0" connectivity: dependency: "direct main" description: @@ -126,14 +126,14 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" file: dependency: transitive description: name: file url: "https://pub.dartlang.org" source: hosted - version: "5.1.0" + version: "6.1.0" file_picker: dependency: "direct main" description: @@ -272,21 +272,28 @@ packages: name: intl url: "https://pub.dartlang.org" source: hosted - version: "0.16.1" + version: "0.17.0" + js: + dependency: transitive + description: + name: js + url: "https://pub.dartlang.org" + source: hosted + version: "0.6.3" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.8" + version: "0.12.10" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.8" + version: "1.3.0" mime: dependency: transitive description: @@ -307,7 +314,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0" path_drawing: dependency: transitive description: @@ -349,7 +356,7 @@ packages: name: path_provider_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.2" + version: "1.0.4" pedantic: dependency: transitive description: @@ -377,7 +384,7 @@ packages: name: platform url: "https://pub.dartlang.org" source: hosted - version: "2.2.1" + version: "3.0.0" plugin_platform_interface: dependency: transitive description: @@ -391,7 +398,7 @@ packages: name: process url: "https://pub.dartlang.org" source: hosted - version: "3.0.13" + version: "4.1.0" provider: dependency: "direct main" description: @@ -454,7 +461,7 @@ packages: name: simple_gesture_detector url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.6" sky_engine: dependency: transitive description: flutter @@ -466,7 +473,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0" sqflite: dependency: "direct main" description: @@ -487,21 +494,21 @@ packages: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.9.5" + version: "1.10.0" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "1.1.0" synchronized: dependency: transitive description: @@ -515,21 +522,21 @@ packages: name: table_calendar url: "https://pub.dartlang.org" source: hosted - version: "2.2.3" + version: "2.3.3" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.17" + version: "0.2.19" timeline_list: dependency: "direct main" description: @@ -543,7 +550,7 @@ packages: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" uuid_enhanced: dependency: transitive description: @@ -557,7 +564,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.1.0" websocket: dependency: transitive description: @@ -571,7 +578,7 @@ packages: name: xdg_directories url: "https://pub.dartlang.org" source: hosted - version: "0.1.0" + version: "0.1.2" xml: dependency: transitive description: @@ -580,5 +587,5 @@ packages: source: hosted version: "3.6.1" sdks: - dart: ">=2.9.0-14.0.dev <3.0.0" - flutter: ">=1.12.13+hotfix.5 <2.0.0" + dart: ">=2.12.0-0.0 <3.0.0" + flutter: ">=1.17.0"