From 044793eebab21de25af3f530177b9a27e6ce707a Mon Sep 17 00:00:00 2001 From: Thome Date: Thu, 5 Mar 2020 17:19:24 -0300 Subject: [PATCH 01/10] Initial Commit --- starwiki/.gitignore | 37 ++ starwiki/.metadata | 10 + starwiki/README.md | 16 + starwiki/android/.gitignore | 7 + starwiki/android/app/build.gradle | 67 +++ .../android/app/src/debug/AndroidManifest.xml | 7 + .../android/app/src/main/AndroidManifest.xml | 30 + .../com/example/starwiki/MainActivity.kt | 12 + .../main/res/drawable/launch_background.xml | 12 + .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 544 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 442 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 721 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 1031 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 1443 bytes .../app/src/main/res/values/styles.xml | 8 + .../app/src/profile/AndroidManifest.xml | 7 + starwiki/android/build.gradle | 31 ++ starwiki/android/gradle.properties | 4 + .../gradle/wrapper/gradle-wrapper.properties | 6 + starwiki/android/settings.gradle | 15 + starwiki/ios/.gitignore | 32 ++ starwiki/ios/Flutter/AppFrameworkInfo.plist | 26 + starwiki/ios/Flutter/Debug.xcconfig | 1 + starwiki/ios/Flutter/Release.xcconfig | 1 + starwiki/ios/Runner.xcodeproj/project.pbxproj | 518 ++++++++++++++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/xcschemes/Runner.xcscheme | 91 +++ .../contents.xcworkspacedata | 7 + starwiki/ios/Runner/AppDelegate.swift | 13 + .../AppIcon.appiconset/Contents.json | 122 +++++ .../Icon-App-1024x1024@1x.png | Bin 0 -> 10932 bytes .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin 0 -> 564 bytes .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin 0 -> 1283 bytes .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin 0 -> 1588 bytes .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin 0 -> 1025 bytes .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin 0 -> 1716 bytes .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin 0 -> 1920 bytes .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin 0 -> 1283 bytes .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin 0 -> 1895 bytes .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin 0 -> 2665 bytes .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin 0 -> 2665 bytes .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin 0 -> 3831 bytes .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin 0 -> 1888 bytes .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin 0 -> 3294 bytes .../Icon-App-83.5x83.5@2x.png | Bin 0 -> 3612 bytes .../LaunchImage.imageset/Contents.json | 23 + .../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 .../LaunchImage.imageset/README.md | 5 + .../Runner/Base.lproj/LaunchScreen.storyboard | 37 ++ .../ios/Runner/Base.lproj/Main.storyboard | 26 + starwiki/ios/Runner/Info.plist | 45 ++ starwiki/ios/Runner/Runner-Bridging-Header.h | 1 + starwiki/lib/main.dart | 63 +++ starwiki/pubspec.lock | 195 +++++++ starwiki/pubspec.yaml | 72 +++ starwiki/test/widget_test.dart | 30 + 58 files changed, 1584 insertions(+) create mode 100644 starwiki/.gitignore create mode 100644 starwiki/.metadata create mode 100644 starwiki/README.md create mode 100644 starwiki/android/.gitignore create mode 100644 starwiki/android/app/build.gradle create mode 100644 starwiki/android/app/src/debug/AndroidManifest.xml create mode 100644 starwiki/android/app/src/main/AndroidManifest.xml create mode 100644 starwiki/android/app/src/main/kotlin/com/example/starwiki/MainActivity.kt create mode 100644 starwiki/android/app/src/main/res/drawable/launch_background.xml create mode 100644 starwiki/android/app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 starwiki/android/app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 starwiki/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 starwiki/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 starwiki/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 starwiki/android/app/src/main/res/values/styles.xml create mode 100644 starwiki/android/app/src/profile/AndroidManifest.xml create mode 100644 starwiki/android/build.gradle create mode 100644 starwiki/android/gradle.properties create mode 100644 starwiki/android/gradle/wrapper/gradle-wrapper.properties create mode 100644 starwiki/android/settings.gradle create mode 100644 starwiki/ios/.gitignore create mode 100644 starwiki/ios/Flutter/AppFrameworkInfo.plist create mode 100644 starwiki/ios/Flutter/Debug.xcconfig create mode 100644 starwiki/ios/Flutter/Release.xcconfig create mode 100644 starwiki/ios/Runner.xcodeproj/project.pbxproj create mode 100644 starwiki/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 starwiki/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme create mode 100644 starwiki/ios/Runner.xcworkspace/contents.xcworkspacedata create mode 100644 starwiki/ios/Runner/AppDelegate.swift create mode 100644 starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png create mode 100644 starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png create mode 100644 starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png create mode 100644 starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png create mode 100644 starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png create mode 100644 starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png create mode 100644 starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png create mode 100644 starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png create mode 100644 starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png create mode 100644 starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png create mode 100644 starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png create mode 100644 starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png create mode 100644 starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png create mode 100644 starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png create mode 100644 starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png create mode 100644 starwiki/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json create mode 100644 starwiki/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png create mode 100644 starwiki/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png create mode 100644 starwiki/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png create mode 100644 starwiki/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md create mode 100644 starwiki/ios/Runner/Base.lproj/LaunchScreen.storyboard create mode 100644 starwiki/ios/Runner/Base.lproj/Main.storyboard create mode 100644 starwiki/ios/Runner/Info.plist create mode 100644 starwiki/ios/Runner/Runner-Bridging-Header.h create mode 100644 starwiki/lib/main.dart create mode 100644 starwiki/pubspec.lock create mode 100644 starwiki/pubspec.yaml create mode 100644 starwiki/test/widget_test.dart diff --git a/starwiki/.gitignore b/starwiki/.gitignore new file mode 100644 index 00000000..ae1f1838 --- /dev/null +++ b/starwiki/.gitignore @@ -0,0 +1,37 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub-cache/ +.pub/ +/build/ + +# Web related +lib/generated_plugin_registrant.dart + +# Exceptions to above rules. +!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages diff --git a/starwiki/.metadata b/starwiki/.metadata new file mode 100644 index 00000000..01d2dcb9 --- /dev/null +++ b/starwiki/.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: 0b8abb4724aa590dd0f429683339b1e045a1594d + channel: stable + +project_type: app diff --git a/starwiki/README.md b/starwiki/README.md new file mode 100644 index 00000000..65c9ef12 --- /dev/null +++ b/starwiki/README.md @@ -0,0 +1,16 @@ +# starwiki + +A new Flutter project. + +## Getting Started + +This project is a starting point for a Flutter application. + +A few resources to get you started if this is your first Flutter project: + +- [Lab: Write your first Flutter app](https://flutter.dev/docs/get-started/codelab) +- [Cookbook: Useful Flutter samples](https://flutter.dev/docs/cookbook) + +For help getting started with Flutter, view our +[online documentation](https://flutter.dev/docs), which offers tutorials, +samples, guidance on mobile development, and a full API reference. diff --git a/starwiki/android/.gitignore b/starwiki/android/.gitignore new file mode 100644 index 00000000..bc2100d8 --- /dev/null +++ b/starwiki/android/.gitignore @@ -0,0 +1,7 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java diff --git a/starwiki/android/app/build.gradle b/starwiki/android/app/build.gradle new file mode 100644 index 00000000..9c24b3d2 --- /dev/null +++ b/starwiki/android/app/build.gradle @@ -0,0 +1,67 @@ +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 plugin: 'kotlin-android' +apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" + +android { + compileSdkVersion 28 + + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } + + lintOptions { + disable 'InvalidPackage' + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId "com.example.starwiki" + minSdkVersion 16 + targetSdkVersion 28 + versionCode flutterVersionCode.toInteger() + versionName flutterVersionName + testInstrumentationRunner "androidx.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 { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test:runner:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' +} diff --git a/starwiki/android/app/src/debug/AndroidManifest.xml b/starwiki/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 00000000..95004f76 --- /dev/null +++ b/starwiki/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/starwiki/android/app/src/main/AndroidManifest.xml b/starwiki/android/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..df1c583c --- /dev/null +++ b/starwiki/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + diff --git a/starwiki/android/app/src/main/kotlin/com/example/starwiki/MainActivity.kt b/starwiki/android/app/src/main/kotlin/com/example/starwiki/MainActivity.kt new file mode 100644 index 00000000..bc942e78 --- /dev/null +++ b/starwiki/android/app/src/main/kotlin/com/example/starwiki/MainActivity.kt @@ -0,0 +1,12 @@ +package com.example.starwiki + +import androidx.annotation.NonNull; +import io.flutter.embedding.android.FlutterActivity +import io.flutter.embedding.engine.FlutterEngine +import io.flutter.plugins.GeneratedPluginRegistrant + +class MainActivity: FlutterActivity() { + override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) { + GeneratedPluginRegistrant.registerWith(flutterEngine); + } +} diff --git a/starwiki/android/app/src/main/res/drawable/launch_background.xml b/starwiki/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 00000000..304732f8 --- /dev/null +++ b/starwiki/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/starwiki/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/starwiki/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..db77bb4b7b0906d62b1847e87f15cdcacf6a4f29 GIT binary patch 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{ literal 0 HcmV?d00001 diff --git a/starwiki/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/starwiki/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..17987b79bb8a35cc66c3c1fd44f5a5526c1b78be GIT binary patch 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)$ literal 0 HcmV?d00001 diff --git a/starwiki/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/starwiki/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..d5f1c8d34e7a88e3f88bea192c3a370d44689c3c GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/starwiki/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/starwiki/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..4d6372eebdb28e45604e46eeda8dd24651419bc0 GIT binary patch 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` literal 0 HcmV?d00001 diff --git a/starwiki/android/app/src/main/res/values/styles.xml b/starwiki/android/app/src/main/res/values/styles.xml new file mode 100644 index 00000000..00fa4417 --- /dev/null +++ b/starwiki/android/app/src/main/res/values/styles.xml @@ -0,0 +1,8 @@ + + + + diff --git a/starwiki/android/app/src/profile/AndroidManifest.xml b/starwiki/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 00000000..95004f76 --- /dev/null +++ b/starwiki/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/starwiki/android/build.gradle b/starwiki/android/build.gradle new file mode 100644 index 00000000..3100ad2d --- /dev/null +++ b/starwiki/android/build.gradle @@ -0,0 +1,31 @@ +buildscript { + ext.kotlin_version = '1.3.50' + repositories { + google() + jcenter() + } + + dependencies { + classpath 'com.android.tools.build:gradle:3.5.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +rootProject.buildDir = '../build' +subprojects { + project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { + project.evaluationDependsOn(':app') +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/starwiki/android/gradle.properties b/starwiki/android/gradle.properties new file mode 100644 index 00000000..38c8d454 --- /dev/null +++ b/starwiki/android/gradle.properties @@ -0,0 +1,4 @@ +org.gradle.jvmargs=-Xmx1536M +android.enableR8=true +android.useAndroidX=true +android.enableJetifier=true diff --git a/starwiki/android/gradle/wrapper/gradle-wrapper.properties b/starwiki/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..296b146b --- /dev/null +++ b/starwiki/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Fri Jun 23 08:50:38 CEST 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/starwiki/android/settings.gradle b/starwiki/android/settings.gradle new file mode 100644 index 00000000..5a2f14fb --- /dev/null +++ b/starwiki/android/settings.gradle @@ -0,0 +1,15 @@ +include ':app' + +def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() + +def plugins = new Properties() +def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins') +if (pluginsFile.exists()) { + pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) } +} + +plugins.each { name, path -> + def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile() + include ":$name" + project(":$name").projectDir = pluginDirectory +} diff --git a/starwiki/ios/.gitignore b/starwiki/ios/.gitignore new file mode 100644 index 00000000..e96ef602 --- /dev/null +++ b/starwiki/ios/.gitignore @@ -0,0 +1,32 @@ +*.mode1v3 +*.mode2v3 +*.moved-aside +*.pbxuser +*.perspectivev3 +**/*sync/ +.sconsign.dblite +.tags* +**/.vagrant/ +**/DerivedData/ +Icon? +**/Pods/ +**/.symlinks/ +profile +xcuserdata +**/.generated/ +Flutter/App.framework +Flutter/Flutter.framework +Flutter/Flutter.podspec +Flutter/Generated.xcconfig +Flutter/app.flx +Flutter/app.zip +Flutter/flutter_assets/ +Flutter/flutter_export_environment.sh +ServiceDefinitions.json +Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. +!default.mode1v3 +!default.mode2v3 +!default.pbxuser +!default.perspectivev3 diff --git a/starwiki/ios/Flutter/AppFrameworkInfo.plist b/starwiki/ios/Flutter/AppFrameworkInfo.plist new file mode 100644 index 00000000..6b4c0f78 --- /dev/null +++ b/starwiki/ios/Flutter/AppFrameworkInfo.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + App + CFBundleIdentifier + io.flutter.flutter.app + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + App + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + MinimumOSVersion + 8.0 + + diff --git a/starwiki/ios/Flutter/Debug.xcconfig b/starwiki/ios/Flutter/Debug.xcconfig new file mode 100644 index 00000000..592ceee8 --- /dev/null +++ b/starwiki/ios/Flutter/Debug.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/starwiki/ios/Flutter/Release.xcconfig b/starwiki/ios/Flutter/Release.xcconfig new file mode 100644 index 00000000..592ceee8 --- /dev/null +++ b/starwiki/ios/Flutter/Release.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/starwiki/ios/Runner.xcodeproj/project.pbxproj b/starwiki/ios/Runner.xcodeproj/project.pbxproj new file mode 100644 index 00000000..1dc2deec --- /dev/null +++ b/starwiki/ios/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,518 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 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, ); }; }; + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 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, ); }; }; + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 9705A1C41CF9048500538489 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */, + 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = ""; }; + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; 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 = ""; }; + 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 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 = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 97C146EB1CF9000F007C117D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */, + 3B80C3941E831B6300D905FE /* App.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 9740EEB11CF90186004384FC /* Flutter */ = { + isa = PBXGroup; + children = ( + 3B80C3931E831B6300D905FE /* App.framework */, + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, + 9740EEBA1CF902C7004384FC /* Flutter.framework */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 9740EEB31CF90195004384FC /* Generated.xcconfig */, + ); + name = Flutter; + sourceTree = ""; + }; + 97C146E51CF9000F007C117D = { + isa = PBXGroup; + children = ( + 9740EEB11CF90186004384FC /* Flutter */, + 97C146F01CF9000F007C117D /* Runner */, + 97C146EF1CF9000F007C117D /* Products */, + ); + sourceTree = ""; + }; + 97C146EF1CF9000F007C117D /* Products */ = { + isa = PBXGroup; + children = ( + 97C146EE1CF9000F007C117D /* Runner.app */, + ); + name = Products; + sourceTree = ""; + }; + 97C146F01CF9000F007C117D /* Runner */ = { + isa = PBXGroup; + children = ( + 97C146FA1CF9000F007C117D /* Main.storyboard */, + 97C146FD1CF9000F007C117D /* Assets.xcassets */, + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, + 97C147021CF9000F007C117D /* Info.plist */, + 97C146F11CF9000F007C117D /* Supporting Files */, + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, + ); + path = Runner; + sourceTree = ""; + }; + 97C146F11CF9000F007C117D /* Supporting Files */ = { + isa = PBXGroup; + children = ( + ); + name = "Supporting Files"; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 97C146ED1CF9000F007C117D /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 9740EEB61CF901F6004384FC /* Run Script */, + 97C146EA1CF9000F007C117D /* Sources */, + 97C146EB1CF9000F007C117D /* Frameworks */, + 97C146EC1CF9000F007C117D /* Resources */, + 9705A1C41CF9048500538489 /* Embed Frameworks */, + 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Runner; + productName = Runner; + productReference = 97C146EE1CF9000F007C117D /* Runner.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 97C146E61CF9000F007C117D /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 1020; + ORGANIZATIONNAME = "The Chromium Authors"; + TargetAttributes = { + 97C146ED1CF9000F007C117D = { + CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 1100; + }; + }; + }; + buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 97C146E51CF9000F007C117D; + productRefGroup = 97C146EF1CF9000F007C117D /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 97C146ED1CF9000F007C117D /* Runner */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 97C146EC1CF9000F007C117D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Thin Binary"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin"; + }; + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 97C146EA1CF9000F007C117D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 97C146FA1CF9000F007C117D /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C146FB1CF9000F007C117D /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C147001CF9000F007C117D /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 249021D3217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Profile; + }; + 249021D4217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.starwiki; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Profile; + }; + 97C147031CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 97C147041CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 97C147061CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.starwiki; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Debug; + }; + 97C147071CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.starwiki; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147031CF9000F007C117D /* Debug */, + 97C147041CF9000F007C117D /* Release */, + 249021D3217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147061CF9000F007C117D /* Debug */, + 97C147071CF9000F007C117D /* Release */, + 249021D4217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 97C146E61CF9000F007C117D /* Project object */; +} diff --git a/starwiki/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/starwiki/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..1d526a16 --- /dev/null +++ b/starwiki/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/starwiki/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/starwiki/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 00000000..a28140cf --- /dev/null +++ b/starwiki/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/starwiki/ios/Runner.xcworkspace/contents.xcworkspacedata b/starwiki/ios/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..1d526a16 --- /dev/null +++ b/starwiki/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/starwiki/ios/Runner/AppDelegate.swift b/starwiki/ios/Runner/AppDelegate.swift new file mode 100644 index 00000000..70693e4a --- /dev/null +++ b/starwiki/ios/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import UIKit +import Flutter + +@UIApplicationMain +@objc class AppDelegate: FlutterAppDelegate { + override func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? + ) -> Bool { + GeneratedPluginRegistrant.register(with: self) + return super.application(application, didFinishLaunchingWithOptions: launchOptions) + } +} diff --git a/starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..d36b1fab --- /dev/null +++ b/starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,122 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@1x.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@1x.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-App-83.5x83.5@2x.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "Icon-App-1024x1024@1x.png", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..dc9ada4725e9b0ddb1deab583e5b5102493aa332 GIT binary patch literal 10932 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 literal 0 HcmV?d00001 diff --git a/starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..f091b6b0bca859a3f474b03065bef75ba58a9e4c GIT binary patch literal 1588 zcmV-42Fv-0P)C1SqPt}wig>|5Crh^=oyX$BK<}M8eLU3e2hGT;=G|!_SP)7zNI6fqUMB=)y zRAZ>eDe#*r`yDAVgB_R*LB*MAc)8(b{g{9McCXW!lq7r(btRoB9!8B-#AI6JMb~YFBEvdsV)`mEQO^&#eRKx@b&x- z5lZm*!WfD8oCLzfHGz#u7sT0^VLMI1MqGxF^v+`4YYnVYgk*=kU?HsSz{v({E3lb9 z>+xILjBN)t6`=g~IBOelGQ(O990@BfXf(DRI5I$qN$0Gkz-FSc$3a+2fX$AedL4u{ z4V+5Ong(9LiGcIKW?_352sR;LtDPmPJXI{YtT=O8=76o9;*n%_m|xo!i>7$IrZ-{l z-x3`7M}qzHsPV@$v#>H-TpjDh2UE$9g6sysUREDy_R(a)>=eHw-WAyfIN z*qb!_hW>G)Tu8nSw9yn#3wFMiLcfc4pY0ek1}8(NqkBR@t4{~oC>ryc-h_ByH(Cg5 z>ao-}771+xE3um9lWAY1FeQFxowa1(!J(;Jg*wrg!=6FdRX+t_<%z&d&?|Bn){>zm zZQj(aA_HeBY&OC^jj*)N`8fa^ePOU72VpInJoI1?`ty#lvlNzs(&MZX+R%2xS~5Kh zX*|AU4QE#~SgPzOXe9>tRj>hjU@c1k5Y_mW*Jp3fI;)1&g3j|zDgC+}2Q_v%YfDax z!?umcN^n}KYQ|a$Lr+51Nf9dkkYFSjZZjkma$0KOj+;aQ&721~t7QUKx61J3(P4P1 zstI~7-wOACnWP4=8oGOwz%vNDqD8w&Q`qcNGGrbbf&0s9L0De{4{mRS?o0MU+nR_! zrvshUau0G^DeMhM_v{5BuLjb#Hh@r23lDAk8oF(C+P0rsBpv85EP>4CVMx#04MOfG z;P%vktHcXwTj~+IE(~px)3*MY77e}p#|c>TD?sMatC0Tu4iKKJ0(X8jxQY*gYtxsC z(zYC$g|@+I+kY;dg_dE>scBf&bP1Nc@Hz<3R)V`=AGkc;8CXqdi=B4l2k|g;2%#m& z*jfX^%b!A8#bI!j9-0Fi0bOXl(-c^AB9|nQaE`*)Hw+o&jS9@7&Gov#HbD~#d{twV zXd^Tr^mWLfFh$@Dr$e;PBEz4(-2q1FF0}c;~B5sA}+Q>TOoP+t>wf)V9Iy=5ruQa;z)y zI9C9*oUga6=hxw6QasLPnee@3^Rr*M{CdaL5=R41nLs(AHk_=Y+A9$2&H(B7!_pURs&8aNw7?`&Z&xY_Ye z)~D5Bog^td-^QbUtkTirdyK^mTHAOuptDflut!#^lnKqU md>ggs(5nOWAqO?umG&QVYK#ibz}*4>0000U6E9hRK9^#O7(mu>ETqrXGsduA8$)?`v2seloOCza43C{NQ$$gAOH**MCn0Q?+L7dl7qnbRdqZ8LSVp1ItDxhxD?t@5_yHg6A8yI zC*%Wgg22K|8E#!~cTNYR~@Y9KepMPrrB8cABapAFa=`H+UGhkXUZV1GnwR1*lPyZ;*K(i~2gp|@bzp8}og7e*#% zEnr|^CWdVV!-4*Y_7rFvlww2Ze+>j*!Z!pQ?2l->4q#nqRu9`ELo6RMS5=br47g_X zRw}P9a7RRYQ%2Vsd0Me{_(EggTnuN6j=-?uFS6j^u69elMypu?t>op*wBx<=Wx8?( ztpe^(fwM6jJX7M-l*k3kEpWOl_Vk3@(_w4oc}4YF4|Rt=2V^XU?#Yz`8(e?aZ@#li0n*=g^qOcVpd-Wbok=@b#Yw zqn8u9a)z>l(1kEaPYZ6hwubN6i<8QHgsu0oE) ziJ(p;Wxm>sf!K+cw>R-(^Y2_bahB+&KI9y^);#0qt}t-$C|Bo71lHi{_+lg#f%RFy z0um=e3$K3i6K{U_4K!EX?F&rExl^W|G8Z8;`5z-k}OGNZ0#WVb$WCpQu-_YsiqKP?BB# vzVHS-CTUF4Ozn5G+mq_~Qqto~ahA+K`|lyv3(-e}00000NkvXXu0mjfd`9t{ literal 0 HcmV?d00001 diff --git a/starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d0ef06e7edb86cdfe0d15b4b0d98334a86163658 GIT binary patch literal 1716 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 literal 0 HcmV?d00001 diff --git a/starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c8f9ed8f5cee1c98386d13b17e89f719e83555b2 GIT binary patch literal 1895 zcmV-t2blPYP)FQtfgmafE#=YDCq`qUBt#QpG%*H6QHY765~R=q zZ6iudfM}q!Pz#~9JgOi8QJ|DSu?1-*(kSi1K4#~5?#|rh?sS)(-JQqX*}ciXJ56_H zdw=^s_srbAdqxlvGyrgGet#6T7_|j;95sL%MtM;q86vOxKM$f#puR)Bjv9Zvz9-di zXOTSsZkM83)E9PYBXC<$6(|>lNLVBb&&6y{NByFCp%6+^ALR@NCTse_wqvNmSWI-m z!$%KlHFH2omF!>#%1l3LTZg(s7eof$7*xB)ZQ0h?ejh?Ta9fDv59+u#MokW+1t8Zb zgHv%K(u9G^Lv`lh#f3<6!JVTL3(dCpxHbnbA;kKqQyd1~^Xe0VIaYBSWm6nsr;dFj z4;G-RyL?cYgsN1{L4ZFFNa;8)Rv0fM0C(~Tkit94 zz#~A)59?QjD&pAPSEQ)p8gP|DS{ng)j=2ux)_EzzJ773GmQ_Cic%3JJhC0t2cx>|v zJcVusIB!%F90{+}8hG3QU4KNeKmK%T>mN57NnCZ^56=0?&3@!j>a>B43pi{!u z7JyDj7`6d)qVp^R=%j>UIY6f+3`+qzIc!Y_=+uN^3BYV|o+$vGo-j-Wm<10%A=(Yk^beI{t%ld@yhKjq0iNjqN4XMGgQtbKubPM$JWBz}YA65k%dm*awtC^+f;a-x4+ddbH^7iDWGg&N0n#MW{kA|=8iMUiFYvMoDY@sPC#t$55gn6ykUTPAr`a@!(;np824>2xJthS z*ZdmT`g5-`BuJs`0LVhz+D9NNa3<=6m;cQLaF?tCv8)zcRSh66*Z|vXhG@$I%U~2l z?`Q zykI#*+rQ=z6Jm=Bui-SfpDYLA=|vzGE(dYm=OC8XM&MDo7ux4UF1~0J1+i%aCUpRe zt3L_uNyQ*cE(38Uy03H%I*)*Bh=Lb^Xj3?I^Hnbeq72(EOK^Y93CNp*uAA{5Lc=ky zx=~RKa4{iTm{_>_vSCm?$Ej=i6@=m%@VvAITnigVg{&@!7CDgs908761meDK5azA} z4?=NOH|PdvabgJ&fW2{Mo$Q0CcD8Qc84%{JPYt5EiG{MdLIAeX%T=D7NIP4%Hw}p9 zg)==!2Lbp#j{u_}hMiao9=!VSyx0gHbeCS`;q&vzeq|fs`y&^X-lso(Ls@-706qmA z7u*T5PMo_w3{se1t2`zWeO^hOvTsohG_;>J0wVqVe+n)AbQCx)yh9;w+J6?NF5Lmo zecS@ieAKL8%bVd@+-KT{yI|S}O>pYckUFs;ry9Ow$CD@ztz5K-*D$^{i(_1llhSh^ zEkL$}tsQt5>QA^;QgjgIfBDmcOgi5YDyu?t6vSnbp=1+@6D& z5MJ}B8q;bRlVoxasyhcUF1+)o`&3r0colr}QJ3hcSdLu;9;td>kf@Tcn<@9sIx&=m z;AD;SCh95=&p;$r{Xz3iWCO^MX83AGJ(yH&eTXgv|0=34#-&WAmw{)U7OU9!Wz^!7 zZ%jZFi@JR;>Mhi7S>V7wQ176|FdW2m?&`qa(ScO^CFPR80HucLHOTy%5s*HR0^8)i h0WYBP*#0Ks^FNSabJA*5${_#%002ovPDHLkV1oKhTl@e3 literal 0 HcmV?d00001 diff --git a/starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..a6d6b8609df07bf62e5100a53a01510388bd2b22 GIT binary patch literal 2665 zcmV-v3YPVWP)oFh3q0MFesq&64WThn3$;G69TfjsAv=f2G9}p zgSx99+!YV6qME!>9MD13x)k(+XE7W?_O4LoLb5ND8 zaV{9+P@>42xDfRiYBMSgD$0!vssptcb;&?u9u(LLBKmkZ>RMD=kvD3h`sk6!QYtBa ztlZI#nu$8lJ^q2Z79UTgZe>BU73(Aospiq+?SdMt8lDZ;*?@tyWVZVS_Q7S&*tJaiRlJ z+aSMOmbg3@h5}v;A*c8SbqM3icg-`Cnwl;7Ts%A1RkNIp+Txl-Ckkvg4oxrqGA5ewEgYqwtECD<_3Egu)xGllKt&J8g&+=ac@Jq4-?w6M3b*>w5 z69N3O%=I^6&UL5gZ!}trC7bUj*12xLdkNs~Bz4QdJJ*UDZox2UGR}SNg@lmOvhCc~ z*f_UeXv(=#I#*7>VZx2ObEN~UoGUTl=-@)E;YtCRZ>SVp$p9yG5hEFZ!`wI!spd)n zSk+vK0Vin7FL{7f&6OB%f;SH22dtbcF<|9fi2Fp%q4kxL!b1#l^)8dUwJ zwEf{(wJj@8iYDVnKB`eSU+;ml-t2`@%_)0jDM`+a46xhDbBj2+&Ih>1A>6aky#(-SYyE{R3f#y57wfLs z6w1p~$bp;6!9DX$M+J~S@D6vJAaElETnsX4h9a5tvPhC3L@qB~bOzkL@^z0k_hS{T4PF*TDrgdXp+dzsE? z>V|VR035Pl9n5&-RePFdS{7KAr2vPOqR9=M$vXA1Yy5>w;EsF`;OK{2pkn-kpp9Pw z)r;5JfJKKaT$4qCb{TaXHjb$QA{y0EYy*+b1XI;6Ah- zw13P)xT`>~eFoJC!>{2XL(a_#upp3gaR1#5+L(Jmzp4TBnx{~WHedpJ1ch8JFk~Sw z>F+gN+i+VD?gMXwcIhn8rz`>e>J^TI3E-MW>f}6R-pL}>WMOa0k#jN+`RyUVUC;#D zg|~oS^$6%wpF{^Qr+}X>0PKcr3Fc&>Z>uv@C);pwDs@2bZWhYP!rvGx?_|q{d`t<*XEb#=aOb=N+L@CVBGqImZf&+a zCQEa3$~@#kC);pasdG=f6tuIi0PO-y&tvX%>Mv=oY3U$nD zJ#gMegnQ46pq+3r=;zmgcG+zRc9D~c>z+jo9&D+`E6$LmyFqlmCYw;-Zooma{sR@~ z)_^|YL1&&@|GXo*pivH7k!msl+$Sew3%XJnxajt0K%3M6Bd&YFNy9}tWG^aovK2eX z1aL1%7;KRDrA@eG-Wr6w+;*H_VD~qLiVI`{_;>o)k`{8xa3EJT1O_>#iy_?va0eR? zDV=N%;Zjb%Z2s$@O>w@iqt!I}tLjGk!=p`D23I}N4Be@$(|iSA zf3Ih7b<{zqpDB4WF_5X1(peKe+rASze%u8eKLn#KKXt;UZ+Adf$_TO+vTqshLLJ5c z52HucO=lrNVae5XWOLm!V@n-ObU11!b+DN<$RuU+YsrBq*lYT;?AwJpmNKniF0Q1< zJCo>Q$=v$@&y=sj6{r!Y&y&`0$-I}S!H_~pI&2H8Z1C|BX4VgZ^-! zje3-;x0PBD!M`v*J_)rL^+$<1VJhH*2Fi~aA7s&@_rUHYJ9zD=M%4AFQ`}k8OC$9s XsPq=LnkwKG00000NkvXXu0mjfhAk5^ literal 0 HcmV?d00001 diff --git a/starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..a6d6b8609df07bf62e5100a53a01510388bd2b22 GIT binary patch literal 2665 zcmV-v3YPVWP)oFh3q0MFesq&64WThn3$;G69TfjsAv=f2G9}p zgSx99+!YV6qME!>9MD13x)k(+XE7W?_O4LoLb5ND8 zaV{9+P@>42xDfRiYBMSgD$0!vssptcb;&?u9u(LLBKmkZ>RMD=kvD3h`sk6!QYtBa ztlZI#nu$8lJ^q2Z79UTgZe>BU73(Aospiq+?SdMt8lDZ;*?@tyWVZVS_Q7S&*tJaiRlJ z+aSMOmbg3@h5}v;A*c8SbqM3icg-`Cnwl;7Ts%A1RkNIp+Txl-Ckkvg4oxrqGA5ewEgYqwtECD<_3Egu)xGllKt&J8g&+=ac@Jq4-?w6M3b*>w5 z69N3O%=I^6&UL5gZ!}trC7bUj*12xLdkNs~Bz4QdJJ*UDZox2UGR}SNg@lmOvhCc~ z*f_UeXv(=#I#*7>VZx2ObEN~UoGUTl=-@)E;YtCRZ>SVp$p9yG5hEFZ!`wI!spd)n zSk+vK0Vin7FL{7f&6OB%f;SH22dtbcF<|9fi2Fp%q4kxL!b1#l^)8dUwJ zwEf{(wJj@8iYDVnKB`eSU+;ml-t2`@%_)0jDM`+a46xhDbBj2+&Ih>1A>6aky#(-SYyE{R3f#y57wfLs z6w1p~$bp;6!9DX$M+J~S@D6vJAaElETnsX4h9a5tvPhC3L@qB~bOzkL@^z0k_hS{T4PF*TDrgdXp+dzsE? z>V|VR035Pl9n5&-RePFdS{7KAr2vPOqR9=M$vXA1Yy5>w;EsF`;OK{2pkn-kpp9Pw z)r;5JfJKKaT$4qCb{TaXHjb$QA{y0EYy*+b1XI;6Ah- zw13P)xT`>~eFoJC!>{2XL(a_#upp3gaR1#5+L(Jmzp4TBnx{~WHedpJ1ch8JFk~Sw z>F+gN+i+VD?gMXwcIhn8rz`>e>J^TI3E-MW>f}6R-pL}>WMOa0k#jN+`RyUVUC;#D zg|~oS^$6%wpF{^Qr+}X>0PKcr3Fc&>Z>uv@C);pwDs@2bZWhYP!rvGx?_|q{d`t<*XEb#=aOb=N+L@CVBGqImZf&+a zCQEa3$~@#kC);pasdG=f6tuIi0PO-y&tvX%>Mv=oY3U$nD zJ#gMegnQ46pq+3r=;zmgcG+zRc9D~c>z+jo9&D+`E6$LmyFqlmCYw;-Zooma{sR@~ z)_^|YL1&&@|GXo*pivH7k!msl+$Sew3%XJnxajt0K%3M6Bd&YFNy9}tWG^aovK2eX z1aL1%7;KRDrA@eG-Wr6w+;*H_VD~qLiVI`{_;>o)k`{8xa3EJT1O_>#iy_?va0eR? zDV=N%;Zjb%Z2s$@O>w@iqt!I}tLjGk!=p`D23I}N4Be@$(|iSA zf3Ih7b<{zqpDB4WF_5X1(peKe+rASze%u8eKLn#KKXt;UZ+Adf$_TO+vTqshLLJ5c z52HucO=lrNVae5XWOLm!V@n-ObU11!b+DN<$RuU+YsrBq*lYT;?AwJpmNKniF0Q1< zJCo>Q$=v$@&y=sj6{r!Y&y&`0$-I}S!H_~pI&2H8Z1C|BX4VgZ^-! zje3-;x0PBD!M`v*J_)rL^+$<1VJhH*2Fi~aA7s&@_rUHYJ9zD=M%4AFQ`}k8OC$9s XsPq=LnkwKG00000NkvXXu0mjfhAk5^ literal 0 HcmV?d00001 diff --git a/starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..75b2d164a5a98e212cca15ea7bf2ab5de5108680 GIT binary patch literal 3831 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 literal 0 HcmV?d00001 diff --git a/starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/starwiki/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..c4df70d39da7941ef3f6dcb7f06a192d8dcb308d GIT binary patch literal 1888 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 iW8Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v literal 0 HcmV?d00001 diff --git a/starwiki/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/starwiki/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/starwiki/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/starwiki/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/starwiki/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/starwiki/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md new file mode 100644 index 00000000..89c2725b --- /dev/null +++ b/starwiki/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md @@ -0,0 +1,5 @@ +# Launch Screen Assets + +You can customize the launch screen with your own desired assets by replacing the image files in this directory. + +You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. \ No newline at end of file diff --git a/starwiki/ios/Runner/Base.lproj/LaunchScreen.storyboard b/starwiki/ios/Runner/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 00000000..f2e259c7 --- /dev/null +++ b/starwiki/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/starwiki/ios/Runner/Base.lproj/Main.storyboard b/starwiki/ios/Runner/Base.lproj/Main.storyboard new file mode 100644 index 00000000..f3c28516 --- /dev/null +++ b/starwiki/ios/Runner/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/starwiki/ios/Runner/Info.plist b/starwiki/ios/Runner/Info.plist new file mode 100644 index 00000000..c9b952ac --- /dev/null +++ b/starwiki/ios/Runner/Info.plist @@ -0,0 +1,45 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + starwiki + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + + diff --git a/starwiki/ios/Runner/Runner-Bridging-Header.h b/starwiki/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 00000000..7335fdf9 --- /dev/null +++ b/starwiki/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" \ No newline at end of file diff --git a/starwiki/lib/main.dart b/starwiki/lib/main.dart new file mode 100644 index 00000000..01240608 --- /dev/null +++ b/starwiki/lib/main.dart @@ -0,0 +1,63 @@ +import 'package:flutter/material.dart'; + +void main() => runApp(MyApp()); + +class MyApp extends StatelessWidget { + @override + Widget build(BuildContext context) { + return MaterialApp( + title: 'StarWiki', + theme: ThemeData( + primarySwatch: Colors.blue, + ), + home: MyHomePage(title: 'StarWiki Home Page'), + ); + } +} + +class MyHomePage extends StatefulWidget { + MyHomePage({Key key, this.title}) : super(key: key); + + final String title; + + @override + _MyHomePageState createState() => _MyHomePageState(); +} + +class _MyHomePageState extends State { + int _counter = 0; + + void _incrementCounter() { + setState(() { + _counter++; + }); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Text(widget.title), + ), + body: Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + 'You have pushed the button this many times:', + ), + Text( + '$_counter', + style: Theme.of(context).textTheme.display1, + ), + ], + ), + ), + floatingActionButton: FloatingActionButton( + onPressed: _incrementCounter, + tooltip: 'Increment', + child: Icon(Icons.add), + ), + ); + } +} diff --git a/starwiki/pubspec.lock b/starwiki/pubspec.lock new file mode 100644 index 00000000..fcf67635 --- /dev/null +++ b/starwiki/pubspec.lock @@ -0,0 +1,195 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + archive: + dependency: transitive + description: + name: archive + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.11" + args: + dependency: transitive + description: + name: args + url: "https://pub.dartlang.org" + source: hosted + version: "1.5.2" + async: + dependency: transitive + description: + name: async + url: "https://pub.dartlang.org" + source: hosted + version: "2.4.0" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.5" + charcode: + dependency: transitive + description: + name: charcode + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.2" + collection: + dependency: transitive + description: + name: collection + url: "https://pub.dartlang.org" + source: hosted + version: "1.14.11" + convert: + dependency: transitive + description: + name: convert + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.1" + crypto: + dependency: transitive + description: + name: crypto + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.3" + cupertino_icons: + dependency: "direct main" + description: + name: cupertino_icons + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.3" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + image: + dependency: transitive + description: + name: image + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.4" + matcher: + dependency: transitive + description: + name: matcher + url: "https://pub.dartlang.org" + source: hosted + version: "0.12.6" + meta: + dependency: transitive + description: + name: meta + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.8" + path: + dependency: transitive + description: + name: path + url: "https://pub.dartlang.org" + source: hosted + version: "1.6.4" + pedantic: + dependency: transitive + description: + name: pedantic + url: "https://pub.dartlang.org" + source: hosted + version: "1.8.0+1" + petitparser: + dependency: transitive + description: + name: petitparser + url: "https://pub.dartlang.org" + source: hosted + version: "2.4.0" + quiver: + dependency: transitive + description: + name: quiver + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.5" + 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.5" + 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: "2.0.0" + string_scanner: + dependency: transitive + description: + name: string_scanner + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.5" + 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.11" + typed_data: + dependency: transitive + description: + name: typed_data + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.6" + vector_math: + dependency: transitive + description: + name: vector_math + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.8" + xml: + dependency: transitive + description: + name: xml + url: "https://pub.dartlang.org" + source: hosted + version: "3.5.0" +sdks: + dart: ">=2.4.0 <3.0.0" diff --git a/starwiki/pubspec.yaml b/starwiki/pubspec.yaml new file mode 100644 index 00000000..6006a677 --- /dev/null +++ b/starwiki/pubspec.yaml @@ -0,0 +1,72 @@ +name: starwiki +description: A new Flutter project. + +# The following defines the version and build number for your application. +# A version number is three numbers separated by dots, like 1.2.43 +# followed by an optional build number separated by a +. +# Both the version and the builder number may be overridden in flutter +# build by specifying --build-name and --build-number, respectively. +# In Android, build-name is used as versionName while build-number used as versionCode. +# Read more about Android versioning at https://developer.android.com/studio/publish/versioning +# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. +# Read more about iOS versioning at +# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html +version: 1.0.0+1 + +environment: + sdk: ">=2.1.0 <3.0.0" + +dependencies: + flutter: + sdk: flutter + + # The following adds the Cupertino Icons font to your application. + # Use with the CupertinoIcons class for iOS style icons. + cupertino_icons: ^0.1.2 + +dev_dependencies: + flutter_test: + sdk: flutter + + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + +# The following section is specific to Flutter. +flutter: + + # The following line ensures that the Material Icons font is + # included with your application, so that you can use the icons in + # the material Icons class. + uses-material-design: true + + # To add assets to your application, add an assets section, like this: + # assets: + # - images/a_dot_burr.jpeg + # - images/a_dot_ham.jpeg + + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.dev/assets-and-images/#resolution-aware. + + # For details regarding adding assets from package dependencies, see + # https://flutter.dev/assets-and-images/#from-packages + + # To add custom fonts to your application, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + # fonts: + # - family: Schyler + # fonts: + # - asset: fonts/Schyler-Regular.ttf + # - asset: fonts/Schyler-Italic.ttf + # style: italic + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts from package dependencies, + # see https://flutter.dev/custom-fonts/#from-packages diff --git a/starwiki/test/widget_test.dart b/starwiki/test/widget_test.dart new file mode 100644 index 00000000..99ea48c6 --- /dev/null +++ b/starwiki/test/widget_test.dart @@ -0,0 +1,30 @@ +// This is a basic Flutter widget test. +// +// To perform an interaction with a widget in your test, use the WidgetTester +// utility that Flutter provides. For example, you can send tap and scroll +// gestures. You can also use WidgetTester to find child widgets in the widget +// tree, read text, and verify that the values of widget properties are correct. + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; + +import 'package:starwiki/main.dart'; + +void main() { + testWidgets('Counter increments smoke test', (WidgetTester tester) async { + // Build our app and trigger a frame. + await tester.pumpWidget(MyApp()); + + // Verify that our counter starts at 0. + expect(find.text('0'), findsOneWidget); + expect(find.text('1'), findsNothing); + + // Tap the '+' icon and trigger a frame. + await tester.tap(find.byIcon(Icons.add)); + await tester.pump(); + + // Verify that our counter has incremented. + expect(find.text('0'), findsNothing); + expect(find.text('1'), findsOneWidget); + }); +} From 9bb184facf987eae41060a52e928f253af163958 Mon Sep 17 00:00:00 2001 From: Thome Date: Fri, 6 Mar 2020 00:44:46 -0300 Subject: [PATCH 02/10] Show scrollable lazy loading character list at wiki homepage --- starwiki/lib/fetcher.dart | 22 ++++++++++ starwiki/lib/main.dart | 88 ++++++++++++++++++++++++++++----------- starwiki/lib/people.dart | 38 +++++++++++++++++ starwiki/pubspec.lock | 14 +++++++ starwiki/pubspec.yaml | 1 + 5 files changed, 139 insertions(+), 24 deletions(-) create mode 100644 starwiki/lib/fetcher.dart create mode 100644 starwiki/lib/people.dart diff --git a/starwiki/lib/fetcher.dart b/starwiki/lib/fetcher.dart new file mode 100644 index 00000000..8ae8b025 --- /dev/null +++ b/starwiki/lib/fetcher.dart @@ -0,0 +1,22 @@ +import 'dart:convert'; +import 'package:starwiki/people.dart'; +import 'package:http/http.dart' as http; + +class PageFetcher { + int _currentPage = 1; + int _maxPages = 9; + + Future> fetch() async { + List list = new List(); + + if (_currentPage <= _maxPages) { + Page page = new Page(); + var res = await http.get("https://swapi.co/api/people/?page=$_currentPage"); + page = Page.fromJson(jsonDecode(res.body)); + list = page.results; + _currentPage++; + } + + return list; + } +} \ No newline at end of file diff --git a/starwiki/lib/main.dart b/starwiki/lib/main.dart index 01240608..dd12e6f2 100644 --- a/starwiki/lib/main.dart +++ b/starwiki/lib/main.dart @@ -1,4 +1,8 @@ import 'package:flutter/material.dart'; +import 'package:starwiki/people.dart'; +import 'package:starwiki/fetcher.dart'; + +//const String peopleURL = "https://swapi.co/api/people/20/"; void main() => runApp(MyApp()); @@ -25,39 +29,75 @@ class MyHomePage extends StatefulWidget { } class _MyHomePageState extends State { - int _counter = 0; + //List _peopleList = new List(); + final _peopleList = List(); + final _pageFetcher = PageFetcher(); - void _incrementCounter() { - setState(() { - _counter++; - }); + bool _isLoading; + bool _hasMore; + + @override + void initState() { + super.initState(); + _isLoading = true; + _hasMore = true; + _getPeople(); } + void _getPeople() { + _isLoading = true; + + _pageFetcher.fetch().then((List fetchedPage) { + if (fetchedPage.isEmpty) { + setState(() { + _isLoading = false; + _hasMore = false; + }); + } else { + setState(() { + _isLoading = false; + _peopleList.addAll(fetchedPage); + }); + } + }); + } + @override Widget build(BuildContext context) { + return Scaffold( appBar: AppBar( title: Text(widget.title), ), - body: Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - 'You have pushed the button this many times:', - ), - Text( - '$_counter', - style: Theme.of(context).textTheme.display1, - ), - ], - ), - ), - floatingActionButton: FloatingActionButton( - onPressed: _incrementCounter, - tooltip: 'Increment', - child: Icon(Icons.add), - ), + body: ListView.builder( + itemCount: _hasMore ? _peopleList.length + 1 : _peopleList.length, + itemBuilder: (BuildContext context, int index) { + if (index >= _peopleList.length) { + if (!_isLoading) { + _getPeople(); + } + return Center( + child: SizedBox( + child: CircularProgressIndicator(), + height: 24, + width: 24, + ), + ); + } + return Column( + children: [ + ListTile( + title: Text(_peopleList[index].nome), + subtitle: Text( + "Altura: " + _peopleList[index].altura + "cm; " + + "Genero: " + _peopleList[index].genero + "; " + + "Peso: " + _peopleList[index].massa + "kg"), + ), + Divider(), + ], + ); + } + ) ); } } diff --git a/starwiki/lib/people.dart b/starwiki/lib/people.dart new file mode 100644 index 00000000..9425c975 --- /dev/null +++ b/starwiki/lib/people.dart @@ -0,0 +1,38 @@ +class People{ + String nome; + String altura; + String massa; + String corCabelo; + String corPele; + String corOlho; + String anoNascimento; + String genero; + String planeta; + List especies; + + People({this.nome, this.altura, this.massa, this.corCabelo, this.corPele, + this.corOlho, this.anoNascimento, this.genero, this.planeta, this.especies}); + + People.fromJson(Map json) + : nome = json['name'], + altura = json['height'], + massa = json['mass'], + corCabelo = json['hair_color'], + corPele = json['skin_color'], + corOlho = json['eye_color'], + anoNascimento = json['birth_year'], + genero = json['gender'], + planeta = json['homeworld'], + especies = json['species']; +} + +class Page { + List results; + + Page({this.results}); + + Page.fromJson(Map json) + : results = List.from(json['results']) + .map((people) => People.fromJson(people)) + .toList(); +} \ No newline at end of file diff --git a/starwiki/pubspec.lock b/starwiki/pubspec.lock index fcf67635..dd132b25 100644 --- a/starwiki/pubspec.lock +++ b/starwiki/pubspec.lock @@ -74,6 +74,20 @@ packages: description: flutter source: sdk version: "0.0.0" + http: + dependency: "direct main" + description: + name: http + url: "https://pub.dartlang.org" + source: hosted + version: "0.12.0+4" + http_parser: + dependency: transitive + description: + name: http_parser + url: "https://pub.dartlang.org" + source: hosted + version: "3.1.3" image: dependency: transitive description: diff --git a/starwiki/pubspec.yaml b/starwiki/pubspec.yaml index 6006a677..80d22098 100644 --- a/starwiki/pubspec.yaml +++ b/starwiki/pubspec.yaml @@ -19,6 +19,7 @@ environment: dependencies: flutter: sdk: flutter + http: ^0.12.0+4 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. From e7d8afd6520b0ce7fcb3ab6154c5dc0861b41d52 Mon Sep 17 00:00:00 2001 From: Thome Date: Sat, 7 Mar 2020 18:50:28 -0300 Subject: [PATCH 03/10] Add offline database to save data requested from API --- .vscode/launch.json | 0 starwiki/lib/database_helper.dart | 162 ++++++++++++++++++++++++++++++ starwiki/lib/fetcher.dart | 18 ++-- starwiki/lib/main.dart | 86 +++++++++++----- starwiki/lib/people.dart | 38 ------- starwiki/pubspec.lock | 59 ++++++++++- starwiki/pubspec.yaml | 3 + 7 files changed, 295 insertions(+), 71 deletions(-) create mode 100644 .vscode/launch.json create mode 100644 starwiki/lib/database_helper.dart delete mode 100644 starwiki/lib/people.dart diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..e69de29b diff --git a/starwiki/lib/database_helper.dart b/starwiki/lib/database_helper.dart new file mode 100644 index 00000000..5dfab1eb --- /dev/null +++ b/starwiki/lib/database_helper.dart @@ -0,0 +1,162 @@ +//import 'package:path_provider/path_provider.dart'; +import 'package:sqflite/sqflite.dart'; +import 'package:path/path.dart'; +//import 'dart:io'; + + +final String personTable = 'personTable'; +final String personName = 'name'; +final String personHeight = 'height'; +final String personMass = 'mass'; +final String personHairColor = 'hair_color'; +final String personSkinColor = 'skin_color'; +final String personEyeColor = 'eye_color'; +final String personBirthYear = 'birth_year'; +final String personGender = 'gender'; +final String personPlanet = 'homeworld'; +final String personSpecies = 'species'; + +class People{ + String name; + String height; + String mass; + String hairColor; + String skinColor; + String eyeColor; + String birthYear; + String gender; + String planet; + String species; + + People({this.name, this.height, this.mass, this.hairColor, this.skinColor, + this.eyeColor, this.birthYear, this.gender, this.planet, this.species}); + + + + People.fromMap(Map map) + : name = map[personName], + height = map[personHeight], + mass = map[personMass], + hairColor = map[personHairColor], + skinColor = map[personSkinColor], + eyeColor = map[personEyeColor], + birthYear = map[personBirthYear], + gender = map[personGender], + planet = map[personPlanet], + species = map[personSpecies].isEmpty ? "" : map[personSpecies][0]; + + Map toMap() { + return { + personName : name, + personHeight : height, + personMass : mass, + personHairColor : hairColor, + personSkinColor : skinColor, + personEyeColor : eyeColor, + personBirthYear : birthYear, + personGender : gender, + personPlanet : planet, + personSpecies : species, + }; + } +} + +class Page { + List results; + + Page({this.results}); + + Page.fromJson(Map json) + : results = List.from(json['results']) + .map((people) => People.fromMap(people)) + .toList(); +} + +class DatabaseHelper { + + static DatabaseHelper _databaseHelper; + static Database _database; + static final _databaseName = "swWiki.db"; + static final _databaseVersion = 2; + + DatabaseHelper._createInstance(); + + factory DatabaseHelper() { + if (_databaseHelper == null) { + _databaseHelper = DatabaseHelper._createInstance(); + } + return _databaseHelper; + } + + Future get database async { + if (_database == null) { + _database = await initializeDatabase(); + } + return _database; + } + + Future initializeDatabase() async { + Stopwatch stopwatch = new Stopwatch(); + stopwatch.start(); + //Directory directory = await getApplicationDocumentsDirectory(); + String path = join(await getDatabasesPath(), _databaseName); + var swWikiDatabase = await openDatabase(path, version: _databaseVersion, onCreate: _createDb, onUpgrade: _upgradeDb); + stopwatch.stop(); + print("Database initialized: " + stopwatch.elapsed.toString()); + return swWikiDatabase; + } + + void _createDb(Database db, int newVersion) async { + await db.execute('CREATE TABLE $personTable($personName TEXT PRIMARY KEY, '+ + '$personHeight TEXT, $personMass TEXT, $personHairColor TEXT, $personSkinColor TEXT, $personEyeColor TEXT, '+ + '$personBirthYear TEXT, $personGender TEXT, $personPlanet TEXT, $personSpecies TEXT)'); + } + + void _upgradeDb(Database db, int oldVersion, int newVersion) async { + if (oldVersion < newVersion){ + await db.execute('DROP TABLE $personTable'); + await db.execute('CREATE TABLE $personTable($personName TEXT PRIMARY KEY, '+ + '$personHeight TEXT, $personMass TEXT, $personHairColor TEXT, $personSkinColor TEXT, $personEyeColor TEXT, '+ + '$personBirthYear TEXT, $personGender TEXT, $personPlanet TEXT, $personSpecies TEXT)'); + } + } + + Future> getPeopleList(int offset, int limit) async { + Database db = await this.database; + List> maps = await db.query('$personTable', offset: offset, limit: limit); + List peopleList = new List(); + People person; + for (var row in maps) { + person = new People( + name: row['$personName'], + height: row['$personHeight'], + mass: row['$personMass'], + hairColor: row['$personHairColor'], + skinColor: row['$personSkinColor'], + eyeColor: row['$personEyeColor'], + birthYear: row['$personBirthYear'], + gender: row['$personGender'], + planet: row['$personPlanet'], + species: row['$personSpecies']); + peopleList.add(person); + } + return peopleList; + } + + Future createOrUpdatePeople(List people) async { + Database db = await this.database; + Batch batch = db.batch(); + List result; + await db.execute("DELETE FROM $personTable"); + for (People person in people) { + result = await db.query('$personTable', where: '$personName = ?', whereArgs: [person.name]); + if (result.isEmpty) { + batch.insert("$personTable", person.toMap()); + } else { + batch.update('$personTable', person.toMap(), where: '$personName = ?', whereArgs: [person.name]); + } + } + + await batch.commit(); + } +} \ No newline at end of file diff --git a/starwiki/lib/fetcher.dart b/starwiki/lib/fetcher.dart index 8ae8b025..9808ed10 100644 --- a/starwiki/lib/fetcher.dart +++ b/starwiki/lib/fetcher.dart @@ -1,5 +1,5 @@ import 'dart:convert'; -import 'package:starwiki/people.dart'; +import 'package:starwiki/database_helper.dart'; import 'package:http/http.dart' as http; class PageFetcher { @@ -7,16 +7,16 @@ class PageFetcher { int _maxPages = 9; Future> fetch() async { - List list = new List(); - - if (_currentPage <= _maxPages) { - Page page = new Page(); + List peopleList = new List(); + Page peoplePage = new Page(); + + while (_currentPage <= _maxPages) { var res = await http.get("https://swapi.co/api/people/?page=$_currentPage"); - page = Page.fromJson(jsonDecode(res.body)); - list = page.results; + peoplePage = Page.fromJson(jsonDecode(res.body)); + peopleList.addAll(peoplePage.results); _currentPage++; } - - return list; + + return peopleList; } } \ No newline at end of file diff --git a/starwiki/lib/main.dart b/starwiki/lib/main.dart index dd12e6f2..481e7665 100644 --- a/starwiki/lib/main.dart +++ b/starwiki/lib/main.dart @@ -1,18 +1,17 @@ import 'package:flutter/material.dart'; -import 'package:starwiki/people.dart'; import 'package:starwiki/fetcher.dart'; - -//const String peopleURL = "https://swapi.co/api/people/20/"; +import 'package:starwiki/database_helper.dart'; void main() => runApp(MyApp()); class MyApp extends StatelessWidget { + @override Widget build(BuildContext context) { return MaterialApp( title: 'StarWiki', theme: ThemeData( - primarySwatch: Colors.blue, + primarySwatch: Colors.grey, ), home: MyHomePage(title: 'StarWiki Home Page'), ); @@ -29,12 +28,17 @@ class MyHomePage extends StatefulWidget { } class _MyHomePageState extends State { - //List _peopleList = new List(); - final _peopleList = List(); final _pageFetcher = PageFetcher(); + TextEditingController editingController = TextEditingController(); + DatabaseHelper databaseHelper = DatabaseHelper(); bool _isLoading; bool _hasMore; + bool _dbUpdated = false; + int _peopleIndex = 0; + int _peoplePageResults = 10; + //int _maxPeople = 0; + final _peopleList = List(); @override void initState() { @@ -44,11 +48,18 @@ class _MyHomePageState extends State { _getPeople(); } - void _getPeople() { + void _getPeople() async { _isLoading = true; + if (!_dbUpdated) { + _dbUpdated = true; + await _pageFetcher.fetch().then((List fetchedPeople) async { + await databaseHelper.createOrUpdatePeople(fetchedPeople); + }); + } - _pageFetcher.fetch().then((List fetchedPage) { - if (fetchedPage.isEmpty) { + await databaseHelper.getPeopleList(_peopleIndex, _peoplePageResults).then((List fetchedPeople) { + _peopleIndex += fetchedPeople.length; + if (fetchedPeople.isEmpty) { setState(() { _isLoading = false; _hasMore = false; @@ -56,20 +67,21 @@ class _MyHomePageState extends State { } else { setState(() { _isLoading = false; - _peopleList.addAll(fetchedPage); + _peopleList.addAll(fetchedPeople); }); } }); - } + } + + void _filterSearch(String query) async { + + } @override Widget build(BuildContext context) { - - return Scaffold( - appBar: AppBar( - title: Text(widget.title), - ), - body: ListView.builder( + + ListView resultsList() { + return ListView.builder( itemCount: _hasMore ? _peopleList.length + 1 : _peopleList.length, itemBuilder: (BuildContext context, int index) { if (index >= _peopleList.length) { @@ -84,20 +96,48 @@ class _MyHomePageState extends State { ), ); } + return Column( children: [ ListTile( - title: Text(_peopleList[index].nome), + title: Text(_peopleList[index].name), subtitle: Text( - "Altura: " + _peopleList[index].altura + "cm; " + - "Genero: " + _peopleList[index].genero + "; " + - "Peso: " + _peopleList[index].massa + "kg"), + "Altura: " + _peopleList[index].height + "cm; " + + "Genero: " + _peopleList[index].gender + "; " + + "Peso: " + _peopleList[index].mass + "kg"), ), - Divider(), ], ); } - ) + ); + } + + return Scaffold( + appBar: AppBar( + title: Text(widget.title), + ), + body: Container( + child: Column( + children: [ + Padding( + padding: const EdgeInsets.all(8.0), + child: TextField( + onChanged: (value) { + _filterSearch(value); + }, + controller: editingController, + decoration: InputDecoration( + labelText: "Search", + hintText: "Search", + prefixIcon: Icon(Icons.search), + border: OutlineInputBorder(borderRadius: BorderRadius.all(Radius.circular(25.0))) + ), + ), + ), + Expanded(child: resultsList(),) + ] + ), + ), ); } } diff --git a/starwiki/lib/people.dart b/starwiki/lib/people.dart deleted file mode 100644 index 9425c975..00000000 --- a/starwiki/lib/people.dart +++ /dev/null @@ -1,38 +0,0 @@ -class People{ - String nome; - String altura; - String massa; - String corCabelo; - String corPele; - String corOlho; - String anoNascimento; - String genero; - String planeta; - List especies; - - People({this.nome, this.altura, this.massa, this.corCabelo, this.corPele, - this.corOlho, this.anoNascimento, this.genero, this.planeta, this.especies}); - - People.fromJson(Map json) - : nome = json['name'], - altura = json['height'], - massa = json['mass'], - corCabelo = json['hair_color'], - corPele = json['skin_color'], - corOlho = json['eye_color'], - anoNascimento = json['birth_year'], - genero = json['gender'], - planeta = json['homeworld'], - especies = json['species']; -} - -class Page { - List results; - - Page({this.results}); - - Page.fromJson(Map json) - : results = List.from(json['results']) - .map((people) => People.fromJson(people)) - .toList(); -} \ No newline at end of file diff --git a/starwiki/pubspec.lock b/starwiki/pubspec.lock index dd132b25..00dba042 100644 --- a/starwiki/pubspec.lock +++ b/starwiki/pubspec.lock @@ -95,6 +95,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.1.4" + lazy_load_scrollview: + dependency: "direct main" + description: + name: lazy_load_scrollview + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" matcher: dependency: transitive description: @@ -116,6 +123,27 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.6.4" + path_provider: + dependency: "direct main" + description: + name: path_provider + url: "https://pub.dartlang.org" + source: hosted + version: "1.6.5" + path_provider_macos: + dependency: transitive + description: + name: path_provider_macos + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.4" + path_provider_platform_interface: + dependency: transitive + description: + name: path_provider_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" pedantic: dependency: transitive description: @@ -130,6 +158,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.4.0" + platform: + dependency: transitive + description: + name: platform + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.1" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.2" quiver: dependency: transitive description: @@ -149,6 +191,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.5.5" + sqflite: + dependency: "direct main" + description: + name: sqflite + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.2" stack_trace: dependency: transitive description: @@ -170,6 +219,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.5" + synchronized: + dependency: transitive + description: + name: synchronized + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.0" term_glyph: dependency: transitive description: @@ -206,4 +262,5 @@ packages: source: hosted version: "3.5.0" sdks: - dart: ">=2.4.0 <3.0.0" + dart: ">=2.6.0 <3.0.0" + flutter: ">=1.10.1 <2.0.0" diff --git a/starwiki/pubspec.yaml b/starwiki/pubspec.yaml index 80d22098..1ebce67a 100644 --- a/starwiki/pubspec.yaml +++ b/starwiki/pubspec.yaml @@ -20,6 +20,9 @@ dependencies: flutter: sdk: flutter http: ^0.12.0+4 + sqflite: ^1.2.2 + path_provider: ^1.6.5 + lazy_load_scrollview: 1.0.1 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. From 14e961c6b915dd1f81db11e987d17761b5772869 Mon Sep 17 00:00:00 2001 From: Thome Date: Sun, 8 Mar 2020 11:25:54 -0300 Subject: [PATCH 04/10] Show character details screen upon tapping --- starwiki/lib/database_helper.dart | 23 +++++- starwiki/lib/fetcher.dart | 19 +++++ starwiki/lib/main.dart | 59 +++++++++----- starwiki/lib/personDetailScreen.dart | 117 +++++++++++++++++++++++++++ 4 files changed, 197 insertions(+), 21 deletions(-) create mode 100644 starwiki/lib/personDetailScreen.dart diff --git a/starwiki/lib/database_helper.dart b/starwiki/lib/database_helper.dart index 5dfab1eb..c6826787 100644 --- a/starwiki/lib/database_helper.dart +++ b/starwiki/lib/database_helper.dart @@ -72,6 +72,24 @@ class Page { .toList(); } +class Planet { + String name; + + Planet({this.name}); + + Planet.fromJson(Map json) + : name = json['name']; +} + +class Species { + String name; + + Species({this.name}); + + Species.fromJson(Map json) + : name = json['name']; +} + class DatabaseHelper { static DatabaseHelper _databaseHelper; @@ -121,9 +139,9 @@ class DatabaseHelper { } } - Future> getPeopleList(int offset, int limit) async { + Future> getPeopleList() async { Database db = await this.database; - List> maps = await db.query('$personTable', offset: offset, limit: limit); + List> maps = await db.query('$personTable'); List peopleList = new List(); People person; for (var row in maps) { @@ -147,7 +165,6 @@ class DatabaseHelper { Database db = await this.database; Batch batch = db.batch(); List result; - await db.execute("DELETE FROM $personTable"); for (People person in people) { result = await db.query('$personTable', where: '$personName = ?', whereArgs: [person.name]); if (result.isEmpty) { diff --git a/starwiki/lib/fetcher.dart b/starwiki/lib/fetcher.dart index 9808ed10..2f3039b2 100644 --- a/starwiki/lib/fetcher.dart +++ b/starwiki/lib/fetcher.dart @@ -13,10 +13,29 @@ class PageFetcher { while (_currentPage <= _maxPages) { var res = await http.get("https://swapi.co/api/people/?page=$_currentPage"); peoplePage = Page.fromJson(jsonDecode(res.body)); + //for (People person in peoplePage.results) { + + //} peopleList.addAll(peoplePage.results); _currentPage++; } return peopleList; } +} + +class PlanetFetcher { + Future fetch(url) async { + var res = await http.get(url); + Planet planet = Planet.fromJson(jsonDecode(res.body)); + return planet; + } +} + +class SpeciesFetcher { + Future fetch(url) async { + var res = await http.get(url); + Species species = Species.fromJson(jsonDecode(res.body)); + return species; + } } \ No newline at end of file diff --git a/starwiki/lib/main.dart b/starwiki/lib/main.dart index 481e7665..92dbf2bd 100644 --- a/starwiki/lib/main.dart +++ b/starwiki/lib/main.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:starwiki/fetcher.dart'; import 'package:starwiki/database_helper.dart'; +import 'package:starwiki/personDetailScreen.dart'; void main() => runApp(MyApp()); @@ -33,18 +34,19 @@ class _MyHomePageState extends State { DatabaseHelper databaseHelper = DatabaseHelper(); bool _isLoading; - bool _hasMore; + //bool _hasMore; bool _dbUpdated = false; - int _peopleIndex = 0; - int _peoplePageResults = 10; + //int _peopleIndex = 0; + //int _peoplePageResults = 10; //int _maxPeople = 0; final _peopleList = List(); + var _people = List(); @override void initState() { super.initState(); _isLoading = true; - _hasMore = true; + //_hasMore = true; _getPeople(); } @@ -57,24 +59,42 @@ class _MyHomePageState extends State { }); } - await databaseHelper.getPeopleList(_peopleIndex, _peoplePageResults).then((List fetchedPeople) { - _peopleIndex += fetchedPeople.length; + await databaseHelper.getPeopleList().then((List fetchedPeople) { if (fetchedPeople.isEmpty) { setState(() { _isLoading = false; - _hasMore = false; }); } else { setState(() { _isLoading = false; _peopleList.addAll(fetchedPeople); + _people.addAll(_peopleList); }); } }); } void _filterSearch(String query) async { - + List dummySearchList = List(); + dummySearchList.addAll(_peopleList); + if (query.isNotEmpty) { + List dummyListData = List(); + dummySearchList.forEach((item) { + if (item.name.contains(query)) { + dummyListData.add(item); + } + }); + setState(() { + _people.clear(); + _people.addAll(dummyListData); + }); + return; + } else { + setState(() { + _people.clear(); + _people.addAll(_peopleList); + }); + } } @override @@ -82,12 +102,9 @@ class _MyHomePageState extends State { ListView resultsList() { return ListView.builder( - itemCount: _hasMore ? _peopleList.length + 1 : _peopleList.length, + itemCount: _isLoading ? 1 : _people.length, itemBuilder: (BuildContext context, int index) { - if (index >= _peopleList.length) { - if (!_isLoading) { - _getPeople(); - } + if (_isLoading) { return Center( child: SizedBox( child: CircularProgressIndicator(), @@ -96,15 +113,21 @@ class _MyHomePageState extends State { ), ); } - return Column( children: [ ListTile( - title: Text(_peopleList[index].name), + title: Text(_people[index].name), subtitle: Text( - "Altura: " + _peopleList[index].height + "cm; " + - "Genero: " + _peopleList[index].gender + "; " + - "Peso: " + _peopleList[index].mass + "kg"), + "Height: " + _people[index].height + " cm; " + + "Gender: " + _people[index].gender + "; " + + "Mass: " + _people[index].mass + " kg"), + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => PersonDetailScreen(person: _people[index],)) + ); + }, ), ], ); diff --git a/starwiki/lib/personDetailScreen.dart b/starwiki/lib/personDetailScreen.dart new file mode 100644 index 00000000..074320af --- /dev/null +++ b/starwiki/lib/personDetailScreen.dart @@ -0,0 +1,117 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:starwiki/database_helper.dart'; +import 'package:starwiki/fetcher.dart'; + +class PersonDetailScreen extends StatefulWidget { + final People person; + + PersonDetailScreen({Key key, @required this.person}) : super(key: key); + + @override + _PersonDetailScreenState createState() => _PersonDetailScreenState(); +} + +class _PersonDetailScreenState extends State { + final _planetFetcher = PlanetFetcher(); + final _speciesFetcher = SpeciesFetcher(); + String planetName; + String speciesName; + bool isLoading = true; + + @override + void initState() { + isLoading = true; + searchDetails(); + } + + void searchDetails () async { + String newPlanetName; + String newSpeciesName; + + await _planetFetcher.fetch(widget.person.planet).then((Planet planet) { + newPlanetName = planet.name; + }); + + if (widget.person.species.contains("species")) { + await _speciesFetcher.fetch(widget.person.species).then((Species species) { + newSpeciesName = species.name; + }); + } else { + newSpeciesName = "Unknown"; + } + + setState(() { + planetName = newPlanetName; + speciesName = newSpeciesName; + isLoading = false; + }); + } + + Widget build(BuildContext context) { + + ListView detailsList() { + return ListView( + padding: const EdgeInsets.all(8.0), + children: [ + Container( + height: 50, + child: Text("Height (cm): " + widget.person.height), + ), + Container( + height: 50, + child: Text("Mass (kg): " + widget.person.mass), + ), + Container( + height: 50, + child: Text("Hair color: " + widget.person.hairColor), + ), + Container( + height: 50, + child: Text("Skin color: " + widget.person.skinColor), + ), + Container( + height: 50, + child: Text("Eye color: " + widget.person.eyeColor), + ), + Container( + height: 50, + child: Text("Birth year: " + widget.person.birthYear), + ), + Container( + height: 50, + child: Text("Gender: " + widget.person.gender), + ), + Container( + height: 50, + child: Text("Home planet: " + planetName), + ), + Container( + height: 50, + child: Text("Species: " + speciesName), + ), + ], + ); + } + + Widget buildProgressIndicator () { + return Center( + child: SizedBox( + child: CircularProgressIndicator(), + height: 24, + width: 24, + ), + ); + } + + return Scaffold( + appBar: AppBar( + title: Text(widget.person.name), + ), + body: Padding( + padding: EdgeInsets.all(16.0), + child: isLoading ? buildProgressIndicator(): detailsList(), + ), + ); + } +} \ No newline at end of file From 0295c3d4fc2305a99670051bf1aa29db07619842 Mon Sep 17 00:00:00 2001 From: Thome Date: Fri, 13 Mar 2020 18:31:08 -0300 Subject: [PATCH 05/10] Fix errors between search and favorite features Saved favorites did not have the right icon on startup. Favorite filter used to override search query. Search -> Favorites ON -> Erase query -> Favorites OFF would yield incorrect results. These issues have now been resolved. --- starwiki/lib/database_helper.dart | 80 ++++++-- starwiki/lib/fetcher.dart | 24 ++- starwiki/lib/main.dart | 296 ++++++++++++++++++++++-------- 3 files changed, 304 insertions(+), 96 deletions(-) diff --git a/starwiki/lib/database_helper.dart b/starwiki/lib/database_helper.dart index c6826787..652997e2 100644 --- a/starwiki/lib/database_helper.dart +++ b/starwiki/lib/database_helper.dart @@ -15,6 +15,8 @@ final String personBirthYear = 'birth_year'; final String personGender = 'gender'; final String personPlanet = 'homeworld'; final String personSpecies = 'species'; +final String personIsFav = 'isFav'; +final String personFavLater = 'favLater'; class People{ String name; @@ -27,11 +29,11 @@ class People{ String gender; String planet; String species; + String isFav; + String favLater; People({this.name, this.height, this.mass, this.hairColor, this.skinColor, - this.eyeColor, this.birthYear, this.gender, this.planet, this.species}); - - + this.eyeColor, this.birthYear, this.gender, this.planet, this.species, this.isFav, this.favLater}); People.fromMap(Map map) : name = map[personName], @@ -45,7 +47,7 @@ class People{ planet = map[personPlanet], species = map[personSpecies].isEmpty ? "" : map[personSpecies][0]; - Map toMap() { + Map toMap() { return { personName : name, personHeight : height, @@ -57,6 +59,7 @@ class People{ personGender : gender, personPlanet : planet, personSpecies : species, + personIsFav : isFav, }; } } @@ -95,7 +98,7 @@ class DatabaseHelper { static DatabaseHelper _databaseHelper; static Database _database; static final _databaseName = "swWiki.db"; - static final _databaseVersion = 2; + static final _databaseVersion = 4; DatabaseHelper._createInstance(); @@ -114,28 +117,25 @@ class DatabaseHelper { } Future initializeDatabase() async { - Stopwatch stopwatch = new Stopwatch(); - stopwatch.start(); //Directory directory = await getApplicationDocumentsDirectory(); String path = join(await getDatabasesPath(), _databaseName); var swWikiDatabase = await openDatabase(path, version: _databaseVersion, onCreate: _createDb, onUpgrade: _upgradeDb); - stopwatch.stop(); - print("Database initialized: " + stopwatch.elapsed.toString()); return swWikiDatabase; } void _createDb(Database db, int newVersion) async { await db.execute('CREATE TABLE $personTable($personName TEXT PRIMARY KEY, '+ '$personHeight TEXT, $personMass TEXT, $personHairColor TEXT, $personSkinColor TEXT, $personEyeColor TEXT, '+ - '$personBirthYear TEXT, $personGender TEXT, $personPlanet TEXT, $personSpecies TEXT)'); + '$personBirthYear TEXT, $personGender TEXT, $personPlanet TEXT, $personSpecies TEXT, $personIsFav TEXT, $personFavLater TEXT)'); } void _upgradeDb(Database db, int oldVersion, int newVersion) async { if (oldVersion < newVersion){ + await db.execute("DROP TABLE favoritePersonTable"); await db.execute('DROP TABLE $personTable'); await db.execute('CREATE TABLE $personTable($personName TEXT PRIMARY KEY, '+ '$personHeight TEXT, $personMass TEXT, $personHairColor TEXT, $personSkinColor TEXT, $personEyeColor TEXT, '+ - '$personBirthYear TEXT, $personGender TEXT, $personPlanet TEXT, $personSpecies TEXT)'); + '$personBirthYear TEXT, $personGender TEXT, $personPlanet TEXT, $personSpecies TEXT, $personIsFav TEXT, $personFavLater TEXT)'); } } @@ -155,7 +155,9 @@ class DatabaseHelper { birthYear: row['$personBirthYear'], gender: row['$personGender'], planet: row['$personPlanet'], - species: row['$personSpecies']); + species: row['$personSpecies'], + isFav: row['$personIsFav'], + favLater: row['$personFavLater']); peopleList.add(person); } return peopleList; @@ -168,12 +170,60 @@ class DatabaseHelper { for (People person in people) { result = await db.query('$personTable', where: '$personName = ?', whereArgs: [person.name]); if (result.isEmpty) { - batch.insert("$personTable", person.toMap()); + batch.rawInsert("INSERT INTO $personTable($personName,$personHeight,$personMass,"+ + "$personHairColor,$personSkinColor,$personEyeColor,$personBirthYear,$personGender,"+ + "$personPlanet,$personSpecies,$personIsFav,$personFavLater) "+ + "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", + [person.name, person.height, person.mass, person.hairColor, person.skinColor, person.eyeColor, + person.birthYear, person.gender, person.planet, person.species, 'false', 'false']); } else { - batch.update('$personTable', person.toMap(), where: '$personName = ?', whereArgs: [person.name]); + batch.rawUpdate(''' + UPDATE $personTable + SET $personHeight = ?, $personMass = ?, $personHairColor = ?, $personSkinColor = ?, $personEyeColor = ?, + $personBirthYear = ?, $personGender = ?, $personPlanet = ?, $personSpecies = ? + WHERE $personName = ? + ''', + [person.height, person.mass, person.hairColor, person.skinColor, person.eyeColor, + person.birthYear, person.gender, person.planet, person.species, person.name]); } } - await batch.commit(); } + + Future addFavoritePeople(People person) async { + Database db = await this.database; + await db.update('$personTable', {'$personIsFav': 'true', '$personFavLater': 'false'}, + where: '$personName = ?', whereArgs: [person.name]); + } + + Future removeFavoritePeople(People person) async { + Database db = await this.database; + await db.update("$personTable", {'$personIsFav': 'false'}, + where: "$personName = ?", whereArgs: [person.name]); + } + + Future> getFavoriteList() async { + Database db = await this.database; + List> maps = await db.query('$personTable', where: '$personIsFav = ?', whereArgs: ['true']); + List peopleList = new List(); + People person; + for (var row in maps) { + person = new People( + name: row['$personName'], + height: row['$personHeight'], + mass: row['$personMass'], + hairColor: row['$personHairColor'], + skinColor: row['$personSkinColor'], + eyeColor: row['$personEyeColor'], + birthYear: row['$personBirthYear'], + gender: row['$personGender'], + planet: row['$personPlanet'], + species: row['$personSpecies'], + isFav: row['$personIsFav'], + favLater: row['$personFavLater'], + ); + peopleList.add(person); + } + return peopleList; + } } \ No newline at end of file diff --git a/starwiki/lib/fetcher.dart b/starwiki/lib/fetcher.dart index 2f3039b2..1b7c556b 100644 --- a/starwiki/lib/fetcher.dart +++ b/starwiki/lib/fetcher.dart @@ -13,9 +13,6 @@ class PageFetcher { while (_currentPage <= _maxPages) { var res = await http.get("https://swapi.co/api/people/?page=$_currentPage"); peoplePage = Page.fromJson(jsonDecode(res.body)); - //for (People person in peoplePage.results) { - - //} peopleList.addAll(peoplePage.results); _currentPage++; } @@ -38,4 +35,25 @@ class SpeciesFetcher { Species species = Species.fromJson(jsonDecode(res.body)); return species; } +} + +class FavoriteHandler { + final String _baseURL = "http://private-782d3-starwarsfavorites.apiary-mock.com/favorite/"; + + Future> createFavorite(People person, String id) async { + var res = await http.post(_baseURL + id, body: person.toMap()); + var resBody = jsonDecode(res.body); + Map result; + + if (res.statusCode == 201) { + result = {"status": resBody["status"], + "message": resBody["message"]}; + } else if (res.statusCode == 400) { + result = {"status": resBody["error"], + "message": resBody["error_message"]}; + //Save request for later + } + + return result; + } } \ No newline at end of file diff --git a/starwiki/lib/main.dart b/starwiki/lib/main.dart index 92dbf2bd..f50f247a 100644 --- a/starwiki/lib/main.dart +++ b/starwiki/lib/main.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:starwiki/fetcher.dart'; import 'package:starwiki/database_helper.dart'; import 'package:starwiki/personDetailScreen.dart'; +import 'dart:io'; void main() => runApp(MyApp()); @@ -30,114 +31,192 @@ class MyHomePage extends StatefulWidget { class _MyHomePageState extends State { final _pageFetcher = PageFetcher(); + final _favoriteHandler = FavoriteHandler(); TextEditingController editingController = TextEditingController(); - DatabaseHelper databaseHelper = DatabaseHelper(); + DatabaseHelper databaseHelper = DatabaseHelper(); bool _isLoading; - //bool _hasMore; - bool _dbUpdated = false; - //int _peopleIndex = 0; - //int _peoplePageResults = 10; - //int _maxPeople = 0; + bool _showingFavorites; + //String _searchQuery; + final _peopleDatabaseList = List(); final _peopleList = List(); - var _people = List(); @override void initState() { super.initState(); _isLoading = true; - //_hasMore = true; + _showingFavorites = false; + //_searchQuery = ''; _getPeople(); } void _getPeople() async { _isLoading = true; - if (!_dbUpdated) { - _dbUpdated = true; - await _pageFetcher.fetch().then((List fetchedPeople) async { - await databaseHelper.createOrUpdatePeople(fetchedPeople); - }); + List databaseList = List(); + + try { + final result = await InternetAddress.lookup('example.com').timeout(Duration(seconds: 30)); + if (result.isNotEmpty && result[0].rawAddress.isNotEmpty) { + await _pageFetcher.fetch().then((List fetchedPeople) async { + await databaseHelper.createOrUpdatePeople(fetchedPeople); + }); + } + } on SocketException catch (_) { + print("SocketException"); } await databaseHelper.getPeopleList().then((List fetchedPeople) { - if (fetchedPeople.isEmpty) { - setState(() { - _isLoading = false; - }); - } else { + databaseList.addAll(fetchedPeople); + }); + + // add favorites as needed + + setState(() { + _peopleDatabaseList.addAll(databaseList); + _peopleList.addAll(_peopleDatabaseList); + _isLoading = false; + }); + } + + Future> _addFavorite(People person, String id) async { + Map message; + int personDatabaseIndex, personListIndex; + await _favoriteHandler.createFavorite(person, id).then((Map response) async { + message = response; + if (response["status"] == "success") { + await databaseHelper.addFavoritePeople(person); + personDatabaseIndex = _peopleDatabaseList.indexOf(person); + personListIndex = _peopleList.indexOf(person); setState(() { - _isLoading = false; - _peopleList.addAll(fetchedPeople); - _people.addAll(_peopleList); + _peopleDatabaseList[personDatabaseIndex].isFav = 'true'; + _peopleList[personListIndex].isFav = 'true'; }); - } + } // else { treat error; } }); + return message; + } + + void _removeFavorite(People person) async { + await databaseHelper.removeFavoritePeople(person); + setState(() { + _peopleDatabaseList.map((item) { + if (item.name == person.name) item.isFav = 'false'; + }); + _peopleList.map((item) { + if (item.name == person.name) item.isFav = 'false'; + }); + }); + } + + Future _inputDialog(BuildContext context) async { + String favId = ''; + return showDialog( + context: context, + barrierDismissible: false, + builder: (BuildContext context) { + return AlertDialog( + title: Text('Enter favorite ID'), + content: new Row( + children: [ + new Expanded( + child: new TextField( + autofocus: true, + decoration: new InputDecoration( + labelText: 'Favorite ID', hintText: 'eg. 1'), + onChanged: (value) { + favId = value; + }, + ), + ) + ] + ), + actions: [ + FlatButton( + child: Text('Ok'), + onPressed: () { + Navigator.of(context).pop(favId); + }, + ), + ], + ); + } + ); } - void _filterSearch(String query) async { + Future _favoriteResult(BuildContext context, Map message) async { + return showDialog( + context: context, + barrierDismissible: false, + builder: (BuildContext context) { + return AlertDialog( + title: Text("Status: " + message["status"]), + content: Text(message["message"]), + actions: [ + FlatButton( + child: Text('OK'), + onPressed: () { + Navigator.of(context).pop(); + }, + ), + ], + ); + } + ); + } + + List _filterSearch(String input) { List dummySearchList = List(); - dummySearchList.addAll(_peopleList); - if (query.isNotEmpty) { - List dummyListData = List(); + dummySearchList.addAll(_peopleDatabaseList); + List dummyListData = List(); + + String query = input.toLowerCase(); + + if (query.isNotEmpty) { dummySearchList.forEach((item) { - if (item.name.contains(query)) { - dummyListData.add(item); - } - }); - setState(() { - _people.clear(); - _people.addAll(dummyListData); + if (_showingFavorites) { + if (item.name.toLowerCase().contains(query) && item.isFav == 'true') { + dummyListData.add(item); + } + } else { + if (item.name.toLowerCase().contains(query)) { + dummyListData.add(item); + } + } }); - return; } else { - setState(() { - _people.clear(); - _people.addAll(_peopleList); - }); + if (_showingFavorites) { + dummySearchList.forEach((item) { + if (item.isFav == 'true') { + dummyListData.add(item); + } + }); + } else { + dummyListData.addAll(dummySearchList); + } } + + return dummyListData; } @override - Widget build(BuildContext context) { - - ListView resultsList() { - return ListView.builder( - itemCount: _isLoading ? 1 : _people.length, - itemBuilder: (BuildContext context, int index) { - if (_isLoading) { - return Center( - child: SizedBox( - child: CircularProgressIndicator(), - height: 24, - width: 24, - ), - ); - } - return Column( - children: [ - ListTile( - title: Text(_people[index].name), - subtitle: Text( - "Height: " + _people[index].height + " cm; " + - "Gender: " + _people[index].gender + "; " + - "Mass: " + _people[index].mass + " kg"), - onTap: () { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => PersonDetailScreen(person: _people[index],)) - ); - }, - ), - ], - ); - } - ); - } - + Widget build(BuildContext context) { return Scaffold( appBar: AppBar( title: Text(widget.title), + actions: [ + IconButton( + icon: Icon( + _showingFavorites ? Icons.favorite : Icons.favorite_border, + color: _showingFavorites ? Colors.red : null), + onPressed: () { + setState(() { + _showingFavorites ? _showingFavorites = false : _showingFavorites = true; + _peopleList.clear(); + _peopleList.addAll(_filterSearch(editingController.text)); + }); + } + ) + ], ), body: Container( child: Column( @@ -146,7 +225,11 @@ class _MyHomePageState extends State { padding: const EdgeInsets.all(8.0), child: TextField( onChanged: (value) { - _filterSearch(value); + List filteredList = _filterSearch(value); + setState(() { + _peopleList.clear(); + _peopleList.addAll(filteredList); + }); }, controller: editingController, decoration: InputDecoration( @@ -157,10 +240,67 @@ class _MyHomePageState extends State { ), ), ), - Expanded(child: resultsList(),) + Expanded( + child: resultsList(_peopleList), + ) ] ), ), ); } -} + + ListView resultsList(List resultsList) { + return ListView.builder( + itemCount: _isLoading ? 1 : resultsList.length, + itemBuilder: (BuildContext context, int index) { + if (_isLoading) { + return Center( + child: SizedBox( + child: CircularProgressIndicator(), + height: 24, + width: 24, + ), + ); + } + return Column( + children: [ + _buildRow(resultsList[index]), + ], + ); + } + ); + } + + Widget _buildRow(People person) { + final isFavorite = person.isFav == 'true'; + + return ListTile( + title: Text(person.name), + subtitle: Text( + "Height: " + person.height + " cm; " + + "Gender: " + person.gender + "; " + + "Mass: " + person.mass + " kg"), + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => PersonDetailScreen(person: person,)) + ); + }, + trailing: IconButton( + icon: Icon( + isFavorite ? Icons.favorite : Icons.favorite_border, + color: isFavorite ? Colors.red : null), + onPressed: () async { + if (isFavorite){ + _removeFavorite(person); + } else { + final String favId = await _inputDialog(context); + final Map message = await _addFavorite(person, favId); + _favoriteResult(context, message); + } + } + ), + ); + } +} \ No newline at end of file From 06b2e68f32d9e9945b3a1130ad0c1bfb40a6cf10 Mon Sep 17 00:00:00 2001 From: Thome Date: Sun, 15 Mar 2020 14:59:35 -0300 Subject: [PATCH 06/10] Add favorite button on detail screen and treat favorite errors --- starwiki/lib/database_helper.dart | 8 +- starwiki/lib/fetcher.dart | 82 ++++++++++++++----- starwiki/lib/main.dart | 91 +++++++++++++++------ starwiki/lib/personDetailScreen.dart | 113 ++++++++++++++++++++++++++- starwiki/pubspec.lock | 7 ++ starwiki/pubspec.yaml | 1 + 6 files changed, 256 insertions(+), 46 deletions(-) diff --git a/starwiki/lib/database_helper.dart b/starwiki/lib/database_helper.dart index 652997e2..c88deb12 100644 --- a/starwiki/lib/database_helper.dart +++ b/starwiki/lib/database_helper.dart @@ -1,7 +1,5 @@ -//import 'package:path_provider/path_provider.dart'; import 'package:sqflite/sqflite.dart'; import 'package:path/path.dart'; -//import 'dart:io'; final String personTable = 'personTable'; @@ -202,6 +200,12 @@ class DatabaseHelper { where: "$personName = ?", whereArgs: [person.name]); } + Future saveFavoriteForLater(People person, String id) async { + Database db = await this.database; + await db.update('$personTable', {'$personFavLater': id}, + where: '$personName = ?', whereArgs: [person.name]); + } + Future> getFavoriteList() async { Database db = await this.database; List> maps = await db.query('$personTable', where: '$personIsFav = ?', whereArgs: ['true']); diff --git a/starwiki/lib/fetcher.dart b/starwiki/lib/fetcher.dart index 1b7c556b..9521b375 100644 --- a/starwiki/lib/fetcher.dart +++ b/starwiki/lib/fetcher.dart @@ -1,20 +1,24 @@ -import 'dart:convert'; import 'package:starwiki/database_helper.dart'; -import 'package:http/http.dart' as http; +import 'package:dio/dio.dart'; class PageFetcher { int _currentPage = 1; int _maxPages = 9; + Dio dio = new Dio(); Future> fetch() async { List peopleList = new List(); Page peoplePage = new Page(); - while (_currentPage <= _maxPages) { - var res = await http.get("https://swapi.co/api/people/?page=$_currentPage"); - peoplePage = Page.fromJson(jsonDecode(res.body)); - peopleList.addAll(peoplePage.results); - _currentPage++; + try { + while (_currentPage <= _maxPages) { + Response res = await dio.get("https://swapi.co/api/people/?page=$_currentPage"); + peoplePage = Page.fromJson(res.data); + peopleList.addAll(peoplePage.results); + _currentPage++; + } + } catch (e) { + print(e); } return peopleList; @@ -22,36 +26,78 @@ class PageFetcher { } class PlanetFetcher { + Dio dio = new Dio(); + Future fetch(url) async { - var res = await http.get(url); - Planet planet = Planet.fromJson(jsonDecode(res.body)); - return planet; + try { + Response res = await dio.get(url); + Planet planet = Planet.fromJson(res.data); + return planet; + } catch (e) { + print(e); + } } } class SpeciesFetcher { + Dio dio = new Dio(); + Future fetch(url) async { - var res = await http.get(url); - Species species = Species.fromJson(jsonDecode(res.body)); - return species; + try { + Response res = await dio.get(url); + Species species = Species.fromJson(res.data); + return species; + } catch (e) { + print(e); + } } } class FavoriteHandler { final String _baseURL = "http://private-782d3-starwarsfavorites.apiary-mock.com/favorite/"; + bool _useHeader = false; + Dio dio = new Dio(); Future> createFavorite(People person, String id) async { - var res = await http.post(_baseURL + id, body: person.toMap()); - var resBody = jsonDecode(res.body); - Map result; - + Map result; + Response res; + if (_useHeader) { + _useHeader = false; + //headers = {"Prefer": "status=400"}; + //res = await http.post(_baseURL + id, body: person.toMap(), headers: headers); + res = await dio.post( + _baseURL + id, + data: person.toMap(), + options: Options( + headers: { + "Prefer": "status=400" + } + ) + ); + } else { + _useHeader = true; + res = await dio.post( + _baseURL + id, + data: person.toMap(), + ); + } + + /*resBody = jsonDecode(res.body); if (res.statusCode == 201) { result = {"status": resBody["status"], "message": resBody["message"]}; } else if (res.statusCode == 400) { result = {"status": resBody["error"], "message": resBody["error_message"]}; - //Save request for later + }*/ + + // + if (res.statusCode == 201) { + result = {"status": res.data["status"], + "message": res.data["message"]}; + } else if (res.statusCode == 400) { + result = {"status": res.data["error"], + "message": res.data["error_message"]}; } return result; diff --git a/starwiki/lib/main.dart b/starwiki/lib/main.dart index f50f247a..d6d1d512 100644 --- a/starwiki/lib/main.dart +++ b/starwiki/lib/main.dart @@ -53,23 +53,31 @@ class _MyHomePageState extends State { void _getPeople() async { _isLoading = true; List databaseList = List(); + var result; try { - final result = await InternetAddress.lookup('example.com').timeout(Duration(seconds: 30)); - if (result.isNotEmpty && result[0].rawAddress.isNotEmpty) { - await _pageFetcher.fetch().then((List fetchedPeople) async { - await databaseHelper.createOrUpdatePeople(fetchedPeople); - }); - } + result = await InternetAddress.lookup('example.com').timeout(Duration(seconds: 15)); } on SocketException catch (_) { print("SocketException"); } + if (result.isNotEmpty && result[0].rawAddress.isNotEmpty) { + await _pageFetcher.fetch().then((List fetchedPeople) async { + await databaseHelper.createOrUpdatePeople(fetchedPeople); + }); + } + await databaseHelper.getPeopleList().then((List fetchedPeople) { databaseList.addAll(fetchedPeople); }); - // add favorites as needed + if (result.isNotEmpty && result[0].rawAddress.isNotEmpty) { + for (var i = 0; i < databaseList.length; i++) { + if (databaseList[i].favLater != 'false') { + databaseList[i] = await _addFavoriteOnStart(databaseList[i], databaseList[i].favLater); + } + } + } setState(() { _peopleDatabaseList.addAll(databaseList); @@ -78,33 +86,54 @@ class _MyHomePageState extends State { }); } + Future _addFavoriteOnStart(People person, String id) async { + await _favoriteHandler.createFavorite(person, id).then((Map response) async { + if (response["status"] == "success") { + await databaseHelper.addFavoritePeople(person); + person.isFav = 'true'; + person.favLater = 'false'; + } + }); + return person; + } + Future> _addFavorite(People person, String id) async { Map message; - int personDatabaseIndex, personListIndex; await _favoriteHandler.createFavorite(person, id).then((Map response) async { message = response; if (response["status"] == "success") { await databaseHelper.addFavoritePeople(person); - personDatabaseIndex = _peopleDatabaseList.indexOf(person); - personListIndex = _peopleList.indexOf(person); - setState(() { - _peopleDatabaseList[personDatabaseIndex].isFav = 'true'; - _peopleList[personListIndex].isFav = 'true'; - }); - } // else { treat error; } + _updateFavorite(person, 'true'); + } else { + await databaseHelper.saveFavoriteForLater(person, id); + _saveFavoriteForLater(person, id); + } }); return message; } void _removeFavorite(People person) async { await databaseHelper.removeFavoritePeople(person); + _updateFavorite(person, 'false'); + } + + void _updateFavorite(People person, String isFav) async { + int personDatabaseIndex, personListIndex; + personDatabaseIndex = _peopleDatabaseList.indexOf(person); + personListIndex = _peopleList.indexOf(person); setState(() { - _peopleDatabaseList.map((item) { - if (item.name == person.name) item.isFav = 'false'; - }); - _peopleList.map((item) { - if (item.name == person.name) item.isFav = 'false'; - }); + _peopleDatabaseList[personDatabaseIndex].isFav = isFav; + _peopleList[personListIndex].isFav = isFav; + }); + } + + void _saveFavoriteForLater(People person, String id) async { + int personDatabaseIndex, personListIndex; + personDatabaseIndex = _peopleDatabaseList.indexOf(person); + personListIndex = _peopleList.indexOf(person); + setState(() { + _peopleDatabaseList[personDatabaseIndex].favLater = id; + _peopleList[personListIndex].favLater = id; }); } @@ -284,7 +313,16 @@ class _MyHomePageState extends State { Navigator.push( context, MaterialPageRoute( - builder: (context) => PersonDetailScreen(person: person,)) + builder: (context) => PersonDetailScreen( + person: person, + onFavorite: (String isFav) { + _updateFavorite(person, isFav); + }, + onFavoriteFail: (String id) { + _saveFavoriteForLater(person, id); + }, + ) + ) ); }, trailing: IconButton( @@ -303,4 +341,11 @@ class _MyHomePageState extends State { ), ); } -} \ No newline at end of file +} + +/* + +1. Implement lazy loading +2. Optional aesthetic changes + +*/ \ No newline at end of file diff --git a/starwiki/lib/personDetailScreen.dart b/starwiki/lib/personDetailScreen.dart index 074320af..25768442 100644 --- a/starwiki/lib/personDetailScreen.dart +++ b/starwiki/lib/personDetailScreen.dart @@ -5,8 +5,14 @@ import 'package:starwiki/fetcher.dart'; class PersonDetailScreen extends StatefulWidget { final People person; + final Function(String) onFavorite; + final Function(String) onFavoriteFail; - PersonDetailScreen({Key key, @required this.person}) : super(key: key); + PersonDetailScreen({ + Key key, + @required this.person, + @required this.onFavorite, + @required this.onFavoriteFail,}) : super(key: key); @override _PersonDetailScreenState createState() => _PersonDetailScreenState(); @@ -15,13 +21,17 @@ class PersonDetailScreen extends StatefulWidget { class _PersonDetailScreenState extends State { final _planetFetcher = PlanetFetcher(); final _speciesFetcher = SpeciesFetcher(); + final _favoriteHandler = FavoriteHandler(); + DatabaseHelper databaseHelper = DatabaseHelper(); String planetName; String speciesName; - bool isLoading = true; + bool isLoading; + String buttonText; @override void initState() { isLoading = true; + buttonText = widget.person.isFav == 'false' ? "Favorite" : "Unfavorite"; searchDetails(); } @@ -48,6 +58,82 @@ class _PersonDetailScreenState extends State { }); } + Future> _addFavorite(People person, String id) async { + Map message; + await _favoriteHandler.createFavorite(person, id).then((Map response) async { + message = response; + if (response["status"] == "success") { + await databaseHelper.addFavoritePeople(person); + widget.onFavorite('true'); + } else { + await databaseHelper.saveFavoriteForLater(person, id); + widget.onFavoriteFail(id); + } + }); + return message; + } + + void _removeFavorite(People person) async { + await databaseHelper.removeFavoritePeople(person); + widget.onFavorite('false'); + } + + Future _inputDialog(BuildContext context) async { + String favId = ''; + return showDialog( + context: context, + barrierDismissible: false, + builder: (BuildContext context) { + return AlertDialog( + title: Text('Enter favorite ID'), + content: new Row( + children: [ + new Expanded( + child: new TextField( + autofocus: true, + decoration: new InputDecoration( + labelText: 'Favorite ID', hintText: 'eg. 1'), + onChanged: (value) { + favId = value; + }, + ), + ) + ] + ), + actions: [ + FlatButton( + child: Text('Ok'), + onPressed: () { + Navigator.of(context).pop(favId); + }, + ), + ], + ); + } + ); + } + + Future _favoriteResult(BuildContext context, Map message) async { + return showDialog( + context: context, + barrierDismissible: false, + builder: (BuildContext context) { + return AlertDialog( + title: Text("Status: " + message["status"]), + content: Text(message["message"]), + actions: [ + FlatButton( + child: Text('OK'), + onPressed: () { + Navigator.of(context).pop(); + }, + ), + ], + ); + } + ); + } + Widget build(BuildContext context) { ListView detailsList() { @@ -90,6 +176,27 @@ class _PersonDetailScreenState extends State { height: 50, child: Text("Species: " + speciesName), ), + Center( + child: FlatButton( + color: Colors.grey, + padding: EdgeInsets.all(8.0), + child: Text(buttonText), + onPressed: () async { + if (widget.person.isFav == 'true') { + _removeFavorite(widget.person); + setState(() { + buttonText = "Favorite"; + }); + } else { + final String favId = await _inputDialog(context); + final Map message = await _addFavorite(widget.person, favId); + _favoriteResult(context, message); + setState(() { + buttonText = "Unfavorite"; + }); + } + }, + )), ], ); } @@ -97,7 +204,7 @@ class _PersonDetailScreenState extends State { Widget buildProgressIndicator () { return Center( child: SizedBox( - child: CircularProgressIndicator(), + child: CircularProgressIndicator(), height: 24, width: 24, ), diff --git a/starwiki/pubspec.lock b/starwiki/pubspec.lock index 00dba042..f4d4cc80 100644 --- a/starwiki/pubspec.lock +++ b/starwiki/pubspec.lock @@ -64,6 +64,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.1.3" + dio: + dependency: "direct main" + description: + name: dio + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.9" flutter: dependency: "direct main" description: flutter diff --git a/starwiki/pubspec.yaml b/starwiki/pubspec.yaml index 1ebce67a..c7f6e336 100644 --- a/starwiki/pubspec.yaml +++ b/starwiki/pubspec.yaml @@ -23,6 +23,7 @@ dependencies: sqflite: ^1.2.2 path_provider: ^1.6.5 lazy_load_scrollview: 1.0.1 + dio: 3.0.9 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. From 13b226fbf780b86615baa27380d581a98ec995af Mon Sep 17 00:00:00 2001 From: Thome Date: Mon, 16 Mar 2020 14:04:56 -0300 Subject: [PATCH 07/10] Correctly treat error when no internet connection --- starwiki/lib/fetcher.dart | 51 +++++++++++++++++----------- starwiki/lib/main.dart | 10 +++--- starwiki/lib/personDetailScreen.dart | 2 ++ 3 files changed, 40 insertions(+), 23 deletions(-) diff --git a/starwiki/lib/fetcher.dart b/starwiki/lib/fetcher.dart index 9521b375..984ff02d 100644 --- a/starwiki/lib/fetcher.dart +++ b/starwiki/lib/fetcher.dart @@ -29,13 +29,14 @@ class PlanetFetcher { Dio dio = new Dio(); Future fetch(url) async { + Planet planet; try { Response res = await dio.get(url); - Planet planet = Planet.fromJson(res.data); - return planet; + planet = Planet.fromJson(res.data); } catch (e) { - print(e); + planet.name = "Unknown"; } + return planet; } } @@ -43,13 +44,14 @@ class SpeciesFetcher { Dio dio = new Dio(); Future fetch(url) async { + Species species; try { Response res = await dio.get(url); - Species species = Species.fromJson(res.data); - return species; + species = Species.fromJson(res.data); } catch (e) { - print(e); + species.name = "Unknown"; } + return species; } } @@ -65,21 +67,32 @@ class FavoriteHandler { _useHeader = false; //headers = {"Prefer": "status=400"}; //res = await http.post(_baseURL + id, body: person.toMap(), headers: headers); - res = await dio.post( - _baseURL + id, - data: person.toMap(), - options: Options( - headers: { - "Prefer": "status=400" - } - ) - ); + try { + res = await dio.post( + _baseURL + id, + data: person.toMap(), + options: Options( + headers: { + "Prefer": "status=400" + }, + validateStatus: (status) { return status < 500;} + ) + ); + } catch (_) { + return {"status": "connection error", + "message": "I felt a great disturbance in the Force."}; + } } else { _useHeader = true; - res = await dio.post( - _baseURL + id, - data: person.toMap(), - ); + try { + res = await dio.post( + _baseURL + id, + data: person.toMap(), + ); + } catch (_) { + return {"status": "connection error", + "message": "I felt a great disturbance in the Force."}; + } } /*resBody = jsonDecode(res.body); diff --git a/starwiki/lib/main.dart b/starwiki/lib/main.dart index d6d1d512..afb49fe7 100644 --- a/starwiki/lib/main.dart +++ b/starwiki/lib/main.dart @@ -56,12 +56,12 @@ class _MyHomePageState extends State { var result; try { - result = await InternetAddress.lookup('example.com').timeout(Duration(seconds: 15)); + result = await InternetAddress.lookup('example.com').timeout(Duration(seconds: 10)); } on SocketException catch (_) { print("SocketException"); } - if (result.isNotEmpty && result[0].rawAddress.isNotEmpty) { + if (result != null && result[0].rawAddress.isNotEmpty) { await _pageFetcher.fetch().then((List fetchedPeople) async { await databaseHelper.createOrUpdatePeople(fetchedPeople); }); @@ -71,7 +71,7 @@ class _MyHomePageState extends State { databaseList.addAll(fetchedPeople); }); - if (result.isNotEmpty && result[0].rawAddress.isNotEmpty) { + if (result != null && result[0].rawAddress.isNotEmpty) { for (var i = 0; i < databaseList.length; i++) { if (databaseList[i].favLater != 'false') { databaseList[i] = await _addFavoriteOnStart(databaseList[i], databaseList[i].favLater); @@ -104,6 +104,8 @@ class _MyHomePageState extends State { if (response["status"] == "success") { await databaseHelper.addFavoritePeople(person); _updateFavorite(person, 'true'); + } else if (response["status"] == "connection error") { + //do nothing } else { await databaseHelper.saveFavoriteForLater(person, id); _saveFavoriteForLater(person, id); @@ -263,7 +265,7 @@ class _MyHomePageState extends State { controller: editingController, decoration: InputDecoration( labelText: "Search", - hintText: "Search", + hintText: "e.g. \"Obi\", \"vader\", \"kywalker\"", prefixIcon: Icon(Icons.search), border: OutlineInputBorder(borderRadius: BorderRadius.all(Radius.circular(25.0))) ), diff --git a/starwiki/lib/personDetailScreen.dart b/starwiki/lib/personDetailScreen.dart index 25768442..26b1b7f8 100644 --- a/starwiki/lib/personDetailScreen.dart +++ b/starwiki/lib/personDetailScreen.dart @@ -65,6 +65,8 @@ class _PersonDetailScreenState extends State { if (response["status"] == "success") { await databaseHelper.addFavoritePeople(person); widget.onFavorite('true'); + } else if (response["status"] == "connection error") { + //do nothing } else { await databaseHelper.saveFavoriteForLater(person, id); widget.onFavoriteFail(id); From 88ecbad2d7d47791dbc5e297897a9452e1d9f2bc Mon Sep 17 00:00:00 2001 From: Thome Date: Mon, 16 Mar 2020 14:36:15 -0300 Subject: [PATCH 08/10] Remove comments in code --- starwiki/lib/fetcher.dart | 12 ------------ starwiki/lib/main.dart | 9 +-------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/starwiki/lib/fetcher.dart b/starwiki/lib/fetcher.dart index 984ff02d..899bd68a 100644 --- a/starwiki/lib/fetcher.dart +++ b/starwiki/lib/fetcher.dart @@ -65,8 +65,6 @@ class FavoriteHandler { Response res; if (_useHeader) { _useHeader = false; - //headers = {"Prefer": "status=400"}; - //res = await http.post(_baseURL + id, body: person.toMap(), headers: headers); try { res = await dio.post( _baseURL + id, @@ -95,16 +93,6 @@ class FavoriteHandler { } } - /*resBody = jsonDecode(res.body); - if (res.statusCode == 201) { - result = {"status": resBody["status"], - "message": resBody["message"]}; - } else if (res.statusCode == 400) { - result = {"status": resBody["error"], - "message": resBody["error_message"]}; - }*/ - - // if (res.statusCode == 201) { result = {"status": res.data["status"], "message": res.data["message"]}; diff --git a/starwiki/lib/main.dart b/starwiki/lib/main.dart index afb49fe7..26fdaa47 100644 --- a/starwiki/lib/main.dart +++ b/starwiki/lib/main.dart @@ -343,11 +343,4 @@ class _MyHomePageState extends State { ), ); } -} - -/* - -1. Implement lazy loading -2. Optional aesthetic changes - -*/ \ No newline at end of file +} \ No newline at end of file From fc277e2d0532d80007a6c906b801c8e661657554 Mon Sep 17 00:00:00 2001 From: Thome Date: Mon, 16 Mar 2020 15:13:17 -0300 Subject: [PATCH 09/10] Load character detail screen when offline --- starwiki/lib/fetcher.dart | 4 ++-- starwiki/lib/main.dart | 2 -- starwiki/lib/personDetailScreen.dart | 19 +++++++++++++++---- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/starwiki/lib/fetcher.dart b/starwiki/lib/fetcher.dart index 899bd68a..f3fc9c7a 100644 --- a/starwiki/lib/fetcher.dart +++ b/starwiki/lib/fetcher.dart @@ -29,7 +29,7 @@ class PlanetFetcher { Dio dio = new Dio(); Future fetch(url) async { - Planet planet; + Planet planet = new Planet(); try { Response res = await dio.get(url); planet = Planet.fromJson(res.data); @@ -44,7 +44,7 @@ class SpeciesFetcher { Dio dio = new Dio(); Future fetch(url) async { - Species species; + Species species = new Species(); try { Response res = await dio.get(url); species = Species.fromJson(res.data); diff --git a/starwiki/lib/main.dart b/starwiki/lib/main.dart index 26fdaa47..656cb7a5 100644 --- a/starwiki/lib/main.dart +++ b/starwiki/lib/main.dart @@ -104,8 +104,6 @@ class _MyHomePageState extends State { if (response["status"] == "success") { await databaseHelper.addFavoritePeople(person); _updateFavorite(person, 'true'); - } else if (response["status"] == "connection error") { - //do nothing } else { await databaseHelper.saveFavoriteForLater(person, id); _saveFavoriteForLater(person, id); diff --git a/starwiki/lib/personDetailScreen.dart b/starwiki/lib/personDetailScreen.dart index 26b1b7f8..aea0710a 100644 --- a/starwiki/lib/personDetailScreen.dart +++ b/starwiki/lib/personDetailScreen.dart @@ -39,12 +39,25 @@ class _PersonDetailScreenState extends State { String newPlanetName; String newSpeciesName; - await _planetFetcher.fetch(widget.person.planet).then((Planet planet) { + await _planetFetcher.fetch(widget.person.planet) + .timeout( + Duration(seconds: 3), + onTimeout: () { + newPlanetName = "Unknown"; + return; + } + ).then((Planet planet) { newPlanetName = planet.name; }); if (widget.person.species.contains("species")) { - await _speciesFetcher.fetch(widget.person.species).then((Species species) { + await _speciesFetcher.fetch(widget.person.species) + .timeout( + Duration(seconds: 3), + onTimeout: () { + newSpeciesName = "Unknown"; + return; + }).then((Species species) { newSpeciesName = species.name; }); } else { @@ -65,8 +78,6 @@ class _PersonDetailScreenState extends State { if (response["status"] == "success") { await databaseHelper.addFavoritePeople(person); widget.onFavorite('true'); - } else if (response["status"] == "connection error") { - //do nothing } else { await databaseHelper.saveFavoriteForLater(person, id); widget.onFavoriteFail(id); From 13230d8bfb5f95014fc9e464697acbbe9f815092 Mon Sep 17 00:00:00 2001 From: Thome Date: Mon, 16 Mar 2020 15:23:57 -0300 Subject: [PATCH 10/10] Remove more code comments --- starwiki/lib/database_helper.dart | 3 --- starwiki/lib/main.dart | 2 -- 2 files changed, 5 deletions(-) diff --git a/starwiki/lib/database_helper.dart b/starwiki/lib/database_helper.dart index c88deb12..7c7e9a9e 100644 --- a/starwiki/lib/database_helper.dart +++ b/starwiki/lib/database_helper.dart @@ -1,7 +1,6 @@ import 'package:sqflite/sqflite.dart'; import 'package:path/path.dart'; - final String personTable = 'personTable'; final String personName = 'name'; final String personHeight = 'height'; @@ -115,7 +114,6 @@ class DatabaseHelper { } Future initializeDatabase() async { - //Directory directory = await getApplicationDocumentsDirectory(); String path = join(await getDatabasesPath(), _databaseName); var swWikiDatabase = await openDatabase(path, version: _databaseVersion, onCreate: _createDb, onUpgrade: _upgradeDb); return swWikiDatabase; @@ -129,7 +127,6 @@ class DatabaseHelper { void _upgradeDb(Database db, int oldVersion, int newVersion) async { if (oldVersion < newVersion){ - await db.execute("DROP TABLE favoritePersonTable"); await db.execute('DROP TABLE $personTable'); await db.execute('CREATE TABLE $personTable($personName TEXT PRIMARY KEY, '+ '$personHeight TEXT, $personMass TEXT, $personHairColor TEXT, $personSkinColor TEXT, $personEyeColor TEXT, '+ diff --git a/starwiki/lib/main.dart b/starwiki/lib/main.dart index 656cb7a5..12e7b2fa 100644 --- a/starwiki/lib/main.dart +++ b/starwiki/lib/main.dart @@ -37,7 +37,6 @@ class _MyHomePageState extends State { bool _isLoading; bool _showingFavorites; - //String _searchQuery; final _peopleDatabaseList = List(); final _peopleList = List(); @@ -46,7 +45,6 @@ class _MyHomePageState extends State { super.initState(); _isLoading = true; _showingFavorites = false; - //_searchQuery = ''; _getPeople(); }