diff --git a/android/app/build.gradle b/android/app/build.gradle
index d9f013c..3967ae7 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -52,6 +52,11 @@ android {
buildConfigField "String", "locale", "\"ua\""
}
+ pip {
+ buildConfigField "String", "primary_color", "\"#008794\""
+ buildConfigField "String", "accent_color", "\"#f49935\""
+ }
+
}
sourceSets.main {
diff --git a/android/app/src/pip/AndroidManifest.xml b/android/app/src/pip/AndroidManifest.xml
new file mode 100644
index 0000000..cda80be
--- /dev/null
+++ b/android/app/src/pip/AndroidManifest.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/app/src/pip/ic_launcher-web.png b/android/app/src/pip/ic_launcher-web.png
new file mode 100644
index 0000000..fd2adeb
Binary files /dev/null and b/android/app/src/pip/ic_launcher-web.png differ
diff --git a/android/app/src/pip/res/mipmap-hdpi/ic_launcher.png b/android/app/src/pip/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..8f0f040
Binary files /dev/null and b/android/app/src/pip/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/pip/res/mipmap-mdpi/ic_launcher.png b/android/app/src/pip/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..9338b03
Binary files /dev/null and b/android/app/src/pip/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/pip/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/pip/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..10d53ed
Binary files /dev/null and b/android/app/src/pip/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/pip/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/pip/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..5e67e2d
Binary files /dev/null and b/android/app/src/pip/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/pip/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/pip/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..c162d38
Binary files /dev/null and b/android/app/src/pip/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/assets/registration_logo.png b/assets/autoclub_logo.png
similarity index 100%
rename from assets/registration_logo.png
rename to assets/autoclub_logo.png
diff --git a/assets/pip_logo.png b/assets/pip_logo.png
new file mode 100644
index 0000000..7a1da89
Binary files /dev/null and b/assets/pip_logo.png differ
diff --git a/lib/base_state.dart b/lib/base_state.dart
index 9e23923..0d15752 100644
--- a/lib/base_state.dart
+++ b/lib/base_state.dart
@@ -118,7 +118,7 @@ abstract class BaseState extends State {
return new RaisedButton(child: new Text(text,
style: new TextStyle(color: Colors.white)),
onPressed: onPressed,
- color: primaryColor);
+ color: buttonColor);
}
/// Метод возвращает контейнер с отступами, который содержит картинку с логотипом.
diff --git a/lib/consts.dart b/lib/consts.dart
index 7234267..0de73a4 100644
--- a/lib/consts.dart
+++ b/lib/consts.dart
@@ -7,7 +7,7 @@ const String url = 'https://pos-api-int.dinect.com/20130701/';
const String appToken = '9fec83cdca38c357e6b65dbb17514cdd36bf2a08';
// Assets
-const String logo_png = 'assets/registration_logo.png';
+const String logo_png = 'assets/pip_logo.png';
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';
@@ -18,7 +18,11 @@ const String powered_by_dinect_png = 'assets/powered_by_dinect.png';
const String splash_text_png = 'assets/splash_text.png';
// Colors
-const Color primaryColor = const Color(0xffeb0004);
+//const Color primaryColor = const Color(0xffeb0004);
+//const Color buttonColor = const Color(0xffeb0004);
+
+const Color primaryColor = const Color(0xff008794);
+const Color buttonColor = const Color(0xfff49935);
const Color greyTextColor = const Color(0xffa5a5a5);
const Color textBorderColor = const Color(0xffcfd8dc);
const Color tokenActiveTextColor = const Color(0xff1f5a1f);
diff --git a/lib/purchase.dart b/lib/purchase.dart
index 6922afc..32a2595 100644
--- a/lib/purchase.dart
+++ b/lib/purchase.dart
@@ -70,7 +70,7 @@ class PurchaseScreenState extends BaseState {
getDecorationForScanButton() {
return new BoxDecoration(
- border: new Border.all(color: primaryColor, width: 1.0),
+ border: new Border.all(color: buttonColor, width: 1.0),
borderRadius: new BorderRadius.all(new Radius.circular(4.0)));
}
diff --git a/lib/splash.dart b/lib/splash.dart
index 16cef33..16ae2e8 100644
--- a/lib/splash.dart
+++ b/lib/splash.dart
@@ -21,7 +21,7 @@ class SplashScreen extends StatelessWidget {
platform.invokeMethod("getLocale").then((locale) {
Intl.defaultLocale = locale;
print(Intl.defaultLocale);
- showNextScreen(context);
+// showNextScreen(context);
});
});
diff --git a/pubspec.yaml b/pubspec.yaml
index eb6d9a4..ac9ab26 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -23,7 +23,8 @@ flutter:
# To add assets to your application, add an assets section here, in
# this "flutter" section, as in:
assets:
- - assets/registration_logo.png
+ - assets/autoclub_logo.png
+ - assets/pip_logo.png
- assets/splash.png
- assets/logout.png
- assets/activate_token_message_background.png
@@ -31,7 +32,7 @@ flutter:
- assets/expansion_icon.png
- assets/powered_by_dinect_splash.png
- assets/powered_by_dinect.png
- - assets/registration_logo.png
+ - assets/autoclub_logo.png
- assets/splash_text.png
# To add assets from package dependencies, first ensure the asset