Skip to content

Commit

Permalink
Merge pull request #56 from FEUP-ESOF-2020-21/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
AssuncaoAndre authored Jan 4, 2021
2 parents a20b840 + 60b07ac commit d97b838
Show file tree
Hide file tree
Showing 28 changed files with 289 additions and 252 deletions.
Binary file modified img/add_talk_display.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/burguer_menu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/check_schedule.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/choose_conference.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed img/choose_tags.jpg
Binary file not shown.
Binary file modified img/create_conference.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/evaluate_interests.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed img/login.png
Binary file not shown.
Binary file added img/login_display.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/profile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/register.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/select_tags_display.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified release/app-release.apk
Binary file not shown.
214 changes: 107 additions & 107 deletions src/.dart_tool/package_config.json

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions src/.flutter-plugins
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# This is a generated file; do not edit or check into version control.
cloud_firestore=C:\\Programs\\flutter_windows_1.22.2-stable\\.pub-cache\\hosted\\pub.dartlang.org\\cloud_firestore-0.14.4\\
cloud_firestore_web=C:\\Programs\\flutter_windows_1.22.2-stable\\.pub-cache\\hosted\\pub.dartlang.org\\cloud_firestore_web-0.2.1+2\\
firebase_auth=C:\\Programs\\flutter_windows_1.22.2-stable\\.pub-cache\\hosted\\pub.dartlang.org\\firebase_auth-0.18.4+1\\
firebase_auth_web=C:\\Programs\\flutter_windows_1.22.2-stable\\.pub-cache\\hosted\\pub.dartlang.org\\firebase_auth_web-0.3.2+3\\
firebase_core=C:\\Programs\\flutter_windows_1.22.2-stable\\.pub-cache\\hosted\\pub.dartlang.org\\firebase_core-0.5.3\\
firebase_core_web=C:\\Programs\\flutter_windows_1.22.2-stable\\.pub-cache\\hosted\\pub.dartlang.org\\firebase_core_web-0.2.1+1\\
firebase_database=C:\\Programs\\flutter_windows_1.22.2-stable\\.pub-cache\\hosted\\pub.dartlang.org\\firebase_database-4.4.0\\
sqflite=C:\\Programs\\flutter_windows_1.22.2-stable\\.pub-cache\\hosted\\pub.dartlang.org\\sqflite-1.3.2+1\\
cloud_firestore=/home/andre/.pub-cache/hosted/pub.dartlang.org/cloud_firestore-0.14.4/
cloud_firestore_web=/home/andre/.pub-cache/hosted/pub.dartlang.org/cloud_firestore_web-0.2.1+2/
firebase_auth=/home/andre/.pub-cache/hosted/pub.dartlang.org/firebase_auth-0.18.4+1/
firebase_auth_web=/home/andre/.pub-cache/hosted/pub.dartlang.org/firebase_auth_web-0.3.2+3/
firebase_core=/home/andre/.pub-cache/hosted/pub.dartlang.org/firebase_core-0.5.3/
firebase_core_web=/home/andre/.pub-cache/hosted/pub.dartlang.org/firebase_core_web-0.2.1+1/
firebase_database=/home/andre/.pub-cache/hosted/pub.dartlang.org/firebase_database-4.4.0/
sqflite=/home/andre/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.2+1/
2 changes: 1 addition & 1 deletion src/.flutter-plugins-dependencies
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"cloud_firestore","path":"C:\\\\Programs\\\\flutter_windows_1.22.2-stable\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\cloud_firestore-0.14.4\\\\","dependencies":["firebase_core"]},{"name":"firebase_auth","path":"C:\\\\Programs\\\\flutter_windows_1.22.2-stable\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-0.18.4+1\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\Programs\\\\flutter_windows_1.22.2-stable\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-0.5.3\\\\","dependencies":[]},{"name":"firebase_database","path":"C:\\\\Programs\\\\flutter_windows_1.22.2-stable\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_database-4.4.0\\\\","dependencies":["firebase_core"]},{"name":"sqflite","path":"C:\\\\Programs\\\\flutter_windows_1.22.2-stable\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\sqflite-1.3.2+1\\\\","dependencies":[]}],"android":[{"name":"cloud_firestore","path":"C:\\\\Programs\\\\flutter_windows_1.22.2-stable\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\cloud_firestore-0.14.4\\\\","dependencies":["firebase_core"]},{"name":"firebase_auth","path":"C:\\\\Programs\\\\flutter_windows_1.22.2-stable\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-0.18.4+1\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\Programs\\\\flutter_windows_1.22.2-stable\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-0.5.3\\\\","dependencies":[]},{"name":"firebase_database","path":"C:\\\\Programs\\\\flutter_windows_1.22.2-stable\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_database-4.4.0\\\\","dependencies":["firebase_core"]},{"name":"sqflite","path":"C:\\\\Programs\\\\flutter_windows_1.22.2-stable\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\sqflite-1.3.2+1\\\\","dependencies":[]}],"macos":[{"name":"cloud_firestore","path":"C:\\\\Programs\\\\flutter_windows_1.22.2-stable\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\cloud_firestore-0.14.4\\\\","dependencies":["firebase_core"]},{"name":"firebase_auth","path":"C:\\\\Programs\\\\flutter_windows_1.22.2-stable\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-0.18.4+1\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\Programs\\\\flutter_windows_1.22.2-stable\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-0.5.3\\\\","dependencies":[]},{"name":"firebase_database","path":"C:\\\\Programs\\\\flutter_windows_1.22.2-stable\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_database-4.4.0\\\\","dependencies":["firebase_core"]},{"name":"sqflite","path":"C:\\\\Programs\\\\flutter_windows_1.22.2-stable\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\sqflite-1.3.2+1\\\\","dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"cloud_firestore_web","path":"C:\\\\Programs\\\\flutter_windows_1.22.2-stable\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\cloud_firestore_web-0.2.1+2\\\\","dependencies":["firebase_core_web"]},{"name":"firebase_auth_web","path":"C:\\\\Programs\\\\flutter_windows_1.22.2-stable\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth_web-0.3.2+3\\\\","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","path":"C:\\\\Programs\\\\flutter_windows_1.22.2-stable\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core_web-0.2.1+1\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"cloud_firestore","dependencies":["firebase_core","cloud_firestore_web"]},{"name":"cloud_firestore_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"firebase_auth","dependencies":["firebase_core","firebase_auth_web"]},{"name":"firebase_auth_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]},{"name":"firebase_database","dependencies":["firebase_core"]},{"name":"sqflite","dependencies":[]}],"date_created":"2020-12-21 18:30:37.782319","version":"1.25.0-4.0.pre"}
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"cloud_firestore","path":"/home/andre/.pub-cache/hosted/pub.dartlang.org/cloud_firestore-0.14.4/","dependencies":["firebase_core"]},{"name":"firebase_auth","path":"/home/andre/.pub-cache/hosted/pub.dartlang.org/firebase_auth-0.18.4+1/","dependencies":["firebase_core"]},{"name":"firebase_core","path":"/home/andre/.pub-cache/hosted/pub.dartlang.org/firebase_core-0.5.3/","dependencies":[]},{"name":"firebase_database","path":"/home/andre/.pub-cache/hosted/pub.dartlang.org/firebase_database-4.4.0/","dependencies":["firebase_core"]},{"name":"sqflite","path":"/home/andre/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.2+1/","dependencies":[]}],"android":[{"name":"cloud_firestore","path":"/home/andre/.pub-cache/hosted/pub.dartlang.org/cloud_firestore-0.14.4/","dependencies":["firebase_core"]},{"name":"firebase_auth","path":"/home/andre/.pub-cache/hosted/pub.dartlang.org/firebase_auth-0.18.4+1/","dependencies":["firebase_core"]},{"name":"firebase_core","path":"/home/andre/.pub-cache/hosted/pub.dartlang.org/firebase_core-0.5.3/","dependencies":[]},{"name":"firebase_database","path":"/home/andre/.pub-cache/hosted/pub.dartlang.org/firebase_database-4.4.0/","dependencies":["firebase_core"]},{"name":"sqflite","path":"/home/andre/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.2+1/","dependencies":[]}],"macos":[{"name":"cloud_firestore","path":"/home/andre/.pub-cache/hosted/pub.dartlang.org/cloud_firestore-0.14.4/","dependencies":["firebase_core"]},{"name":"firebase_auth","path":"/home/andre/.pub-cache/hosted/pub.dartlang.org/firebase_auth-0.18.4+1/","dependencies":["firebase_core"]},{"name":"firebase_core","path":"/home/andre/.pub-cache/hosted/pub.dartlang.org/firebase_core-0.5.3/","dependencies":[]},{"name":"firebase_database","path":"/home/andre/.pub-cache/hosted/pub.dartlang.org/firebase_database-4.4.0/","dependencies":["firebase_core"]},{"name":"sqflite","path":"/home/andre/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.2+1/","dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"cloud_firestore_web","path":"/home/andre/.pub-cache/hosted/pub.dartlang.org/cloud_firestore_web-0.2.1+2/","dependencies":["firebase_core_web"]},{"name":"firebase_auth_web","path":"/home/andre/.pub-cache/hosted/pub.dartlang.org/firebase_auth_web-0.3.2+3/","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","path":"/home/andre/.pub-cache/hosted/pub.dartlang.org/firebase_core_web-0.2.1+1/","dependencies":[]}]},"dependencyGraph":[{"name":"cloud_firestore","dependencies":["firebase_core","cloud_firestore_web"]},{"name":"cloud_firestore_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"firebase_auth","dependencies":["firebase_core","firebase_auth_web"]},{"name":"firebase_auth_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]},{"name":"firebase_database","dependencies":["firebase_core"]},{"name":"sqflite","dependencies":[]}],"date_created":"2021-01-04 22:36:26.329563","version":"1.24.0-8.0.pre.375"}
Loading

0 comments on commit d97b838

Please sign in to comment.