mirror of
https://github.com/DungeonPaper/dungeon-paper-app.git
synced 2026-05-17 17:58:11 +00:00
upgrades
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -7,3 +7,4 @@
|
||||
build/
|
||||
|
||||
.flutter-plugins
|
||||
*.log
|
||||
|
||||
4
.idea/encodings.xml
generated
Normal file
4
.idea/encodings.xml
generated
Normal file
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Encoding" addBOMForNewFiles="with NO BOM" />
|
||||
</project>
|
||||
276
.idea/libraries/Dart_Packages.xml
generated
Normal file
276
.idea/libraries/Dart_Packages.xml
generated
Normal file
@@ -0,0 +1,276 @@
|
||||
<component name="libraryTable">
|
||||
<library name="Dart Packages" type="DartPackagesLibraryType">
|
||||
<properties>
|
||||
<option name="packageNameToDirsMap">
|
||||
<entry key="args">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/args-1.5.1/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="async">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/async-2.0.8/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="boolean_selector">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.4/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="charcode">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.2/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="cloud_firestore">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/cloud_firestore-0.9.0+2/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="collection">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/collection-1.14.11/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="cupertino_icons">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.2/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="dungeon_world_data">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/dungeon_world_data-1.0.0/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="firebase_auth">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/firebase_auth-0.8.1+1/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="firebase_core">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/firebase_core-0.3.0+2/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="flutter">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/packages/flutter/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="flutter_markdown">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/flutter_markdown-0.2.0/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="flutter_redux">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/flutter_redux-0.5.3/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="flutter_staggered_grid_view">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/flutter_staggered_grid_view-0.2.7/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="flutter_test">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/packages/flutter_test/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="google_sign_in">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/google_sign_in-4.0.0/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="markdown">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/markdown-2.0.2/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="matcher">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.3+1/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="meta">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/meta-1.1.6/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="path">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/path-1.6.2/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="quiver">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/quiver-2.0.1/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="redux">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/redux-3.0.0/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="shared_preferences">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.0/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="sky_engine">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/bin/cache/pkg/sky_engine/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="source_span">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/source_span-1.4.1/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="stack_trace">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.3/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="stream_channel">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.8/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="string_scanner">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.4/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="term_glyph">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.0.1/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="test_api">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.1/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="typed_data">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.6/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="url_launcher">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.0.0/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="vector_math">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/vector_math-2.0.8/lib" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
</option>
|
||||
</properties>
|
||||
<CLASSES>
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/args-1.5.1/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/async-2.0.8/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.4/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.2/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/cloud_firestore-0.9.0+2/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/collection-1.14.11/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.2/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/dungeon_world_data-1.0.0/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/firebase_auth-0.8.1+1/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/firebase_core-0.3.0+2/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/flutter_markdown-0.2.0/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/flutter_redux-0.5.3/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/flutter_staggered_grid_view-0.2.7/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/google_sign_in-4.0.0/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/markdown-2.0.2/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.3+1/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/meta-1.1.6/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/path-1.6.2/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/quiver-2.0.1/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/redux-3.0.0/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.0/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/source_span-1.4.1/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.3/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.8/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.4/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.0.1/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.1/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.6/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.0.0/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/vector_math-2.0.8/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/bin/cache/pkg/sky_engine/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/packages/flutter/lib" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/packages/flutter_test/lib" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
</library>
|
||||
</component>
|
||||
14
.idea/libraries/Flutter_Plugins.xml
generated
Normal file
14
.idea/libraries/Flutter_Plugins.xml
generated
Normal file
@@ -0,0 +1,14 @@
|
||||
<component name="libraryTable">
|
||||
<library name="Flutter Plugins" type="FlutterPluginsLibraryType">
|
||||
<CLASSES>
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/google_sign_in-4.0.0" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.0.0" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.0" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/firebase_auth-0.8.1+1" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/firebase_core-0.3.0+2" />
|
||||
<root url="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/cloud_firestore-0.9.0+2" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
</library>
|
||||
</component>
|
||||
4
.idea/misc.xml
generated
Normal file
4
.idea/misc.xml
generated
Normal file
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="Android API 28 Platform" project-jdk-type="Android SDK" />
|
||||
</project>
|
||||
6
.idea/vcs.xml
generated
Normal file
6
.idea/vcs.xml
generated
Normal file
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
283
.idea/workspace.xml
generated
283
.idea/workspace.xml
generated
@@ -1,36 +1,291 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="c5c05976-6167-48bf-aa0c-9208a9c917fe" name="Default Changelist" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/android/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/android/app/build.gradle" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/android/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/android/build.gradle" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/android/gradle.properties" beforeDir="false" afterPath="$PROJECT_DIR$/android/gradle.properties" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/android/gradle/wrapper/gradle-wrapper.properties" beforeDir="false" afterPath="$PROJECT_DIR$/android/gradle/wrapper/gradle-wrapper.properties" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/dungeon_paper.iml" beforeDir="false" afterPath="$PROJECT_DIR$/dungeon_paper.iml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lib/db/base.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/db/base.dart" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lib/db/character.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/db/character.dart" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lib/db/listeners.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/db/listeners.dart" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lib/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/main.dart" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lib/redux/actions/character_actions.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/redux/actions/character_actions.dart" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lib/redux/stores/characters_reducer.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/redux/stores/characters_reducer.dart" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lib/sidebar.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/sidebar.dart" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pubspec.lock" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.lock" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/run.log" beforeDir="false" />
|
||||
</list>
|
||||
<ignored path="$PROJECT_DIR$/.dart_tool/" />
|
||||
<ignored path="$PROJECT_DIR$/.idea/" />
|
||||
<ignored path="$PROJECT_DIR$/.pub/" />
|
||||
<ignored path="$PROJECT_DIR$/build/" />
|
||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<component name="FileEditorManager">
|
||||
<leaf>
|
||||
<file leaf-file-name="main.dart" pinned="false" current-in-tab="true">
|
||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/lib/main.dart">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="0">
|
||||
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<state relative-caret-position="960">
|
||||
<caret line="64" column="16" selection-start-line="64" selection-start-column="16" selection-end-line="64" selection-end-column="16" />
|
||||
<folding>
|
||||
<element signature="e#0#44#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/lib/profile_view/login_button.dart">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="840">
|
||||
<caret line="60" column="2" selection-start-line="60" selection-start-column="2" selection-end-line="60" selection-end-column="2" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/android/app/build.gradle">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="318">
|
||||
<caret line="68" column="58" selection-start-line="68" selection-start-column="58" selection-end-line="68" selection-end-column="58" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/android/gradle.properties">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="45">
|
||||
<caret line="3" selection-start-line="3" selection-end-line="3" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/android/build.gradle">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
</file>
|
||||
</leaf>
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
||||
</layout>
|
||||
<component name="FindInProjectRecents">
|
||||
<findStrings>
|
||||
<find>compilesdk</find>
|
||||
</findStrings>
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="IdeDocumentHistory">
|
||||
<option name="CHANGED_PATHS">
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$/android/gradle.properties" />
|
||||
<option value="$PROJECT_DIR$/android/app/build.gradle" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectFrameBounds" fullScreen="true">
|
||||
<option name="width" value="1440" />
|
||||
<option name="height" value="900" />
|
||||
</component>
|
||||
<component name="ProjectView">
|
||||
<navigator currentView="ProjectPane" proportions="" version="1">
|
||||
<foldersAlwaysOnTop value="true" />
|
||||
</navigator>
|
||||
<panes>
|
||||
<pane id="ProjectPane">
|
||||
<option name="show-excluded-files" value="false" />
|
||||
</pane>
|
||||
<pane id="AndroidView" />
|
||||
<pane id="Scope" />
|
||||
<pane id="ProjectPane" />
|
||||
<pane id="PackagesPane" />
|
||||
</panes>
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
<property name="dart.analysis.tool.window.force.activate" value="false" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
||||
<property name="dart.analysis.tool.window.force.activate" value="true" />
|
||||
<property name="project.structure.last.edited" value="SDKs" />
|
||||
<property name="project.structure.proportion" value="0.15" />
|
||||
<property name="project.structure.side.proportion" value="0.2" />
|
||||
<property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
|
||||
<property name="show.migrate.to.gradle.popup" value="false" />
|
||||
</component>
|
||||
</project>
|
||||
<component name="RunDashboard">
|
||||
<option name="ruleStates">
|
||||
<list>
|
||||
<RuleState>
|
||||
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
|
||||
</RuleState>
|
||||
<RuleState>
|
||||
<option name="name" value="StatusDashboardGroupingRule" />
|
||||
</RuleState>
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="SvnConfiguration">
|
||||
<configuration />
|
||||
</component>
|
||||
<component name="TaskManager">
|
||||
<task active="true" id="Default" summary="Default task">
|
||||
<changelist id="c5c05976-6167-48bf-aa0c-9208a9c917fe" name="Default Changelist" comment="" />
|
||||
<created>1550346843292</created>
|
||||
<option name="number" value="Default" />
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1550346843292</updated>
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24105866" />
|
||||
<window_info id="Captures" order="1" side_tool="true" />
|
||||
<window_info id="Structure" order="2" side_tool="true" />
|
||||
<window_info id="Image Layers" order="3" />
|
||||
<window_info id="Designer" order="4" />
|
||||
<window_info id="Build Variants" order="5" side_tool="true" />
|
||||
<window_info id="Resources Explorer" order="6" />
|
||||
<window_info id="Capture Tool" order="7" />
|
||||
<window_info id="Favorites" order="8" side_tool="true" />
|
||||
<window_info anchor="bottom" id="Dart Analysis" order="0" sideWeight="0.49928468" visible="true" weight="0.3110285" />
|
||||
<window_info anchor="bottom" id="Run" order="1" />
|
||||
<window_info anchor="bottom" id="TODO" order="2" />
|
||||
<window_info anchor="bottom" id="Android Profiler" order="3" show_stripe_button="false" />
|
||||
<window_info anchor="bottom" id="Logcat" order="4" />
|
||||
<window_info anchor="bottom" id="Debug" order="5" />
|
||||
<window_info anchor="bottom" id="Terminal" order="6" />
|
||||
<window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5007153" side_tool="true" weight="0.3110285" />
|
||||
<window_info anchor="bottom" id="Flutter Performance" order="8" side_tool="true" />
|
||||
<window_info anchor="bottom" id="Version Control" order="9" />
|
||||
<window_info anchor="bottom" id="Find" order="10" />
|
||||
<window_info anchor="right" id="Device File Explorer" order="0" side_tool="true" />
|
||||
<window_info anchor="right" id="Capture Analysis" order="1" />
|
||||
<window_info anchor="right" id="Theme Preview" order="2" />
|
||||
<window_info anchor="right" id="Flutter Inspector" order="3" />
|
||||
<window_info anchor="right" id="Flutter Outline" order="4" />
|
||||
<window_info anchor="right" id="Palette	" order="5" />
|
||||
<window_info anchor="right" id="Assistant" order="6" weight="0.32987398" />
|
||||
</layout>
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/lib/main.dart">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="960">
|
||||
<caret line="64" column="16" selection-start-line="64" selection-start-column="16" selection-end-line="64" selection-end-column="16" />
|
||||
<folding>
|
||||
<element signature="e#0#44#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/lib/profile_view/login_button.dart">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="840">
|
||||
<caret line="60" column="2" selection-start-line="60" selection-start-column="2" selection-end-line="60" selection-end-column="2" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/android/gradle.properties">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="45">
|
||||
<caret line="3" selection-start-line="3" selection-end-line="3" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/android/build.gradle">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/android/app/build.gradle">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="318">
|
||||
<caret line="68" column="58" selection-start-line="68" selection-start-column="58" selection-end-line="68" selection-end-column="58" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</component>
|
||||
<component name="masterDetails">
|
||||
<states>
|
||||
<state key="ArtifactsStructureConfigurable.UI">
|
||||
<settings>
|
||||
<artifact-editor />
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
<option value="0.2" />
|
||||
</list>
|
||||
</option>
|
||||
</splitter-proportions>
|
||||
</settings>
|
||||
</state>
|
||||
<state key="FacetStructureConfigurable.UI">
|
||||
<settings>
|
||||
<last-edited>Android</last-edited>
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
<option value="0.2" />
|
||||
</list>
|
||||
</option>
|
||||
</splitter-proportions>
|
||||
</settings>
|
||||
</state>
|
||||
<state key="GlobalLibrariesConfigurable.UI">
|
||||
<settings>
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
<option value="0.2" />
|
||||
</list>
|
||||
</option>
|
||||
</splitter-proportions>
|
||||
</settings>
|
||||
</state>
|
||||
<state key="JdkListConfigurable.UI">
|
||||
<settings>
|
||||
<last-edited>Android API 28 Platform</last-edited>
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
<option value="0.2" />
|
||||
</list>
|
||||
</option>
|
||||
</splitter-proportions>
|
||||
</settings>
|
||||
</state>
|
||||
<state key="ModuleStructureConfigurable.UI">
|
||||
<settings>
|
||||
<last-edited>dungeon_paper_android</last-edited>
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
<option value="0.2" />
|
||||
<option value="0.6" />
|
||||
</list>
|
||||
</option>
|
||||
</splitter-proportions>
|
||||
</settings>
|
||||
</state>
|
||||
<state key="ProjectLibrariesConfigurable.UI">
|
||||
<settings>
|
||||
<last-edited>Flutter Plugins</last-edited>
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
<option value="0.2" />
|
||||
</list>
|
||||
</option>
|
||||
</splitter-proportions>
|
||||
</settings>
|
||||
</state>
|
||||
</states>
|
||||
</component>
|
||||
</project>
|
||||
BIN
android.zip
Normal file
BIN
android.zip
Normal file
Binary file not shown.
BIN
android/.idea/caches/build_file_checksums.ser
generated
Normal file
BIN
android/.idea/caches/build_file_checksums.ser
generated
Normal file
Binary file not shown.
BIN
android/.idea/caches/gradle_models.ser
generated
Normal file
BIN
android/.idea/caches/gradle_models.ser
generated
Normal file
Binary file not shown.
15
android/.idea/compiler.xml
generated
Normal file
15
android/.idea/compiler.xml
generated
Normal file
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CompilerConfiguration">
|
||||
<wildcardResourcePatterns>
|
||||
<entry name="!?*.java" />
|
||||
<entry name="!?*.form" />
|
||||
<entry name="!?*.class" />
|
||||
<entry name="!?*.groovy" />
|
||||
<entry name="!?*.scala" />
|
||||
<entry name="!?*.flex" />
|
||||
<entry name="!?*.kt" />
|
||||
<entry name="!?*.clj" />
|
||||
</wildcardResourcePatterns>
|
||||
</component>
|
||||
</project>
|
||||
4
android/.idea/encodings.xml
generated
Normal file
4
android/.idea/encodings.xml
generated
Normal file
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Encoding" addBOMForNewFiles="with NO BOM" />
|
||||
</project>
|
||||
15
android/.idea/gradle.xml
generated
Normal file
15
android/.idea/gradle.xml
generated
Normal file
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="GradleSettings">
|
||||
<option name="linkedExternalProjectsSettings">
|
||||
<GradleProjectSettings>
|
||||
<compositeConfiguration>
|
||||
<compositeBuild compositeDefinitionSource="SCRIPT" />
|
||||
</compositeConfiguration>
|
||||
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||
<option name="resolveModulePerSourceSet" value="false" />
|
||||
</GradleProjectSettings>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
||||
9
android/.idea/misc.xml
generated
Normal file
9
android/.idea/misc.xml
generated
Normal file
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="ProjectType">
|
||||
<option name="id" value="Android" />
|
||||
</component>
|
||||
</project>
|
||||
15
android/.idea/modules.xml
generated
Normal file
15
android/.idea/modules.xml
generated
Normal file
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/android.iml" filepath="$PROJECT_DIR$/android.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
|
||||
<module fileurl="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/cloud_firestore-0.9.0+2/android/cloud_firestore.iml" filepath="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/cloud_firestore-0.9.0+2/android/cloud_firestore.iml" />
|
||||
<module fileurl="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/firebase_auth-0.8.1+1/android/firebase_auth.iml" filepath="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/firebase_auth-0.8.1+1/android/firebase_auth.iml" />
|
||||
<module fileurl="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/firebase_core-0.3.0+2/android/firebase_core.iml" filepath="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/firebase_core-0.3.0+2/android/firebase_core.iml" />
|
||||
<module fileurl="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/google_sign_in-4.0.0/android/google_sign_in.iml" filepath="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/google_sign_in-4.0.0/android/google_sign_in.iml" />
|
||||
<module fileurl="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.0/android/shared_preferences.iml" filepath="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.0/android/shared_preferences.iml" />
|
||||
<module fileurl="file://$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.0.0/android/url_launcher.iml" filepath="$USER_HOME$/.flutter.src/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.0.0/android/url_launcher.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
12
android/.idea/runConfigurations.xml
generated
Normal file
12
android/.idea/runConfigurations.xml
generated
Normal file
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="RunConfigurationProducerService">
|
||||
<option name="ignoredProducers">
|
||||
<set>
|
||||
<option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
|
||||
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
|
||||
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
|
||||
</set>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
||||
6
android/.idea/vcs.xml
generated
Normal file
6
android/.idea/vcs.xml
generated
Normal file
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
@@ -15,20 +15,20 @@ apply plugin: 'com.android.application'
|
||||
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
|
||||
|
||||
android {
|
||||
compileSdkVersion 27
|
||||
compileSdkVersion 28
|
||||
|
||||
lintOptions {
|
||||
disable 'InvalidPackage'
|
||||
}
|
||||
|
||||
defaultConfig {
|
||||
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
|
||||
applicationId "app.dungeonpaper"
|
||||
minSdkVersion 21
|
||||
targetSdkVersion 27
|
||||
minSdkVersion 28
|
||||
compileSdkVersion 28
|
||||
targetSdkVersion 28
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
multiDexEnabled true
|
||||
}
|
||||
|
||||
@@ -59,9 +59,17 @@ flutter {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
testImplementation 'junit:junit:4.12'
|
||||
androidTestImplementation 'com.android.support.test:runner:1.0.1'
|
||||
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
|
||||
testImplementation('junit:junit:4.12') {
|
||||
// com.google.common.util.concurrent.ListenableFuture
|
||||
exclude group: 'com.google.guava', module:'guava'
|
||||
}
|
||||
implementation 'com.google.firebase:firebase-core:16.0.7'
|
||||
implementation 'com.google.firebase:firebase-firestore:18.0.1'
|
||||
implementation 'com.google.firebase:firebase-auth:16.1.0'
|
||||
implementation 'androidx.appcompat:appcompat:1.1.0-alpha02'
|
||||
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
|
||||
androidTestImplementation 'androidx.test:runner:1.1.1'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
|
||||
}
|
||||
|
||||
apply plugin: 'com.google.gms.google-services'
|
||||
|
||||
@@ -5,8 +5,8 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.0.1'
|
||||
classpath 'com.google.gms:google-services:3.2.1'
|
||||
classpath 'com.android.tools.build:gradle:3.4.0-beta04'
|
||||
classpath 'com.google.gms:google-services:4.2.0'
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1 +1,3 @@
|
||||
org.gradle.jvmargs=-Xmx1536M
|
||||
android.useAndroidX=true
|
||||
android.enableJetifier=true
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#Fri Jun 23 08:50:38 CEST 2017
|
||||
#Sat Feb 16 22:11:11 IST 2019
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
|
||||
|
||||
@@ -9,6 +9,42 @@
|
||||
<excludeFolder url="file://$MODULE_DIR$/.idea" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/.pub" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/cloud_firestore/.dart_tool" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/cloud_firestore/.pub" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/cloud_firestore/build" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/cloud_firestore/example/.dart_tool" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/cloud_firestore/example/.pub" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/cloud_firestore/example/build" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/firebase_auth/.dart_tool" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/firebase_auth/.pub" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/firebase_auth/build" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/firebase_auth/example/.dart_tool" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/firebase_auth/example/.pub" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/firebase_auth/example/build" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/firebase_core/.dart_tool" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/firebase_core/.pub" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/firebase_core/build" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/firebase_core/example/.dart_tool" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/firebase_core/example/.pub" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/firebase_core/example/build" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/google_sign_in/.dart_tool" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/google_sign_in/.pub" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/google_sign_in/build" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/google_sign_in/example/.dart_tool" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/google_sign_in/example/.pub" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/google_sign_in/example/build" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/shared_preferences/.dart_tool" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/shared_preferences/.pub" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/shared_preferences/build" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/shared_preferences/example/.dart_tool" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/shared_preferences/example/.pub" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/shared_preferences/example/build" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/url_launcher/.dart_tool" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/url_launcher/.pub" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/url_launcher/build" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/url_launcher/example/.dart_tool" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/url_launcher/example/.pub" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/url_launcher/example/build" />
|
||||
</content>
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="Dart SDK" level="project" />
|
||||
|
||||
@@ -15,7 +15,7 @@ abstract class DbBase {
|
||||
this.propertyMapping: const {},
|
||||
this.listProperties: const [],
|
||||
}) {
|
||||
_map = map != null ? map : Map();
|
||||
_map = map != null ? Map.from(map) : Map();
|
||||
|
||||
defaultData.forEach((key, val) {
|
||||
if (!_map.containsKey(key) || _map[key] == null) {
|
||||
@@ -72,5 +72,5 @@ abstract class DbBase {
|
||||
List<T> getList<T extends DbBase>(String key) =>
|
||||
List.from(get<List>(key, []));
|
||||
|
||||
get map => _map;
|
||||
get map => Map.from(_map);
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import 'package:dungeon_paper/db/character_types.dart';
|
||||
import 'package:dungeon_paper/db/notes.dart';
|
||||
import 'package:dungeon_paper/db/user.dart';
|
||||
import 'package:dungeon_paper/redux/actions/character_actions.dart';
|
||||
import 'package:dungeon_paper/redux/actions/user_actions.dart';
|
||||
import 'package:dungeon_paper/redux/stores/stores.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
import 'base.dart';
|
||||
@@ -90,6 +91,24 @@ Future<DbCharacter> setCurrentCharacterById(String documentId) async {
|
||||
return dbCharacter;
|
||||
}
|
||||
|
||||
Future<Map<String, DbCharacter>> getAllCharacters(DocumentSnapshot user) async {
|
||||
Map<String, Future<DocumentSnapshot>> refs = {};
|
||||
Map<String, DbCharacter> chars = {};
|
||||
user.data['characters'].forEach((char) {
|
||||
refs[char.documentID] =
|
||||
Firestore.instance.document('character_bios/${char.documentID}').get();
|
||||
});
|
||||
|
||||
List<DocumentSnapshot> results = await Future.wait(refs.values);
|
||||
|
||||
results.forEach((r) {
|
||||
chars[r.documentID] = DbCharacter(r.data);
|
||||
});
|
||||
|
||||
dwStore.dispatch(CharacterActions.setCharacters(chars));
|
||||
return chars;
|
||||
}
|
||||
|
||||
unsetCurrentCharacter() async {
|
||||
print('Unsetting characters');
|
||||
SharedPreferences prefs = await SharedPreferences.getInstance();
|
||||
@@ -120,17 +139,20 @@ Future<Map> updateCharacter(Map<String, dynamic> data) async {
|
||||
|
||||
createCharacter() async {
|
||||
SharedPreferences sharedPrefs = await SharedPreferences.getInstance();
|
||||
DbCharacter character = DbCharacter({});
|
||||
DbCharacter character = DbCharacter();
|
||||
|
||||
DocumentReference charDoc =
|
||||
await firestore.collection('character_bios').add(character.map);
|
||||
|
||||
String userDocId = sharedPrefs.getString('userId');
|
||||
|
||||
firestore.document('user/$userDocId').updateData({
|
||||
'characters': [charDoc]
|
||||
});
|
||||
|
||||
var userDoc = Firestore.instance.document('users/$userDocId');
|
||||
DocumentSnapshot user = await userDoc.get();
|
||||
List characters = List.from(user.data['characters']);
|
||||
if (characters == null) {
|
||||
characters = [];
|
||||
}
|
||||
characters.add(charDoc);
|
||||
userDoc.updateData({'characters': characters});
|
||||
dwStore.dispatch(
|
||||
CharacterActions.setCurrentChar(charDoc.documentID, character),
|
||||
);
|
||||
@@ -139,6 +161,7 @@ createCharacter() async {
|
||||
getOrCreateCharacter(DocumentSnapshot userSnap) {
|
||||
if (userSnap.data['characters'].length > 0) {
|
||||
print('userSnap data:' + userSnap.data['characters'][0].documentID);
|
||||
getAllCharacters(userSnap);
|
||||
setCurrentCharacterById(userSnap.data['characters'][0].documentID);
|
||||
} else {
|
||||
createCharacter();
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
import 'package:dungeon_paper/db/auth.dart';
|
||||
import 'package:dungeon_paper/db/character.dart';
|
||||
import 'package:dungeon_paper/db/user.dart';
|
||||
import 'package:dungeon_paper/nav_bar.dart';
|
||||
import 'package:dungeon_paper/notes_view/notes_view.dart';
|
||||
import 'package:dungeon_paper/profile_view/basic_info.dart';
|
||||
import 'package:dungeon_paper/profile_view/user_badge.dart';
|
||||
import 'package:dungeon_paper/profile_view/login_button.dart';
|
||||
import 'package:dungeon_paper/redux/stores/connectors.dart';
|
||||
import 'package:dungeon_paper/redux/stores/loading_reducer.dart';
|
||||
import 'package:dungeon_paper/sidebar.dart';
|
||||
@@ -26,7 +27,8 @@ class DungeonPaper extends StatelessWidget {
|
||||
title: appName,
|
||||
home: DWStoreConnector(builder: (context, state) {
|
||||
DbCharacter character = state.characters.current;
|
||||
var body = character == null
|
||||
DbUser user = state.user.current;
|
||||
Widget body = character == null
|
||||
? Container(
|
||||
decoration: BoxDecoration(
|
||||
color: Theme.of(context).scaffoldBackgroundColor),
|
||||
@@ -58,12 +60,12 @@ class DungeonPaper extends StatelessWidget {
|
||||
appBar: AppBar(
|
||||
title: const Text(appName),
|
||||
actions: [
|
||||
UserBadge(onUserChange: () {
|
||||
LoginButton(onUserChange: () {
|
||||
_pageController.jumpToPage(0);
|
||||
})
|
||||
],
|
||||
),
|
||||
drawer: Sidebar(),
|
||||
drawer: user != null ? Sidebar() : null,
|
||||
floatingActionButton: character != null
|
||||
? ActionButtons(pageController: _pageController)
|
||||
: null,
|
||||
|
||||
67
lib/profile_view/login_button.dart
Normal file
67
lib/profile_view/login_button.dart
Normal file
@@ -0,0 +1,67 @@
|
||||
import 'dart:math';
|
||||
import 'package:dungeon_paper/db/auth.dart';
|
||||
import 'package:dungeon_paper/db/user.dart';
|
||||
import 'package:dungeon_paper/redux/stores/connectors.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
class LoginButton extends StatefulWidget {
|
||||
final void Function() onUserChange;
|
||||
LoginButton({Key key, this.onUserChange}) : super(key: key);
|
||||
|
||||
@override
|
||||
LoginButtonState createState() =>
|
||||
LoginButtonState(onUserChange: onUserChange);
|
||||
}
|
||||
|
||||
class LoginButtonState extends State<LoginButton> {
|
||||
final void Function() onUserChange;
|
||||
LoginButtonState({this.onUserChange});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return DWStoreConnector(
|
||||
builder: (context, state) {
|
||||
DbUser user = state.user.current;
|
||||
if (user == null) {
|
||||
return IconButton(
|
||||
icon: CircleAvatar(
|
||||
child: Icon(Icons.account_circle),
|
||||
),
|
||||
tooltip: 'Log in',
|
||||
onPressed: () => _handleSignIn(),
|
||||
);
|
||||
}
|
||||
return SizedBox(height: 0, width: 0);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
void _handleSignIn() async {
|
||||
try {
|
||||
var user = await requestSignInWithCredentials();
|
||||
if (user == null) {
|
||||
throw ('user_canceled');
|
||||
}
|
||||
if (onUserChange != null) {
|
||||
onUserChange();
|
||||
}
|
||||
} catch (e) {
|
||||
if (e != 'user_canceled') {
|
||||
throw e;
|
||||
}
|
||||
Scaffold.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text('Login failed.'),
|
||||
duration: Duration(seconds: 6),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
_handleSignOut() async {
|
||||
requestSignOut();
|
||||
if (onUserChange != null) {
|
||||
onUserChange();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -20,12 +20,14 @@ class UpdateField {
|
||||
class RemoveAll {}
|
||||
|
||||
class CharacterActions {
|
||||
static SetCurrentChar setCurrentChar(
|
||||
String id, DbCharacter data) =>
|
||||
static SetCurrentChar setCurrentChar(String id, DbCharacter data) =>
|
||||
SetCurrentChar(id, data);
|
||||
|
||||
static UpdateField updateField(String field, value) =>
|
||||
UpdateField(field, value);
|
||||
|
||||
static SetCharacters setCharacters(Map<String, DbCharacter> characters) =>
|
||||
SetCharacters(characters);
|
||||
|
||||
static RemoveAll remove() => RemoveAll();
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import 'package:dungeon_paper/db/character.dart';
|
||||
import 'package:dungeon_paper/redux/actions/character_actions.dart';
|
||||
import 'package:dungeon_paper/redux/actions/user_actions.dart';
|
||||
import 'package:meta/meta.dart';
|
||||
|
||||
class CharacterStore {
|
||||
|
||||
@@ -1,28 +1,58 @@
|
||||
import 'package:dungeon_paper/db/auth.dart';
|
||||
import 'package:dungeon_paper/db/character.dart';
|
||||
import 'package:dungeon_paper/db/user.dart';
|
||||
import 'package:dungeon_paper/redux/actions/character_actions.dart';
|
||||
import 'package:dungeon_paper/redux/stores/connectors.dart';
|
||||
import 'package:dungeon_paper/redux/stores/stores.dart';
|
||||
import 'package:dungeon_paper/utils.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
class Sidebar extends StatelessWidget {
|
||||
class Sidebar extends StatefulWidget {
|
||||
@override
|
||||
SidebarState createState() {
|
||||
return new SidebarState();
|
||||
}
|
||||
}
|
||||
|
||||
class SidebarState extends State<Sidebar> {
|
||||
bool expanded = false;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return DWStoreConnector<DWStore>(
|
||||
builder: (context, state) {
|
||||
List<Widget> characterItems = [];
|
||||
DbUser user = state.user.current;
|
||||
|
||||
Widget title = UserAccountsDrawerHeader(
|
||||
accountEmail: Text(user.email),
|
||||
accountName: Text(user.displayName),
|
||||
currentAccountPicture: Container(
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
image: DecorationImage(
|
||||
image: NetworkImage(user.photoURL),
|
||||
),
|
||||
),
|
||||
),
|
||||
onDetailsPressed: () {
|
||||
setState(() {
|
||||
expanded = !expanded;
|
||||
});
|
||||
},
|
||||
);
|
||||
Widget addNew = ListTile(
|
||||
title: Text('+ Create Empty Character'),
|
||||
onTap: () {
|
||||
createCharacter();
|
||||
},
|
||||
);
|
||||
List<Widget> characterItems = [title];
|
||||
title: Text('+ Create Empty Character'),
|
||||
onTap: () {
|
||||
createCharacter();
|
||||
},
|
||||
);
|
||||
Widget logOut = ListTile(
|
||||
title: Text('Log out'),
|
||||
onTap: () {
|
||||
requestSignOut();
|
||||
},
|
||||
);
|
||||
characterItems.add(title);
|
||||
state.characters.characters.forEach((id, character) {
|
||||
Widget charLine = ListTile(
|
||||
title: Text(character.displayName),
|
||||
@@ -32,6 +62,8 @@ class Sidebar extends StatelessWidget {
|
||||
);
|
||||
characterItems.add(charLine);
|
||||
});
|
||||
characterItems.add(addNew);
|
||||
characterItems.add(logOut);
|
||||
|
||||
return Drawer(
|
||||
child: ListView(
|
||||
|
||||
13
pubspec.lock
13
pubspec.lock
@@ -35,7 +35,7 @@ packages:
|
||||
name: cloud_firestore
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "0.8.2+3"
|
||||
version: "0.9.0+2"
|
||||
collection:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -50,20 +50,27 @@ packages:
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "0.1.2"
|
||||
dungeon_world_data:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: dungeon_world_data
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.0.0"
|
||||
firebase_auth:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: firebase_auth
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "0.7.0"
|
||||
version: "0.8.1+1"
|
||||
firebase_core:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: firebase_core
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "0.2.5+1"
|
||||
version: "0.3.0+2"
|
||||
flutter:
|
||||
dependency: "direct main"
|
||||
description: flutter
|
||||
|
||||
@@ -8,14 +8,15 @@ dependencies:
|
||||
# The following adds the Cupertino Icons font to your application.
|
||||
# Use with the CupertinoIcons class for iOS style icons.
|
||||
cupertino_icons: ^0.1.2
|
||||
firebase_auth: ^0.7.0
|
||||
cloud_firestore: ^0.8.0
|
||||
firebase_auth: ^0.8.0
|
||||
cloud_firestore: ^0.9.0
|
||||
google_sign_in: ^4.0.0
|
||||
flutter_redux: ^0.5.3
|
||||
shared_preferences: ^0.5.0
|
||||
flutter_staggered_grid_view: ^0.2.7
|
||||
flutter_markdown: ^0.2.0
|
||||
url_launcher: ^5.0.0
|
||||
dungeon_world_data: ^1.0.0
|
||||
# quiver: '>=2.0.0 <3.0.0'
|
||||
|
||||
dev_dependencies:
|
||||
|
||||
Reference in New Issue
Block a user