sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix button flow

Browse Source
This commit is contained in:
Sai Naw Wun
2020-05-29 21:42:00 +06:30
parent c4fbb79af0
commit 9fa5b9ff51
2 changed files with 62 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.vscode/launch.json vendored
View File

@@ -11,5 +11,15 @@
"lib/main-dev.dart", "lib/main-dev.dart",
], ],
}, },
{
"name": "Flutter Dev2",
"request": "launch",
"type": "dart",
"program": "lib/main-dev.dart",
"args": [
"-t",
"lib/main-dev.dart",
],
},
] ]
} }

85
lib/pages/home_page.dart
View File

@@ -117,17 +117,17 @@ class _HomePageState extends State<HomePage> {
btnCallback: () => Navigator.of(context) btnCallback: () => Navigator.of(context)
.push(MaterialPageRoute(builder: (_) => ReportList()))); .push(MaterialPageRoute(builder: (_) => ReportList())));
final pickUpBtn = _buildBtn("pickup.title", final pickUpBtn = _buildBtn2("pickup.title",
icon: FontAwesomeIcons.directions, icon: FontAwesomeIcons.directions,
btnCallback: () => Navigator.of(context) btnCallback: () => Navigator.of(context)
.push(MaterialPageRoute(builder: (_) => PickUpList()))); .push(MaterialPageRoute(builder: (_) => PickUpList())));
final shipmentCostBtn = _buildBtn("pickup.title", final shipmentCostBtn = _buildBtn2("pickup.title",
icon: FontAwesomeIcons.ship, icon: FontAwesomeIcons.ship,
btnCallback: () => Navigator.of(context) btnCallback: () => Navigator.of(context)
.push(MaterialPageRoute(builder: (_) => ShipmentRates()))); .push(MaterialPageRoute(builder: (_) => ShipmentRates())));
final fcsProfileBtn = _buildBtn("profile.title", final fcsProfileBtn = _buildBtn2("profile.title",
icon: Icons.account_circle, icon: Icons.account_circle,
btnCallback: () => Navigator.of(context) btnCallback: () => Navigator.of(context)
.push(MaterialPageRoute(builder: (_) => FCSProfilePage()))); .push(MaterialPageRoute(builder: (_) => FCSProfilePage())));
@@ -391,31 +391,34 @@ class _HomePageState extends State<HomePage> {
// ], // ],
// stops: [0.4, 1.0], // stops: [0.4, 1.0],
// ) // )
// LinearGradient( LinearGradient(
// begin: Alignment.topCenter, begin: Alignment.topCenter,
// end: Alignment end: Alignment
// .bottomCenter, // 10% of the width, so there are ten blinds. .bottomCenter, // 10% of the width, so there are ten blinds.
// colors: [ colors: [
// Color(0xd0272262), Color(0xd0272262),
// Color(0xfa272262), Color(0xfa272262),
// ], // whitish to gray // Color(0xa0ff4400),
// ), // secondaryColor,
SweepGradient( ], // whitish to gray
center: FractionalOffset.centerLeft,
startAngle: 0.0,
endAngle: math.pi * 2,
colors: const <Color>[
secondaryColor,
primaryColor,
secondaryColor,
primaryColor,
secondaryColor,
],
stops: const <double>[0.0, 0.25, 0.5, 0.75, 1.0],
), ),
// SweepGradient(
// center: FractionalOffset.centerLeft,
// startAngle: 0.0,
// endAngle: math.pi * 2,
// colors: const <Color>[
// secondaryColor,
// primaryColor,
// secondaryColor,
// primaryColor,
// secondaryColor,
// ],
// stops: const <double>[0.0, 0.25, 0.5, 0.75, 1.0],
// ),
), ),
child: ListView(children: [ child: ListView(children: [
Wrap( Wrap(
alignment: WrapAlignment.center,
children: widgets, children: widgets,
), ),
]) ])
@@ -519,8 +522,8 @@ class _HomePageState extends State<HomePage> {
{Image imgIcon, IconData icon, BtnCallback btnCallback}) { {Image imgIcon, IconData icon, BtnCallback btnCallback}) {
var languageModel = Provider.of<LanguageModel>(context); var languageModel = Provider.of<LanguageModel>(context);
return Container( return Container(
width: 130, width: 100,
height: 130, height: 100,
decoration: new BoxDecoration( decoration: new BoxDecoration(
color: Colors.transparent, //new Color.fromRGBO(255, 0, 0, 0.0), color: Colors.transparent, //new Color.fromRGBO(255, 0, 0, 0.0),
borderRadius: new BorderRadius.only( borderRadius: new BorderRadius.only(
@@ -539,30 +542,34 @@ class _HomePageState extends State<HomePage> {
// Padding(padding: EdgeInsets.only(bottom: 10.0)), // Padding(padding: EdgeInsets.only(bottom: 10.0)),
ClipOval( ClipOval(
child: Material( child: Material(
color: Colors.white, // button color color: Colors.black54, // button color
child: InkWell( child: InkWell(
splashColor: secondaryColor, // inkwell color splashColor: primaryColor, // inkwell color
child: SizedBox( child: SizedBox(
width: 60, height: 60, child: Icon(icon, size: 35)), width: 60, height: 60, child:Icon(icon,color: Colors.white, size: 30)
),
onTap: btnCallback, onTap: btnCallback,
), ),
), ),
), ),
Text(AppTranslations.of(context).text(title), FittedBox(
fit:BoxFit.fitWidth,
child: Text(AppTranslations.of(context).text(title),
style: style:
// languageModel.isEng languageModel.isEng
// ? ?
TextStyle( TextStyle(
color: Colors.white, color: Colors.white,
fontWeight: FontWeight.normal, fontWeight: FontWeight.w500,
fontSize: 16.0, fontSize: 14.0,
fontFamily: "Roboto") fontFamily: "Roboto")
// : TextStyle( : TextStyle(
// color: Colors.black, color: Colors.white,
// fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
// fontSize: 12.0, fontSize: 12.0,
// fontFamily: "MyanmarUnicode") fontFamily: "MyanmarUnicode")
),
), ),
]), ]),
), ),