Skip to content

Commit 20ab0af

Browse files
TimothySealyTimothySealy
authored
Merge pull request #7 from SaxionSmartCities/dev
Alpha release
2 parents 4752077 + 9ca7b13 commit 20ab0af

File tree

13 files changed

+201
-23
lines changed

13 files changed

+201
-23
lines changed

‎frontend_app/android/app/build.gradle

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ android {
3939

4040
defaultConfig {
4141
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
42-
applicationId "nl.smartenschede.netmobiel.frontendapp"
42+
applicationId "eu.netmobiel.frontendapp"
4343
minSdkVersion 16
44-
targetSdkVersion 27
44+
targetSdkVersion 28
4545
versionCode flutterVersionCode.toInteger()
4646
versionName flutterVersionName
4747
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -58,6 +58,11 @@ android {
5858
buildTypes {
5959
release {
6060
signingConfig signingConfigs.release
61+
62+
minifyEnabled true
63+
useProguard true
64+
65+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
6166
}
6267
}
6368
}
@@ -68,6 +73,9 @@ flutter {
6873

6974
dependencies {
7075
testImplementation 'junit:junit:4.12'
76+
implementation 'com.google.firebase:firebase-analytics:17.2.0'
7177
androidTestImplementation 'com.android.support.test:runner:1.0.2'
7278
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
7379
}
80+
81+
apply plugin: 'com.google.gms.google-services'

‎frontend_app/android/app/google-services.json

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"project_info": {
3+
"project_number": "119510705158",
4+
"firebase_url": "https://netmobiel-push.firebaseio.com",
5+
"project_id": "netmobiel-push",
6+
"storage_bucket": "netmobiel-push.appspot.com"
7+
},
8+
"client": [
9+
{
10+
"client_info": {
11+
"mobilesdk_app_id": "1:119510705158:android:7c4a4cbb2b10a9c4688f87",
12+
"android_client_info": {
13+
"package_name": "eu.netmobiel.frontendapp"
14+
}
15+
},
16+
"oauth_client": [
17+
{
18+
"client_id": "119510705158-slk85pna9hhqf19481a4afsipprpr5ua.apps.googleusercontent.com",
19+
"client_type": 3
20+
}
21+
],
22+
"api_key": [
23+
{
24+
"current_key": "AIzaSyDsvRU4TKWO-dHYkmZYowm3ptD2y7Szojc"
25+
}
26+
],
27+
"services": {
28+
"appinvite_service": {
29+
"other_platform_oauth_client": [
30+
{
31+
"client_id": "119510705158-slk85pna9hhqf19481a4afsipprpr5ua.apps.googleusercontent.com",
32+
"client_type": 3
33+
},
34+
{
35+
"client_id": "119510705158-auh7kbc1uot14hsd1q0qek4daa8h4v8n.apps.googleusercontent.com",
36+
"client_type": 2,
37+
"ios_info": {
38+
"bundle_id": "eu.netmobiel.frontendApp"
39+
}
40+
}
41+
]
42+
}
43+
}
44+
}
45+
],
46+
"configuration_version": "1"
47+
}

‎frontend_app/android/app/proguard-rules.pro

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
## Flutter wrapper
2+
-keep class io.flutter.app.** { *; }
3+
-keep class io.flutter.plugin.** { *; }
4+
-keep class io.flutter.util.** { *; }
5+
-keep class io.flutter.view.** { *; }
6+
-keep class io.flutter.** { *; }
7+
-keep class io.flutter.plugins.** { *; }
8+
-dontwarn io.flutter.embedding.**

‎frontend_app/android/app/src/main/AndroidManifest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
<action android:name="android.intent.action.MAIN"/>
3535
<category android:name="android.intent.category.LAUNCHER"/>
3636
</intent-filter>
37+
<intent-filter>
38+
<action android:name="FLUTTER_NOTIFICATION_CLICK" />
39+
<category android:name="android.intent.category.DEFAULT" />
40+
</intent-filter>
3741
</activity>
3842
</application>
3943
</manifest>

‎frontend_app/android/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ buildscript {
55
}
66

77
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.1.2'
8+
classpath 'com.android.tools.build:gradle:3.5.0'
9+
classpath 'com.google.gms:google-services:4.3.2'
910
}
1011
}
1112

‎frontend_app/android/gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
org.gradle.jvmargs=-Xmx1536M
2+
android.useAndroidX=true
3+
android.enableJetifier=true

‎frontend_app/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Jun 23 08:50:38 CEST 2017
1+
#Mon Sep 23 14:28:37 CEST 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

‎frontend_app/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
2121
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
2222
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
23+
FD7F91822333B4F800395B73 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = FD7F91812333B4F700395B73 /* GoogleService-Info.plist */; };
2324
/* End PBXBuildFile section */
2425

2526
/* Begin PBXCopyFilesBuildPhase section */
@@ -57,6 +58,8 @@
5758
B46F70FCE36C9956EFBA34A1 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
5859
DD2D4F29AEFED67A346B5B4D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
5960
DE021F08EFD81B5EA2D4029B /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
61+
FD7F91812333B4F700395B73 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
62+
FD7F91832333BBBC00395B73 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
6063
/* End PBXFileReference section */
6164

6265
/* Begin PBXFrameworksBuildPhase section */
@@ -117,6 +120,7 @@
117120
97C146F01CF9000F007C117D /* Runner */ = {
118121
isa = PBXGroup;
119122
children = (
123+
FD7F91832333BBBC00395B73 /* Runner.entitlements */,
120124
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */,
121125
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */,
122126
97C146FA1CF9000F007C117D /* Main.storyboard */,
@@ -126,6 +130,7 @@
126130
97C146F11CF9000F007C117D /* Supporting Files */,
127131
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
128132
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
133+
FD7F91812333B4F700395B73 /* GoogleService-Info.plist */,
129134
);
130135
path = Runner;
131136
sourceTree = "<group>";
@@ -182,7 +187,12 @@
182187
TargetAttributes = {
183188
97C146ED1CF9000F007C117D = {
184189
CreatedOnToolsVersion = 7.3.1;
185-
DevelopmentTeam = 93DRRVG35M;
190+
DevelopmentTeam = 3YKQEK3FCQ;
191+
SystemCapabilities = {
192+
com.apple.Push = {
193+
enabled = 1;
194+
};
195+
};
186196
};
187197
};
188198
};
@@ -215,6 +225,7 @@
215225
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
216226
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
217227
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
228+
FD7F91822333B4F800395B73 /* GoogleService-Info.plist in Resources */,
218229
);
219230
runOnlyForDeploymentPostprocessing = 0;
220231
};
@@ -427,8 +438,9 @@
427438
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
428439
buildSettings = {
429440
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
441+
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
430442
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
431-
DEVELOPMENT_TEAM = 93DRRVG35M;
443+
DEVELOPMENT_TEAM = 3YKQEK3FCQ;
432444
ENABLE_BITCODE = NO;
433445
FRAMEWORK_SEARCH_PATHS = (
434446
"$(inherited)",
@@ -440,7 +452,7 @@
440452
"$(inherited)",
441453
"$(PROJECT_DIR)/Flutter",
442454
);
443-
PRODUCT_BUNDLE_IDENTIFIER = nl.smartenschede.netmobiel.frontendApp;
455+
PRODUCT_BUNDLE_IDENTIFIER = eu.netmobiel.frontendApp;
444456
PRODUCT_NAME = "$(TARGET_NAME)";
445457
VERSIONING_SYSTEM = "apple-generic";
446458
};
@@ -451,8 +463,9 @@
451463
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
452464
buildSettings = {
453465
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
466+
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
454467
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
455-
DEVELOPMENT_TEAM = 93DRRVG35M;
468+
DEVELOPMENT_TEAM = 3YKQEK3FCQ;
456469
ENABLE_BITCODE = NO;
457470
FRAMEWORK_SEARCH_PATHS = (
458471
"$(inherited)",
@@ -464,7 +477,7 @@
464477
"$(inherited)",
465478
"$(PROJECT_DIR)/Flutter",
466479
);
467-
PRODUCT_BUNDLE_IDENTIFIER = nl.smartenschede.netmobiel.frontendApp;
480+
PRODUCT_BUNDLE_IDENTIFIER = eu.netmobiel.frontendApp;
468481
PRODUCT_NAME = "$(TARGET_NAME)";
469482
VERSIONING_SYSTEM = "apple-generic";
470483
};

‎frontend_app/ios/Runner/GoogleService-Info.plist

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CLIENT_ID</key>
6+
<string>119510705158-auh7kbc1uot14hsd1q0qek4daa8h4v8n.apps.googleusercontent.com</string>
7+
<key>REVERSED_CLIENT_ID</key>
8+
<string>com.googleusercontent.apps.119510705158-auh7kbc1uot14hsd1q0qek4daa8h4v8n</string>
9+
<key>API_KEY</key>
10+
<string>AIzaSyAaY6jNtGfjbfgS9Mrozm97KHvd-APxtsY</string>
11+
<key>GCM_SENDER_ID</key>
12+
<string>119510705158</string>
13+
<key>PLIST_VERSION</key>
14+
<string>1</string>
15+
<key>BUNDLE_ID</key>
16+
<string>eu.netmobiel.frontendApp</string>
17+
<key>PROJECT_ID</key>
18+
<string>netmobiel-push</string>
19+
<key>STORAGE_BUCKET</key>
20+
<string>netmobiel-push.appspot.com</string>
21+
<key>IS_ADS_ENABLED</key>
22+
<false></false>
23+
<key>IS_ANALYTICS_ENABLED</key>
24+
<false></false>
25+
<key>IS_APPINVITE_ENABLED</key>
26+
<true></true>
27+
<key>IS_GCM_ENABLED</key>
28+
<true></true>
29+
<key>IS_SIGNIN_ENABLED</key>
30+
<true></true>
31+
<key>GOOGLE_APP_ID</key>
32+
<string>1:119510705158:ios:d18ce081674f4107688f87</string>
33+
<key>DATABASE_URL</key>
34+
<string>https://netmobiel-push.firebaseio.com</string>
35+
</dict>
36+
</plist>

‎frontend_app/ios/Runner/Info.plist

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>FirebaseAppDelegateProxyEnabled</key>
6+
<string>NO</string>
57
<key>CFBundleDevelopmentRegion</key>
68
<string>en</string>
79
<key>CFBundleDisplayName</key>
8-
<string>netmobiel</string>
10+
<string>Netmobiel</string>
911
<key>CFBundleExecutable</key>
1012
<string>$(EXECUTABLE_NAME)</string>
1113
<key>CFBundleIdentifier</key>

0 commit comments

Comments
 (0)