Добавил ресурсы приложения PIP, иконка приложения устанавливается при сборке

This commit is contained in:
Ivan Murashov
2017-09-06 18:59:13 +03:00
parent 60090ea437
commit 8d81fb185d
15 changed files with 68 additions and 7 deletions

View File

@@ -52,6 +52,11 @@ android {
buildConfigField "String", "locale", "\"ua\"" buildConfigField "String", "locale", "\"ua\""
} }
pip {
buildConfigField "String", "primary_color", "\"#008794\""
buildConfigField "String", "accent_color", "\"#f49935\""
}
} }
sourceSets.main { sourceSets.main {

View File

@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.dinect.checker"
android:versionCode="1"
android:versionName="1.0.1">
<uses-sdk
android:minSdkVersion="16"
android:targetSdkVersion="21"/>
<!-- The INTERNET permission is required for development. Specifically,
flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.CAMERA"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
calls FlutterMain.startInitialization(this); in its onCreate method.
In most cases you can leave this as-is, but you if you want to provide
additional functionality it is fine to subclass or reimplement
FlutterApplication and put your custom class here. -->
<application
android:name="io.flutter.app.FlutterApplication"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name">
<activity
android:name=".MainActivity"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection"
android:hardwareAccelerated="true"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@android:style/Theme.Black.NoTitleBar"
android:windowSoftInputMode="adjustResize">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity
android:name=".zbar.CameraActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme"/>
<activity
android:name=".zxing.ScannerActivity"
android:theme="@style/AppTheme"/>
</application>
</manifest>

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

View File

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 74 KiB

BIN
assets/pip_logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

View File

@@ -118,7 +118,7 @@ abstract class BaseState<T extends StatefulWidget> extends State<T> {
return new RaisedButton(child: new Text(text, return new RaisedButton(child: new Text(text,
style: new TextStyle(color: Colors.white)), style: new TextStyle(color: Colors.white)),
onPressed: onPressed, onPressed: onPressed,
color: primaryColor); color: buttonColor);
} }
/// Метод возвращает контейнер с отступами, который содержит картинку с логотипом. /// Метод возвращает контейнер с отступами, который содержит картинку с логотипом.

View File

@@ -7,7 +7,7 @@ const String url = 'https://pos-api-int.dinect.com/20130701/';
const String appToken = '9fec83cdca38c357e6b65dbb17514cdd36bf2a08'; const String appToken = '9fec83cdca38c357e6b65dbb17514cdd36bf2a08';
// Assets // 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 splash_png = 'assets/splash.png';
const String logout_png = 'assets/logout.png'; const String logout_png = 'assets/logout.png';
const String activate_token_bg_png = 'assets/activate_token_message_background.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'; const String splash_text_png = 'assets/splash_text.png';
// Colors // 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 greyTextColor = const Color(0xffa5a5a5);
const Color textBorderColor = const Color(0xffcfd8dc); const Color textBorderColor = const Color(0xffcfd8dc);
const Color tokenActiveTextColor = const Color(0xff1f5a1f); const Color tokenActiveTextColor = const Color(0xff1f5a1f);

View File

@@ -70,7 +70,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
getDecorationForScanButton() { getDecorationForScanButton() {
return new BoxDecoration( 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))); borderRadius: new BorderRadius.all(new Radius.circular(4.0)));
} }

View File

@@ -21,7 +21,7 @@ class SplashScreen extends StatelessWidget {
platform.invokeMethod("getLocale").then((locale) { platform.invokeMethod("getLocale").then((locale) {
Intl.defaultLocale = locale; Intl.defaultLocale = locale;
print(Intl.defaultLocale); print(Intl.defaultLocale);
showNextScreen(context); // showNextScreen(context);
}); });
}); });

View File

@@ -23,7 +23,8 @@ flutter:
# To add assets to your application, add an assets section here, in # To add assets to your application, add an assets section here, in
# this "flutter" section, as in: # this "flutter" section, as in:
assets: assets:
- assets/registration_logo.png - assets/autoclub_logo.png
- assets/pip_logo.png
- assets/splash.png - assets/splash.png
- assets/logout.png - assets/logout.png
- assets/activate_token_message_background.png - assets/activate_token_message_background.png
@@ -31,7 +32,7 @@ flutter:
- assets/expansion_icon.png - assets/expansion_icon.png
- assets/powered_by_dinect_splash.png - assets/powered_by_dinect_splash.png
- assets/powered_by_dinect.png - assets/powered_by_dinect.png
- assets/registration_logo.png - assets/autoclub_logo.png
- assets/splash_text.png - assets/splash_text.png
# To add assets from package dependencies, first ensure the asset # To add assets from package dependencies, first ensure the asset