tret2003/checker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Начал экран успешного проведения покупки

Browse Source
This commit is contained in:
kifio
2017-07-24 08:48:51 +03:00
parent 3f7dc05d9e
commit 8dcae4c256
8 changed files with 240 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
checker.sublime-workspace
View File

@@ -15,7 +15,7 @@
"file": "lib/base_state.dart", "file": "lib/base_state.dart",
"settings": "settings":
{ {
"buffer_size": 2856, "buffer_size": 3196,
"encoding": "UTF-8", "encoding": "UTF-8",
"line_ending": "Unix" "line_ending": "Unix"
} }
@@ -33,7 +33,25 @@
"file": "lib/purchase.dart", "file": "lib/purchase.dart",
"settings": "settings":
{ {
"buffer_size": 3100, "buffer_size": 3790,
"encoding": "UTF-8",
"line_ending": "Unix"
}
},
{
"file": "lib/purchase_success.dart",
"settings":
{
"buffer_size": 1219,
"encoding": "UTF-8",
"line_ending": "Unix"
}
},
{
"file": "lib/main.dart",
"settings":
{
"buffer_size": 3225,
"encoding": "UTF-8", "encoding": "UTF-8",
"line_ending": "Unix" "line_ending": "Unix"
} }
@@ -42,7 +60,7 @@
"file": "lib/registration.dart", "file": "lib/registration.dart",
"settings": "settings":
{ {
"buffer_size": 4245, "buffer_size": 4032,
"encoding": "UTF-8", "encoding": "UTF-8",
"line_ending": "Unix" "line_ending": "Unix"
} }
@@ -51,7 +69,7 @@
"file": "lib/activate_token.dart", "file": "lib/activate_token.dart",
"settings": "settings":
{ {
"buffer_size": 3537, "buffer_size": 3446,
"encoding": "UTF-8", "encoding": "UTF-8",
"line_ending": "Unix" "line_ending": "Unix"
} }
@@ -97,8 +115,9 @@
}, },
"expanded_folders": "expanded_folders":
[ [
"/home/kifio/ShitCoding/checker", "/Users/kifio/FlutterProjects/checker",
"/home/kifio/ShitCoding/checker/lib" "/Users/kifio/FlutterProjects/checker/assets",
"/Users/kifio/FlutterProjects/checker/lib"
], ],
"file_history": "file_history":
[ [
@@ -110,7 +129,7 @@
], ],
"find": "find":
{ {
"height": 25.0 "height": 46.0
}, },
"find_in_files": "find_in_files":
{ {
@@ -124,6 +143,9 @@
"case_sensitive": true, "case_sensitive": true,
"find_history": "find_history":
[ [
" \treturn new Text('Покупка на сумму 1234.00 руб. проведена', style: new TextStyle(color: tokenActiveTextColor, decorationColor: const Color(0x8ae28aff)));\n",
"getProgressIndicator",
"direc",
"_loading", "_loading",
"_merchantID", "_merchantID",
" \n", " \n",
@@ -153,7 +175,7 @@
"groups": "groups":
[ [
{ {
"selected": 4, "selected": 6,
"sheets": "sheets":
[ [
{ {
@@ -162,27 +184,29 @@
"semi_transient": false, "semi_transient": false,
"settings": "settings":
{ {
"buffer_size": 2856, "buffer_size": 3196,
"regions": "regions":
{ {
}, },
"selection": "selection":
[ [
[ [
2234, 713,
2234 713
] ]
], ],
"settings": "settings":
{ {
"auto_name": "", "auto_name": "",
"syntax": "Packages/Dart/Dart.tmLanguage" "syntax": "Packages/Dart/Dart.tmLanguage",
"tab_size": 2,
"translate_tabs_to_spaces": true
}, },
"translation.x": 0.0, "translation.x": 0.0,
"translation.y": 934.0, "translation.y": 121.0,
"zoom_level": 1.0 "zoom_level": 1.0
}, },
"stack_index": 1, "stack_index": 6,
"type": "text" "type": "text"
}, },
{ {
@@ -198,8 +222,8 @@
"selection": "selection":
[ [
[ [
504, 581,
504 581
] ]
], ],
"settings": "settings":
@@ -212,7 +236,7 @@
"translation.y": 0.0, "translation.y": 0.0,
"zoom_level": 1.0 "zoom_level": 1.0
}, },
"stack_index": 2, "stack_index": 5,
"type": "text" "type": "text"
}, },
{ {
@@ -221,15 +245,15 @@
"semi_transient": false, "semi_transient": false,
"settings": "settings":
{ {
"buffer_size": 3100, "buffer_size": 3790,
"regions": "regions":
{ {
}, },
"selection": "selection":
[ [
[ [
2658, 1224,
2658 1224
] ]
], ],
"settings": "settings":
@@ -239,7 +263,7 @@
"translate_tabs_to_spaces": true "translate_tabs_to_spaces": true
}, },
"translation.x": 0.0, "translation.x": 0.0,
"translation.y": 0.0, "translation.y": 390.0,
"zoom_level": 1.0 "zoom_level": 1.0
}, },
"stack_index": 4, "stack_index": 4,
@@ -247,29 +271,28 @@
}, },
{ {
"buffer": 3, "buffer": 3,
"file": "lib/registration.dart", "file": "lib/purchase_success.dart",
"semi_transient": false, "semi_transient": false,
"settings": "settings":
{ {
"buffer_size": 4245, "buffer_size": 1219,
"regions": "regions":
{ {
}, },
"selection": "selection":
[ [
[ [
1514, 724,
1514 724
] ]
], ],
"settings": "settings":
{ {
"syntax": "Packages/Dart/Dart.tmLanguage", "auto_name": "",
"tab_size": 2, "syntax": "Packages/Dart/Dart.tmLanguage"
"translate_tabs_to_spaces": true
}, },
"translation.x": 0.0, "translation.x": 0.0,
"translation.y": 1802.0, "translation.y": 0.0,
"zoom_level": 1.0 "zoom_level": 1.0
}, },
"stack_index": 3, "stack_index": 3,
@@ -277,19 +300,19 @@
}, },
{ {
"buffer": 4, "buffer": 4,
"file": "lib/activate_token.dart", "file": "lib/main.dart",
"semi_transient": false, "semi_transient": false,
"settings": "settings":
{ {
"buffer_size": 3537, "buffer_size": 3225,
"regions": "regions":
{ {
}, },
"selection": "selection":
[ [
[ [
595, 1267,
595 1267
] ]
], ],
"settings": "settings":
@@ -299,7 +322,67 @@
"translate_tabs_to_spaces": true "translate_tabs_to_spaces": true
}, },
"translation.x": 0.0, "translation.x": 0.0,
"translation.y": 0.0, "translation.y": 367.0,
"zoom_level": 1.0
},
"stack_index": 2,
"type": "text"
},
{
"buffer": 5,
"file": "lib/registration.dart",
"semi_transient": false,
"settings":
{
"buffer_size": 4032,
"regions":
{
},
"selection":
[
[
990,
990
]
],
"settings":
{
"syntax": "Packages/Dart/Dart.tmLanguage",
"tab_size": 2,
"translate_tabs_to_spaces": true
},
"translation.x": 0.0,
"translation.y": 630.0,
"zoom_level": 1.0
},
"stack_index": 1,
"type": "text"
},
{
"buffer": 6,
"file": "lib/activate_token.dart",
"semi_transient": false,
"settings":
{
"buffer_size": 3446,
"regions":
{
},
"selection":
[
[
2138,
2156
]
],
"settings":
{
"syntax": "Packages/Dart/Dart.tmLanguage",
"tab_size": 2,
"translate_tabs_to_spaces": true
},
"translation.x": 0.0,
"translation.y": 222.0,
"zoom_level": 1.0 "zoom_level": 1.0
}, },
"stack_index": 0, "stack_index": 0,

8
lib/activate_token.dart
View File

@@ -11,10 +11,6 @@ class FinishRegistrationScreen extends StatefulWidget {
class _RegistrationScreenState extends BaseState<FinishRegistrationScreen> { class _RegistrationScreenState extends BaseState<FinishRegistrationScreen> {
@override Widget build(BuildContext context) {
return new Scaffold(appBar: _getAppBar(), body: _getScreen(context));
}
@override String getTitle() { @override String getTitle() {
return "Регистрация"; return "Регистрация";
} }
@@ -23,11 +19,11 @@ class _RegistrationScreenState extends BaseState<FinishRegistrationScreen> {
return 'ID merchant'; return 'ID merchant';
} }
@overide getMenuButtons() { @overide getMenuButtons(BuildContext context) {
return <Widget>[new IconButton(icon: new Icon(Icons.help_outline), onPressed: () {})]; return <Widget>[new IconButton(icon: new Icon(Icons.help_outline), onPressed: () {})];
} }
Widget _getScreen(BuildContext context) { @override Widget _getScreenContent(BuildContext context) {
if (textFieldValue == "") { if (textFieldValue == "") {
_getSavedValue(); _getSavedValue();
} }

16
lib/base_state.dart
View File

@@ -11,11 +11,21 @@ abstract class BaseState<T> extends State<T> {
String error = null; String error = null;
String textFieldValue = ""; String textFieldValue = "";
AppBar getAppBar() { @override Widget build(BuildContext context) {
return new AppBar(title: new Text(getTitle(), style: new TextStyle(fontSize: 18.0)), return new Scaffold(appBar: getAppBar(context), body: getBody(context));
backgroundColor: primaryColor, actions: getMenuButtons());
} }
AppBar getAppBar(BuildContext context) {
return new AppBar(title: new Text(getTitle(), style: new TextStyle(fontSize: 18.0)),
backgroundColor: primaryColor, actions: getMenuButtons(context));
}
Widget getBody(BuildContext context) {
return new Stack(children: <Widget>[getScreenContent(), getProgressIndicator()]);
}
Widget getScreenContent(BuildContext context);
String getTitle(); String getTitle();
String getHint(); String getHint();

26
lib/main.dart
View File

@@ -62,18 +62,7 @@ startScanner(BuildContext context) async {
platform.setMethodCallHandler((MethodCall call) async { platform.setMethodCallHandler((MethodCall call) async {
if (call.method == 'foo') { if (call.method == 'foo') {
logout();
String url = intUrl + 'tokens/' + token + '?_dmapptoken=' + intToken;
httpClient.delete(url).then((response) {
print(response.body);
}).catchError((error) {
print(error.toString());
});
pushRoute(context, new RegistrationScreen());
} else { } else {
pushRoute(context, new PurchaseScreen()); pushRoute(context, new PurchaseScreen());
} }
@@ -85,6 +74,19 @@ startScanner(BuildContext context) async {
await platform.invokeMethod('startScanner'); await platform.invokeMethod('startScanner');
} }
logout(BuildContext context) {
// String url = intUrl + 'tokens/' + token + '?_dmapptoken=' + intToken;
// httpClient.delete(url).then((response) {
// print(response.body);
// }).catchError((error) {
// print(error.toString());
// });
pushRoute(context, new RegistrationScreen());
}
/// Навигация по приложению. /// Навигация по приложению.
/// widget - следующий экран приложения. /// widget - следующий экран приложения.
pushRoute(BuildContext context, Widget widget) { pushRoute(BuildContext context, Widget widget) {

83
lib/purchase.dart
View File

@@ -4,19 +4,17 @@ import 'dart:convert';
import 'dart:async'; import 'dart:async';
import 'main.dart'; import 'main.dart';
import 'activate_token.dart';
import 'base_state.dart'; import 'base_state.dart';
import 'purchase_success.dart';
/// Экран проведения покупки. /// Экран проведения покупки.
class PurchaseScreen extends StatefulWidget { class PurchaseScreen extends StatefulWidget {
@override State createState() => new _PurchaseScreenState(); @override State createState() => new PurchaseScreenState<PurchaseScreen>();
} }
class _PurchaseScreenState extends BaseState<PurchaseScreen> { class PurchaseScreenState<T> extends BaseState<T> {
@override Widget build(BuildContext context) { String _sum = "1234.00";
return new Scaffold(appBar: getAppBar(), body: _getScreen(context));
}
@override String getTitle() { @override String getTitle() {
return "Проведение покупки"; return "Проведение покупки";
@@ -26,29 +24,28 @@ class _PurchaseScreenState extends BaseState<PurchaseScreen> {
return 'Сумма'; return 'Сумма';
} }
@overide getMenuButtons() { @overide getMenuButtons(BuildContext context) {
return <Widget>[new IconButton(icon: new Icon(Icons.help_outline), onPressed: () {})]; return <Widget>[
new IconButton(icon: new Icon(Icons.help_outline), onPressed: () {}),
new IconButton(icon: new Image.asset(logout_png, height: 20.0, width: 20.0), onPressed: () => logout(context))
];
} }
Widget _getScreen(BuildContext context) { @override Widget getScreenContent() {
return new Stack(children: <Widget>[_getScreenContent(context), getProgressIndicator()]);
}
Widget _getScreenContent(BuildContext context) {
return new Container(height: 398.0, return new Container(height: 398.0,
child: new ListView(reverse: true, children: <Widget>[ child: new ListView(reverse: true, children: <Widget>[
new Column(children: <Widget>[ new Column(children: <Widget>[
_getValueWithTitle('ФИО', 'Знаменитый Рокер Паук'), getValueWithTitle('ФИО', 'Знаменитый Рокер Паук'),
_getValueWithTitle('Карта', 'B0399900702'), getValueWithTitle('Карта', 'B0399900702'),
_getValueWithTitle('Вознаграждение', '100%'), getValueWithTitle('Вознаграждение', '100%'),
getHintLabel(), getHintLabel(),
getDecoratedTextWidget(), getDecoratedTextWidget(),
_getApprovePurchaseButton(context), getApprovePurchaseButton(context),
_getScanButton(context)]) buildScanButton(context)])
].reversed.toList())); ].reversed.toList()));
} }
Widget _getValueWithTitle(String title, String value) { Widget getValueWithTitle(String title, String value) {
return new Container(padding: new EdgeInsets.only(left: verticalMargin, right: verticalMargin, top: 12.0), return new Container(padding: new EdgeInsets.only(left: verticalMargin, right: verticalMargin, top: 12.0),
child: new Column(children: <Widget>[ child: new Column(children: <Widget>[
new Row(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[new Text(title, textAlign: TextAlign.left, style: new TextStyle(color: greyTextColor, fontSize: 14.0))]), new Row(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[new Text(title, textAlign: TextAlign.left, style: new TextStyle(color: greyTextColor, fontSize: 14.0))]),
@@ -56,29 +53,53 @@ class _PurchaseScreenState extends BaseState<PurchaseScreen> {
])); ]));
} }
Widget _getApprovePurchaseButton(BuildContext context) { Widget getApprovePurchaseButton(BuildContext context) {
return new Container(margin: new EdgeInsets.only(top: 36.0), height: 42.0, return new Container(margin: new EdgeInsets.only(top: 36.0), height: 44.0,
child: new RaisedButton(child: new Text('ЗАФИКСИРОВАТЬ ПОКУПКУ', child: new RaisedButton(child: new Text('ЗАВЕРШИТЬ ПОКУПКУ',
style: new TextStyle(color: Colors.white)), style: new TextStyle(color: Colors.white)),
onPressed: () => _purchase(), onPressed: () => _purchase(context),
color: primaryColor)); color: primaryColor));
} }
Widget _getScanButton(BuildContext context) { Widget buildScanButton(BuildContext context) {
return new Container(margin: new EdgeInsets.only(top: 36.0), height: 42.0, return new Container(margin: new EdgeInsets.only(top: 24.0, left: 70.0, right: 70.0), child: _getScanButtonRow(context));
child: new RaisedButton(child: new Container(height: 42.0, child: new Text('СКАНИРОВАТЬ',
style: new TextStyle(color: Colors.white)),
decoration: getDecoraionForScanButton()),
onPressed: () => _purchase()));
} }
getDecoraionForScanButton() { Widget _getScanButtonRow(BuildContext context) {
return new Row(children: <Widget>[new Expanded(child: _getScanButton(context))]);
}
Widget _getScanButton(BuildContext context) {
return new Container(height: 44.0, child: new FlatButton(child: new Text('СКАНИРОВАТЬ',
style: new TextStyle(color: primaryColor)),
onPressed: () => startScanner(context)),
decoration: _getDecoraionForScanButton());
}
_getDecoraionForScanButton() {
return new BoxDecoration( return new BoxDecoration(
border: new Border.all(color: primaryColor, width: 1.0), border: new Border.all(color: primaryColor, width: 1.0),
borderRadius: new BorderRadius.all(new Radius.circular(4.0))); borderRadius: new BorderRadius.all(new Radius.circular(4.0)));
} }
_purchase() { _purchase(BuildContext context) {
showDialog(context: context, child: new AlertDialog(
title: new Text('Подтверждение'),
content: new Text('Вы подтверждаете покупку на ${_sum} руб?'),
actions: <Widget>[
new FlatButton(
child: new Text('Нет'),
onPressed: () {
Navigator.of(context).pop();
},
),
new FlatButton(
child: new Text('Дат'),
onPressed: () {
pushRoute(context, new PurchaseSuccessScreen());
},
)
]));
print('purchase'); print('purchase');
} }

38
lib/purchase_success.dart Normal file
View File

@@ -0,0 +1,38 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'main.dart';
import 'base_state.dart';
import 'purchase.dart';
/// Экран проведения покупки.
class PurchaseSuccessScreen extends StatefulWidget {
@override State createState() => new _PurchaseSuccessScreenState();
}
class _PurchaseSuccessScreenState<T> extends PurchaseScreenState<T> {
@override String getTitle() {
return "Проведение покупки";
}
@overide getMenuButtons(BuildContext context) {
return <Widget>[
new IconButton(icon: new Icon(Icons.help_outline), onPressed: () {}),
new IconButton(icon: new Image.asset(logout_png, height: 20.0, width: 20.0), onPressed: () => logout(context))
];
}
@override Widget getScreenContent() {
return new Column(children: <Widget>[
getValueWithTitle('Покупатель', 'Знаменитый Рокер Паук'),
_getSuccessMessage(),
getApprovePurchaseButton(context)
]);
}
_getSuccessMessage() {
return new Container(height: 64.0, decoration: new BoxDecoration(color: const Color(0x8ae28aff)), child: new Text('Покупка на сумму 1234.00 руб. проведена', style: new TextStyle(color: tokenActiveTextColor)));
}
}

12
lib/registration.dart
View File

@@ -16,10 +16,6 @@ class RegistrationScreen extends StatefulWidget {
class _RegistrationScreenState extends BaseState<RegistrationScreen> { class _RegistrationScreenState extends BaseState<RegistrationScreen> {
@override build(BuildContext context) {
return new Scaffold(appBar: getAppBar(), body: _getScreen(context));
}
@override String getTitle() { @override String getTitle() {
return "Регистрация"; return "Регистрация";
} }
@@ -28,17 +24,13 @@ class _RegistrationScreenState extends BaseState<RegistrationScreen> {
return 'ID merchant'; return 'ID merchant';
} }
@overide getMenuButtons() { @overide getMenuButtons(BuildContext context) {
return <Widget>[new IconButton(icon: new Icon(Icons.help_outline), onPressed: () {})]; return <Widget>[new IconButton(icon: new Icon(Icons.help_outline), onPressed: () {})];
} }
_getScreen(BuildContext context) {
return new Stack(children: <Widget>[_getScreenContent(), getProgressIndicator()]);
}
/// Высота контейнера задана для того, чтобы элементы располагались вверху экрана /// Высота контейнера задана для того, чтобы элементы располагались вверху экрана
/// и список скроллился снизу вверх при открытии клавиатуры. /// и список скроллился снизу вверх при открытии клавиатуры.
_getScreenContent() { @override Widget getScreenContent() {
return new Container(height: 332.0, return new Container(height: 332.0,
child: new ListView(reverse: true, children: <Widget>[ child: new ListView(reverse: true, children: <Widget>[
new Center(child: new Column(children: <Widget>[ new Center(child: new Column(children: <Widget>[

4
lib/splash.dart
View File

@@ -17,8 +17,8 @@ class SplashScreen extends StatelessWidget {
// После этого начинается проверка токена. // После этого начинается проверка токена.
new Future.delayed(const Duration(milliseconds: 1000), () { new Future.delayed(const Duration(milliseconds: 1000), () {
// pushRoute(context, new PurchaseScreen()); pushRoute(context, new PurchaseScreen());
_showNextScreen(context); // _showNextScreen(context);
}); });
return new Image.asset(splash_png, fit: BoxFit.cover); return new Image.asset(splash_png, fit: BoxFit.cover);