Skip to content

Commit ec5a73e

Browse files
DeckeDengDeckeDeng
authored
Merge pull request alibaba#251 from alibaba/develop
Develop
2 parents 489352c + d786fff commit ec5a73e

File tree

131 files changed

+2569
-284
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+2569
-284
lines changed

‎android/.project

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>android</name>
4+
<comment>Project android created by Buildship.</comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
16+
</natures>
17+
</projectDescription>

‎android/.settings/org.eclipse.buildship.core.prefs

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
connection.project.dir=
2+
eclipse.preferences.version=1

‎android/app/.classpath

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
4+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
5+
<classpathentry kind="output" path="bin/default"/>
6+
</classpath>

‎android/app/.project

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>app</name>
4+
<comment>Project app created by Buildship.</comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
22+
</natures>
23+
</projectDescription>

‎android/app/.settings/org.eclipse.buildship.core.prefs

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
connection.project.dir=..
2+
eclipse.preferences.version=1

‎android/app/build.gradle

+23-9
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,15 @@ apply plugin: 'com.android.application'
2525
apply plugin: 'kotlin-android'
2626
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2727

28+
def keystoreProperties = new Properties()
29+
def keystorePropertiesFile = rootProject.file('key.properties')
30+
if (keystorePropertiesFile.exists()) {
31+
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
32+
}
33+
34+
2835
android {
29-
compileSdkVersion 27
36+
compileSdkVersion 28
3037

3138
sourceSets {
3239
main.java.srcDirs += 'src/main/kotlin'
@@ -38,21 +45,28 @@ android {
3845

3946
defaultConfig {
4047
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
41-
applicationId "com.ali.fluttergo"
48+
applicationId "com.alibaba.fluttergo"
4249
minSdkVersion 16
43-
targetSdkVersion 27
50+
targetSdkVersion 28
4451
versionCode flutterVersionCode.toInteger()
4552
versionName flutterVersionName
46-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
53+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4754
}
4855

56+
signingConfigs {
57+
release {
58+
keyAlias keystoreProperties['keyAlias']
59+
keyPassword keystoreProperties['keyPassword']
60+
storeFile file(keystoreProperties['storeFile'])
61+
storePassword keystoreProperties['storePassword']
62+
}
63+
}
4964
buildTypes {
5065
release {
51-
// TODO: Add your own signing config for the release build.
52-
// Signing with the debug keys for now, so `flutter run --release` works.
53-
signingConfig signingConfigs.debug
66+
signingConfig signingConfigs.release
5467
}
5568
}
69+
5670
}
5771

5872
flutter {
@@ -62,8 +76,8 @@ flutter {
6276
dependencies {
6377
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
6478
testImplementation 'junit:junit:4.12'
65-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
66-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
79+
androidTestImplementation 'androidx.test:runner:1.1.1'
80+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
6781
//firebase
6882
implementation 'com.google.firebase:firebase-core:16.0.8'
6983
//Crashlytics SDK

‎android/app/google-services.json

+10-17
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,40 @@
11
{
22
"project_info": {
3-
"project_number": "1002138254102",
4-
//"firebase_url": "https://ali-flutter-go.firebaseio.com",
5-
"project_id": "ali-flutter-go",
6-
"storage_bucket": "ali-flutter-go.appspot.com"
3+
"project_number": "611157827052",
4+
"firebase_url": "https://alibaba-flutter-go.firebaseio.com",
5+
"project_id": "alibaba-flutter-go",
6+
"storage_bucket": "alibaba-flutter-go.appspot.com"
77
},
88
"client": [
99
{
1010
"client_info": {
11-
"mobilesdk_app_id": "1:1002138254102:android:00e8533fa0274183",
11+
"mobilesdk_app_id": "1:611157827052:android:c6129e5eff2f125d",
1212
"android_client_info": {
13-
"package_name": "com.ali.fluttergo"
13+
"package_name": "com.alibaba.fluttergo"
1414
}
1515
},
1616
"oauth_client": [
1717
{
18-
"client_id": "1002138254102-2r4hs0mm1avp4p1qielecihnbugan693.apps.googleusercontent.com",
18+
"client_id": "611157827052-iiuevj8qu56alpqh47v37j9sd4e40di7.apps.googleusercontent.com",
1919
"client_type": 3
2020
}
2121
],
2222
"api_key": [
2323
{
24-
"current_key": "AIzaSyDFdL3GSwVDfejIq44pyOpiEBZ32dTGMVA"
24+
"current_key": "AIzaSyA9chxDIuds7gmPQTJPpDpoXyN9rDTdvhU"
2525
}
2626
],
2727
"services": {
2828
"appinvite_service": {
2929
"other_platform_oauth_client": [
3030
{
31-
"client_id": "1002138254102-2r4hs0mm1avp4p1qielecihnbugan693.apps.googleusercontent.com",
31+
"client_id": "611157827052-iiuevj8qu56alpqh47v37j9sd4e40di7.apps.googleusercontent.com",
3232
"client_type": 3
33-
},
34-
{
35-
"client_id": "1002138254102-qo9jp8c3lc69p9lclu0rtp5dmt1kulv7.apps.googleusercontent.com",
36-
"client_type": 2,
37-
"ios_info": {
38-
"bundle_id": "com.ali.fluttergo"
39-
}
4033
}
4134
]
4235
}
4336
}
4437
}
4538
],
4639
"configuration_version": "1"
47-
}
40+
}

‎android/app/release/app-release.apk

15.2 MB
Binary file not shown.

‎android/app/release/output.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.6","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

‎android/app/src/debug/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.ali.fluttergo">
2+
package="com.alibaba.fluttergo">
33
<!-- Flutter needs it to communicate with the running application
44
to allow setting breakpoints, to provide hot reload, etc.
55
-->

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

+30-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.ali.fluttergo">
2+
package="com.alibaba.fluttergo">
33

44
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
55
calls FlutterMain.startInitialization(this); in its onCreate method.
@@ -10,10 +10,11 @@
1010
<uses-permission android:name="android.permission.INTERNET"/>
1111
<uses-permission android:name="android.permission.MODE_WORLD_READABLE"/>
1212
<uses-permission android:name="android.permission.MODE_WORLD_WRITEABLE"/>
13+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
1314

1415
<application
1516
android:name="io.flutter.app.FlutterApplication"
16-
android:label="fluttergo"
17+
android:label="FlutterGo"
1718
android:icon="@mipmap/ic_launcher_logo">
1819
<activity
1920
android:name=".MainActivity"
@@ -34,5 +35,32 @@
3435
<category android:name="android.intent.category.LAUNCHER"/>
3536
</intent-filter>
3637
</activity>
38+
39+
40+
<provider
41+
android:name="vn.hunghd.flutterdownloader.DownloadedFileProvider"
42+
android:authorities="${applicationId}.flutter_downloader.provider"
43+
android:exported="false"
44+
android:grantUriPermissions="true">
45+
<meta-data
46+
android:name="android.support.FILE_PROVIDER_PATHS"
47+
android:resource="@xml/provider_paths"/>
48+
</provider>
49+
50+
<provider
51+
android:name="androidx.work.impl.WorkManagerInitializer"
52+
android:authorities="${applicationId}.workmanager-init"
53+
android:enabled="false"
54+
android:exported="false" />
55+
56+
<provider
57+
android:name="vn.hunghd.flutterdownloader.FlutterDownloaderInitializer"
58+
android:authorities="${applicationId}.flutter-downloader-init"
59+
android:exported="false">
60+
<meta-data
61+
android:name="vn.hunghd.flutterdownloader.MAX_CONCURRENT_TASKS"
62+
android:value="5" />
63+
</provider>
64+
3765
</application>
3866
</manifest>

‎android/app/src/main/kotlin/fluttergo/ali/com/fluttergo/MainActivity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.ali.fluttergo
1+
package com.alibaba.fluttergo
22

33
import android.os.Bundle
44

‎android/app/src/main/res/drawable/launch_background.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<!-- You can insert your own image assets here -->
77
<item>
88
<bitmap
9-
android:gravity="center"
10-
android:src="@mipmap/splash" />
9+
android:src="@drawable/splash" />
1110
</item>
1211
</layer-list>

‎android/app/src/main/res/mipmap-xhdpi/splash.png

-197 KB
Binary file not shown.

‎android/app/src/main/res/mipmap-xxxhdpi/spalsh.png

1 MB
Loading

‎android/app/src/profile/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.ali.fluttergo">
2+
package="com.alibaba.fluttergo">
33
<!-- Flutter needs it to communicate with the running application
44
to allow setting breakpoints, to provide hot reload, etc.
55
-->

‎android/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.2.71'
2+
ext.kotlin_version = '1.3.0'
33
repositories {
44
google()
55
jcenter()
@@ -10,7 +10,7 @@ buildscript {
1010
}
1111

1212
dependencies {
13-
classpath 'com.android.tools.build:gradle:3.2.0'
13+
classpath 'com.android.tools.build:gradle:3.3.0'
1414
//firebase
1515
classpath 'com.google.gms:google-services:4.2.0'
1616
//Crashlytics SDK

‎android/gradle.properties

+2
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
org.gradle.jvmargs=-Xmx1536M
2+
android.enableJetifier=true
3+
android.useAndroidX=true

‎android/key.properties

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
storePassword=fluttergo123
2+
keyPassword=fluttergo123
3+
keyAlias=key
4+
storeFile=/Users/xj.deng/key.jks

‎assets/app.db

4 KB
Binary file not shown.

‎assets/images/FlutterGo.png

1.04 KB
Loading

‎assets/images/ali_connors.png

19 KB
Loading

‎flutter_01.png

40.8 KB
Loading

0 commit comments

Comments
 (0)