Browse Source

Build ios Smart Farm

smf
daivph 5 years ago
parent
commit
d7a3383b6b
41 changed files with 29 additions and 28 deletions
  1. +1
    -1
      android/app/build.gradle
  2. +1
    -1
      android/app/src/debug/AndroidManifest.xml
  3. +1
    -1
      android/app/src/main/AndroidManifest.xml
  4. +1
    -1
      android/app/src/main/kotlin/vn/azteam/farmdemo/MainActivity.kt
  5. +1
    -1
      android/app/src/profile/AndroidManifest.xml
  6. BIN
      assets/png/logo.png
  7. BIN
      assets/png/logoWithSlogan.png
  8. BIN
      assets/png/splash.png
  9. +1
    -1
      ios/Flutter/.last_build_id
  10. +6
    -6
      ios/Runner.xcodeproj/project.pbxproj
  11. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
  12. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
  13. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
  14. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
  15. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
  16. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
  17. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
  18. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
  19. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
  20. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
  21. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
  22. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
  23. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
  24. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
  25. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
  26. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
  27. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
  28. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
  29. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
  30. BIN
      ios/Runner/Assets.xcassets/LaunchImage.imageset/AZteam-1.png
  31. BIN
      ios/Runner/Assets.xcassets/LaunchImage.imageset/AZteam-2.png
  32. BIN
      ios/Runner/Assets.xcassets/LaunchImage.imageset/AZteam.png
  33. +3
    -3
      ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
  34. BIN
      ios/Runner/Assets.xcassets/LaunchImage.imageset/ic_logo_slogan-1.png
  35. BIN
      ios/Runner/Assets.xcassets/LaunchImage.imageset/ic_logo_slogan-2.png
  36. BIN
      ios/Runner/Assets.xcassets/LaunchImage.imageset/ic_logo_slogan.png
  37. +9
    -9
      ios/Runner/GoogleService-Info.plist
  38. +1
    -1
      ios/Runner/Info.plist
  39. +1
    -1
      lib/data/api/rest_client.g.dart
  40. +2
    -2
      lib/utils/const_common.dart
  41. +1
    -0
      pubspec.yaml

+ 1
- 1
android/app/build.gradle View File

@@ -44,7 +44,7 @@ android {

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "vn.azteam.tpfarm"
applicationId "vn.azteam.farmdemo"
minSdkVersion 21
targetSdkVersion 29
versionCode flutterVersionCode.toInteger()

+ 1
- 1
android/app/src/debug/AndroidManifest.xml View File

@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="vn.azteam.tpfarm">
package="vn.azteam.farmdemo">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->

+ 1
- 1
android/app/src/main/AndroidManifest.xml View File

@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="vn.azteam.tpfarm">
package="vn.azteam.farmdemo">
<!-- 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

android/app/src/main/kotlin/vn/azteam/tpfarm/MainActivity.kt → android/app/src/main/kotlin/vn/azteam/farmdemo/MainActivity.kt View File

@@ -1,4 +1,4 @@
package vn.azteam.tpfarm
package vn.azteam.farmdemo

import io.flutter.embedding.android.FlutterActivity


+ 1
- 1
android/app/src/profile/AndroidManifest.xml View File

@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="vn.azteam.tpfarm">
package="vn.azteam.farmdemo">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->

BIN
assets/png/logo.png View File

Before After
Width: 335  |  Height: 362  |  Size: 72KB Width: 792  |  Height: 146  |  Size: 11KB

BIN
assets/png/logoWithSlogan.png View File

Before After
Width: 670  |  Height: 452  |  Size: 82KB Width: 792  |  Height: 146  |  Size: 11KB

BIN
assets/png/splash.png View File

Before After
Width: 1080  |  Height: 1920  |  Size: 97KB Width: 1080  |  Height: 1920  |  Size: 22KB

+ 1
- 1
ios/Flutter/.last_build_id View File

@@ -1 +1 @@
256048b5f2de139c42fadf38202f819b
a4ee48868fa35a3a4493484923ea48b2

+ 6
- 6
ios/Runner.xcodeproj/project.pbxproj View File

@@ -374,7 +374,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = C3DTD2JH94;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -392,7 +392,7 @@
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 1.0.0;
PRODUCT_BUNDLE_IDENTIFIER = vn.azteam.tpfarm;
PRODUCT_BUNDLE_IDENTIFIER = vn.azteam.farmdemo;
PRODUCT_NAME = Runner;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
@@ -517,7 +517,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = C3DTD2JH94;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -535,7 +535,7 @@
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 1.0.0;
PRODUCT_BUNDLE_IDENTIFIER = vn.azteam.tpfarm;
PRODUCT_BUNDLE_IDENTIFIER = vn.azteam.farmdemo;
PRODUCT_NAME = Runner;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -552,7 +552,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = C3DTD2JH94;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -570,7 +570,7 @@
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 1.0.0;
PRODUCT_BUNDLE_IDENTIFIER = vn.azteam.tpfarm;
PRODUCT_BUNDLE_IDENTIFIER = vn.azteam.farmdemo;
PRODUCT_NAME = Runner;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] View File

Before After
Width: 20  |  Height: 20  |  Size: 985B Width: 20  |  Height: 20  |  Size: 392B

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] View File

Before After
Width: 40  |  Height: 40  |  Size: 2.6KB Width: 40  |  Height: 40  |  Size: 1.0KB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] View File

Before After
Width: 40  |  Height: 40  |  Size: 2.6KB Width: 40  |  Height: 40  |  Size: 1.0KB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] View File

Before After
Width: 60  |  Height: 60  |  Size: 4.4KB Width: 60  |  Height: 60  |  Size: 1.8KB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] View File

Before After
Width: 29  |  Height: 29  |  Size: 1.6KB Width: 29  |  Height: 29  |  Size: 696B

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] View File

Before After
Width: 29  |  Height: 29  |  Size: 1.6KB Width: 29  |  Height: 29  |  Size: 696B

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] View File

Before After
Width: 58  |  Height: 58  |  Size: 4.2KB Width: 58  |  Height: 58  |  Size: 1.7KB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] View File

Before After
Width: 58  |  Height: 58  |  Size: 4.2KB Width: 58  |  Height: 58  |  Size: 1.7KB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] View File

Before After
Width: 87  |  Height: 87  |  Size: 7.3KB Width: 87  |  Height: 87  |  Size: 2.8KB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] View File

Before After
Width: 40  |  Height: 40  |  Size: 2.6KB Width: 40  |  Height: 40  |  Size: 1.0KB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] View File

Before After
Width: 80  |  Height: 80  |  Size: 6.5KB Width: 80  |  Height: 80  |  Size: 2.5KB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] View File

Before After
Width: 80  |  Height: 80  |  Size: 6.5KB Width: 80  |  Height: 80  |  Size: 2.5KB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] View File

Before After
Width: 120  |  Height: 120  |  Size: 11KB Width: 120  |  Height: 120  |  Size: 4.0KB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] View File

Before After
Width: 120  |  Height: 120  |  Size: 11KB Width: 120  |  Height: 120  |  Size: 4.0KB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] View File

Before After
Width: 180  |  Height: 180  |  Size: 21KB Width: 180  |  Height: 180  |  Size: 6.4KB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] View File

Before After
Width: 76  |  Height: 76  |  Size: 6.0KB Width: 76  |  Height: 76  |  Size: 2.3KB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] View File

Before After
Width: 152  |  Height: 152  |  Size: 16KB Width: 152  |  Height: 152  |  Size: 5.4KB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] View File

Before After
Width: 167  |  Height: 167  |  Size: 19KB Width: 167  |  Height: 167  |  Size: 5.9KB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] View File

Before After
Width: 1024  |  Height: 1024  |  Size: 282KB Width: 1024  |  Height: 1024  |  Size: 30KB

BIN
ios/Runner/Assets.xcassets/LaunchImage.imageset/AZteam-1.png View File

Before After
Width: 792  |  Height: 146  |  Size: 11KB

BIN
ios/Runner/Assets.xcassets/LaunchImage.imageset/AZteam-2.png View File

Before After
Width: 792  |  Height: 146  |  Size: 11KB

BIN
ios/Runner/Assets.xcassets/LaunchImage.imageset/AZteam.png View File

Before After
Width: 792  |  Height: 146  |  Size: 11KB

+ 3
- 3
ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json View File

@@ -1,17 +1,17 @@
{
"images" : [
{
"filename" : "ic_logo_slogan.png",
"filename" : "AZteam.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "ic_logo_slogan-1.png",
"filename" : "AZteam-1.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ic_logo_slogan-2.png",
"filename" : "AZteam-2.png",
"idiom" : "universal",
"scale" : "3x"
}

BIN
ios/Runner/Assets.xcassets/LaunchImage.imageset/ic_logo_slogan-1.png View File

Before After
Width: 904  |  Height: 610  |  Size: 136KB

BIN
ios/Runner/Assets.xcassets/LaunchImage.imageset/ic_logo_slogan-2.png View File

Before After
Width: 904  |  Height: 610  |  Size: 136KB

BIN
ios/Runner/Assets.xcassets/LaunchImage.imageset/ic_logo_slogan.png View File

Before After
Width: 904  |  Height: 610  |  Size: 136KB

+ 9
- 9
ios/Runner/GoogleService-Info.plist View File

@@ -3,21 +3,21 @@
<plist version="1.0">
<dict>
<key>CLIENT_ID</key>
<string>618842128088-9qq79tu8vtaomorcpir47bgaakdm7rpu.apps.googleusercontent.com</string>
<string>133633341213-onmfpr1862a89392av68uhn5sql5pt7h.apps.googleusercontent.com</string>
<key>REVERSED_CLIENT_ID</key>
<string>com.googleusercontent.apps.618842128088-9qq79tu8vtaomorcpir47bgaakdm7rpu</string>
<string>com.googleusercontent.apps.133633341213-onmfpr1862a89392av68uhn5sql5pt7h</string>
<key>API_KEY</key>
<string>AIzaSyCB3usmrSGhfDEmoPxj6Ya0WJ4Ag79DI9Q</string>
<string>AIzaSyDdd_1yFjpcN9vy4KeN2rMFUQgegfSSRT0</string>
<key>GCM_SENDER_ID</key>
<string>618842128088</string>
<string>133633341213</string>
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>vn.azteam.tpfarm</string>
<string>vn.azteam.farmdemo</string>
<key>PROJECT_ID</key>
<string>tpfarm-825d1</string>
<string>farm-demo-71aca</string>
<key>STORAGE_BUCKET</key>
<string>tpfarm-825d1.appspot.com</string>
<string>farm-demo-71aca.appspot.com</string>
<key>IS_ADS_ENABLED</key>
<false></false>
<key>IS_ANALYTICS_ENABLED</key>
@@ -29,8 +29,8 @@
<key>IS_SIGNIN_ENABLED</key>
<true></true>
<key>GOOGLE_APP_ID</key>
<string>1:618842128088:ios:710f52451ebce86edea1ad</string>
<string>1:133633341213:ios:3eb489a175c1c673cb53f4</string>
<key>DATABASE_URL</key>
<string>https://tpfarm-825d1.firebaseio.com</string>
<string>https://farm-demo-71aca.firebaseio.com</string>
</dict>
</plist>

+ 1
- 1
ios/Runner/Info.plist View File

@@ -11,7 +11,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Tiên Phong Farm</string>
<string>Smart Farm</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>

+ 1
- 1
lib/data/api/rest_client.g.dart View File

@@ -9,7 +9,7 @@ part of 'rest_client.dart';
class _RestClient implements RestClient {
_RestClient(this._dio, {this.baseUrl}) {
ArgumentError.checkNotNull(_dio, '_dio');
this.baseUrl ??= 'https://tpf.aztrace.vn';
this.baseUrl ??= 'https://smartfarm.aztrace.vn';
}

final Dio _dio;

+ 2
- 2
lib/utils/const_common.dart View File

@@ -2,8 +2,8 @@ class ConstCommon {
static int kExpiredTime = 518400000; //6* 24 * 60 * 60 * 1000; 6days
static int kFileSize = 1000000; //1M = 1000.000 bytes
static int kMaxAgeCache = 7; // 7days
static const String baseUrl = "https://tpf.aztrace.vn";
static const String baseImageUrl = "https://tpf.aztrace.vn/upload/";
static const String baseUrl = "https://smartfarm.aztrace.vn";
static const String baseImageUrl = "https://smartfarm.aztrace.vn/upload/";
static RegExp regExpDecimal = RegExp("[0-9,]");

static const String apiDetailNursery = "api/activity-nursery";

+ 1
- 0
pubspec.yaml View File

@@ -31,6 +31,7 @@ dependencies:
font_awesome_flutter: ^8.8.1
package_info: ^0.4.3
change_app_package_name: ^0.1.2
#flutter pub run change_app_package_name:main vn.azteam.farmdemo
firebase_messaging: ^7.0.0
get: ^3.8.0
intl: ^0.16.1

Loading…
Cancel
Save