Skip to content

N
NBT_APP
Commit 5e25a04e by Nuttee
Options

Merge branch 'develop' of https://gitlab.2fellows.com/art/NBT_APP into develop

parents 1d99460f 9f56dfd6
Showing with 347 additions and 83 deletions
.dart_tool/package_config.json
...@@ -104,12 +104,6 @@ ...@@ -104,12 +104,6 @@
"languageVersion": "2.12" "languageVersion": "2.12"
}, },
{ {
"name": "material_color_utilities",
"rootUri": "file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.3",
"packageUri": "lib/",
"languageVersion": "2.13"
},
{
"name": "meta", "name": "meta",
"rootUri": "file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.7.0", "rootUri": "file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.7.0",
"packageUri": "lib/", "packageUri": "lib/",
...@@ -171,7 +165,7 @@ ...@@ -171,7 +165,7 @@
}, },
{ {
"name": "test_api", "name": "test_api",
"rootUri": "file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.8", "rootUri": "file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.3",
"packageUri": "lib/", "packageUri": "lib/",
"languageVersion": "2.12" "languageVersion": "2.12"
}, },
...@@ -194,7 +188,7 @@ ...@@ -194,7 +188,7 @@
"languageVersion": "2.15" "languageVersion": "2.15"
} }
], ],
"generated": "2022-03-14T03:56:01.754182Z", "generated": "2022-03-15T03:33:00.169572Z",
"generator": "pub", "generator": "pub",
"generatorVersion": "2.16.1" "generatorVersion": "2.15.1"
} }
.dart_tool/package_config_subset
nbt_app
2.15
file:///C:/Users/Kim/AndroidStudioProjects/project/NBT_APP/
file:///C:/Users/Kim/AndroidStudioProjects/project/NBT_APP/lib/
async async
2.12 2.12
file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.8.2/ file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.8.2/
...@@ -58,10 +62,6 @@ matcher ...@@ -58,10 +62,6 @@ matcher
2.12 2.12
file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.11/ file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.11/
file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.11/lib/ file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.11/lib/
material_color_utilities
2.13
file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.3/
file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.3/lib/
meta meta
2.12 2.12
file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.7.0/ file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.7.0/
...@@ -100,8 +100,8 @@ file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/ ...@@ -100,8 +100,8 @@ file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/
file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/ file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/
test_api test_api
2.12 2.12
file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.8/ file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.3/
file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.8/lib/ file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.3/lib/
typed_data typed_data
2.12 2.12
file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/ file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/
...@@ -122,8 +122,4 @@ flutter_test ...@@ -122,8 +122,4 @@ flutter_test
2.12 2.12
file:///C:/src/flutter/packages/flutter_test/ file:///C:/src/flutter/packages/flutter_test/
file:///C:/src/flutter/packages/flutter_test/lib/ file:///C:/src/flutter/packages/flutter_test/lib/
nbt_app
2.15
file:///D:/2fellows/NBT_APP-1/
file:///D:/2fellows/NBT_APP-1/lib/
2 2
.dart_tool/version
2.10.3 2.8.1
\ No newline at end of file \ No newline at end of file
.idea/libraries/Dart_SDK.xml
<component name="libraryTable"> <component name="libraryTable">
<library name="Dart SDK"> <library name="Dart SDK">
<CLASSES> <CLASSES>
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/async" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/bin/cache/dart-sdk/lib/async" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/cli" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/bin/cache/dart-sdk/lib/cli" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/collection" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/bin/cache/dart-sdk/lib/collection" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/convert" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/bin/cache/dart-sdk/lib/convert" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/core" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/bin/cache/dart-sdk/lib/core" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/developer" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/bin/cache/dart-sdk/lib/developer" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/ffi" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/bin/cache/dart-sdk/lib/ffi" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/html" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/bin/cache/dart-sdk/lib/html" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/indexed_db" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/bin/cache/dart-sdk/lib/indexed_db" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/io" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/bin/cache/dart-sdk/lib/io" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/isolate" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/bin/cache/dart-sdk/lib/isolate" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/js" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/bin/cache/dart-sdk/lib/js" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/js_util" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/bin/cache/dart-sdk/lib/js_util" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/math" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/bin/cache/dart-sdk/lib/math" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/mirrors" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/bin/cache/dart-sdk/lib/mirrors" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/svg" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/bin/cache/dart-sdk/lib/svg" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/typed_data" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/bin/cache/dart-sdk/lib/typed_data" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/web_audio" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/bin/cache/dart-sdk/lib/web_audio" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/web_gl" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/bin/cache/dart-sdk/lib/web_gl" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
......
.idea/workspace.xml
...@@ -5,15 +5,9 @@ ...@@ -5,15 +5,9 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="c1439925-efc2-4fdb-a5ea-1a37e7dbf139" name="Default Changelist" comment=""> <list default="true" id="c1439925-efc2-4fdb-a5ea-1a37e7dbf139" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/lib/components/bottombar.dart" afterDir="false" /> <change afterPath="$PROJECT_DIR$/lib/screen/favorite/favouriteList_Page.dart" afterDir="false" />
<change afterPath="$PROJECT_DIR$/lib/screen/home/home_search.dart" afterDir="false" />
<change afterPath="$PROJECT_DIR$/lib/screen/home/home_search_result.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.dart_tool/package_config.json" beforeDir="false" afterPath="$PROJECT_DIR$/.dart_tool/package_config.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.packages" beforeDir="false" afterPath="$PROJECT_DIR$/.packages" afterDir="false" /> <change beforePath="$PROJECT_DIR$/nbt_app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/nbt_app.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/c075001b96339384a97db4862b8ab8db.cache.dill.track.dill" beforeDir="false" afterPath="$PROJECT_DIR$/build/c075001b96339384a97db4862b8ab8db.cache.dill.track.dill" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/components/appbar_logo.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/components/appbar_logo.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/screen/home/home_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/screen/home/home_page.dart" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -27,6 +21,9 @@ ...@@ -27,6 +21,9 @@
</list> </list>
</option> </option>
</component> </component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="ProjectId" id="25XTl1I3iMTwUPve7TQ4tAd3hxM" /> <component name="ProjectId" id="25XTl1I3iMTwUPve7TQ4tAd3hxM" />
<component name="ProjectLevelVcsManager"> <component name="ProjectLevelVcsManager">
<ConfirmationsSetting value="2" id="Add" /> <ConfirmationsSetting value="2" id="Add" />
...@@ -42,19 +39,18 @@ ...@@ -42,19 +39,18 @@
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="android.sdk.path" value="$USER_HOME$/Library/Android/sdk" /> <property name="android.sdk.path" value="$USER_HOME$/Library/Android/sdk" />
<property name="dart.analysis.tool.window.visible" value="false" /> <property name="dart.analysis.tool.window.visible" value="false" />
<property name="flutter.view.tool.window.visible" value="true" />
<property name="io.flutter.reload.alreadyRun" value="true" /> <property name="io.flutter.reload.alreadyRun" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="settings.editor.selected.configurable" value="dart.settings" /> <property name="settings.editor.selected.configurable" value="flutter.settings" />
<property name="show.migrate.to.gradle.popup" value="false" /> <property name="show.migrate.to.gradle.popup" value="false" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="C:\Users\Kim\AndroidStudioProjects\project\NBT_APP\lib\screen\favorite" />
<recent name="$PROJECT_DIR$/lib/screen/home" /> <recent name="$PROJECT_DIR$/lib/screen/home" />
<recent name="$PROJECT_DIR$/lib/components" /> <recent name="$PROJECT_DIR$/lib/components" />
<recent name="$PROJECT_DIR$/assets/images" /> <recent name="$PROJECT_DIR$/assets/images" />
<recent name="$PROJECT_DIR$/lib/screen" /> <recent name="$PROJECT_DIR$/lib/screen" />
<recent name="$PROJECT_DIR$/lib" />
</key> </key>
</component> </component>
<component name="RunManager"> <component name="RunManager">
...@@ -74,26 +70,15 @@ ...@@ -74,26 +70,15 @@
</task> </task>
<servers /> <servers />
</component> </component>
<component name="WindowStateProjectService"> <component name="Vcs.Log.Tabs.Properties">
<state width="1398" height="223" key="GridCell.Tab.0.bottom" timestamp="1646900905435"> <option name="TAB_STATES">
<screen x="0" y="25" width="1440" height="875" /> <map>
</state> <entry key="MAIN">
<state width="1398" height="223" key="GridCell.Tab.0.bottom/0.25.1440.875@0.25.1440.875" timestamp="1646900905435" /> <value>
<state width="1398" height="223" key="GridCell.Tab.0.center" timestamp="1646900905434"> <State />
<screen x="0" y="25" width="1440" height="875" /> </value>
</state> </entry>
<state width="1398" height="223" key="GridCell.Tab.0.center/0.25.1440.875@0.25.1440.875" timestamp="1646900905434" /> </map>
<state width="1398" height="223" key="GridCell.Tab.0.left" timestamp="1646900905433"> </option>
<screen x="0" y="25" width="1440" height="875" />
</state>
<state width="1398" height="223" key="GridCell.Tab.0.left/0.25.1440.875@0.25.1440.875" timestamp="1646900905433" />
<state width="1398" height="223" key="GridCell.Tab.0.right" timestamp="1646900905434">
<screen x="0" y="25" width="1440" height="875" />
</state>
<state width="1398" height="223" key="GridCell.Tab.0.right/0.25.1440.875@0.25.1440.875" timestamp="1646900905434" />
<state x="229" y="98" key="SettingsEditor" timestamp="1647228814899">
<screen x="0" y="25" width="1440" height="875" />
</state>
<state x="229" y="98" key="SettingsEditor/0.25.1440.875@0.25.1440.875" timestamp="1647228814899" />
</component> </component>
</project> </project>
\ No newline at end of file
.packages
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
# For more info see: https://dart.dev/go/dot-packages-deprecation # For more info see: https://dart.dev/go/dot-packages-deprecation
# #
# Generated by pub on 2022-03-14 10:56:01.738216. # Generated by pub on 2022-03-15 10:33:00.143641.
async:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.8.2/lib/ async:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.8.2/lib/
boolean_selector:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ boolean_selector:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/
carousel_slider:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/carousel_slider-4.0.0/lib/ carousel_slider:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/carousel_slider-4.0.0/lib/
...@@ -21,7 +21,6 @@ flutter_slider_drawer:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/ ...@@ -21,7 +21,6 @@ flutter_slider_drawer:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/
flutter_test:file:///C:/src/flutter/packages/flutter_test/lib/ flutter_test:file:///C:/src/flutter/packages/flutter_test/lib/
lints:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/lints-1.0.1/lib/ lints:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/lints-1.0.1/lib/
matcher:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.11/lib/ matcher:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.11/lib/
material_color_utilities:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.3/lib/
meta:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.7.0/lib/ meta:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.7.0/lib/
path:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib/ path:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib/
rflutter_alert:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/rflutter_alert-1.1.0/lib/ rflutter_alert:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/rflutter_alert-1.1.0/lib/
...@@ -32,7 +31,7 @@ stack_trace:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trac ...@@ -32,7 +31,7 @@ stack_trace:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trac
stream_channel:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ stream_channel:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/
string_scanner:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib/ string_scanner:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib/
term_glyph:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/ term_glyph:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/
test_api:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.8/lib/ test_api:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.3/lib/
typed_data:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/ typed_data:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/
vector_math:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.1/lib/ vector_math:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.1/lib/
nbt_app:lib/ nbt_app:lib/
pubspec.lock
...@@ -116,13 +116,6 @@ packages: ...@@ -116,13 +116,6 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.12.11" version: "0.12.11"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.3"
meta: meta:
dependency: transitive dependency: transitive
description: description:
...@@ -197,7 +190,7 @@ packages: ...@@ -197,7 +190,7 @@ packages:
name: test_api name: test_api
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.4.8" version: "0.4.3"
typed_data: typed_data:
dependency: transitive dependency: transitive
description: description:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment