Экран сканера

lib/activate_token.dart

@@ -15,7 +15,7 @@ class _RegistrationScreenState extends BaseState<FinishRegistrationScreen> {
 
   AppBar _getAppBar() {
     return new AppBar(title: new Text("Регистрация магазина"),
-        backgroundColor: const Color(0xff4272e7),  actions: <Widget>[
+        backgroundColor: const Color(primaryColor),  actions: <Widget>[
           new IconButton(
             icon: new Icon(Icons.help_outline),
             tooltip: 'Air it',

lib/main.dart

@@ -21,6 +21,9 @@ const String splash_png = 'assets/splash.png';
 const String logout_png = 'assets/logout.png';
 const String activate_token_bg_png = 'assets/activate_token_message_background.png';
 
+
+// Colors
+const int primaryColor = 0xffeb0004;
 final httpClient = createHttpClient();
 
 void main() {
@@ -64,7 +67,7 @@ startScanner() async{
 /// Навигация по приложению.
 /// widget - следующий экран приложения.
 pushRoute(BuildContext context, Widget widget) {
-  Navigator.of(context).push(new MaterialPageRoute<Null>(
+  Navigator.of(context).pushReplacement(new MaterialPageRoute<Null>(
       builder: (BuildContext context) {
         return widget;
       }));

lib/registration.dart

@@ -19,17 +19,12 @@ class _RegistrationScreenState extends BaseState<RegistrationScreen> {
   }
 
   AppBar _getAppBar() {
-    return new AppBar(title: new Text("Регистрация магазина"),
-        backgroundColor: const Color(0xff4272e7),  actions: <Widget>[
+    return new AppBar(title: new Text("Регистрация"),
+        backgroundColor: const Color(primaryColor),  actions: <Widget>[
           new IconButton(
             icon: new Icon(Icons.help_outline),
             tooltip: 'Air it',
             onPressed: faq,
-          ),
-          new IconButton(
-            icon: new Image(height: 24.0, width: 24.0, image: new AssetImage('assets/logout.png')),
-            tooltip: 'Restitch it',
-            onPressed: logout,
           )
         ]);
   }

lib/splash.dart

@@ -16,7 +16,7 @@ class SplashScreen extends StatelessWidget {
       _showNextScreen(context);
     });
 
-    return new Image.asset(logo_png, fit: BoxFit.cover);
+    return new Image.asset(splash_png, fit: BoxFit.cover);
   }
 
   /// Запуск следующего экрана приложения.