Skip to content

N
NBT_APP
Commit 1f3d4d8e by Mobile : Art
Options

update100322

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