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 1143 additions and 143 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_Packages.xml
...@@ -5,246 +5,246 @@ ...@@ -5,246 +5,246 @@
<entry key="async"> <entry key="async">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.8.2/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.8.2/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="boolean_selector"> <entry key="boolean_selector">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="carousel_slider"> <entry key="carousel_slider">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/carousel_slider-4.0.0/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/carousel_slider-4.0.0/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="characters"> <entry key="characters">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.0/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.0/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="charcode"> <entry key="charcode">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.3.1/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.3.1/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="clock"> <entry key="clock">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="collection"> <entry key="collection">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="cupertino_icons"> <entry key="cupertino_icons">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-1.0.4/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-1.0.4/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="dots_indicator"> <entry key="dots_indicator">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/dots_indicator-2.1.0/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/dots_indicator-2.1.0/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="fake_async"> <entry key="fake_async">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="flutter"> <entry key="flutter">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/packages/flutter/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/packages/flutter/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="flutter_lints"> <entry key="flutter_lints">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_lints-1.0.4/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_lints-1.0.4/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="flutter_screenutil"> <entry key="flutter_screenutil">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_screenutil-5.3.1/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_screenutil-5.3.1/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="flutter_slider_drawer"> <entry key="flutter_slider_drawer">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_slider_drawer-2.1.1/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_slider_drawer-2.1.1/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="flutter_test"> <entry key="flutter_test">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/packages/flutter_test/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/packages/flutter_test/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="lints"> <entry key="lints">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/lints-1.0.1/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/lints-1.0.1/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="matcher"> <entry key="matcher">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.11/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.11/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="meta"> <entry key="meta">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.7.0/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.7.0/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="path"> <entry key="path">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="rflutter_alert"> <entry key="rflutter_alert">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/rflutter_alert-1.1.0/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/rflutter_alert-1.1.0/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="sky_engine"> <entry key="sky_engine">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/bin/cache/pkg/sky_engine/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/bin/cache/pkg/sky_engine/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="smooth_page_indicator"> <entry key="smooth_page_indicator">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/smooth_page_indicator-1.0.0+2/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/smooth_page_indicator-1.0.0+2/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="source_span"> <entry key="source_span">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.1/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.1/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="stack_trace"> <entry key="stack_trace">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="stream_channel"> <entry key="stream_channel">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="string_scanner"> <entry key="string_scanner">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="term_glyph"> <entry key="term_glyph">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="test_api"> <entry key="test_api">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.3/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.3/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="typed_data"> <entry key="typed_data">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib" />
</list> </list>
</value> </value>
</entry> </entry>
<entry key="vector_math"> <entry key="vector_math">
<value> <value>
<list> <list>
<option value="$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.1/lib" /> <option value="$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.1/lib" />
</list> </list>
</value> </value>
</entry> </entry>
</option> </option>
</properties> </properties>
<CLASSES> <CLASSES>
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.8.2/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.8.2/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/carousel_slider-4.0.0/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/carousel_slider-4.0.0/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.0/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.0/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.3.1/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.3.1/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-1.0.4/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-1.0.4/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/dots_indicator-2.1.0/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/dots_indicator-2.1.0/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_lints-1.0.4/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_lints-1.0.4/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_screenutil-5.3.1/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_screenutil-5.3.1/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_slider_drawer-2.1.1/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_slider_drawer-2.1.1/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/lints-1.0.1/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/lints-1.0.1/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.11/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.11/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.7.0/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.7.0/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/rflutter_alert-1.1.0/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/rflutter_alert-1.1.0/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/smooth_page_indicator-1.0.0+2/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/smooth_page_indicator-1.0.0+2/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.1/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.1/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.3/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.3/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib" />
<root url="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.1/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.1/lib" />
<root url="file://$USER_HOME$/development/flutter/bin/cache/pkg/sky_engine/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/bin/cache/pkg/sky_engine/lib" />
<root url="file://$USER_HOME$/development/flutter/packages/flutter/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/packages/flutter/lib" />
<root url="file://$USER_HOME$/development/flutter/packages/flutter_test/lib" /> <root url="file://$PROJECT_DIR$/../../../../../src/flutter/packages/flutter_test/lib" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
......
.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/
lib/screen/comment & report/comment_page.dart 0 → 100644
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
class CommentPage extends StatefulWidget {
const CommentPage({Key? key}) : super(key: key);
@override
State<CommentPage> createState() => _CommentPageState();
}
class _CommentPageState extends State<CommentPage> {
int? _select;
@override
Widget build(BuildContext context) {
ScreenUtil.init(
BoxConstraints(
maxWidth: MediaQuery.of(context).size.width,
maxHeight: MediaQuery.of(context).size.height),
designSize: Size(360, 690),
context: context,
minTextAdapt: true,
orientation: Orientation.portrait);
return MaterialApp(
debugShowCheckedModeBanner: false,
home: Scaffold(
resizeToAvoidBottomInset: true,
appBar: AppBar(
elevation: 0.55,
shadowColor: Color.fromRGBO(77, 32, 126, 1),
bottomOpacity: 0,
backgroundColor: Color.fromRGBO(77, 32, 126, 1),
toolbarHeight: 80.h,
title: Row(mainAxisAlignment: MainAxisAlignment.start, children: [
Container(
margin: EdgeInsets.only(top: 10),
child: GestureDetector(
onTap: () {
Navigator.pop(context);
},
child: Icon(Icons.arrow_back_ios))),
SizedBox(
width: 58,
),
Text('แสดงความคิดเห็น/แจ้งปัญหา',
style: TextStyle(
fontFamily: 'DBHeavent',
fontSize: 28,
color: Colors.white)),
]),
),
body: SizedBox(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height,
child: Stack(children: [
Container(
color: Color.fromRGBO(77, 32, 126, 1),
height: 60.h,
),
SingleChildScrollView(
child: Container(
padding: EdgeInsets.only(top: 20, left: 20, right: 20),
margin: EdgeInsets.only(left: 15, right: 15, bottom: 40),
width: 400.h,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(10),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.1),
spreadRadius: 3,
blurRadius: 6)
]),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
ListTile(
title: Text(
'แสดงความเห็น',
style: TextStyle(
fontFamily: 'DBHeavent',
fontSize: 22,
color: Color.fromRGBO(77, 37, 124, 1),
),
),
leading: Radio(
activeColor: Colors.red,
value: 1,
groupValue: _select,
onChanged: (value) {
setState(() {
_select = value as int?;
});
}),
),
ListTile(
title: Text(
'แจ้งปัญหา',
style: TextStyle(
fontFamily: 'DBHeavent',
fontSize: 22,
color: Color.fromRGBO(77, 37, 124, 1),
),
),
leading: Radio(
activeColor: Colors.red,
value: 2,
groupValue: _select,
onChanged: (value) {
setState(() {
_select = value as int?;
});
}),
),
ListTile(
title: Text(
'เรื่องอื่นๆ',
style: TextStyle(
fontFamily: 'DBHeavent',
fontSize: 22,
color: Color.fromRGBO(77, 37, 124, 1),
),
),
leading: Radio(
activeColor: Colors.red,
value: 3,
groupValue: _select,
onChanged: (value) {
setState(() {
_select = value as int?;
});
}),
),
Container(
padding: EdgeInsets.only(
left: 5,
right: 5,
top: 5,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
InputData('ชื่อ', 'ชื่อ'),
SizedBox(
height: 20,
),
InputData('นามสกุล', 'นามสกุล'),
SizedBox(
height: 20,
),
InputData('หมายเลขโทรศัพท์ที่สามารถติดต่อกลับได้',
'หมายเลขโทรศัพท์'),
SizedBox(
height: 20,
),
InputData('E-mail', 'E-mail'),
SizedBox(
height: 20,
),
TextForm('รายละเอียด'),
SizedBox(
height: 40,
),
Botton(context),
SizedBox(
height: 30,
)
],
),
),
],
),
),
),
]),
),
),
);
}
}
Widget InputData(String topic, String detail) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
topic,
style: TextStyle(
fontFamily: 'DBHeavent',
fontSize: 22,
color: Color.fromRGBO(77, 37, 124, 1),
),
),
SizedBox(
height: 10,
),
Container(
child: TextField(
decoration: InputDecoration(
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(30),
),
filled: true,
contentPadding: EdgeInsets.only(
left: 25,
),
focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.grey),
borderRadius: BorderRadius.circular(30),
),
enabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.grey),
borderRadius: BorderRadius.circular(30),
),
hintStyle: TextStyle(
color: Colors.grey,
fontFamily: 'DBHeavent',
fontSize: 25,
),
hintText: detail,
fillColor: Colors.white),
),
),
],
);
}
Widget TextForm(String data) {
return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
Text(
data,
style: TextStyle(
fontFamily: 'DBHeavent',
fontSize: 22,
color: Color.fromRGBO(77, 37, 124, 1),
),
),
SizedBox(
height: 10,
),
Container(
child: TextFormField(
maxLines: 10,
decoration: InputDecoration(
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(20),
),
filled: true,
contentPadding:
EdgeInsets.only(left: 25, top: 25, right: 25, bottom: 5),
focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.grey),
borderRadius: BorderRadius.circular(30),
),
enabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.grey),
borderRadius: BorderRadius.circular(30),
),
hintStyle: TextStyle(
color: Colors.grey,
fontFamily: 'DBHeavent',
fontSize: 25,
),
hintText: data,
fillColor: Colors.white),
),
),
]);
}
Widget Botton(BuildContext context) {
return GestureDetector(
onTap: () {},
child: Container(
height: 50,
width: MediaQuery.of(context).size.width,
decoration: BoxDecoration(
gradient: LinearGradient(colors: [
Color.fromRGBO(122, 79, 159, 1),
Color.fromRGBO(77, 32, 126, 1)
], begin: Alignment.topCenter, end: Alignment.bottomCenter),
color: Color.fromRGBO(77, 37, 124, 1),
borderRadius: BorderRadius.circular(30)),
child: Center(
child: Text(
'ส่ง',
style: TextStyle(
fontFamily: 'DBHeavent',
fontSize: 25,
color: Colors.white,
),
),
),
),
);
}
lib/screen/edit-password/edit-password_page.dart 0 → 100644
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
class EditPassword_Page extends StatefulWidget {
const EditPassword_Page({Key? key}) : super(key: key);
@override
State<EditPassword_Page> createState() => _EditPassword_PageState();
}
class _EditPassword_PageState extends State<EditPassword_Page> {
bool _check1 = true;
bool _check2 = true;
bool _check3 = true;
RegExp regex = RegExp(r'^(?=.*?[a-z])(?=.*?[0-9])');
String? oldpass, newpass, comfirmpass;
TextEditingController _controllerold = new TextEditingController();
TextEditingController _controllernew = new TextEditingController();
TextEditingController _controllercomfirm = new TextEditingController();
final _key = GlobalKey<FormState>();
@override
Widget build(BuildContext context) {
ScreenUtil.init(
BoxConstraints(
maxWidth: MediaQuery.of(context).size.width,
maxHeight: MediaQuery.of(context).size.height),
designSize: Size(360, 690),
context: context,
minTextAdapt: true,
orientation: Orientation.portrait);
return MaterialApp(
debugShowCheckedModeBanner: false,
home: Scaffold(
resizeToAvoidBottomInset: true,
appBar: AppBar(
elevation: 0.55,
shadowColor: Color.fromRGBO(77, 32, 126, 1),
bottomOpacity: 0,
backgroundColor: Color.fromRGBO(77, 32, 126, 1),
toolbarHeight: 80.h,
title: Row(mainAxisAlignment: MainAxisAlignment.start, children: [
Container(
margin: EdgeInsets.only(top: 10),
child: GestureDetector(
onTap: () {
Navigator.pop(context);
},
child: Icon(Icons.arrow_back_ios))),
SizedBox(
width: 115,
),
Text('แก้ไข้รหัสผ่าน',
style: TextStyle(
fontFamily: 'DBHeavent',
fontSize: 28,
color: Colors.white)),
]),
),
body: SizedBox(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height,
child: Stack(children: [
Container(
color: Color.fromRGBO(77, 32, 126, 1),
height: 60.h,
),
SingleChildScrollView(
child: Container(
padding: EdgeInsets.only(top: 20, left: 20, right: 20),
margin: EdgeInsets.only(left: 15, right: 15, bottom: 40),
width: 400.h,
height: 540.h,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(10),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.1),
spreadRadius: 3,
blurRadius: 6)
]),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
padding: EdgeInsets.only(
left: 5,
right: 5,
top: 5,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Form(
key: _key,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'รหัสผ่านปัจจุบัน',
style: TextStyle(
fontFamily: 'DBHeavent',
fontSize: 23,
color: Color.fromRGBO(77, 37, 124, 1),
),
),
SizedBox(
height: 10,
),
Container(
child: TextField(
controller: _controllerold,
onChanged: (value) {
setState(() {
this.oldpass = value;
print(value);
});
},
obscureText: _check1,
decoration: InputDecoration(
suffixIcon: GestureDetector(
onTap: () {
setState(() {
_check1 = !_check1;
});
},
child: Icon(_check1
? Icons.visibility_off_outlined
: Icons.visibility_outlined),
),
border: OutlineInputBorder(
borderRadius:
BorderRadius.circular(30),
),
filled: true,
contentPadding: EdgeInsets.only(
left: 25,
),
focusedBorder: OutlineInputBorder(
borderSide:
BorderSide(color: Colors.grey),
borderRadius:
BorderRadius.circular(30),
),
enabledBorder: OutlineInputBorder(
borderSide:
BorderSide(color: Colors.grey),
borderRadius:
BorderRadius.circular(30),
),
hintStyle: TextStyle(
color: Colors.grey,
fontFamily: 'DBHeavent',
fontSize: 23,
),
hintText: 'กรอกรหัสผ่าน',
fillColor: Colors.white),
),
),
SizedBox(
height: 20,
),
Text(
'รหัสผ่านใหม่',
style: TextStyle(
fontFamily: 'DBHeavent',
fontSize: 23,
color: Color.fromRGBO(77, 37, 124, 1),
),
),
SizedBox(
height: 10,
),
Container(
child: TextFormField(
validator: (value) {
if (value!.isEmpty) {
return "Required";
} else {
return null;
}
},
onChanged: (value) {
setState(() {
this.newpass = value;
});
},
controller: _controllernew,
obscureText: _check2,
decoration: InputDecoration(
suffixIcon: GestureDetector(
onTap: () {
setState(() {
_check2 = !_check2;
});
},
child: Icon(_check2
? Icons.visibility_off_outlined
: Icons.visibility_outlined),
),
border: OutlineInputBorder(
borderRadius:
BorderRadius.circular(30),
),
filled: true,
contentPadding: EdgeInsets.only(
left: 25,
),
focusedBorder: OutlineInputBorder(
borderSide:
BorderSide(color: Colors.grey),
borderRadius:
BorderRadius.circular(30),
),
enabledBorder: OutlineInputBorder(
borderSide:
BorderSide(color: Colors.grey),
borderRadius:
BorderRadius.circular(30),
),
hintStyle: TextStyle(
color: Colors.grey,
fontFamily: 'DBHeavent',
fontSize: 23,
),
hintText:
'กรุณาใส่ 6-20 ที่มีทั้งตัวอักษรและตัวเลข',
fillColor: Colors.white),
),
),
SizedBox(
height: 20,
),
Text(
'ยืนยันรหัสผ่านใหม่',
style: TextStyle(
fontFamily: 'DBHeavent',
fontSize: 23,
color: Color.fromRGBO(77, 37, 124, 1),
),
),
SizedBox(
height: 10,
),
Container(
child: TextField(
onChanged: (value) {
setState(() {
this.comfirmpass = value;
});
},
controller: _controllercomfirm,
obscureText: _check3,
decoration: InputDecoration(
suffixIcon: GestureDetector(
onTap: () {
setState(() {
_check3 = !_check3;
});
},
child: Icon(_check3
? Icons.visibility_off_outlined
: Icons.visibility_outlined),
),
border: OutlineInputBorder(
borderRadius:
BorderRadius.circular(30),
),
filled: true,
contentPadding: EdgeInsets.only(
left: 25,
),
focusedBorder: OutlineInputBorder(
borderSide:
BorderSide(color: Colors.grey),
borderRadius:
BorderRadius.circular(30),
),
enabledBorder: OutlineInputBorder(
borderSide:
BorderSide(color: Colors.grey),
borderRadius:
BorderRadius.circular(30),
),
hintStyle: TextStyle(
color: Colors.grey,
fontFamily: 'DBHeavent',
fontSize: 23,
),
hintText:
'กรุณายืนยันรหัสผ่านของคุณอีกครั้ง',
fillColor: Colors.white),
),
),
SizedBox(
height: 155,
),
GestureDetector(
onTap: () {
if (this.oldpass == "") {
} else if (this.newpass == "") {
print('object');
} else if (this.comfirmpass == "" &&
this.comfirmpass == this.newpass) {}
},
child: Container(
height: 50,
width: MediaQuery.of(context).size.width,
decoration: BoxDecoration(
gradient: LinearGradient(
colors: [
Color.fromRGBO(122, 79, 159, 1),
Color.fromRGBO(77, 32, 126, 1)
],
begin: Alignment.topCenter,
end: Alignment.bottomCenter),
color: Color.fromRGBO(77, 37, 124, 1),
borderRadius:
BorderRadius.circular(30)),
child: Center(
child: Text(
'ยืนยัน',
style: TextStyle(
fontFamily: 'DBHeavent',
fontSize: 25,
color: Colors.white,
),
),
),
),
)
],
),
),
],
),
),
],
),
),
),
]),
),
),
);
}
}
lib/screen/favorite/favouriteList_Page.dart 0 → 100644
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
class FavouriteListPage extends StatefulWidget {
const FavouriteListPage({Key? key}) : super(key: key);
@override
State<FavouriteListPage> createState() => _FavouriteListPageState();
}
class _FavouriteListPageState extends State<FavouriteListPage>
with SingleTickerProviderStateMixin {
late TabController tabcontroller;
@override
void initState() {
tabcontroller = TabController(length: 2, vsync: this);
super.initState();
}
@override
void dispose() {
tabcontroller.dispose();
super.dispose();
}
Widget build(BuildContext context) {
// TabController _tabontroller = TabController(length: 2, vsync: );
ScreenUtil.init(
BoxConstraints(
maxWidth: MediaQuery.of(context).size.width,
maxHeight: MediaQuery.of(context).size.height),
designSize: Size(360, 690),
context: context,
minTextAdapt: true,
orientation: Orientation.portrait);
return MaterialApp(
debugShowCheckedModeBanner: false,
home: Scaffold(
appBar: AppBar(
elevation: 0.55,
shadowColor: Color.fromRGBO(77, 32, 126, 1),
bottomOpacity: 0,
backgroundColor: Color.fromRGBO(77, 32, 126, 1),
toolbarHeight: 80.h,
title: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Container(
margin: EdgeInsets.only(top: 10),
child: GestureDetector(
onTap: () {
Navigator.pop(context);
},
child: Icon(Icons.arrow_back_ios))),
SizedBox(
width: 115,
),
Container(
margin: EdgeInsets.only(top: 10),
child: Text(
'รายการโปรด',
style: TextStyle(
fontFamily: 'DBHeavent',
fontSize: 30,
color: Colors.white),
),
)
],
),
),
body: Container(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height,
child: Stack(children: [
Container(
color: Color.fromRGBO(77, 32, 126, 1),
height: 60.h,
),
Container(
padding: EdgeInsets.only(top: 20, left: 20, right: 20),
margin: EdgeInsets.only(left: 15, right: 15),
height: 550,
width: 400,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(10),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.1),
spreadRadius: 3,
blurRadius: 6)
]),
child: Column(
children: [
Container(
padding: EdgeInsets.only(
left: 5, right: 5, top: 5, bottom: 5),
color: Color.fromRGBO(244, 244, 244, 100),
height: 40.h,
child: TabBar(
labelColor: Color.fromRGBO(77, 37, 124, 1),
unselectedLabelColor:
Color.fromRGBO(177, 177, 177, 1),
indicatorColor: Colors.white,
indicatorWeight: 2,
indicator: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(5)),
controller: tabcontroller,
tabs: [
Tab(
child: Text(
'วิดีโอที่ชอบ',
style: TextStyle(
fontFamily: 'DBHeavent',
fontSize: 20,
),
),
),
Tab(
child: Text(
'รายการโปรด',
style: TextStyle(
fontFamily: 'DBHeavent',
fontSize: 20,
),
),
),
]),
),
// Container(
// color: Colors.red,
// margin: EdgeInsets.only(top: 10),
// height: 460,
// child: GridView.builder(
// itemCount: favouritevideoItems.length,
// gridDelegate:
// SliverGridDelegateWithFixedCrossAxisCount(
// crossAxisCount: 2,
// crossAxisSpacing: 11.42,
// mainAxisSpacing: 0),
// itemBuilder: (context, index) {
// return buildvideo_Card(
// data: favouritelistItems[index]);
// }),
// )
Container(
height: 470,
child:
TabBarView(controller: tabcontroller, children: [
Container(
margin: EdgeInsets.only(top: 10),
height: 460,
child: GridView.builder(
itemCount: favouritevideoItems.length,
gridDelegate:
SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2,
crossAxisSpacing: 11.42,
mainAxisSpacing: 0),
itemBuilder: (context, index) {
return buildvideo_Card(
data: favouritevideoItems[index]);
}),
),
Container(
margin: EdgeInsets.only(top: 10),
height: 460,
child: GridView.builder(
itemCount: favouritevideoItems.length,
gridDelegate:
SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2,
crossAxisSpacing: 11.42,
mainAxisSpacing: 0),
itemBuilder: (context, index) {
return buildfavourite_Card(
data: favouritelistItems[index]);
}),
)
]),
)
],
),
)
]))));
}
}
Widget buildvideo_Card({required Model data}) => Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: 165,
height: 95,
child: ClipRRect(
borderRadius: BorderRadius.circular(5),
child: Image.network(
data.url,
fit: BoxFit.cover,
),
),
),
Row(
children: [
Text(
data.date,
style: TextStyle(
color: Color.fromRGBO(161, 159, 163, 1),
fontSize: 17,
fontFamily: 'DBHeavent'),
),
SizedBox(
width: 3,
),
Icon(
Icons.remove_red_eye_outlined,
color: Color.fromRGBO(161, 159, 163, 1),
size: 13,
),
SizedBox(
width: 3,
),
Text(data.view,
style: TextStyle(
color: Color.fromRGBO(161, 159, 163, 1),
fontSize: 17,
fontFamily: 'DBHeavent')),
],
),
Text(
data.des,
maxLines: 2,
softWrap: true,
style: TextStyle(
height: 0.9,
color: Colors.black,
fontSize: 20,
fontFamily: 'DBHeavent'),
)
],
);
Widget buildfavourite_Card({required Model data}) => Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: 165,
height: 95,
child: ClipRRect(
borderRadius: BorderRadius.circular(5),
child: Image.network(
data.url,
fit: BoxFit.cover,
),
),
),
Row(
children: [
Text(
data.date,
style: TextStyle(
color: Color.fromRGBO(161, 159, 163, 1),
fontSize: 17,
fontFamily: 'DBHeavent'),
),
SizedBox(
width: 3,
),
Icon(
Icons.remove_red_eye_outlined,
color: Color.fromRGBO(161, 159, 163, 1),
size: 13,
),
SizedBox(
width: 3,
),
Text(data.view,
style: TextStyle(
color: Color.fromRGBO(161, 159, 163, 1),
fontSize: 17,
fontFamily: 'DBHeavent')),
],
),
Text(
data.des,
maxLines: 2,
softWrap: true,
style: TextStyle(
height: 0.9,
color: Colors.black,
fontSize: 20,
fontFamily: 'DBHeavent'),
)
],
);
class Model {
String url, title, date, view, des;
Model(
{required this.url,
required this.title,
required this.date,
required this.view,
required this.des});
}
List<Model> favouritelistItems = [
Model(
url: 'https://ophtus.com/wp-content/uploads/2017/11/UL7539-main-1.jpg',
title: 'title1',
date: '15 ม.ค. 20',
view: '100',
des:
'Ophtus เผย ทางจุฬาฯ ไม่ให้ขึ้นรูปพรีเซนเตอร์บนบิลบอร์ดและให้เปลี่ยนไปเป็นรูปอื่นแทน fghfgjf'),
Model(
url:
'https://images.unsplash.com/photo-1538481199705-c710c4e965fc?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxzZWFyY2h8NHx8Z2FtaW5nfGVufDB8fDB8fA%3D%3D&auto=format&fit=crop&w=400&q=60',
title: 'title2',
date: '20 พ.ค. 20',
view: '200',
des:
'สาวก FromSoftware ลั่น ที่เคยบอกมือใหม่ก็เล่น Elden Ring ได้สบาย มันไม่จริง!'),
Model(
url:
'https://images.unsplash.com/photo-1593305841991-05c297ba4575?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxzZWFyY2h8NXx8Z2FtaW5nfGVufDB8fDB8fA%3D%3D&auto=format&fit=crop&w=400&q=60',
title: 'title3',
date: '54 ก.ย. 20',
view: '300',
des:
'สาวก FromSoftware ลั่น ที่เคยบอกมือใหม่ก็เล่น Elden Ring ได้สบาย มันไม่จริง!'),
Model(
url:
'https://images.unsplash.com/photo-1580234811497-9df7fd2f357e?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxzZWFyY2h8MTF8fGdhbWluZ3xlbnwwfHwwfHw%3D&auto=format&fit=crop&w=400&q=60',
title: 'title4',
date: '20 ส.ค. 20',
view: '400',
des:
'X10CRIT ถูกตัดสิทธิ์ หลังทำผิดกฎการแข่ง VALORANT Champions Tour 2022'),
Model(
url:
'https://images.unsplash.com/photo-1560253023-3ec5d502959f?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxzZWFyY2h8MTd8fGdhbWluZ3xlbnwwfHwwfHw%3D&auto=format&fit=crop&w=400&q=60',
title: 'TITLEEEEE',
date: '20 ม.ค. 21',
view: '4165',
des:
'HTC อาจจะมีการเปิดตัวสมาร์ทโฟนที่มาพร้อมฟังก์ชัน Metaverse ในเดือนเมษายนนี้!')
];
List<Model> favouritevideoItems = [
Model(
url:
'https://media.istockphoto.com/photos/coronavirus-new-strain-wide-dark-background-picture-id1308624310?b=1&k=20&m=1308624310&s=170667a&w=0&h=HyEGR3DtK8TD2_kqoryPPuBWexQnG_KK0KhHYtXvm-c=',
title: 'title1',
date: '15 ม.ค. 20',
view: '100',
des: 'สถานการณ์ COVID-19 ในประเทศไทย'),
Model(
url:
'https://media.istockphoto.com/photos/asian-woman-holding-covid-rapid-test-and-waiting-for-results-picture-id1345296778?b=1&k=20&m=1345296778&s=170667a&w=0&h=jSixqhOleGak2Z9xEXcjNYZ1cUqLm5J8LKzbBVMf2Cg=',
title: 'title2',
date: '20 พ.ค. 20',
view: '200',
des:
'โควิดวันนี้ เสียชีวิตนิวไฮ ป่วยใหม่พุ่ง2.3หมื่น เข้าข่ายATK ทะลุ3.1หมื่น'),
Model(
url:
'https://media.istockphoto.com/photos/medical-worker-wearing-personal-protective-equipment-doing-corona-picture-id1297810407?b=1&k=20&m=1297810407&s=170667a&w=0&h=1v5rc9sDIJvyjESAhNDksU2_oDKvUPbcEqYYVqYikEw=',
title: 'title3',
date: '54 ก.ย. 20',
view: '300',
des: 'อาการโควิดโอมิครอน เช็กเลยติดแล้วป่วยแบบไหน'),
Model(
url:
'https://images.unsplash.com/photo-1584483766114-2cea6facdf57?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxzZWFyY2h8NXx8Y292aWQlMjAxOXxlbnwwfHwwfHw%3D&auto=format&fit=crop&w=400&q=60',
title: 'title4',
date: '20 ส.ค. 20',
view: '400',
des:
'ยอดดับเพิ่มอีก! โควิดวันนี้ ไทยพบผู้ติดเชื้อใหม่ 23,834 ราย เสียชีวิตอีก 54 ราย'),
Model(
url:
'https://images.unsplash.com/photo-1605289982774-9a6fef564df8?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxzZWFyY2h8NHx8Y292aWQlMjAxOXxlbnwwfHwwfHw%3D&auto=format&fit=crop&w=400&q=60',
title: 'TITLEEEEE',
date: '20 ม.ค. 21',
view: '4165',
des:
'โควิดวันนี้ (3 มี.ค.) ศบค.พบป่วยใหม่ 23,618 ราย+ATK พุ่งกระฉูด 42,138 คน')
];
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