Commit 1f3d4d8e by Mobile : Art

update100322

parent cd551ef8
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
"languageVersion": "2.15" "languageVersion": "2.15"
} }
], ],
"generated": "2022-03-03T03:51:07.163060Z", "generated": "2022-03-09T09:42:06.560021Z",
"generator": "pub", "generator": "pub",
"generatorVersion": "2.15.1" "generatorVersion": "2.15.1"
} }
...@@ -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-03 10:51:07.149011. # Generated by pub on 2022-03-09 16:42:06.545741.
async:file:///Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.8.2/lib/ async:file:///Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.8.2/lib/
boolean_selector:file:///Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ boolean_selector:file:///Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/
carousel_slider:file:///Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/carousel_slider-4.0.0/lib/ carousel_slider:file:///Users/artza007/development/flutter/.pub-cache/hosted/pub.dartlang.org/carousel_slider-4.0.0/lib/
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</data> </data>
<key>flutter_assets/NOTICES.Z</key> <key>flutter_assets/NOTICES.Z</key>
<data> <data>
rzuYf6AsjuNj75pEUEGOLXCVVJs= y3dJFHZmZr7ysAXckDi7Qr8A/WM=
</data> </data>
<key>flutter_assets/assets/font/DBHeavent.ttf</key> <key>flutter_assets/assets/font/DBHeavent.ttf</key>
<data> <data>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</data> </data>
<key>flutter_assets/kernel_blob.bin</key> <key>flutter_assets/kernel_blob.bin</key>
<data> <data>
X4FbpMQolC1B57z86qOo4VFk47Q= xG2qioWGfagubOa4xS9FoRXS8bI=
</data> </data>
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key> <key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
<data> <data>
...@@ -149,11 +149,11 @@ ...@@ -149,11 +149,11 @@
<dict> <dict>
<key>hash</key> <key>hash</key>
<data> <data>
rzuYf6AsjuNj75pEUEGOLXCVVJs= y3dJFHZmZr7ysAXckDi7Qr8A/WM=
</data> </data>
<key>hash2</key> <key>hash2</key>
<data> <data>
BLVRMaR4wbU+8vS3R8Z3LSX75lyusnldoo7FJxbXrBs= MOvN0YxBCOdXO8dm8HNg5mKVWctxwQ50aS+H7aFXt9c=
</data> </data>
</dict> </dict>
<key>flutter_assets/assets/font/DBHeavent.ttf</key> <key>flutter_assets/assets/font/DBHeavent.ttf</key>
...@@ -237,11 +237,11 @@ ...@@ -237,11 +237,11 @@
<dict> <dict>
<key>hash</key> <key>hash</key>
<data> <data>
X4FbpMQolC1B57z86qOo4VFk47Q= xG2qioWGfagubOa4xS9FoRXS8bI=
</data> </data>
<key>hash2</key> <key>hash2</key>
<data> <data>
zgh9p2Lxyi9UmY7FHwcL//nf19g7hV8v30p10DxDYgc= wqbFE4Bd6FxnRBCjfDcHuq6K7svPsM3jkWYQOWZr4CQ=
</data> </data>
</dict> </dict>
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key> <key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</data> </data>
<key>flutter_assets/NOTICES.Z</key> <key>flutter_assets/NOTICES.Z</key>
<data> <data>
rzuYf6AsjuNj75pEUEGOLXCVVJs= y3dJFHZmZr7ysAXckDi7Qr8A/WM=
</data> </data>
<key>flutter_assets/assets/font/DBHeavent.ttf</key> <key>flutter_assets/assets/font/DBHeavent.ttf</key>
<data> <data>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</data> </data>
<key>flutter_assets/kernel_blob.bin</key> <key>flutter_assets/kernel_blob.bin</key>
<data> <data>
X4FbpMQolC1B57z86qOo4VFk47Q= xG2qioWGfagubOa4xS9FoRXS8bI=
</data> </data>
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key> <key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
<data> <data>
...@@ -149,11 +149,11 @@ ...@@ -149,11 +149,11 @@
<dict> <dict>
<key>hash</key> <key>hash</key>
<data> <data>
rzuYf6AsjuNj75pEUEGOLXCVVJs= y3dJFHZmZr7ysAXckDi7Qr8A/WM=
</data> </data>
<key>hash2</key> <key>hash2</key>
<data> <data>
BLVRMaR4wbU+8vS3R8Z3LSX75lyusnldoo7FJxbXrBs= MOvN0YxBCOdXO8dm8HNg5mKVWctxwQ50aS+H7aFXt9c=
</data> </data>
</dict> </dict>
<key>flutter_assets/assets/font/DBHeavent.ttf</key> <key>flutter_assets/assets/font/DBHeavent.ttf</key>
...@@ -237,11 +237,11 @@ ...@@ -237,11 +237,11 @@
<dict> <dict>
<key>hash</key> <key>hash</key>
<data> <data>
X4FbpMQolC1B57z86qOo4VFk47Q= xG2qioWGfagubOa4xS9FoRXS8bI=
</data> </data>
<key>hash2</key> <key>hash2</key>
<data> <data>
zgh9p2Lxyi9UmY7FHwcL//nf19g7hV8v30p10DxDYgc= wqbFE4Bd6FxnRBCjfDcHuq6K7svPsM3jkWYQOWZr4CQ=
</data> </data>
</dict> </dict>
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key> <key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
......
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
</data> </data>
<key>Assets.car</key> <key>Assets.car</key>
<data> <data>
P2xgV4rEwnLvnKbR+gOhWNjI5cE= mCrROKTqYDo96KT0uVA+CehQz44=
</data> </data>
<key>Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <key>Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key>
<data> <data>
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
</data> </data>
<key>Frameworks/App.framework/App</key> <key>Frameworks/App.framework/App</key>
<data> <data>
JwCh4h/1d6rnR45nl9JBsx/n3MQ= xBb/Fc7ME2Fc3LMuPm8NusB9Cb4=
</data> </data>
<key>Frameworks/App.framework/Info.plist</key> <key>Frameworks/App.framework/Info.plist</key>
<data> <data>
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
</data> </data>
<key>Frameworks/App.framework/_CodeSignature/CodeResources</key> <key>Frameworks/App.framework/_CodeSignature/CodeResources</key>
<data> <data>
ove9g5G6qLj4Bs8RWp0KrB8GQAU= FUOgkl//rH4pVI82xMsGHhnQ7JI=
</data> </data>
<key>Frameworks/App.framework/flutter_assets/AssetManifest.json</key> <key>Frameworks/App.framework/flutter_assets/AssetManifest.json</key>
<data> <data>
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
</data> </data>
<key>Frameworks/App.framework/flutter_assets/NOTICES.Z</key> <key>Frameworks/App.framework/flutter_assets/NOTICES.Z</key>
<data> <data>
rzuYf6AsjuNj75pEUEGOLXCVVJs= y3dJFHZmZr7ysAXckDi7Qr8A/WM=
</data> </data>
<key>Frameworks/App.framework/flutter_assets/assets/font/DBHeavent.ttf</key> <key>Frameworks/App.framework/flutter_assets/assets/font/DBHeavent.ttf</key>
<data> <data>
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
</data> </data>
<key>Frameworks/App.framework/flutter_assets/kernel_blob.bin</key> <key>Frameworks/App.framework/flutter_assets/kernel_blob.bin</key>
<data> <data>
X4FbpMQolC1B57z86qOo4VFk47Q= xG2qioWGfagubOa4xS9FoRXS8bI=
</data> </data>
<key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key> <key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
<data> <data>
...@@ -540,11 +540,11 @@ ...@@ -540,11 +540,11 @@
<dict> <dict>
<key>hash</key> <key>hash</key>
<data> <data>
P2xgV4rEwnLvnKbR+gOhWNjI5cE= mCrROKTqYDo96KT0uVA+CehQz44=
</data> </data>
<key>hash2</key> <key>hash2</key>
<data> <data>
bDs6zN62cfQB7fY4m0HYW9/nUGuddYw9zbPcRknGfDU= 2BaMWiPMSt0kHqWdp31MkiwYFB+FquVt3VcK6phxk4g=
</data> </data>
</dict> </dict>
<key>Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <key>Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key>
...@@ -617,11 +617,11 @@ ...@@ -617,11 +617,11 @@
<dict> <dict>
<key>hash</key> <key>hash</key>
<data> <data>
JwCh4h/1d6rnR45nl9JBsx/n3MQ= xBb/Fc7ME2Fc3LMuPm8NusB9Cb4=
</data> </data>
<key>hash2</key> <key>hash2</key>
<data> <data>
fNNPUuXREpJ6nFpc9ic+F2vUNj0RQ+BC35wXVr5jH9E= clVgu+rOkFUhf48YOofFg6/7jeYmd3FfK0+WGMCGi/Q=
</data> </data>
</dict> </dict>
<key>Frameworks/App.framework/Info.plist</key> <key>Frameworks/App.framework/Info.plist</key>
...@@ -639,11 +639,11 @@ ...@@ -639,11 +639,11 @@
<dict> <dict>
<key>hash</key> <key>hash</key>
<data> <data>
ove9g5G6qLj4Bs8RWp0KrB8GQAU= FUOgkl//rH4pVI82xMsGHhnQ7JI=
</data> </data>
<key>hash2</key> <key>hash2</key>
<data> <data>
LhnhNwK70d2f77MwovSHpAM/eFSR2+sZwjo+IqVtU74= ROcT4vUWlcX74/Z+Tkk+MtPzPFrF8t8Evkm4tM328eA=
</data> </data>
</dict> </dict>
<key>Frameworks/App.framework/flutter_assets/AssetManifest.json</key> <key>Frameworks/App.framework/flutter_assets/AssetManifest.json</key>
...@@ -672,11 +672,11 @@ ...@@ -672,11 +672,11 @@
<dict> <dict>
<key>hash</key> <key>hash</key>
<data> <data>
rzuYf6AsjuNj75pEUEGOLXCVVJs= y3dJFHZmZr7ysAXckDi7Qr8A/WM=
</data> </data>
<key>hash2</key> <key>hash2</key>
<data> <data>
BLVRMaR4wbU+8vS3R8Z3LSX75lyusnldoo7FJxbXrBs= MOvN0YxBCOdXO8dm8HNg5mKVWctxwQ50aS+H7aFXt9c=
</data> </data>
</dict> </dict>
<key>Frameworks/App.framework/flutter_assets/assets/font/DBHeavent.ttf</key> <key>Frameworks/App.framework/flutter_assets/assets/font/DBHeavent.ttf</key>
...@@ -760,11 +760,11 @@ ...@@ -760,11 +760,11 @@
<dict> <dict>
<key>hash</key> <key>hash</key>
<data> <data>
X4FbpMQolC1B57z86qOo4VFk47Q= xG2qioWGfagubOa4xS9FoRXS8bI=
</data> </data>
<key>hash2</key> <key>hash2</key>
<data> <data>
zgh9p2Lxyi9UmY7FHwcL//nf19g7hV8v30p10DxDYgc= wqbFE4Bd6FxnRBCjfDcHuq6K7svPsM3jkWYQOWZr4CQ=
</data> </data>
</dict> </dict>
<key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key> <key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</data> </data>
<key>flutter_assets/NOTICES.Z</key> <key>flutter_assets/NOTICES.Z</key>
<data> <data>
rzuYf6AsjuNj75pEUEGOLXCVVJs= y3dJFHZmZr7ysAXckDi7Qr8A/WM=
</data> </data>
<key>flutter_assets/assets/font/DBHeavent.ttf</key> <key>flutter_assets/assets/font/DBHeavent.ttf</key>
<data> <data>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</data> </data>
<key>flutter_assets/kernel_blob.bin</key> <key>flutter_assets/kernel_blob.bin</key>
<data> <data>
X4FbpMQolC1B57z86qOo4VFk47Q= xG2qioWGfagubOa4xS9FoRXS8bI=
</data> </data>
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key> <key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
<data> <data>
...@@ -149,11 +149,11 @@ ...@@ -149,11 +149,11 @@
<dict> <dict>
<key>hash</key> <key>hash</key>
<data> <data>
rzuYf6AsjuNj75pEUEGOLXCVVJs= y3dJFHZmZr7ysAXckDi7Qr8A/WM=
</data> </data>
<key>hash2</key> <key>hash2</key>
<data> <data>
BLVRMaR4wbU+8vS3R8Z3LSX75lyusnldoo7FJxbXrBs= MOvN0YxBCOdXO8dm8HNg5mKVWctxwQ50aS+H7aFXt9c=
</data> </data>
</dict> </dict>
<key>flutter_assets/assets/font/DBHeavent.ttf</key> <key>flutter_assets/assets/font/DBHeavent.ttf</key>
...@@ -237,11 +237,11 @@ ...@@ -237,11 +237,11 @@
<dict> <dict>
<key>hash</key> <key>hash</key>
<data> <data>
X4FbpMQolC1B57z86qOo4VFk47Q= xG2qioWGfagubOa4xS9FoRXS8bI=
</data> </data>
<key>hash2</key> <key>hash2</key>
<data> <data>
zgh9p2Lxyi9UmY7FHwcL//nf19g7hV8v30p10DxDYgc= wqbFE4Bd6FxnRBCjfDcHuq6K7svPsM3jkWYQOWZr4CQ=
</data> </data>
</dict> </dict>
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key> <key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
......
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
</data> </data>
<key>Assets.car</key> <key>Assets.car</key>
<data> <data>
P2xgV4rEwnLvnKbR+gOhWNjI5cE= mCrROKTqYDo96KT0uVA+CehQz44=
</data> </data>
<key>Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <key>Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key>
<data> <data>
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
</data> </data>
<key>Frameworks/App.framework/App</key> <key>Frameworks/App.framework/App</key>
<data> <data>
JwCh4h/1d6rnR45nl9JBsx/n3MQ= xBb/Fc7ME2Fc3LMuPm8NusB9Cb4=
</data> </data>
<key>Frameworks/App.framework/Info.plist</key> <key>Frameworks/App.framework/Info.plist</key>
<data> <data>
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
</data> </data>
<key>Frameworks/App.framework/_CodeSignature/CodeResources</key> <key>Frameworks/App.framework/_CodeSignature/CodeResources</key>
<data> <data>
ove9g5G6qLj4Bs8RWp0KrB8GQAU= FUOgkl//rH4pVI82xMsGHhnQ7JI=
</data> </data>
<key>Frameworks/App.framework/flutter_assets/AssetManifest.json</key> <key>Frameworks/App.framework/flutter_assets/AssetManifest.json</key>
<data> <data>
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
</data> </data>
<key>Frameworks/App.framework/flutter_assets/NOTICES.Z</key> <key>Frameworks/App.framework/flutter_assets/NOTICES.Z</key>
<data> <data>
rzuYf6AsjuNj75pEUEGOLXCVVJs= y3dJFHZmZr7ysAXckDi7Qr8A/WM=
</data> </data>
<key>Frameworks/App.framework/flutter_assets/assets/font/DBHeavent.ttf</key> <key>Frameworks/App.framework/flutter_assets/assets/font/DBHeavent.ttf</key>
<data> <data>
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
</data> </data>
<key>Frameworks/App.framework/flutter_assets/kernel_blob.bin</key> <key>Frameworks/App.framework/flutter_assets/kernel_blob.bin</key>
<data> <data>
X4FbpMQolC1B57z86qOo4VFk47Q= xG2qioWGfagubOa4xS9FoRXS8bI=
</data> </data>
<key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key> <key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
<data> <data>
...@@ -540,11 +540,11 @@ ...@@ -540,11 +540,11 @@
<dict> <dict>
<key>hash</key> <key>hash</key>
<data> <data>
P2xgV4rEwnLvnKbR+gOhWNjI5cE= mCrROKTqYDo96KT0uVA+CehQz44=
</data> </data>
<key>hash2</key> <key>hash2</key>
<data> <data>
bDs6zN62cfQB7fY4m0HYW9/nUGuddYw9zbPcRknGfDU= 2BaMWiPMSt0kHqWdp31MkiwYFB+FquVt3VcK6phxk4g=
</data> </data>
</dict> </dict>
<key>Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <key>Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key>
...@@ -617,11 +617,11 @@ ...@@ -617,11 +617,11 @@
<dict> <dict>
<key>hash</key> <key>hash</key>
<data> <data>
JwCh4h/1d6rnR45nl9JBsx/n3MQ= xBb/Fc7ME2Fc3LMuPm8NusB9Cb4=
</data> </data>
<key>hash2</key> <key>hash2</key>
<data> <data>
fNNPUuXREpJ6nFpc9ic+F2vUNj0RQ+BC35wXVr5jH9E= clVgu+rOkFUhf48YOofFg6/7jeYmd3FfK0+WGMCGi/Q=
</data> </data>
</dict> </dict>
<key>Frameworks/App.framework/Info.plist</key> <key>Frameworks/App.framework/Info.plist</key>
...@@ -639,11 +639,11 @@ ...@@ -639,11 +639,11 @@
<dict> <dict>
<key>hash</key> <key>hash</key>
<data> <data>
ove9g5G6qLj4Bs8RWp0KrB8GQAU= FUOgkl//rH4pVI82xMsGHhnQ7JI=
</data> </data>
<key>hash2</key> <key>hash2</key>
<data> <data>
LhnhNwK70d2f77MwovSHpAM/eFSR2+sZwjo+IqVtU74= ROcT4vUWlcX74/Z+Tkk+MtPzPFrF8t8Evkm4tM328eA=
</data> </data>
</dict> </dict>
<key>Frameworks/App.framework/flutter_assets/AssetManifest.json</key> <key>Frameworks/App.framework/flutter_assets/AssetManifest.json</key>
...@@ -672,11 +672,11 @@ ...@@ -672,11 +672,11 @@
<dict> <dict>
<key>hash</key> <key>hash</key>
<data> <data>
rzuYf6AsjuNj75pEUEGOLXCVVJs= y3dJFHZmZr7ysAXckDi7Qr8A/WM=
</data> </data>
<key>hash2</key> <key>hash2</key>
<data> <data>
BLVRMaR4wbU+8vS3R8Z3LSX75lyusnldoo7FJxbXrBs= MOvN0YxBCOdXO8dm8HNg5mKVWctxwQ50aS+H7aFXt9c=
</data> </data>
</dict> </dict>
<key>Frameworks/App.framework/flutter_assets/assets/font/DBHeavent.ttf</key> <key>Frameworks/App.framework/flutter_assets/assets/font/DBHeavent.ttf</key>
...@@ -760,11 +760,11 @@ ...@@ -760,11 +760,11 @@
<dict> <dict>
<key>hash</key> <key>hash</key>
<data> <data>
X4FbpMQolC1B57z86qOo4VFk47Q= xG2qioWGfagubOa4xS9FoRXS8bI=
</data> </data>
<key>hash2</key> <key>hash2</key>
<data> <data>
zgh9p2Lxyi9UmY7FHwcL//nf19g7hV8v30p10DxDYgc= wqbFE4Bd6FxnRBCjfDcHuq6K7svPsM3jkWYQOWZr4CQ=
</data> </data>
</dict> </dict>
<key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key> <key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
......
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_slider_drawer/flutter_slider_drawer.dart'; import 'package:flutter_slider_drawer/flutter_slider_drawer.dart';
import 'package:nbt_app/screen/catch%20up/catchup_page.dart';
import 'package:nbt_app/screen/home/home_page.dart'; import 'package:nbt_app/screen/home/home_page.dart';
import 'package:nbt_app/screen/login/login_page.dart'; import 'package:nbt_app/screen/login/login_page.dart';
import 'package:nbt_app/screen/news/news_page.dart';
import 'package:nbt_app/screen/notification/FavouriteList_Page.dart';
import 'package:nbt_app/screen/notification/notification_page.dart';
import 'package:nbt_app/screen/register/register_page.dart';
class AppBarLogo extends StatefulWidget { class AppBarLogo extends StatefulWidget {
bool isShowBackButton; bool isShowBackButton;
...@@ -52,7 +57,17 @@ class _AppBarLogoState extends State<AppBarLogo> { ...@@ -52,7 +57,17 @@ class _AppBarLogoState extends State<AppBarLogo> {
SizedBox( SizedBox(
width: 50.w, width: 50.w,
), ),
Icon(Icons.notifications_none), GestureDetector(
onTap: () {
setState(() {
Navigator.pushReplacement(
context,
MaterialPageRoute(
builder: (context) => NotificationPage()));
});
},
child: Icon(Icons.notifications_none),
),
SizedBox( SizedBox(
width: 10.w, width: 10.w,
), ),
...@@ -64,7 +79,7 @@ class _AppBarLogoState extends State<AppBarLogo> { ...@@ -64,7 +79,7 @@ class _AppBarLogoState extends State<AppBarLogo> {
drawer: Drawer( drawer: Drawer(
backgroundColor: Color.fromRGBO(77, 32, 126, 1), backgroundColor: Color.fromRGBO(77, 32, 126, 1),
child: SingleChildScrollView( child: SingleChildScrollView(
child: notMember(), child: member(),
), ),
), ),
), ),
...@@ -318,30 +333,38 @@ class _AppBarLogoState extends State<AppBarLogo> { ...@@ -318,30 +333,38 @@ class _AppBarLogoState extends State<AppBarLogo> {
SizedBox( SizedBox(
height: 10.h, height: 10.h,
), ),
Row( GestureDetector(
children: [ onTap: () {
SizedBox( setState(() {
width: 20.w, Navigator.push(context,
), MaterialPageRoute(builder: (context) => FavouriteListPage()));
Text( });
"รายการโปรด", },
style: TextStyle( child: Row(
children: [
SizedBox(
width: 20.w,
),
Text(
"รายการโปรด",
style: TextStyle(
color: Colors.white,
fontFamily: 'DBHeavent',
fontSize: 25,
fontWeight: FontWeight.w500,
letterSpacing: 1,
),
),
Spacer(),
Icon(
Icons.arrow_forward_ios_rounded,
color: Colors.white, color: Colors.white,
fontFamily: 'DBHeavent',
fontSize: 25,
fontWeight: FontWeight.w500,
letterSpacing: 1,
), ),
), SizedBox(
Spacer(), width: 20.w,
Icon( ),
Icons.arrow_forward_ios_rounded, ],
color: Colors.white, ),
),
SizedBox(
width: 20.w,
),
],
), ),
SizedBox( SizedBox(
height: 20.h, height: 20.h,
...@@ -530,16 +553,24 @@ class _AppBarLogoState extends State<AppBarLogo> { ...@@ -530,16 +553,24 @@ class _AppBarLogoState extends State<AppBarLogo> {
SizedBox( SizedBox(
height: 10.h, height: 10.h,
), ),
Text( // GestureDetector(
"สมัครสมาชิก", // onTap: () {
style: TextStyle( // setState(() {
color: Colors.white, // Navigator.pushReplacement(context,
fontFamily: 'DBHeavent', // MaterialPageRoute(builder: (context) => RegisterPage()));
fontSize: 25, // });
fontWeight: FontWeight.w500, // },
letterSpacing: 1, // child: Text(
), // "สมัครสมาชิก",
), // style: TextStyle(
// color: Colors.white,
// fontFamily: 'DBHeavent',
// fontSize: 25,
// fontWeight: FontWeight.w500,
// letterSpacing: 1,
// ),
// ),
// ),
SizedBox( SizedBox(
height: 20.h, height: 20.h,
), ),
...@@ -550,30 +581,38 @@ class _AppBarLogoState extends State<AppBarLogo> { ...@@ -550,30 +581,38 @@ class _AppBarLogoState extends State<AppBarLogo> {
SizedBox( SizedBox(
height: 20.h, height: 20.h,
), ),
Row( GestureDetector(
children: [ onTap: () {
SizedBox( setState(() {
width: 20.w, Navigator.pushReplacement(
), context, MaterialPageRoute(builder: (context) => NewsPage()));
Text( });
"ข่าว", },
style: TextStyle( child: Row(
children: [
SizedBox(
width: 20.w,
),
Text(
"ข่าว",
style: TextStyle(
color: Colors.white,
fontFamily: 'DBHeavent',
fontSize: 25,
fontWeight: FontWeight.w500,
letterSpacing: 1,
),
),
Spacer(),
Icon(
Icons.arrow_forward_ios_rounded,
color: Colors.white, color: Colors.white,
fontFamily: 'DBHeavent',
fontSize: 25,
fontWeight: FontWeight.w500,
letterSpacing: 1,
), ),
), SizedBox(
Spacer(), width: 20.w,
Icon( ),
Icons.arrow_forward_ios_rounded, ],
color: Colors.white, ),
),
SizedBox(
width: 20.w,
),
],
), ),
SizedBox( SizedBox(
height: 10.h, height: 10.h,
...@@ -662,30 +701,36 @@ class _AppBarLogoState extends State<AppBarLogo> { ...@@ -662,30 +701,36 @@ class _AppBarLogoState extends State<AppBarLogo> {
SizedBox( SizedBox(
height: 10.h, height: 10.h,
), ),
Row( GestureDetector(
children: [ onTap: () {
SizedBox( Navigator.pushReplacement(context,
width: 20.w, MaterialPageRoute(builder: (context) => CatchupPage()));
), },
Text( child: Row(
"Catch up", children: [
style: TextStyle( SizedBox(
width: 20.w,
),
Text(
"Catch up",
style: TextStyle(
color: Colors.white,
fontFamily: 'DBHeavent',
fontSize: 25,
fontWeight: FontWeight.w500,
letterSpacing: 1,
),
),
Spacer(),
Icon(
Icons.arrow_forward_ios_rounded,
color: Colors.white, color: Colors.white,
fontFamily: 'DBHeavent',
fontSize: 25,
fontWeight: FontWeight.w500,
letterSpacing: 1,
), ),
), SizedBox(
Spacer(), width: 20.w,
Icon( ),
Icons.arrow_forward_ios_rounded, ],
color: Colors.white, ),
),
SizedBox(
width: 20.w,
),
],
), ),
SizedBox( SizedBox(
height: 20.h, height: 20.h,
......
int selectedIndex = 2;
\ No newline at end of file
import 'package:flutter/material.dart';
class CatchupPage extends StatefulWidget {
const CatchupPage({ Key? key }) : super(key: key);
@override
State<CatchupPage> createState() => _CatchupPageState();
}
class _CatchupPageState extends State<CatchupPage> {
@override
Widget build(BuildContext context) {
return Container(
);
}
}
\ No newline at end of file
import 'package:flutter/material.dart';
class TvOnlinePage extends StatefulWidget {
const TvOnlinePage({ Key? key }) : super(key: key);
@override
State<TvOnlinePage> createState() => _TvOnlinePageState();
}
class _TvOnlinePageState extends State<TvOnlinePage> {
@override
Widget build(BuildContext context) {
return Container(
child: Text('Live TV'),
);
}
}
\ No newline at end of file
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:nbt_app/components/appbar_logo.dart';
import 'package:nbt_app/screen/forgotpassword/forgotpassword_page.dart';
import 'package:nbt_app/screen/term/term_page.dart'; import 'package:nbt_app/screen/term/term_page.dart';
class LoginPage extends StatefulWidget { class LoginPage extends StatefulWidget {
...@@ -31,6 +33,24 @@ class _LoginPageState extends State<LoginPage> { ...@@ -31,6 +33,24 @@ class _LoginPageState extends State<LoginPage> {
SizedBox( SizedBox(
height: 50.h, height: 50.h,
), ),
Container(
alignment: Alignment.topLeft,
margin: EdgeInsets.only(left: 30),
child: GestureDetector(
onTap: () {
print("bbb");
setState(() {
Navigator.pushReplacement(context,
MaterialPageRoute(builder: (context) => AppBarLogo()));
});
},
child: Icon(
Icons.arrow_back_ios,
color: Colors.black,
),
),
),
Center( Center(
child: Image.asset( child: Image.asset(
'assets/images/logo_login.png', 'assets/images/logo_login.png',
...@@ -144,18 +164,26 @@ class _LoginPageState extends State<LoginPage> { ...@@ -144,18 +164,26 @@ class _LoginPageState extends State<LoginPage> {
fillColor: Colors.white), fillColor: Colors.white),
), ),
), ),
Container( GestureDetector(
padding: EdgeInsets.only(right: 30, top: 10), onTap: () {
alignment: Alignment.topRight, Navigator.push(
child: Text( context,
"ลืมรหัสผ่าน", MaterialPageRoute(
textAlign: TextAlign.left, builder: (context) => ForgotPasswordPage()));
style: TextStyle( },
decoration: TextDecoration.underline, child: Container(
color: Color.fromRGBO(77, 32, 126, 1), padding: EdgeInsets.only(right: 30, top: 10),
fontFamily: 'DBHeavent', alignment: Alignment.topRight,
fontSize: 25, child: Text(
fontWeight: FontWeight.w500, "ลืมรหัสผ่าน",
textAlign: TextAlign.left,
style: TextStyle(
decoration: TextDecoration.underline,
color: Color.fromRGBO(77, 32, 126, 1),
fontFamily: 'DBHeavent',
fontSize: 25,
fontWeight: FontWeight.w500,
),
), ),
), ),
), ),
......
...@@ -34,12 +34,20 @@ class _NotificationPageState extends State<NotificationPage> { ...@@ -34,12 +34,20 @@ class _NotificationPageState extends State<NotificationPage> {
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
Container( Container(
margin: EdgeInsets.only(top: 10), margin: EdgeInsets.only(top: 10),
child: GestureDetector( child: GestureDetector(
onTap: () { onTap: () {
Navigator.pop(context); setState(() {
}, Navigator.pushReplacement(
child: Icon(Icons.arrow_back_ios))), context,
MaterialPageRoute(
builder: (context) => AppBarLogo()));
// Navigator.pop(context);
});
},
child: Icon(Icons.arrow_back_ios),
),
),
SizedBox( SizedBox(
width: 115, width: 115,
), ),
...@@ -48,9 +56,12 @@ class _NotificationPageState extends State<NotificationPage> { ...@@ -48,9 +56,12 @@ class _NotificationPageState extends State<NotificationPage> {
child: Text( child: Text(
'การแจ้งเตือน', 'การแจ้งเตือน',
style: TextStyle( style: TextStyle(
fontFamily: 'DBHeavent',
fontSize: 30, fontSize: 30,
color: Colors.white), letterSpacing: 1,
fontWeight: FontWeight.w700,
// color: Color.fromRGBO(77, 32, 126, 1),
color: Colors.white,
fontFamily: 'DBHeavent'),
), ),
) )
], ],
...@@ -124,7 +135,12 @@ Widget buildCard({required Model item}) => Container( ...@@ -124,7 +135,12 @@ Widget buildCard({required Model item}) => Container(
maxLines: 2, maxLines: 2,
softWrap: true, softWrap: true,
style: TextStyle( style: TextStyle(
fontFamily: 'DHeavent', fontSize: 18, height: 1.3), fontSize: 22,
letterSpacing: 1,
fontWeight: FontWeight.w700,
// color: Color.fromRGBO(77, 32, 126, 1),
color: Colors.black,
fontFamily: 'DBHeavent'),
), ),
), ),
Container( Container(
...@@ -132,10 +148,12 @@ Widget buildCard({required Model item}) => Container( ...@@ -132,10 +148,12 @@ Widget buildCard({required Model item}) => Container(
child: Text( child: Text(
item.time, item.time,
style: TextStyle( style: TextStyle(
height: 1, fontSize: 18,
fontFamily: 'DHeavent', letterSpacing: 1,
fontSize: 13, fontWeight: FontWeight.w500,
color: Color.fromRGBO(77, 32, 126, 1)), color: Color.fromRGBO(77, 32, 126, 1),
// color: Colors.white,
fontFamily: 'DBHeavent'),
), ),
) )
], ],
......
import 'package:flutter/material.dart';
class ProgramsPage extends StatefulWidget {
const ProgramsPage({ Key? key }) : super(key: key);
@override
State<ProgramsPage> createState() => _ProgramsPageState();
}
class _ProgramsPageState extends State<ProgramsPage> {
@override
Widget build(BuildContext context) {
return Container(
child: Text('Programs'),
);
}
}
\ No newline at end of file
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:nbt_app/components/appbar_logo.dart';
import 'package:nbt_app/components/appbar_title.dart'; import 'package:nbt_app/components/appbar_title.dart';
import 'package:nbt_app/screen/register/register_complete_page.dart'; import 'package:nbt_app/screen/register/register_complete_page.dart';
...@@ -29,8 +30,41 @@ class _RegisterPageState extends State<RegisterPage> { ...@@ -29,8 +30,41 @@ class _RegisterPageState extends State<RegisterPage> {
bottomOpacity: 0, bottomOpacity: 0,
backgroundColor: Color.fromRGBO(77, 32, 126, 1), backgroundColor: Color.fromRGBO(77, 32, 126, 1),
toolbarHeight: 80.h, toolbarHeight: 80.h,
title: AppbarTitle( title: Row(
title: 'ลงทะเบียน / ยืนยันตัวตน', mainAxisAlignment: MainAxisAlignment.start,
children: [
// Container(
// margin: EdgeInsets.only(top: 10),
// child: GestureDetector(
// onTap: () {
// setState(() {
// Navigator.pushReplacement(context,
// MaterialPageRoute(builder: (context) => AppBarLogo()));
// // Navigator.pop(context);
// });
// },
// child: Icon(Icons.arrow_back_ios),
// ),
// ),
// Spacer(),
SizedBox(
width: 40,
),
Container(
margin: EdgeInsets.only(top: 10),
child: Text(
'ลงทะเบียน / ยืนยันตัวตน',
style: TextStyle(
fontSize: 30,
letterSpacing: 1,
fontWeight: FontWeight.w700,
// color: Color.fromRGBO(77, 32, 126, 1),
color: Colors.white,
fontFamily: 'DBHeavent'),
),
),
Spacer(),
],
), ),
), ),
body: Stack( body: Stack(
......
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