From c00c6278e50a156caadff9c683ab70d628a8d36b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E9=9C=B2?= Date: Mon, 8 Apr 2019 14:38:28 +0800 Subject: [PATCH 01/12] remove extra files --- .gitignore | 6 ++++++ .gradle/3.5.1/file-changes/last-build.bin | Bin 1 -> 0 bytes .gradle/3.5.1/taskHistory/taskHistory.lock | Bin 17 -> 0 bytes .gradle/buildOutputCleanup/built.bin | 0 .gradle/buildOutputCleanup/cache.properties | 2 -- .gradle/buildOutputCleanup/cache.properties.lock | 1 - .vscode/launch.json | 13 ------------- .vscode/settings.json | 4 ---- .../.settings/org.eclipse.buildship.core.prefs | 2 -- android/app/build.gradle | 6 ++++++ android/app/src/debug/AndroidManifest.xml | 7 +++++++ android/app/src/main/AndroidManifest.xml | 14 +++----------- .../fluttergo/ali/com/fluttergo/MainActivity.kt | 13 +++++++++++++ .../main/res/mipmap-hdpi/ic_launcher_logo.png | Bin 0 -> 3770 bytes .../main/res/mipmap-mdpi/ic_launcher_logo.png | Bin 0 -> 3770 bytes .../main/res/mipmap-xhdpi/ic_launcher_logo.png | Bin 0 -> 3770 bytes .../main/res/mipmap-xxhdpi/ic_launcher_logo.png | Bin 0 -> 3770 bytes .../main/res/mipmap-xxxhdpi/ic_launcher_logo.png | Bin 0 -> 3770 bytes android/app/src/profile/AndroidManifest.xml | 7 +++++++ android/build.gradle | 2 ++ res/values/strings_en.arb | 1 - 21 files changed, 44 insertions(+), 34 deletions(-) delete mode 100644 .gradle/3.5.1/file-changes/last-build.bin delete mode 100644 .gradle/3.5.1/taskHistory/taskHistory.lock delete mode 100644 .gradle/buildOutputCleanup/built.bin delete mode 100644 .gradle/buildOutputCleanup/cache.properties delete mode 100644 .gradle/buildOutputCleanup/cache.properties.lock delete mode 100644 .vscode/launch.json delete mode 100644 .vscode/settings.json delete mode 100644 android/.settings/org.eclipse.buildship.core.prefs create mode 100644 android/app/src/debug/AndroidManifest.xml create mode 100644 android/app/src/main/kotlin/fluttergo/ali/com/fluttergo/MainActivity.kt create mode 100644 android/app/src/main/res/mipmap-hdpi/ic_launcher_logo.png create mode 100644 android/app/src/main/res/mipmap-mdpi/ic_launcher_logo.png create mode 100644 android/app/src/main/res/mipmap-xhdpi/ic_launcher_logo.png create mode 100644 android/app/src/main/res/mipmap-xxhdpi/ic_launcher_logo.png create mode 100644 android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_logo.png create mode 100644 android/app/src/profile/AndroidManifest.xml delete mode 100644 res/values/strings_en.arb diff --git a/.gitignore b/.gitignore index 47e0b4d6..8f144e60 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,12 @@ .buildlog/ .history .svn/ +.vscode +.gradle +.idea +/local.properties +.DS_Store +/build # IntelliJ related *.iml diff --git a/.gradle/3.5.1/file-changes/last-build.bin b/.gradle/3.5.1/file-changes/last-build.bin deleted file mode 100644 index f76dd238ade08917e6712764a16a22005a50573d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1 IcmZPo000310RR91 diff --git a/.gradle/3.5.1/taskHistory/taskHistory.lock b/.gradle/3.5.1/taskHistory/taskHistory.lock deleted file mode 100644 index 1a1ada5203be8e7b6e776c64bbe342499620c2d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 TcmZQ}US2Noawhu}1}FdkEbs%G diff --git a/.gradle/buildOutputCleanup/built.bin b/.gradle/buildOutputCleanup/built.bin deleted file mode 100644 index e69de29b..00000000 diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties deleted file mode 100644 index 061d565e..00000000 --- a/.gradle/buildOutputCleanup/cache.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Thu Nov 22 22:29:42 CST 2018 -gradle.version=3.5.1 diff --git a/.gradle/buildOutputCleanup/cache.properties.lock b/.gradle/buildOutputCleanup/cache.properties.lock deleted file mode 100644 index 40fdece9..00000000 --- a/.gradle/buildOutputCleanup/cache.properties.lock +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index bbfd110a..00000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - // 使用 IntelliSense 了解相关属性。 - // 悬停以查看现有属性的描述。 - // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "name": "Flutter", - "request": "launch", - "type": "dart" - } - ] -} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 9a7349a6..00000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "editor.fontSize": 14, - -} \ No newline at end of file diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index e8895216..00000000 --- a/android/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -connection.project.dir= -eclipse.preferences.version=1 diff --git a/android/app/build.gradle b/android/app/build.gradle index d3038cdf..3eef3030 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -22,11 +22,16 @@ if (flutterVersionName == null) { } apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { compileSdkVersion 27 + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } + lintOptions { disable 'InvalidPackage' } @@ -55,6 +60,7 @@ flutter { } dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 00000000..6c60789b --- /dev/null +++ b/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 94a4ff63..7f34fb1e 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,14 +1,6 @@ - - - - - + android:label="fluttergo" + android:icon="@mipmap/ic_launcher_logo"> + + diff --git a/android/build.gradle b/android/build.gradle index e81b1a1d..01352d98 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,4 +1,5 @@ buildscript { + ext.kotlin_version = '1.2.71' repositories { google() jcenter() @@ -6,6 +7,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:3.2.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb deleted file mode 100644 index 9e26dfee..00000000 --- a/res/values/strings_en.arb +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file From 220ae2829e5b92b26563b1f2f52521998ed86930 Mon Sep 17 00:00:00 2001 From: DeckeDeng Date: Mon, 8 Apr 2019 14:44:22 +0800 Subject: [PATCH 02/12] android permission --- android/app/src/main/AndroidManifest.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 7f34fb1e..97b1e4ee 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -6,6 +6,11 @@ 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. --> + + + + + Date: Mon, 8 Apr 2019 14:55:34 +0800 Subject: [PATCH 03/12] test --- .gitignore | 9 +- .metadata | 10 + LICENSE | 21 -- android/.gitignore | 10 - android/.project | 17 - android/app/.classpath | 6 - android/app/.project | 23 -- .../org.eclipse.buildship.core.prefs | 2 - android/app/bin/build.gradle | 61 ---- android/app/bin/src/main/AndroidManifest.xml | 39 --- .../main/res/drawable/launch_background.xml | 12 - .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 544 -> 0 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 442 -> 0 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 721 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 1031 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 1443 -> 0 bytes .../app/bin/src/main/res/values/styles.xml | 8 - android/app/src/main/AndroidManifest.xml | 5 - .../java/com/ali/fluttergo/MainActivity.java | 16 - ios/Podfile.lock | 61 ++++ ios/Runner/AppDelegate.swift | 13 + .../LaunchImage.imageset/LaunchImage.png | Bin 0 -> 68 bytes .../LaunchImage.imageset/LaunchImage@2x.png | Bin 0 -> 68 bytes .../LaunchImage.imageset/LaunchImage@3x.png | Bin 0 -> 68 bytes ios/Runner/Runner-Bridging-Header.h | 1 + pubspec.lock | 259 ++++++++++++++++ pubspec.yaml | 290 +++++++++--------- 27 files changed, 490 insertions(+), 373 deletions(-) create mode 100644 .metadata delete mode 100644 LICENSE delete mode 100644 android/.gitignore delete mode 100644 android/.project delete mode 100644 android/app/.classpath delete mode 100644 android/app/.project delete mode 100644 android/app/.settings/org.eclipse.buildship.core.prefs delete mode 100644 android/app/bin/build.gradle delete mode 100644 android/app/bin/src/main/AndroidManifest.xml delete mode 100644 android/app/bin/src/main/res/drawable/launch_background.xml delete mode 100644 android/app/bin/src/main/res/mipmap-hdpi/ic_launcher.png delete mode 100644 android/app/bin/src/main/res/mipmap-mdpi/ic_launcher.png delete mode 100644 android/app/bin/src/main/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 android/app/bin/src/main/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 android/app/bin/src/main/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 android/app/bin/src/main/res/values/styles.xml delete mode 100644 android/app/src/main/java/com/ali/fluttergo/MainActivity.java create mode 100644 ios/Podfile.lock create mode 100644 ios/Runner/AppDelegate.swift create mode 100644 ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png create mode 100644 ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png create mode 100644 ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png create mode 100644 ios/Runner/Runner-Bridging-Header.h create mode 100644 pubspec.lock diff --git a/.gitignore b/.gitignore index 8f144e60..07488ba6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ # Miscellaneous *.class -*.lock *.log *.pyc *.swp @@ -9,12 +8,6 @@ .buildlog/ .history .svn/ -.vscode -.gradle -.idea -/local.properties -.DS_Store -/build # IntelliJ related *.iml @@ -32,7 +25,7 @@ .packages .pub-cache/ .pub/ -build/ +/build/ # Android related **/android/**/gradle-wrapper.jar diff --git a/.metadata b/.metadata new file mode 100644 index 00000000..a3ce5b16 --- /dev/null +++ b/.metadata @@ -0,0 +1,10 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: 1e5992a3c59eff6a75c2d93e5209d995069158dd + channel: master + +project_type: app diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 266fb814..00000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -Copyright (c) 2018-present Alibaba Inc. - -Permission is granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS", -WITHOUT WARRANTY OF ANY KIND,EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO -THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE \ No newline at end of file diff --git a/android/.gitignore b/android/.gitignore deleted file mode 100644 index 65b7315a..00000000 --- a/android/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -*.iml -*.class -.gradle -/local.properties -/.idea/workspace.xml -/.idea/libraries -.DS_Store -/build -/captures -GeneratedPluginRegistrant.java diff --git a/android/.project b/android/.project deleted file mode 100644 index 3964dd3f..00000000 --- a/android/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - android - Project android created by Buildship. - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - - org.eclipse.buildship.core.gradleprojectnature - - diff --git a/android/app/.classpath b/android/app/.classpath deleted file mode 100644 index eb19361b..00000000 --- a/android/app/.classpath +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/android/app/.project b/android/app/.project deleted file mode 100644 index ac485d7c..00000000 --- a/android/app/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - app - Project app created by Buildship. - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.buildship.core.gradleprojectnature - - diff --git a/android/app/.settings/org.eclipse.buildship.core.prefs b/android/app/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index b1886adb..00000000 --- a/android/app/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -connection.project.dir=.. -eclipse.preferences.version=1 diff --git a/android/app/bin/build.gradle b/android/app/bin/build.gradle deleted file mode 100644 index 4b2420a5..00000000 --- a/android/app/bin/build.gradle +++ /dev/null @@ -1,61 +0,0 @@ -def localProperties = new Properties() -def localPropertiesFile = rootProject.file('local.properties') -if (localPropertiesFile.exists()) { - localPropertiesFile.withReader('UTF-8') { reader -> - localProperties.load(reader) - } -} - -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - -def flutterVersionCode = localProperties.getProperty('flutter.versionCode') -if (flutterVersionCode == null) { - flutterVersionCode = '1' -} - -def flutterVersionName = localProperties.getProperty('flutter.versionName') -if (flutterVersionName == null) { - flutterVersionName = '1.0' -} - -apply plugin: 'com.android.application' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - -android { - compileSdkVersion 27 - - lintOptions { - disable 'InvalidPackage' - } - - defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.example.flutterrookiebook" - minSdkVersion 16 - targetSdkVersion 27 - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - // TODO: Add your own signing config for the release build. - // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig signingConfigs.debug - } - } -} - -flutter { - source '../..' -} - -dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' -} diff --git a/android/app/bin/src/main/AndroidManifest.xml b/android/app/bin/src/main/AndroidManifest.xml deleted file mode 100644 index 2347843c..00000000 --- a/android/app/bin/src/main/AndroidManifest.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/android/app/bin/src/main/res/drawable/launch_background.xml b/android/app/bin/src/main/res/drawable/launch_background.xml deleted file mode 100644 index 304732f8..00000000 --- a/android/app/bin/src/main/res/drawable/launch_background.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/android/app/bin/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/bin/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index db77bb4b7b0906d62b1847e87f15cdcacf6a4f29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8bpbvhu0Wd6uZuB!w&u2PAxD2eNXD>P5D~Wn-+_Wa#27Xc zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U|N3vA*22NaGQG zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#iqdw@AL`7MR}m`rwr|mZgU`8P7SBkL78fFf!WnuYWm$5Z0 zNXhDbCv&49sM544K|?c)WrFfiZvCi9h0O)B3Pgg&ebxsLQ05GG~ AQ2+n{ diff --git a/android/app/bin/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/bin/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 17987b79bb8a35cc66c3c1fd44f5a5526c1b78be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xx&nMcT!A!W`0S9QKQy;}1Cl^CgaH=;G9cpY;r$Q>i*pfB zP2drbID<_#qf;rPZx^FqH)F_D#*k@@q03KywUtLX8Ua?`H+NMzkczFPK3lFz@i_kW%1NOn0|D2I9n9wzH8m|-tHjsw|9>@K=iMBhxvkv6m8Y-l zytQ?X=U+MF$@3 zt`~i=@j|6y)RWMK--}M|=T`o&^Ni>IoWKHEbBXz7?A@mgWoL>!*SXo`SZH-*HSdS+ yn*9;$7;m`l>wYBC5bq;=U}IMqLzqbYCidGC!)_gkIk_C@Uy!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R` zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg zoq1^2_p9@|WEo z*X_Uko@K)qYYv~>43eQGMdbiGbo>E~Q& zrYBH{QP^@Sti!`2)uG{irBBq@y*$B zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N zdG@vOZB4v_lF7Plrx+hxo7(fCV&}fHq)$ diff --git a/android/app/bin/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/bin/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index d5f1c8d34e7a88e3f88bea192c3a370d44689c3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1031 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFa`(sgt!6~Yi|1%a`XoT0ojZ}lNrNjb9xjc(B0U1_% zz5^97Xt*%oq$rQy4?0GKNfJ44uvxI)gC`h-NZ|&0-7(qS@?b!5r36oQ}zyZrNO3 zMO=Or+<~>+A&uN&E!^Sl+>xE!QC-|oJv`ApDhqC^EWD|@=#J`=d#Xzxs4ah}w&Jnc z$|q_opQ^2TrnVZ0o~wh<3t%W&flvYGe#$xqda2bR_R zvPYgMcHgjZ5nSA^lJr%;<&0do;O^tDDh~=pIxA#coaCY>&N%M2^tq^U%3DB@ynvKo}b?yu-bFc-u0JHzced$sg7S3zqI(2 z#Km{dPr7I=pQ5>FuK#)QwK?Y`E`B?nP+}U)I#c1+FM*1kNvWG|a(TpksZQ3B@sD~b zpQ2)*V*TdwjFOtHvV|;OsiDqHi=6%)o4b!)x$)%9pGTsE z-JL={-Ffv+T87W(Xpooq<`r*VzWQcgBN$$`u}f>-ZQI1BB8ykN*=e4rIsJx9>z}*o zo~|9I;xof diff --git a/android/app/bin/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/bin/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 4d6372eebdb28e45604e46eeda8dd24651419bc0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1443 zcmb`G{WsKk6vsdJTdFg%tJav9_E4vzrOaqkWF|A724Nly!y+?N9`YV6wZ}5(X(D_N(?!*n3`|_r0Hc?=PQw&*vnU?QTFY zB_MsH|!j$PP;I}?dppoE_gA(4uc!jV&0!l7_;&p2^pxNo>PEcNJv za5_RT$o2Mf!<+r?&EbHH6nMoTsDOa;mN(wv8RNsHpG)`^ymG-S5By8=l9iVXzN_eG%Xg2@Xeq76tTZ*dGh~Lo9vl;Zfs+W#BydUw zCkZ$o1LqWQO$FC9aKlLl*7x9^0q%0}$OMlp@Kk_jHXOjofdePND+j!A{q!8~Jn+s3 z?~~w@4?egS02}8NuulUA=L~QQfm;MzCGd)XhiftT;+zFO&JVyp2mBww?;QByS_1w! zrQlx%{^cMj0|Bo1FjwY@Q8?Hx0cIPF*@-ZRFpPc#bBw{5@tD(5%sClzIfl8WU~V#u zm5Q;_F!wa$BSpqhN>W@2De?TKWR*!ujY;Yylk_X5#~V!L*Gw~;$%4Q8~Mad z@`-kG?yb$a9cHIApZDVZ^U6Xkp<*4rU82O7%}0jjHlK{id@?-wpN*fCHXyXh(bLt* zPc}H-x0e4E&nQ>y%B-(EL=9}RyC%MyX=upHuFhAk&MLbsF0LP-q`XnH78@fT+pKPW zu72MW`|?8ht^tz$iC}ZwLp4tB;Q49K!QCF3@!iB1qOI=?w z7In!}F~ij(18UYUjnbmC!qKhPo%24?8U1x{7o(+?^Zu0Hx81|FuS?bJ0jgBhEMzf< zCgUq7r2OCB(`XkKcN-TL>u5y#dD6D!)5W?`O5)V^>jb)P)GBdy%t$uUMpf$SNV31$ zb||OojAbvMP?T@$h_ZiFLFVHDmbyMhJF|-_)HX3%m=CDI+ID$0^C>kzxprBW)hw(v zr!Gmda);ICoQyhV_oP5+C%?jcG8v+D@9f?Dk*!BxY}dazmrT@64UrP3hlslANK)bq z$67n83eh}OeW&SV@HG95P|bjfqJ7gw$e+`Hxo!4cx`jdK1bJ>YDSpGKLPZ^1cv$ek zIB?0S<#tX?SJCLWdMd{-ME?$hc7A$zBOdIJ)4!KcAwb=VMov)nK;9z>x~rfT1>dS+ zZ6#`2v@`jgbqq)P22H)Tx2CpmM^o1$B+xT6`(v%5xJ(?j#>Q$+rx_R|7TzDZe{J6q zG1*EcU%tE?!kO%^M;3aM6JN*LAKUVb^xz8-Pxo#jR5(-KBeLJvA@-gxNHx0M-ZJLl z;#JwQoh~9V?`UVo#}{6ka@II>++D@%KqGpMdlQ}?9E*wFcf5(#XQnP$Dk5~%iX^>f z%$y;?M0BLp{O3a(-4A?ewryHrrD%cx#Q^%KY1H zNre$ve+vceSLZcNY4U(RBX&)oZn*Py()h)XkE?PL$!bNb{N5FVI2Y%LKEm%yvpyTP z(1P?z~7YxD~Rf<(a@_y` diff --git a/android/app/bin/src/main/res/values/styles.xml b/android/app/bin/src/main/res/values/styles.xml deleted file mode 100644 index 00fa4417..00000000 --- a/android/app/bin/src/main/res/values/styles.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 97b1e4ee..7f34fb1e 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,6 @@ 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. --> - - - - - 2.7.2) + - url_launcher (0.0.1): + - Flutter + +DEPENDENCIES: + - city_pickers (from `.symlinks/plugins/city_pickers/ios`) + - Flutter (from `.symlinks/flutter/ios`) + - flutter_webview_plugin (from `.symlinks/plugins/flutter_webview_plugin/ios`) + - image_picker (from `.symlinks/plugins/image_picker/ios`) + - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`) + - sqflite (from `.symlinks/plugins/sqflite/ios`) + - url_launcher (from `.symlinks/plugins/url_launcher/ios`) + +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - FMDB + +EXTERNAL SOURCES: + city_pickers: + :path: ".symlinks/plugins/city_pickers/ios" + Flutter: + :path: ".symlinks/flutter/ios" + flutter_webview_plugin: + :path: ".symlinks/plugins/flutter_webview_plugin/ios" + image_picker: + :path: ".symlinks/plugins/image_picker/ios" + shared_preferences: + :path: ".symlinks/plugins/shared_preferences/ios" + sqflite: + :path: ".symlinks/plugins/sqflite/ios" + url_launcher: + :path: ".symlinks/plugins/url_launcher/ios" + +SPEC CHECKSUMS: + city_pickers: d6a9e81ec99140576f5adf29c75b7080ca9a9f99 + Flutter: 9d0fac939486c9aba2809b7982dfdbb47a7b0296 + flutter_webview_plugin: 116575b48572029304775b768e9f15ebfc316274 + FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a + image_picker: ee00aab0487cedc80a304085219503cc6d0f2e22 + shared_preferences: 5a1d487c427ee18fcd3ea1f2a131569481834b53 + sqflite: 801b6b0983f722fa29baf00d1476e4556ada6de4 + url_launcher: 92b89c1029a0373879933c21642958c874539095 + +PODFILE CHECKSUM: 1e5af4103afd21ca5ead147d7b81d06f494f51a2 + +COCOAPODS: 1.5.3 diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift new file mode 100644 index 00000000..71cc41e3 --- /dev/null +++ b/ios/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import UIKit +import Flutter + +@UIApplicationMain +@objc class AppDelegate: FlutterAppDelegate { + override func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]? + ) -> Bool { + GeneratedPluginRegistrant.register(with: self) + return super.application(application, didFinishLaunchingWithOptions: launchOptions) + } +} diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png new file mode 100644 index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838 GIT binary patch literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838 GIT binary patch literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838 GIT binary patch literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v literal 0 HcmV?d00001 diff --git a/ios/Runner/Runner-Bridging-Header.h b/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 00000000..7335fdf9 --- /dev/null +++ b/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock new file mode 100644 index 00000000..271d0bfb --- /dev/null +++ b/pubspec.lock @@ -0,0 +1,259 @@ +# Generated by pub +# See https://www.dartlang.org/tools/pub/glossary#lockfile +packages: + args: + dependency: transitive + description: + name: args + url: "https://pub.dartlang.org" + source: hosted + version: "1.5.1" + async: + dependency: transitive + description: + name: async + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.8" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.4" + charcode: + dependency: transitive + description: + name: charcode + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.2" + city_pickers: + dependency: "direct main" + description: + name: city_pickers + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.14" + collection: + dependency: transitive + description: + name: collection + url: "https://pub.dartlang.org" + source: hosted + version: "1.14.11" + cookie_jar: + dependency: transitive + description: + name: cookie_jar + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.8" + cupertino_icons: + dependency: "direct main" + description: + name: cupertino_icons + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.2" + dio: + dependency: "direct main" + description: + name: dio + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.17" + event_bus: + dependency: "direct main" + description: + name: event_bus + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" + fluro: + dependency: "direct main" + description: + name: fluro + url: "https://pub.dartlang.org" + source: hosted + version: "1.4.0" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_markdown: + dependency: "direct main" + description: + name: flutter_markdown + url: "https://pub.dartlang.org" + source: hosted + version: "0.2.0" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + flutter_webview_plugin: + dependency: "direct main" + description: + name: flutter_webview_plugin + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.3" + image_picker: + dependency: "direct main" + description: + name: image_picker + url: "https://pub.dartlang.org" + source: hosted + version: "0.4.12+1" + intl: + dependency: "direct main" + description: + name: intl + url: "https://pub.dartlang.org" + source: hosted + version: "0.15.7" + lpinyin: + dependency: transitive + description: + name: lpinyin + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.7" + markdown: + dependency: transitive + description: + name: markdown + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.2" + matcher: + dependency: transitive + description: + name: matcher + url: "https://pub.dartlang.org" + source: hosted + version: "0.12.3+1" + meta: + dependency: transitive + description: + name: meta + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.6" + path: + dependency: transitive + description: + name: path + url: "https://pub.dartlang.org" + source: hosted + version: "1.6.2" + pedantic: + dependency: transitive + description: + name: pedantic + url: "https://pub.dartlang.org" + source: hosted + version: "1.5.0" + quiver: + dependency: transitive + description: + name: quiver + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" + shared_preferences: + dependency: "direct main" + description: + name: shared_preferences + url: "https://pub.dartlang.org" + source: hosted + version: "0.4.3" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.99" + source_span: + dependency: transitive + description: + name: source_span + url: "https://pub.dartlang.org" + source: hosted + version: "1.5.4" + sqflite: + dependency: "direct main" + description: + name: sqflite + url: "https://pub.dartlang.org" + source: hosted + version: "0.12.2+1" + stack_trace: + dependency: transitive + description: + name: stack_trace + url: "https://pub.dartlang.org" + source: hosted + version: "1.9.3" + stream_channel: + dependency: transitive + description: + name: stream_channel + url: "https://pub.dartlang.org" + source: hosted + version: "1.6.8" + string_scanner: + dependency: transitive + description: + name: string_scanner + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.4" + synchronized: + dependency: transitive + description: + name: synchronized + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + term_glyph: + dependency: transitive + description: + name: term_glyph + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" + test_api: + dependency: transitive + description: + name: test_api + url: "https://pub.dartlang.org" + source: hosted + version: "0.2.2" + typed_data: + dependency: transitive + description: + name: typed_data + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.6" + url_launcher: + dependency: "direct main" + description: + name: url_launcher + url: "https://pub.dartlang.org" + source: hosted + version: "4.2.0+3" + vector_math: + dependency: transitive + description: + name: vector_math + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.8" +sdks: + dart: ">=2.1.1-dev.0.0 <3.0.0" + flutter: ">=0.5.6 <2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 3a43950c..1d47ed4c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -48,151 +48,151 @@ flutter: # the material Icons class. uses-material-design: true assets: - - lib/widgets/elements/Form/Input/TextField/text_field_demo.dart - - lib/widgets/elements/Form/CheckBox/Checkbox/demo.dart - - lib/widgets/components/Bar/AppBar/demo.dart - - lib/widgets/components/Bar/BottomAppBar/demo.dart - - lib/widgets/components/Bar/ButtonBar/demo.dart - - lib/widgets/components/Bar/FlexibleSpaceBar/demo.dart - - lib/widgets/components/Bar/SliverAppBar/demo.dart - - lib/widgets/components/Bar/SnackBar/demo.dart - - lib/widgets/components/Bar/SnackBarAction/demo.dart - - lib/widgets/components/Bar/TabBar/demo.dart - - lib/widgets/components/Card/Card/demo.dart - - lib/widgets/components/Chip/Chip/demo.dart - - lib/widgets/components/Chip/ChipTheme/demo.dart - - lib/widgets/components/Chip/ChipThemeData/demo.dart - - lib/widgets/components/Chip/ChoiceChip/demo.dart - - lib/widgets/components/Chip/FilterChip/demo.dart - - lib/widgets/components/Chip/InputChip/demo.dart - - lib/widgets/components/Chip/RawChip/demo.dart - - lib/widgets/components/Dialog/AboutDialog/demo.dart - - lib/widgets/components/Dialog/AlertDialog/demo.dart - - lib/widgets/components/Dialog/Dialog/demo.dart - - lib/widgets/components/Dialog/SimpleDialog/demo.dart - - lib/widgets/components/Grid/GridTile/demo.dart - - lib/widgets/components/Grid/GridTileBar/demo.dart - - lib/widgets/components/Grid/GridView/demo.dart - - lib/widgets/components/Grid/GridPaper/demo.dart - - lib/widgets/components/Grid/SliverGrid/demo.dart - - lib/widgets/components/List/AnimatedList/demo.dart - - lib/widgets/components/List/ListBody/demo.dart - - lib/widgets/components/List/ListView/demo.dart - - lib/widgets/components/Menu/CheckedPopupMenuItem/demo.dart - - lib/widgets/components/Menu/DropdownMenuItem/demo.dart - - lib/widgets/components/Menu/PopupMenuButton/demo.dart - - lib/widgets/components/Menu/PopupMenuDivider/demo.dart - - lib/widgets/components/Navigation/BottomNavigationBar/demo.dart - - lib/widgets/components/Navigation/BottomNavigationBarItem/demo.dart - - lib/widgets/components/Panel/ExpansionPanel/demo.dart - - lib/widgets/components/Panel/ExpansionPanelList/demo.dart - - lib/widgets/components/Pick/DayPicker/demo.dart - - lib/widgets/components/Pick/MonthPicker/demo.dart - - lib/widgets/components/Pick/ShowdatePicker/demo.dart - - lib/widgets/components/Pick/YearPicker/demo.dart - - lib/widgets/components/Progress/CircularProgressIndicator/demo.dart - - lib/widgets/components/Progress/LinearProgressIndicator/demo.dart - - lib/widgets/components/Progress/RefreshProgressIndicator/demo.dart - - lib/widgets/components/Scaffold/Scaffold/demo.dart - - lib/widgets/components/Scaffold/ScaffoldState/demo.dart - - lib/widgets/components/Scroll/BoxScrollView/demo.dart - - lib/widgets/components/Scroll/CustomScrollView/demo.dart - - lib/widgets/components/Scroll/NestedScrollView/demo.dart - - lib/widgets/components/Scroll/Scrollable/demo.dart - - lib/widgets/components/Scroll/ScrollbarPainter/demo.dart - - lib/widgets/components/Scroll/ScrollMetrics/demo.dart - - lib/widgets/components/Scroll/ScrollPhysics/demo.dart - - lib/widgets/components/Scroll/ScrollView/demo.dart - - lib/widgets/components/Tab/Tab/demo.dart - - lib/widgets/elements/Form/Button/DropdownButton/demo.dart - - lib/widgets/elements/Form/Button/FlatButton/demo.dart - - lib/widgets/elements/Form/Button/FloatingActionButton/demo.dart - - lib/widgets/elements/Form/Button/IconButton/demo.dart - - lib/widgets/elements/Form/Button/OutlineButton/demo.dart - - lib/widgets/elements/Form/Button/PopupMenuButton/demo.dart - - lib/widgets/elements/Form/Button/RaisedButton/demo.dart - - lib/widgets/elements/Form/Button/RawMaterialButton/demo.dart - - lib/widgets/elements/Form/CheckBox/Checkbox/demo.dart - - lib/widgets/elements/Form/CheckBox/CheckboxListTile/demo.dart - - lib/widgets/elements/Form/Radio/Radio/demo.dart - - lib/widgets/elements/Form/Radio/RadioListTile/demo.dart - - lib/widgets/elements/Form/Slider/Slider/demo.dart - - lib/widgets/elements/Form/Slider/SliderTheme/demo.dart - - lib/widgets/elements/Form/Slider/SliderThemeData/demo.dart - - lib/widgets/elements/Form/Switch/AnimatedSwitcher/demo.dart - - lib/widgets/elements/Form/Switch/Switch/demo.dart - - lib/widgets/elements/Form/Switch/SwitchListTile/demo.dart - - lib/widgets/elements/Frame/Align/Align/demo.dart - - lib/widgets/elements/Frame/Box/ConstrainedBox/demo.dart - - lib/widgets/elements/Frame/Box/DecoratedBox/demo.dart - - lib/widgets/elements/Frame/Box/FittedBox/demo.dart - - lib/widgets/elements/Frame/Box/LimitedBox/demo.dart - - lib/widgets/elements/Frame/Box/OverflowBox/demo.dart - - lib/widgets/elements/Frame/Box/RotatedBox/demo.dart - - lib/widgets/elements/Frame/Box/SizeBox/demo.dart - - lib/widgets/elements/Frame/Box/SizedOverflowBox/demo.dart - - lib/widgets/elements/Form/Text/Text/demo.dart - - lib/widgets/elements/Form/Text/RichText/index.dart - - lib/widgets/elements/Frame/Box/UnconstrainedBox/demo.dart - - lib/widgets/elements/Frame/Expanded/Expanded/expanded_demo.dart - - lib/widgets/elements/Frame/Layout/Center/demo.dart - - lib/widgets/elements/Frame/Layout/Column/demo.dart - - lib/widgets/elements/Frame/Layout/Container/demo.dart - - lib/widgets/elements/Frame/Layout/Row/demo.dart - - lib/widgets/elements/Frame/Spacing/AnimatedPadding/animatedPadding_demo.dart - - lib/widgets/elements/Frame/Spacing/Padding/padding_demo.dart - - lib/widgets/elements/Frame/Spacing/SliverPadding/sliverpadding_demo.dart - - lib/widgets/elements/Frame/Stack/IndexedStack/demo.dart - - lib/widgets/elements/Frame/Stack/Stack/demo.dart - - lib/widgets/elements/Frame/Table/Table/table_demo.dart - - lib/widgets/elements/Media/Icon/Icon/demo.dart - - lib/widgets/elements/Media/Icon/IconData/demo.dart - - lib/widgets/elements/Media/Icon/IconTheme/demo.dart - - lib/widgets/elements/Media/Icon/IconThemeData/demo.dart - - lib/widgets/elements/Media/Icon/ImageIcon/demo.dart - - lib/widgets/elements/Media/Image/AssetImage/assetImage_demo.dart - - lib/widgets/elements/Media/Image/DecorationImage/decorationImage_demo.dart - - lib/widgets/elements/Media/Image/DecorationImagePainter/decoration_image_painter_demo.dart - - lib/widgets/elements/Media/Image/ExactAssetImage/exact_asset_image_demo.dart - - lib/widgets/elements/Media/Image/FadeInImage/fade_in_image_demo.dart - - lib/widgets/elements/Media/Image/FileImage/file_image_demo.dart - - lib/widgets/elements/Media/Image/Image/demo.dart - - lib/widgets/elements/Media/Image/MemoryImage/memory_image_demo.dart - - lib/widgets/elements/Media/Image/NetworkImage/network_image_demo.dart - - lib/widgets/elements/Media/Image/paintImage/paint_image_demo.dart - - lib/widgets/elements/Media/Image/precacheImage/precache_image_demo.dart - - lib/widgets/elements/Media/Image/RawImage/raw_image_demo.dart - - lib/widgets/elements/Media/Canvas/Canvas/demo.dart - - lib/widgets/elements/Media/Canvas/CircleProgressBarPainter/demo.dart - - lib/widgets/elements/Media/Canvas/PainterPath/demo.dart - - lib/widgets/elements/Media/Canvas/PainterSketch/demo.dart - - lib/widgets/themes/Material/MaterialApp/demo.dart - - lib/widgets/themes/Material/MaterialButton/demo.dart - - lib/widgets/themes/Material/MaterialColor/demo.dart - - lib/widgets/themes/Material/MaterialPageRoute/demo.dart - - lib/widgets/themes/Material/MergeableMaterialItem/demo.dart - - lib/widgets/themes/Cupertino/CupertinoApp/demo.dart - - lib/widgets/themes/Cupertino/CupertinoButton/demo.dart - - lib/widgets/themes/Cupertino/CupertinoColors/demo.dart - - lib/widgets/themes/Cupertino/CupertinoIcons/demo.dart - - lib/widgets/themes/Cupertino/CupertinoNavigationBar/demo.dart - - lib/widgets/themes/Cupertino/CupertinoPageRoute/demo.dart - - lib/widgets/themes/Cupertino/CupertinoPageScaffold/demo.dart - - lib/widgets/themes/Cupertino/CupertinoPicker/demo.dart - - lib/widgets/themes/Cupertino/CupertinoPopupSurface/demo.dart - - lib/widgets/themes/Cupertino/CupertinoScrollbar/demo.dart - - lib/widgets/themes/Cupertino/CupertinoSegmentedControl/demo.dart - - lib/widgets/elements/Form/Switch/Switch/demo.dart - - lib/widgets/themes/Cupertino/CupertinoSlider/demo.dart - - lib/widgets/themes/Cupertino/CupertinoSliverNavigationBar/demo.dart - - lib/widgets/themes/Cupertino/CupertinoSwitch/demo.dart - - lib/widgets/themes/Cupertino/CupertinoTabBar/demo.dart - - lib/widgets/themes/Cupertino/CupertinoTabScaffold/demo.dart - - lib/widgets/themes/Cupertino/CupertinoTabView/demo.dart - - lib/widgets/themes/Cupertino/CupertinoTimerPicker/demo.dart - - assets/app.db - - assets/images/ - - assets/fonts/ + - lib/widgets/elements/Form/Input/TextField/text_field_demo.dart + - lib/widgets/elements/Form/CheckBox/Checkbox/demo.dart + - lib/widgets/components/Bar/AppBar/demo.dart + - lib/widgets/components/Bar/BottomAppBar/demo.dart + - lib/widgets/components/Bar/ButtonBar/demo.dart + - lib/widgets/components/Bar/FlexibleSpaceBar/demo.dart + - lib/widgets/components/Bar/SliverAppBar/demo.dart + - lib/widgets/components/Bar/SnackBar/demo.dart + - lib/widgets/components/Bar/SnackBarAction/demo.dart + - lib/widgets/components/Bar/TabBar/demo.dart + - lib/widgets/components/Card/Card/demo.dart + - lib/widgets/components/Chip/Chip/demo.dart + - lib/widgets/components/Chip/ChipTheme/demo.dart + - lib/widgets/components/Chip/ChipThemeData/demo.dart + - lib/widgets/components/Chip/ChoiceChip/demo.dart + - lib/widgets/components/Chip/FilterChip/demo.dart + - lib/widgets/components/Chip/InputChip/demo.dart + - lib/widgets/components/Chip/RawChip/demo.dart + - lib/widgets/components/Dialog/AboutDialog/demo.dart + - lib/widgets/components/Dialog/AlertDialog/demo.dart + - lib/widgets/components/Dialog/Dialog/demo.dart + - lib/widgets/components/Dialog/SimpleDialog/demo.dart + - lib/widgets/components/Grid/GridTile/demo.dart + - lib/widgets/components/Grid/GridTileBar/demo.dart + - lib/widgets/components/Grid/GridView/demo.dart + - lib/widgets/components/Grid/GridPaper/demo.dart + - lib/widgets/components/Grid/SliverGrid/demo.dart + - lib/widgets/components/List/AnimatedList/demo.dart + - lib/widgets/components/List/ListBody/demo.dart + - lib/widgets/components/List/ListView/demo.dart + - lib/widgets/components/Menu/CheckedPopupMenuItem/demo.dart + - lib/widgets/components/Menu/DropdownMenuItem/demo.dart + - lib/widgets/components/Menu/PopupMenuButton/demo.dart + - lib/widgets/components/Menu/PopupMenuDivider/demo.dart + - lib/widgets/components/Navigation/BottomNavigationBar/demo.dart + - lib/widgets/components/Navigation/BottomNavigationBarItem/demo.dart + - lib/widgets/components/Panel/ExpansionPanel/demo.dart + - lib/widgets/components/Panel/ExpansionPanelList/demo.dart + - lib/widgets/components/Pick/DayPicker/demo.dart + - lib/widgets/components/Pick/MonthPicker/demo.dart + - lib/widgets/components/Pick/ShowdatePicker/demo.dart + - lib/widgets/components/Pick/YearPicker/demo.dart + - lib/widgets/components/Progress/CircularProgressIndicator/demo.dart + - lib/widgets/components/Progress/LinearProgressIndicator/demo.dart + - lib/widgets/components/Progress/RefreshProgressIndicator/demo.dart + - lib/widgets/components/Scaffold/Scaffold/demo.dart + - lib/widgets/components/Scaffold/ScaffoldState/demo.dart + - lib/widgets/components/Scroll/BoxScrollView/demo.dart + - lib/widgets/components/Scroll/CustomScrollView/demo.dart + - lib/widgets/components/Scroll/NestedScrollView/demo.dart + - lib/widgets/components/Scroll/Scrollable/demo.dart + - lib/widgets/components/Scroll/ScrollbarPainter/demo.dart + - lib/widgets/components/Scroll/ScrollMetrics/demo.dart + - lib/widgets/components/Scroll/ScrollPhysics/demo.dart + - lib/widgets/components/Scroll/ScrollView/demo.dart + - lib/widgets/components/Tab/Tab/demo.dart + - lib/widgets/elements/Form/Button/DropdownButton/demo.dart + - lib/widgets/elements/Form/Button/FlatButton/demo.dart + - lib/widgets/elements/Form/Button/FloatingActionButton/demo.dart + - lib/widgets/elements/Form/Button/IconButton/demo.dart + - lib/widgets/elements/Form/Button/OutlineButton/demo.dart + - lib/widgets/elements/Form/Button/PopupMenuButton/demo.dart + - lib/widgets/elements/Form/Button/RaisedButton/demo.dart + - lib/widgets/elements/Form/Button/RawMaterialButton/demo.dart + - lib/widgets/elements/Form/CheckBox/Checkbox/demo.dart + - lib/widgets/elements/Form/CheckBox/CheckboxListTile/demo.dart + - lib/widgets/elements/Form/Radio/Radio/demo.dart + - lib/widgets/elements/Form/Radio/RadioListTile/demo.dart + - lib/widgets/elements/Form/Slider/Slider/demo.dart + - lib/widgets/elements/Form/Slider/SliderTheme/demo.dart + - lib/widgets/elements/Form/Slider/SliderThemeData/demo.dart + - lib/widgets/elements/Form/Switch/AnimatedSwitcher/demo.dart + - lib/widgets/elements/Form/Switch/Switch/demo.dart + - lib/widgets/elements/Form/Switch/SwitchListTile/demo.dart + - lib/widgets/elements/Frame/Align/Align/demo.dart + - lib/widgets/elements/Frame/Box/ConstrainedBox/demo.dart + - lib/widgets/elements/Frame/Box/DecoratedBox/demo.dart + - lib/widgets/elements/Frame/Box/FittedBox/demo.dart + - lib/widgets/elements/Frame/Box/LimitedBox/demo.dart + - lib/widgets/elements/Frame/Box/OverflowBox/demo.dart + - lib/widgets/elements/Frame/Box/RotatedBox/demo.dart + - lib/widgets/elements/Frame/Box/SizeBox/demo.dart + - lib/widgets/elements/Frame/Box/SizedOverflowBox/demo.dart + - lib/widgets/elements/Form/Text/Text/demo.dart + - lib/widgets/elements/Form/Text/RichText/index.dart + - lib/widgets/elements/Frame/Box/UnconstrainedBox/demo.dart + - lib/widgets/elements/Frame/Expanded/Expanded/expanded_demo.dart + - lib/widgets/elements/Frame/Layout/Center/demo.dart + - lib/widgets/elements/Frame/Layout/Column/demo.dart + - lib/widgets/elements/Frame/Layout/Container/demo.dart + - lib/widgets/elements/Frame/Layout/Row/demo.dart + - lib/widgets/elements/Frame/Spacing/AnimatedPadding/animatedPadding_demo.dart + - lib/widgets/elements/Frame/Spacing/Padding/padding_demo.dart + - lib/widgets/elements/Frame/Spacing/SliverPadding/sliverpadding_demo.dart + - lib/widgets/elements/Frame/Stack/IndexedStack/demo.dart + - lib/widgets/elements/Frame/Stack/Stack/demo.dart + - lib/widgets/elements/Frame/Table/Table/table_demo.dart + - lib/widgets/elements/Media/Icon/Icon/demo.dart + - lib/widgets/elements/Media/Icon/IconData/demo.dart + - lib/widgets/elements/Media/Icon/IconTheme/demo.dart + - lib/widgets/elements/Media/Icon/IconThemeData/demo.dart + - lib/widgets/elements/Media/Icon/ImageIcon/demo.dart + - lib/widgets/elements/Media/Image/AssetImage/assetImage_demo.dart + - lib/widgets/elements/Media/Image/DecorationImage/decorationImage_demo.dart + - lib/widgets/elements/Media/Image/DecorationImagePainter/decoration_image_painter_demo.dart + - lib/widgets/elements/Media/Image/ExactAssetImage/exact_asset_image_demo.dart + - lib/widgets/elements/Media/Image/FadeInImage/fade_in_image_demo.dart + - lib/widgets/elements/Media/Image/FileImage/file_image_demo.dart + - lib/widgets/elements/Media/Image/Image/demo.dart + - lib/widgets/elements/Media/Image/MemoryImage/memory_image_demo.dart + - lib/widgets/elements/Media/Image/NetworkImage/network_image_demo.dart + - lib/widgets/elements/Media/Image/paintImage/paint_image_demo.dart + - lib/widgets/elements/Media/Image/precacheImage/precache_image_demo.dart + - lib/widgets/elements/Media/Image/RawImage/raw_image_demo.dart + - lib/widgets/elements/Media/Canvas/Canvas/demo.dart + - lib/widgets/elements/Media/Canvas/CircleProgressBarPainter/demo.dart + - lib/widgets/elements/Media/Canvas/PainterPath/demo.dart + - lib/widgets/elements/Media/Canvas/PainterSketch/demo.dart + - lib/widgets/themes/Material/MaterialApp/demo.dart + - lib/widgets/themes/Material/MaterialButton/demo.dart + - lib/widgets/themes/Material/MaterialColor/demo.dart + - lib/widgets/themes/Material/MaterialPageRoute/demo.dart + - lib/widgets/themes/Material/MergeableMaterialItem/demo.dart + - lib/widgets/themes/Cupertino/CupertinoApp/demo.dart + - lib/widgets/themes/Cupertino/CupertinoButton/demo.dart + - lib/widgets/themes/Cupertino/CupertinoColors/demo.dart + - lib/widgets/themes/Cupertino/CupertinoIcons/demo.dart + - lib/widgets/themes/Cupertino/CupertinoNavigationBar/demo.dart + - lib/widgets/themes/Cupertino/CupertinoPageRoute/demo.dart + - lib/widgets/themes/Cupertino/CupertinoPageScaffold/demo.dart + - lib/widgets/themes/Cupertino/CupertinoPicker/demo.dart + - lib/widgets/themes/Cupertino/CupertinoPopupSurface/demo.dart + - lib/widgets/themes/Cupertino/CupertinoScrollbar/demo.dart + - lib/widgets/themes/Cupertino/CupertinoSegmentedControl/demo.dart + - lib/widgets/elements/Form/Switch/Switch/demo.dart + - lib/widgets/themes/Cupertino/CupertinoSlider/demo.dart + - lib/widgets/themes/Cupertino/CupertinoSliverNavigationBar/demo.dart + - lib/widgets/themes/Cupertino/CupertinoSwitch/demo.dart + - lib/widgets/themes/Cupertino/CupertinoTabBar/demo.dart + - lib/widgets/themes/Cupertino/CupertinoTabScaffold/demo.dart + - lib/widgets/themes/Cupertino/CupertinoTabView/demo.dart + - lib/widgets/themes/Cupertino/CupertinoTimerPicker/demo.dart + - assets/app.db + - assets/images/ + - assets/fonts/ fonts: - family: FlamanteRoma From a8b8cef0620dc82ce63428adad38ce337b75b67b Mon Sep 17 00:00:00 2001 From: DeckeDeng Date: Mon, 8 Apr 2019 15:10:14 +0800 Subject: [PATCH 04/12] flutter project switch ios or android by androidstudio --- .gitignore | 9 +++++++++ .metadata | 10 ---------- LICENSE | 21 +++++++++++++++++++++ android/app/src/main/AndroidManifest.xml | 5 +++++ 4 files changed, 35 insertions(+), 10 deletions(-) delete mode 100644 .metadata create mode 100644 LICENSE diff --git a/.gitignore b/.gitignore index 07488ba6..639431bc 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,15 @@ .buildlog/ .history .svn/ +*.lock +.vscode +.gradle +.idea +/local.properties +.DS_Store +/build +.metadata + # IntelliJ related *.iml diff --git a/.metadata b/.metadata deleted file mode 100644 index a3ce5b16..00000000 --- a/.metadata +++ /dev/null @@ -1,10 +0,0 @@ -# This file tracks properties of this Flutter project. -# Used by Flutter tool to assess capabilities and perform upgrades etc. -# -# This file should be version controlled and should not be manually edited. - -version: - revision: 1e5992a3c59eff6a75c2d93e5209d995069158dd - channel: master - -project_type: app diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..266fb814 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +Copyright (c) 2018-present Alibaba Inc. + +Permission is granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS", +WITHOUT WARRANTY OF ANY KIND,EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO +THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE \ No newline at end of file diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 7f34fb1e..97b1e4ee 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -6,6 +6,11 @@ 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. --> + + + + + Date: Thu, 11 Apr 2019 22:30:36 +0800 Subject: [PATCH 05/12] +roadmap +roadmap --- README.md | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 5568e6f8..2bd875db 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,8 @@ Language: [English](https://github.com/alibaba/flutter-go/blob/master/README-en. [<< Flutter Go 开发规范第一版 >>](https://github.com/alibaba/flutter-go/blob/develop/Flutter_Go%20%E4%BB%A3%E7%A0%81%E5%BC%80%E5%8F%91%E8%A7%84%E8%8C%83.md) +## 关于2019年的 Roadmap(由于flutter 未来的变化和策略的不确定，目前只规划到 2019上半年的为基准 ） + ## Release安装包下载地址 android下载地址: @@ -98,33 +100,3 @@ flutter优点主要包括： Powered by [阿里拍卖前端团队](https://github.com/alibaba-paimai-frontend) - ---- - -## 加个广告：团队招聘 - - ### 🔥《阿里巴巴集团春季校园招聘》已经启动。 - -- 团队获取此消息后第一时间，赶紧通知，各位刚走出校园的千里马，走进阿里的机会来了！！！ - - 基本要求如下： - - - 招收 2019年11月-2020年10月 毕业的同学 - - 本次校招行动共执行四周，到 4月12日结束 - -#### 🔔强调一下这次是校招哦！！！如果你有意向，又符合 2019年11月-2020年10月 的应届毕业生条件; - -- 不符合，也没关系，可以推荐优秀的学弟，学妹；增进一下“纯洁”的同学感情 👫😎。 - -#### 请移步往下,关注我们《阿里拍卖团队》 的招聘信息。 - - - - - - - -#### 最重要的部分来了，手机扫描下面二维码，即可进入简历投递系统 - - - From 0fd606afb6ed55dac52212414935e0fd975e2d93 Mon Sep 17 00:00:00 2001 From: ryan730 Date: Fri, 12 Apr 2019 16:05:57 +0800 Subject: [PATCH 06/12] add: doc roadmap add: doc roadmap --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2bd875db..0c2ee89c 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,11 @@ Language: [English](https://github.com/alibaba/flutter-go/blob/master/README-en. [<< Flutter Go 开发规范第一版 >>](https://github.com/alibaba/flutter-go/blob/develop/Flutter_Go%20%E4%BB%A3%E7%A0%81%E5%BC%80%E5%8F%91%E8%A7%84%E8%8C%83.md) -## 关于2019年的 Roadmap(由于flutter 未来的变化和策略的不确定，目前只规划到 2019上半年的为基准 ） +## The Flutter-Go Roadmap for 2019 +> 考虑到flutter 未来的变化和策略的可变性,roadmap 不排查有一定调整，但总体不会变化太大。 + + + ## Release安装包下载地址 From d6ef595f1c2182179730bf0f33c434ef96f450d4 Mon Sep 17 00:00:00 2001 From: ryan730 Date: Fri, 12 Apr 2019 16:14:20 +0800 Subject: [PATCH 07/12] =?UTF-8?q?update:=20=E4=BF=AE=E6=94=B9=E9=94=99?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit update: 修改错字 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0c2ee89c..912b809a 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,8 @@ Language: [English](https://github.com/alibaba/flutter-go/blob/master/README-en. [<< Flutter Go 开发规范第一版 >>](https://github.com/alibaba/flutter-go/blob/develop/Flutter_Go%20%E4%BB%A3%E7%A0%81%E5%BC%80%E5%8F%91%E8%A7%84%E8%8C%83.md) -## The Flutter-Go Roadmap for 2019 -> 考虑到flutter 未来的变化和策略的可变性,roadmap 不排查有一定调整，但总体不会变化太大。 +## The Flutter-Go Roadmap（路线图） for 2019 +> 考虑到 Flutter 未来的变化和策略的可变性, roadmap 不排除有一定调整，但总体不会变化太大。 From 398ed2a89a256fe782acf13e69ff3a9973c95d95 Mon Sep 17 00:00:00 2001 From: Fiona <408232927@qq.com> Date: Mon, 15 Apr 2019 10:18:00 +0800 Subject: [PATCH 08/12] Update README-en.md --- README-en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README-en.md b/README-en.md index 8d12ec7a..e6a91cfe 100644 --- a/README-en.md +++ b/README-en.md @@ -9,7 +9,7 @@ Android download URL: - + Iphone download URL: No From f55539cab34541d3f17ae428ca06d9c48bd5d40c Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 15 Apr 2019 17:48:06 +0800 Subject: [PATCH 09/12] =?UTF-8?q?Add:=20=E5=A2=9E=E5=8A=A0firebase=20?= =?UTF-8?q?=E7=9A=84=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/build.gradle | 14 +++++++ android/app/google-services.json | 42 +++++++++++++++++++ android/build.gradle | 14 +++++++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- ios/Runner.xcodeproj/project.pbxproj | 24 +++++------ ios/Runner/AppDelegate.m | 5 +++ ios/Runner/GoogleService-Info.plist | 40 ++++++++++++++++++ lib/main.dart | 2 + lib/routers/routers.dart | 4 ++ lib/utils/analytics.dart | 7 ++++ lib/utils/login.dart | 26 ++++++++++++ pubspec.yaml | 3 ++ 12 files changed, 170 insertions(+), 13 deletions(-) create mode 100644 android/app/google-services.json create mode 100644 ios/Runner/GoogleService-Info.plist create mode 100644 lib/utils/analytics.dart create mode 100644 lib/utils/login.dart diff --git a/android/app/build.gradle b/android/app/build.gradle index d3038cdf..b548dd94 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -58,4 +58,18 @@ dependencies { testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + //firebase + implementation 'com.google.firebase:firebase-core:16.0.8' + //Crashlytics SDK + implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9' + // 性能监控 + ///implementation 'com.google.firebase:firebase-perf:16.2.3' + // 登陆 + ////implementation 'com.google.firebase:firebase-auth:16.0.3' } +//firebase +apply plugin: 'com.google.gms.google-services' +//Crashlytics SDK +apply plugin: 'io.fabric' +// 性能监控 +///apply plugin: 'com.google.firebase.firebase-perf' \ No newline at end of file diff --git a/android/app/google-services.json b/android/app/google-services.json new file mode 100644 index 00000000..22b356f0 --- /dev/null +++ b/android/app/google-services.json @@ -0,0 +1,42 @@ +{ + "project_info": { + "project_number": "958876143057", + "firebase_url": "https://flutter-go-421b4.firebaseio.com", + "project_id": "flutter-go-421b4", + "storage_bucket": "flutter-go-421b4.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:958876143057:android:00e8533fa0274183", + "android_client_info": { + "package_name": "com.ali.fluttergo" + } + }, + "oauth_client": [ + { + "client_id": "958876143057-maa2o9gk35r67d3dbn1gjilpg4ukac71.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyAfYEa2NfytIA-Rdc_K4F-iufgXQ6Lz5ZI" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 1, + "other_platform_oauth_client": [] + }, + "ads_service": { + "status": 2 + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index e81b1a1d..8cb8f7fe 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,10 +2,20 @@ buildscript { repositories { google() jcenter() + //Crashlytics SDK + maven { + url 'https://maven.fabric.io/public' + } } dependencies { classpath 'com.android.tools.build:gradle:3.2.0' + //firebase + classpath 'com.google.gms:google-services:4.2.0' + //Crashlytics SDK + classpath 'io.fabric.tools:gradle:1.26.1' + // 性能监控 + ///classpath 'com.google.firebase:firebase-plugins:1.1.5' } } @@ -13,6 +23,10 @@ allprojects { repositories { google() jcenter() + //Crashlytics SDK + maven { + url 'https://maven.google.com/' + } } } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 03824124..c2bcac0e 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 8c3f0e89..f458f3aa 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -29,6 +29,7 @@ 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; }; 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 94722E5C22511D3600F63900 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 94722E5B22511D3600F63900 /* GoogleService-Info.plist */; }; 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; }; 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; @@ -78,6 +79,7 @@ 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; + 94722E5B22511D3600F63900 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../../../../../Downloads/GoogleService-Info.plist"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = ""; }; @@ -87,6 +89,8 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + A9941E6EA19A9CEF6B117A70 /* 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 = ""; }; + CBA6E34746642008D95A119D /* 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 = ""; }; DDA792F029EDD7A11295D192 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -129,6 +133,8 @@ 0C172CA58CDB230D5DA80034 /* Pods */ = { isa = PBXGroup; children = ( + CBA6E34746642008D95A119D /* Pods-Runner.debug.xcconfig */, + A9941E6EA19A9CEF6B117A70 /* Pods-Runner.release.xcconfig */, ); name = Pods; sourceTree = ""; @@ -178,6 +184,7 @@ 97C146F01CF9000F007C117D /* Runner */ = { isa = PBXGroup; children = ( + 94722E5B22511D3600F63900 /* GoogleService-Info.plist */, 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */, 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */, 97C146FA1CF9000F007C117D /* Main.storyboard */, @@ -282,6 +289,7 @@ 0828E49B220692B500A59437 /* iPad Landscape@2x.png in Resources */, 0828E495220692B500A59437 /* iPhone Portrait-Retina 4.png in Resources */, 0828E498220692B500A59437 /* iPhone XS Max Portrait.png in Resources */, + 94722E5C22511D3600F63900 /* GoogleService-Info.plist in Resources */, 0828E496220692B500A59437 /* iPad Portrait.png in Resources */, 0828E49C220692B500A59437 /* iPhone Landscape-Retina HD 5.5.png in Resources */, ); @@ -309,15 +317,11 @@ buildActionMask = 2147483647; files = ( ); - inputFileListPaths = ( - ); inputPaths = ( "${PODS_PODFILE_DIR_PATH}/Podfile.lock", "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); outputPaths = ( "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); @@ -345,21 +349,17 @@ buildActionMask = 2147483647; files = ( ); - inputFileListPaths = ( - ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", "${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework", ); name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - ); outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -522,7 +522,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.ali.flutterRookieBook; + PRODUCT_BUNDLE_IDENTIFIER = com.ali.fluttergo; PRODUCT_NAME = "$(TARGET_NAME)"; VERSIONING_SYSTEM = "apple-generic"; }; @@ -547,7 +547,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.ali.flutterRookieBook; + PRODUCT_BUNDLE_IDENTIFIER = com.ali.fluttergo; PRODUCT_NAME = "$(TARGET_NAME)"; VERSIONING_SYSTEM = "apple-generic"; }; diff --git a/ios/Runner/AppDelegate.m b/ios/Runner/AppDelegate.m index 7feb3d13..7474c39b 100644 --- a/ios/Runner/AppDelegate.m +++ b/ios/Runner/AppDelegate.m @@ -1,10 +1,15 @@ #include "AppDelegate.h" #include "GeneratedPluginRegistrant.h" +@import Firebase;//增加 firebase 支持 + @implementation AppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + + [FIRApp configure];//增加 firebase 支持 + [GeneratedPluginRegistrant registerWithRegistry:self]; // Override point for customization after application launch. [NSThread sleepForTimeInterval:2]; diff --git a/ios/Runner/GoogleService-Info.plist b/ios/Runner/GoogleService-Info.plist new file mode 100644 index 00000000..2c32fe6f --- /dev/null +++ b/ios/Runner/GoogleService-Info.plist @@ -0,0 +1,40 @@ + + + + + AD_UNIT_ID_FOR_BANNER_TEST + ca-app-pub-3940256099942544/2934735716 + AD_UNIT_ID_FOR_INTERSTITIAL_TEST + ca-app-pub-3940256099942544/4411468910 + CLIENT_ID + 958876143057-v6bp8g0p6dflvlk38qmbngt5pmon8sfs.apps.googleusercontent.com + REVERSED_CLIENT_ID + com.googleusercontent.apps.958876143057-v6bp8g0p6dflvlk38qmbngt5pmon8sfs + API_KEY + AIzaSyDbNj43LaECfyAEebrEkAN_ZcvmmOitwTY + GCM_SENDER_ID + 958876143057 + PLIST_VERSION + 1 + BUNDLE_ID + com.ali.fluttergo + PROJECT_ID + flutter-go-421b4 + STORAGE_BUCKET + flutter-go-421b4.appspot.com + IS_ADS_ENABLED + + IS_ANALYTICS_ENABLED + + IS_APPINVITE_ENABLED + + IS_GCM_ENABLED + + IS_SIGNIN_ENABLED + + GOOGLE_APP_ID + 1:958876143057:ios:00e8533fa0274183 + DATABASE_URL + https://flutter-go-421b4.firebaseio.com + + \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index 8d268d7b..f83e2133 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -8,6 +8,7 @@ import 'package:flutter_go/utils/provider.dart'; import 'package:flutter_go/utils/shared_preferences.dart'; import 'package:flutter_go/views/first_page/home.dart'; import 'package:flutter_go/model/search_history.dart'; +import 'package:flutter_go/utils/analytics.dart' as Analytics; //import 'views/welcome_page/index.dart'; const int ThemeColor = 0xFFC91B3A; @@ -53,6 +54,7 @@ class MyApp extends StatelessWidget { body: showWelcomePage() ), onGenerateRoute: Application.router.generator, + navigatorObservers: [Analytics.observer], ); } } diff --git a/lib/routers/routers.dart b/lib/routers/routers.dart index 4e589b61..7715b2bf 100644 --- a/lib/routers/routers.dart +++ b/lib/routers/routers.dart @@ -1,6 +1,7 @@ import 'package:fluro/fluro.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_go/utils/analytics.dart' show analytics; import '../widgets/index.dart'; import './router_handler.dart'; @@ -26,6 +27,9 @@ class Routes { widgetDemosList.forEach((demo) { Handler handler = new Handler( handlerFunc: (BuildContext context, Map> params) { + print('组件路由params=$params widgetsItem=${demo.routerName}'); + analytics.logEvent( + name: 'component', parameters: {'name': demo.routerName }); return demo.buildRouter(context); }); router.define('${demo.routerName}', handler: handler); diff --git a/lib/utils/analytics.dart b/lib/utils/analytics.dart new file mode 100644 index 00000000..2a7fcf6f --- /dev/null +++ b/lib/utils/analytics.dart @@ -0,0 +1,7 @@ +import 'package:firebase_analytics/firebase_analytics.dart'; +import 'package:firebase_analytics/observer.dart'; + +//统计 +FirebaseAnalytics analytics = FirebaseAnalytics(); +FirebaseAnalyticsObserver observer = + FirebaseAnalyticsObserver(analytics: analytics); diff --git a/lib/utils/login.dart b/lib/utils/login.dart new file mode 100644 index 00000000..d21b94bb --- /dev/null +++ b/lib/utils/login.dart @@ -0,0 +1,26 @@ +import 'package:firebase_auth/firebase_auth.dart'; +final GoogleSignIn _googleSignIn = GoogleSignIn(); +final FirebaseAuth _auth = FirebaseAuth.instance; + +Future _handleSignIn() async { + final GoogleSignInAccount googleUser = await _googleSignIn.signIn(); + final GoogleSignInAuthentication googleAuth = await googleUser.authentication; + + final AuthCredential credential = GoogleAuthProvider.getCredential( + accessToken: googleAuth.accessToken, + idToken: googleAuth.idToken, + ); + + final FirebaseUser user = await _auth.signInWithCredential(credential); + print("signed in " + user.displayName); + return user; +} + +_handleSignIn() + .then((FirebaseUser user) => print(user)) + .catchError((e) => print(e)); + +final FirebaseUser user = await _auth.createUserWithEmailAndPassword( + email: 'an email', + password: 'a password', +); \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 3a43950c..a99e40bc 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -32,6 +32,9 @@ dependencies: # 日期格式化 intl: 0.15.7 city_pickers: ^0.1.0 + firebase_analytics: ^2.0.2+1 + firebase_auth: ^0.8.3 #auth + firebase_core: ^0.3.0 # add dependency for Firebase Core dev_dependencies: flutter_test: From 9f268fc3e2b349373320ed8389f67fcbfd08f208 Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 15 Apr 2019 23:30:32 +0800 Subject: [PATCH 10/12] =?UTF-8?q?Add:=20=E5=A2=9E=E5=8A=A0firebase=20?= =?UTF-8?q?=E7=9A=84=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/google-services.json | 35 ++++++++++++++++------------- ios/Runner/GoogleService-Info.plist | 24 +++++++++----------- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/android/app/google-services.json b/android/app/google-services.json index 22b356f0..db0fccf8 100644 --- a/android/app/google-services.json +++ b/android/app/google-services.json @@ -1,39 +1,44 @@ { "project_info": { - "project_number": "958876143057", - "firebase_url": "https://flutter-go-421b4.firebaseio.com", - "project_id": "flutter-go-421b4", - "storage_bucket": "flutter-go-421b4.appspot.com" + "project_number": "1002138254102", + "firebase_url": "https://ali-flutter-go.firebaseio.com", + "project_id": "ali-flutter-go", + "storage_bucket": "ali-flutter-go.appspot.com" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:958876143057:android:00e8533fa0274183", + "mobilesdk_app_id": "1:1002138254102:android:00e8533fa0274183", "android_client_info": { "package_name": "com.ali.fluttergo" } }, "oauth_client": [ { - "client_id": "958876143057-maa2o9gk35r67d3dbn1gjilpg4ukac71.apps.googleusercontent.com", + "client_id": "1002138254102-2r4hs0mm1avp4p1qielecihnbugan693.apps.googleusercontent.com", "client_type": 3 } ], "api_key": [ { - "current_key": "AIzaSyAfYEa2NfytIA-Rdc_K4F-iufgXQ6Lz5ZI" + "current_key": "AIzaSyDFdL3GSwVDfejIq44pyOpiEBZ32dTGMVA" } ], "services": { - "analytics_service": { - "status": 1 - }, "appinvite_service": { - "status": 1, - "other_platform_oauth_client": [] - }, - "ads_service": { - "status": 2 + "other_platform_oauth_client": [ + { + "client_id": "1002138254102-2r4hs0mm1avp4p1qielecihnbugan693.apps.googleusercontent.com", + "client_type": 3 + }, + { + "client_id": "1002138254102-qo9jp8c3lc69p9lclu0rtp5dmt1kulv7.apps.googleusercontent.com", + "client_type": 2, + "ios_info": { + "bundle_id": "com.ali.fluttergo" + } + } + ] } } } diff --git a/ios/Runner/GoogleService-Info.plist b/ios/Runner/GoogleService-Info.plist index 2c32fe6f..26e23345 100644 --- a/ios/Runner/GoogleService-Info.plist +++ b/ios/Runner/GoogleService-Info.plist @@ -2,39 +2,35 @@ - AD_UNIT_ID_FOR_BANNER_TEST - ca-app-pub-3940256099942544/2934735716 - AD_UNIT_ID_FOR_INTERSTITIAL_TEST - ca-app-pub-3940256099942544/4411468910 CLIENT_ID - 958876143057-v6bp8g0p6dflvlk38qmbngt5pmon8sfs.apps.googleusercontent.com + 1002138254102-qo9jp8c3lc69p9lclu0rtp5dmt1kulv7.apps.googleusercontent.com REVERSED_CLIENT_ID - com.googleusercontent.apps.958876143057-v6bp8g0p6dflvlk38qmbngt5pmon8sfs + com.googleusercontent.apps.1002138254102-qo9jp8c3lc69p9lclu0rtp5dmt1kulv7 API_KEY - AIzaSyDbNj43LaECfyAEebrEkAN_ZcvmmOitwTY + AIzaSyD01jR14RevQibnzkg4tBUbFzc7UjKESFQ GCM_SENDER_ID - 958876143057 + 1002138254102 PLIST_VERSION 1 BUNDLE_ID com.ali.fluttergo PROJECT_ID - flutter-go-421b4 + ali-flutter-go STORAGE_BUCKET - flutter-go-421b4.appspot.com + ali-flutter-go.appspot.com IS_ADS_ENABLED - + IS_ANALYTICS_ENABLED IS_APPINVITE_ENABLED - + IS_GCM_ENABLED IS_SIGNIN_ENABLED GOOGLE_APP_ID - 1:958876143057:ios:00e8533fa0274183 + 1:1002138254102:ios:00e8533fa0274183 DATABASE_URL - https://flutter-go-421b4.firebaseio.com + https://ali-flutter-go.firebaseio.com \ No newline at end of file From 4c72f685031769221c83b76240552fe76482b063 Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 22 Apr 2019 15:26:20 +0800 Subject: [PATCH 11/12] =?UTF-8?q?Delete:=E5=88=A0=E9=99=A4=20.gradle=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gradle/3.5.1/file-changes/last-build.bin | Bin 1 -> 0 bytes .gradle/3.5.1/taskHistory/taskHistory.lock | Bin 17 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .gradle/3.5.1/file-changes/last-build.bin delete mode 100644 .gradle/3.5.1/taskHistory/taskHistory.lock diff --git a/.gradle/3.5.1/file-changes/last-build.bin b/.gradle/3.5.1/file-changes/last-build.bin deleted file mode 100644 index f76dd238ade08917e6712764a16a22005a50573d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1 IcmZPo000310RR91 diff --git a/.gradle/3.5.1/taskHistory/taskHistory.lock b/.gradle/3.5.1/taskHistory/taskHistory.lock deleted file mode 100644 index 1a1ada5203be8e7b6e776c64bbe342499620c2d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 TcmZQ}US2Noawhu}1}FdkEbs%G From 220f417739925a84707c51424cf3404898237e45 Mon Sep 17 00:00:00 2001 From: ryan730 Date: Mon, 22 Apr 2019 16:11:00 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 格式化 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 912b809a..6ec8fa68 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ flutter优点主要包括： #### Flutter Go 的优势 -- 详解常用widget多达 **140+** 个 +- 详解常用 widget 多达 **140+** 个 - 配套 Demo 详解 widget 常规用法 - 集中整合 widget 案例，一个 APP 搞定所有常用 widget 的用法 - 持续迭代 ‘追新’ 官方版本