Skip to content

N
NBT_APP
Commit 8f889b4a by Mobile : Art
Options

update100322

parent 1f3d4d8e
Showing with 58 additions and 102 deletions
.idea/workspace.xml
...@@ -5,41 +5,12 @@ ...@@ -5,41 +5,12 @@
</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$/assets/images/ic_success.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/lib/screen/forgotpassword/forgotpassword_page.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.dart_tool/flutter_build/70f237836f513e84d16b29b63bfd9185/.filecache" beforeDir="false" afterPath="$PROJECT_DIR$/.dart_tool/flutter_build/70f237836f513e84d16b29b63bfd9185/.filecache" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.dart_tool/flutter_build/70f237836f513e84d16b29b63bfd9185/app.dill" beforeDir="false" afterPath="$PROJECT_DIR$/.dart_tool/flutter_build/70f237836f513e84d16b29b63bfd9185/app.dill" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.dart_tool/flutter_build/70f237836f513e84d16b29b63bfd9185/debug_ios_bundle_flutter_assets.stamp" beforeDir="false" afterPath="$PROJECT_DIR$/.dart_tool/flutter_build/70f237836f513e84d16b29b63bfd9185/debug_ios_bundle_flutter_assets.stamp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.dart_tool/flutter_build/70f237836f513e84d16b29b63bfd9185/flutter_assets.d" beforeDir="false" afterPath="$PROJECT_DIR$/.dart_tool/flutter_build/70f237836f513e84d16b29b63bfd9185/flutter_assets.d" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.dart_tool/flutter_build/70f237836f513e84d16b29b63bfd9185/kernel_snapshot.d" beforeDir="false" afterPath="$PROJECT_DIR$/.dart_tool/flutter_build/70f237836f513e84d16b29b63bfd9185/kernel_snapshot.d" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.dart_tool/flutter_build/70f237836f513e84d16b29b63bfd9185/kernel_snapshot.stamp" beforeDir="false" afterPath="$PROJECT_DIR$/.dart_tool/flutter_build/70f237836f513e84d16b29b63bfd9185/kernel_snapshot.stamp" 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$/build/c075001b96339384a97db4862b8ab8db.cache.dill.track.dill" beforeDir="false" afterPath="$PROJECT_DIR$/build/c075001b96339384a97db4862b8ab8db.cache.dill.track.dill" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/ios/Debug-iphonesimulator/App.framework/App" beforeDir="false" afterPath="$PROJECT_DIR$/build/ios/Debug-iphonesimulator/App.framework/App" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/ios/Debug-iphonesimulator/App.framework/_CodeSignature/CodeResources" beforeDir="false" afterPath="$PROJECT_DIR$/build/ios/Debug-iphonesimulator/App.framework/_CodeSignature/CodeResources" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/ios/Debug-iphonesimulator/App.framework/flutter_assets/NOTICES.Z" beforeDir="false" afterPath="$PROJECT_DIR$/build/ios/Debug-iphonesimulator/App.framework/flutter_assets/NOTICES.Z" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/ios/Debug-iphonesimulator/App.framework/flutter_assets/kernel_blob.bin" beforeDir="false" afterPath="$PROJECT_DIR$/build/ios/Debug-iphonesimulator/App.framework/flutter_assets/kernel_blob.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/ios/Debug-iphonesimulator/Runner.app/Assets.car" beforeDir="false" afterPath="$PROJECT_DIR$/build/ios/Debug-iphonesimulator/Runner.app/Assets.car" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/App" beforeDir="false" afterPath="$PROJECT_DIR$/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/App" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/_CodeSignature/CodeResources" beforeDir="false" afterPath="$PROJECT_DIR$/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/_CodeSignature/CodeResources" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/NOTICES.Z" beforeDir="false" afterPath="$PROJECT_DIR$/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/NOTICES.Z" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/kernel_blob.bin" beforeDir="false" afterPath="$PROJECT_DIR$/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/kernel_blob.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/ios/Debug-iphonesimulator/Runner.app/Runner" beforeDir="false" afterPath="$PROJECT_DIR$/build/ios/Debug-iphonesimulator/Runner.app/Runner" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/ios/Debug-iphonesimulator/Runner.app/_CodeSignature/CodeResources" beforeDir="false" afterPath="$PROJECT_DIR$/build/ios/Debug-iphonesimulator/Runner.app/_CodeSignature/CodeResources" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/ios/iphonesimulator/Runner.app/Assets.car" beforeDir="false" afterPath="$PROJECT_DIR$/build/ios/iphonesimulator/Runner.app/Assets.car" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/App" beforeDir="false" afterPath="$PROJECT_DIR$/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/App" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/_CodeSignature/CodeResources" beforeDir="false" afterPath="$PROJECT_DIR$/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/_CodeSignature/CodeResources" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/NOTICES.Z" beforeDir="false" afterPath="$PROJECT_DIR$/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/NOTICES.Z" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/kernel_blob.bin" beforeDir="false" afterPath="$PROJECT_DIR$/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/kernel_blob.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/ios/iphonesimulator/Runner.app/Runner" beforeDir="false" afterPath="$PROJECT_DIR$/build/ios/iphonesimulator/Runner.app/Runner" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/ios/iphonesimulator/Runner.app/_CodeSignature/CodeResources" beforeDir="false" afterPath="$PROJECT_DIR$/build/ios/iphonesimulator/Runner.app/_CodeSignature/CodeResources" 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/components/appbar_logo.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/components/appbar_logo.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/components/appbar_title.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/components/appbar_title.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" /> <change beforePath="$PROJECT_DIR$/lib/screen/home/home_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/screen/home/home_page.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/screen/login/login_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/screen/login/login_page.dart" afterDir="false" /> <change beforePath="$PROJECT_DIR$/lib/screen/login/login_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/screen/login/login_page.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/screen/notification/notification_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/screen/notification/notification_page.dart" afterDir="false" /> <change beforePath="$PROJECT_DIR$/lib/screen/news/news_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/screen/news/news_page.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/screen/register/register_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/screen/register/register_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" />
...@@ -68,6 +39,7 @@ ...@@ -68,6 +39,7 @@
<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="AndroidSdkUpdater" /> <property name="settings.editor.selected.configurable" value="AndroidSdkUpdater" />
......
lib/components/appbar_logo.dart
...@@ -79,7 +79,7 @@ class _AppBarLogoState extends State<AppBarLogo> { ...@@ -79,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: member(), child: notMember(),
), ),
), ),
), ),
...@@ -584,7 +584,7 @@ class _AppBarLogoState extends State<AppBarLogo> { ...@@ -584,7 +584,7 @@ class _AppBarLogoState extends State<AppBarLogo> {
GestureDetector( GestureDetector(
onTap: () { onTap: () {
setState(() { setState(() {
Navigator.pushReplacement( Navigator.push(
context, MaterialPageRoute(builder: (context) => NewsPage())); context, MaterialPageRoute(builder: (context) => NewsPage()));
}); });
}, },
......
lib/components/appbar_title.dart
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';
class AppbarTitle extends StatelessWidget { class AppbarTitle extends StatelessWidget {
// const AppbarTitle({required this.title}) : super(key: title); // const AppbarTitle({required this.title}) : super(key: title);
...@@ -20,18 +21,50 @@ class AppbarTitle extends StatelessWidget { ...@@ -20,18 +21,50 @@ class AppbarTitle extends StatelessWidget {
context: context, context: context,
minTextAdapt: true, minTextAdapt: true,
orientation: Orientation.portrait); orientation: Orientation.portrait);
return Container( return Row(
// alignment: Alignment.topCenter, children: [
child: Text( SizedBox(
"${title}", height: 50.h,
style: TextStyle(
color: Colors.white,
fontFamily: 'DBHeavent',
fontSize: 25,
fontWeight: FontWeight.w500,
letterSpacing: 1,
), ),
), // Container(
// alignment: Alignment.topLeft,
// margin: EdgeInsets.only(left: 30),
// child: GestureDetector(
// onTap: () {
// print("bbb");
//
// // setState(() {
// // Navigator.pop(context);
// Navigator.push(context,
// MaterialPageRoute(builder: (context) => AppBarLogo()));
// // });
// },
// child: Icon(
// Icons.arrow_back_ios,
// color: Colors.black,
// ),
// ),
// ),
// Spacer(),
SizedBox(
width: 50,
),
Container(
// alignment: Alignment.topCenter,
child: Text(
"${title}",
style: TextStyle(
color: Colors.white,
fontFamily: 'DBHeavent',
fontSize: 25,
fontWeight: FontWeight.w500,
letterSpacing: 1,
),
),
),
Spacer(),
],
); );
} }
} }
lib/screen/home/home_page.dart
...@@ -298,7 +298,7 @@ class _HomePageState extends State<HomePage> { ...@@ -298,7 +298,7 @@ class _HomePageState extends State<HomePage> {
GestureDetector( GestureDetector(
onTap: () { onTap: () {
setState(() { setState(() {
Navigator.pushReplacement( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => NewsPage())); builder: (context) => NewsPage()));
...@@ -351,7 +351,7 @@ class _HomePageState extends State<HomePage> { ...@@ -351,7 +351,7 @@ class _HomePageState extends State<HomePage> {
GestureDetector( GestureDetector(
onTap: () { onTap: () {
setState(() { setState(() {
Navigator.pushReplacement( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => NewsPage())); builder: (context) => NewsPage()));
...@@ -410,7 +410,7 @@ class _HomePageState extends State<HomePage> { ...@@ -410,7 +410,7 @@ class _HomePageState extends State<HomePage> {
GestureDetector( GestureDetector(
onTap: () { onTap: () {
setState(() { setState(() {
Navigator.pushReplacement( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => NewsPage())); builder: (context) => NewsPage()));
...@@ -462,7 +462,7 @@ class _HomePageState extends State<HomePage> { ...@@ -462,7 +462,7 @@ class _HomePageState extends State<HomePage> {
GestureDetector( GestureDetector(
onTap: () { onTap: () {
setState(() { setState(() {
Navigator.pushReplacement( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => NewsPage())); builder: (context) => NewsPage()));
......
lib/screen/login/login_page.dart
...@@ -41,7 +41,8 @@ class _LoginPageState extends State<LoginPage> { ...@@ -41,7 +41,8 @@ class _LoginPageState extends State<LoginPage> {
print("bbb"); print("bbb");
setState(() { setState(() {
Navigator.pushReplacement(context, // Navigator.pop(context);
Navigator.push(context,
MaterialPageRoute(builder: (context) => AppBarLogo())); MaterialPageRoute(builder: (context) => AppBarLogo()));
}); });
}, },
......
lib/screen/news/news_page.dart
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_logo.dart';
import 'package:nbt_app/components/appbar_title.dart';
import 'package:nbt_app/screen/notification/notification_page.dart'; import 'package:nbt_app/screen/notification/notification_page.dart';
import '../home/home_page.dart'; import '../home/home_page.dart';
...@@ -32,59 +33,8 @@ class _NewsPageState extends State<NewsPage> { ...@@ -32,59 +33,8 @@ class _NewsPageState extends State<NewsPage> {
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: Row( title: AppbarTitle(
mainAxisAlignment: MainAxisAlignment.start, title: 'ลงทะเบียน / ยืนยันตัวตน',
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(),
// SizedBox(
// width: 50.w,
// ),
GestureDetector(
onTap: () {
setState(() {
Navigator.pushReplacement(
context,
MaterialPageRoute(
builder: (context) => NotificationPage()));
});
},
child: Icon(Icons.notifications_none),
),
SizedBox(
width: 10.w,
),
Icon(Icons.search),
],
), ),
), ),
body: SingleChildScrollView( body: SingleChildScrollView(
......
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