From 8f524b43dd713dcafb7ee53e9eec13f2ab151642 Mon Sep 17 00:00:00 2001 From: Simon Uhrmann Date: Tue, 14 Apr 2020 17:16:04 +0200 Subject: [PATCH] Further clean up and work under the hood - continues 181fb09d - rename App to "Karlorona" "& package to "de.karlorona.app" - Fix `AndroidManifest.xml` for releases --- android/app/build.gradle | 34 +++- android/app/src/debug/AndroidManifest.xml | 2 +- android/app/src/main/AndroidManifest.xml | 13 +- .../MainActivity.java | 36 ---- .../karlorona/app}/MainActivity.kt | 2 +- .../app/src/main/res/drawable/app_icon.png | Bin 1912 -> 2361 bytes .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 544 -> 1451 bytes .../main/res/mipmap-hdpi/launcher_icon.png | Bin 1451 -> 0 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 442 -> 929 bytes .../main/res/mipmap-mdpi/launcher_icon.png | Bin 929 -> 0 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 721 -> 1934 bytes .../main/res/mipmap-xhdpi/launcher_icon.png | Bin 1934 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 1031 -> 2805 bytes .../main/res/mipmap-xxhdpi/launcher_icon.png | Bin 2805 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 1443 -> 3708 bytes .../main/res/mipmap-xxxhdpi/launcher_icon.png | Bin 3708 -> 0 bytes android/app/src/profile/AndroidManifest.xml | 2 +- android/build.gradle | 9 +- ios/Runner.xcodeproj/project.pbxproj | 174 +++--------------- .../xcshareddata/xcschemes/Runner.xcscheme | 18 +- .../contents.xcworkspacedata | 3 - ios/Runner/Info.plist | 8 +- lib/activities/health-page.dart | 2 +- lib/activities/health/drink-page.dart | 8 +- lib/activities/health/eat-page.dart | 2 +- lib/activities/health/gym-page.dart | 6 +- lib/activities/health/run-page.dart | 4 +- lib/activities/health/sleep-page.dart | 4 +- lib/activities/health/walk-page.dart | 6 +- lib/activities/hygiene-page.dart | 4 +- lib/activities/hygiene/distance-page.dart | 4 +- lib/activities/hygiene/hand-page.dart | 4 +- lib/activities/hygiene/handsface-page.dart | 4 +- lib/activities/hygiene/smartdes-page.dart | 4 +- lib/activities/hygiene/sneeze-page.dart | 4 +- lib/activities/hygiene/ventilate-page.dart | 4 +- lib/activities/psych-page.dart | 2 +- lib/activities/psych/daystruct-page.dart | 4 +- lib/activities/psych/goal-page.dart | 4 +- lib/activities/psych/medien-page.dart | 4 +- lib/activities/psych/social-page.dart | 4 +- lib/activities/psych/yoga-page.dart | 4 +- lib/app-container.dart | 2 +- lib/components/think-bubble.dart | 2 +- lib/database/db.dart | 2 +- lib/main.dart | 4 +- lib/notification-manager.dart | 2 +- lib/pages/activity-page.dart | 4 +- lib/pages/mascot-page.dart | 4 +- lib/quiz/quiz-widget.dart | 2 +- lib/scoped-model/database-model.dart | 2 +- pubspec.lock | 4 +- pubspec.yaml | 23 ++- test/widget_test.dart | 4 +- 54 files changed, 152 insertions(+), 286 deletions(-) delete mode 100644 android/app/src/main/java/com/dexterous/flutterlocalnotificationsexample/MainActivity.java rename android/app/src/main/kotlin/{com/example/ich_mache_es_richtig_richtig_oder => de/karlorona/app}/MainActivity.kt (90%) delete mode 100644 android/app/src/main/res/mipmap-hdpi/launcher_icon.png delete mode 100644 android/app/src/main/res/mipmap-mdpi/launcher_icon.png delete mode 100644 android/app/src/main/res/mipmap-xhdpi/launcher_icon.png delete mode 100644 android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png delete mode 100644 android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png diff --git a/android/app/build.gradle b/android/app/build.gradle index a927ed9..ef25a45 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -11,7 +11,18 @@ 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" //Configure signing @@ -22,18 +33,22 @@ if (keystorePropertiesFile.exists()) { } android { - compileSdkVersion 29 + compileSdkVersion 28 + + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } lintOptions { disable 'InvalidPackage' } defaultConfig { - applicationId "org.wirvsvirushackathon.karlorona" + applicationId "de.karlorona.app" minSdkVersion 16 - targetSdkVersion 29 - versionCode 1 - versionName "1.0" + targetSdkVersion 28 + versionCode flutterVersionCode.toInteger() + versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -48,7 +63,6 @@ android { 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.release @@ -75,9 +89,9 @@ flutter { } dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation 'androidx.test:rules:1.2.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' - implementation "androidx.core:core:1.1.0" + androidTestImplementation 'androidx.test:runner:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + // implementation "androidx.core:core:1.1.0" // TODO Is this needed? } diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index bdc1d9e..90cc078 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="de.karlorona.app"> diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index a1107d4..f5be76b 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="de.karlorona.app"> + android:label="Karlorona" + android:icon="@mipmap/ic_launcher"> @@ -31,14 +31,17 @@ + + + + This is used by the Flutter tool to generate GeneratedPluginRegistrant.java --> diff --git a/android/app/src/main/java/com/dexterous/flutterlocalnotificationsexample/MainActivity.java b/android/app/src/main/java/com/dexterous/flutterlocalnotificationsexample/MainActivity.java deleted file mode 100644 index 790294b..0000000 --- a/android/app/src/main/java/com/dexterous/flutterlocalnotificationsexample/MainActivity.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.wirvsvirushackathon.karlorona; - -import android.content.ContentResolver; -import android.content.Context; -import android.os.Bundle; - -import io.flutter.embedding.android.FlutterActivity; -import io.flutter.embedding.engine.FlutterEngine; -import io.flutter.plugin.common.MethodChannel; -import io.flutter.plugins.GeneratedPluginRegistrant; - -public class MainActivity extends FlutterActivity { - private static String resourceToUriString(Context context, int resId) { - return - ContentResolver.SCHEME_ANDROID_RESOURCE - + "://" - + context.getResources().getResourcePackageName(resId) - + "/" - + context.getResources().getResourceTypeName(resId) - + "/" - + context.getResources().getResourceEntryName(resId); - } - - @Override - public void configureFlutterEngine(FlutterEngine flutterEngine) { - GeneratedPluginRegistrant.registerWith(flutterEngine); - new MethodChannel(flutterEngine.getDartExecutor(), "crossingthestreams.io/resourceResolver").setMethodCallHandler( - (call, result) -> { - if ("drawableToUri".equals(call.method)) { - int resourceId = MainActivity.this.getResources().getIdentifier((String) call.arguments, "drawable", MainActivity.this.getPackageName()); - String uriString = resourceToUriString(MainActivity.this.getApplicationContext(), resourceId); - result.success(uriString); - } - }); - } -} diff --git a/android/app/src/main/kotlin/com/example/ich_mache_es_richtig_richtig_oder/MainActivity.kt b/android/app/src/main/kotlin/de/karlorona/app/MainActivity.kt similarity index 90% rename from android/app/src/main/kotlin/com/example/ich_mache_es_richtig_richtig_oder/MainActivity.kt rename to android/app/src/main/kotlin/de/karlorona/app/MainActivity.kt index fb52e08..be70acc 100644 --- a/android/app/src/main/kotlin/com/example/ich_mache_es_richtig_richtig_oder/MainActivity.kt +++ b/android/app/src/main/kotlin/de/karlorona/app/MainActivity.kt @@ -1,4 +1,4 @@ -package org.wirvsvirushackathon.karlorona +package de.karlorona.app import androidx.annotation.NonNull; import io.flutter.embedding.android.FlutterActivity diff --git a/android/app/src/main/res/drawable/app_icon.png b/android/app/src/main/res/drawable/app_icon.png index c4cc798d7408b624d2be0ae7a5276c50aa9ee25b..112dfc4b173c42d5bfa3c8546a4c1f60404f1df6 100644 GIT binary patch literal 2361 zcmbVO3se(l77o=aiDFftQWj+zQWk+^W|9zK4$(ydNstJJsMtMj872eFl4OR=0KrG0 zpj0XW(WQzHET*d$41>YRD}^Z(!f z-TU3S_ns+ESfg~~dGk0Nj+AukT+ zS#Ls@#3X6r5R5d6P(7J~i!4TpMRPb2D=id?W#9~uf~OHCIsfj5XZZl3m-9D-Xdn$0 zg{Kp$&1O7t^BNttIRgvV^H;6_A}k0?V8j^|uow*{8nMXvle`E!c1(kOU=qS)$oY{D zgFuod0f-{aI1nO|2{Bk2284!-V3`z>$btbe1c!rA7zj&*5R5=FBqS7=KKQIPvpyBk zDq^N>v2SvII>S&12{ zqzP~^qA6q+Bj>Z8PDwCQPFfQ^9VRwlparEsSOhsFO#=0p6Gvs44U@+87>FBiBW_}7 z77IJER65C!bUOKOsGZAC8DK-J(Kv1VqAy0H(*(^#XR|V<1M-V#T9-@VpcbdeEHj2j zXR~hlIn+={lo>}E(ySv%!_0?Dm~j~pv#Nmr4T=#ahlu4*Y{3;MgUk71NDK)fsSuXx z;1EO#BO!1QBt{@;3aTOXL~8E8LS={~43R)jLD{6yqYV0A!FmiyCCx^Zl}s4XG#sQ% zX?(yLNF<6hkY?5}>z(Aud397&f|*Pu4D14}RjvZm(NQuuTqYBWMewA%8V#a0(F|(B zaJ53tXTu{R2t9&9xE{taSg03=%7ju}su!l97&{7;rot(qQZyu0JhNXxVp)zPnAxxY zKljI*3APAP!>{IXl%^wl5EVhQ-!*r-coOl<>5+i|CKCohF-IZD`IsXEa6Nx|n)uZb zn4--|$63<88oKGfLr!CE9oC--;5$3DCArF@iF^9pJ|>G@V4G^=vLT9XW26i!?Zu;|bBhz}`WI&Nz%sh?Z3fmrq? z2x`5*er4Zi-;YJEW1o5Eo*cQnD{sZ3!iVcK4Dv8Pf!7x|gC`z0(jC{}8fw@1qBpi} zsP;`>e89i`+D7^F+cDf`8i^lCst#%y4C%YGX=F+Isn|!__rA;i;;8M~`ayfH>-DtE zI-n2h)n@jzgrO6MsW@nSJn-F{wz{6Kz@%~BNA8#AxtA>OFLH19o`74D$6C1V%Z_|9 z+x@4#nXN4m<0zd6+3G#o~zy6y6)M}Io)Bq3Xk!0m1PNE`|PG$N{lCl z^Iibmx9qJcy|Ogv+^eT1>g|W}vwfO*HQB?z@nZvjbwD}V_o8*(DrNDuPMeqN^6ByG zwutn1j9>N-)V@XC@W5-SzxsWL!e*fdV z%DMg#;m5Wor@K5r%40YEvD>Hc`@cN|7F>1P5eHREs+RW|&TfsXPg%Xy`dpdHSK_m$ zm>VB|qT)6BW8_rZqMXvu8}Gm3V|#1a(XQ7SyI_C+t-(iP<=xKy`O+0g;DQ?aEe}tA zl`Z$cako>0xbK1Z(vuDEy*P022k!N>p)%MnQ`i`1bAaHHf}5#`li)x&g)n Mqt_@JRwWnw6Bk8^asU7T delta 1706 zcmZWqe>~IqAKwn!8uHr|?uI=4<}*@p3>#YuYbKfpeKR(i%$UiKy4F@#oSaw~8j2Cu zRw7AG(+b`Es=Ka^aB}$(?r8Z{;a1(_ao@-H`+huL@8|3Nd_7;U=i~AE=Y2fV1f7otSIm_Ey#5=paheU zSQeX(ba&qA3|OM!NMykZ2BHGh5qN;V)cTx$dLsn~!FGuMCXgA-#H3VD4kIp3Km{9f zKPE0HXTastq|Z%AuMB3gCzeg8a#-vGELI}gkH(6jBMD4uJe^FZ(lWhV{#Ws@hu6oE zp8MGhdJ>1qVX%_WC@+`)@|h+33FAR2D6U>ClbViQdL0oG_S(lQv#DgW#oy#>e&)Q*RNzdTVhz|VF`X=VF(^5F zh+iZvrX$Sx z4aYBYEZx96ADn;m{6C?&t*y!^I|F&|*8v99_M4`A?P|18!|nG;a0_=V^xo?VD-&^$ zU`Oz6(P>hju`uZXgt`z?&2rU6@@6A6PjH`kb7O5&3AZ#HgRf$Dg{sX%gA%IN`2>yT zO5iSJh$TD(Hdhbo_JwNvtT*U)e-6eO1em<#FO*N1^~PNt^r+RLn$Ek(iB-hGVK()J zX76trj3{(Ja6ud>@y&_G^9o}^>&B~Y*!Dd^D&aoG?|t1W@R=vzBBvu-7)J#+p-Mv3 z*`|Cnm4|{}=?R3dZ#1Qk^pwi)ew&%r^5*K`+X(Mia|5Z)d7Dg==o=b+%}5SvG9{xl zy3p#0`bFBv>waUG^O{fO%YK; z=83hxuIna2_hK4SCTPcc9iG*mPs+VmL!_`Z^&HgPUTyeP zuNZubDc0GXNYZFw;l#Ul?Wx+L! z|JYCqD>TsSJ?7S!)}wzUk912vd0DY!F)R1G6r8)K9M*+5sTk0PbuX%cy95ysyz8D8 zb!&@1a8tl9X_3eV-{IarUIq{;+o@DHtz+M#Ps1(un(qVTFE3BsX_b$JY)c4a;E`bt zo=16kODVYQ_<5-o4C^8M@ z>i3#)KZJIN3q0nJ>wVK`_~WVm2d#_Q{CamesKSvWHw-+w^~3UdVoo%q4iS8YAq*xc zA8m^43~y(bsQ2cdoI25Y_h$V4@07`*`M{na-D?t=&u;F$;-^rsVtH~bUD~mRGOTsC zHJUd2W%^CyeAZ|wCdG>UQ;Ubl@XwCI<7(8}W@j(jxGfJU)KdRph02K2Z_r7oTA^Jw zUf5#t{)5>?9L6kFze)mQe${2>6;ZDoFz+)8Dw-t-KoC@ z1|7M7fjcfb_cF2sAST}^+81eGv^5(hAl+`ia#fnYu{Hzc*=(Kt&=?QcCr}8bbxkL` zNi)2%syFdyyYP`eLy}6t5RzFJ1nhZsNTj3Z@A~-0Qy;?vHe;p}#c1n0(up7|yv>z& z-$JuwfN87krA$5C_4Zu(Stiq-r7IqXd{rCBEjWAuF2i3p6qjNv*$dL&ycVgY72p|G z)T#Q#EwnEFIX4yyt_K!RGmD&1?&z-eJi=R46!36+meO|YzR}b;4hgJU$h!8;Zmtvy%e*?K%^I-r0 diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index db77bb4b7b0906d62b1847e87f15cdcacf6a4f29..c494fcd6e8d1e8addc2b70cdbe296fc8dbaa8a53 100644 GIT binary patch delta 1444 zcmV;V1zY-{1gi^>8Gix*007#LBoF`q1#(G5K~#7F?U~z899100=ggVQUMO;B7bpuX z2(;YGQZ3d>YpFG{_3~g$^vS0t{w2Pd821FF+F}W&YK0cL%4I<)(t-;+ zmovxT79~jbGUx0pux3A*huO*Rcjo(@Ip@spoR!u;I4b-fk$?7EK&HqU%QkYxvW=Xv zY$InZ+sGNqHgd+Y4Hjb}Mv99@BN-Eu6f6rE3wqRMIEyihxG!EZ?hhLGZVHt0h~q^H zwkyZaZ(jb0X2h5vkcBBV)Gr0w^r7oyc9dNqGuT(Fg!*yWVQY1XZmii)WHV+?kH`(3 zxX9=3f5)7k(0>NLqK_XkO0^4ed6k}*r1}no(34vaGo>@WvG6!01VLYi%*r5s?LF<* z7v|Vqrbg_5{k5*sZy}dw`-;ifK^SL6)3BCjv9D(97s8Ty@^xHVrQNwI5Ho&?>JdGM zklTw?k08k~IH{r2$YbbQ0x{xd$Su7}_gQFs`wHERSbxj&OiG!jdlH`5HU>aHk(-Yr zZ$b2%j|I#6=c?k8>pP^Hqhd(~lGV8FP-07#-RTv7>#+X^ zvCu~%48_zIJjNt{9Y+>7QlOd4{l=WdaVK0=&wr7{4SX22+h4M-Czy>vZ7P;jv1X-1 z?2hFDYjK(>i`f{iZbYKUnw2I}b(5ZHV^U2EYfAb+*{Kg+V@qL*hIIt43^JuSf_SJ9 zSJV-f4;q^>sWAk#E2AoBkei>$m@zCXEhm^2IRp+gqx@pJwqi4$!5B=tFhOyta)8*v zuYaLS|M9xbcm`u~V>g#1$B-I2^}9C&i`WXb*{E3T$Nt(hR5^g?%?EGh=#ZUYyT+8z zxilm>hSKqZIsS8^&61tiGKMRHQsthOQHc=q3go74V|XBCqzz*TDc$`Jh;j(I{geSO zP1{HwmfD!ydJ>mbI;6@0M0cL6_d@i>r+>-AQWz79d`j18=Ttd^RNDfFIrVF@m}Cuz zqWb(BJ2x&54(hY7#I_6)cgSR-m5x4K?1vL-5o>7{)(%_S==%r(8AattQjpuL9(ysi zPD?;yV@RahrZ(`kwYCDysiAW_H-PsIN+X}V4+BIjC`DKXk?_>x1|~K}Eo1oh)_*Ck zYLJ^knb64!F0Ymwj~VxFrCfK~7(c38J#oPiS&pD|o*{GN*6JV0!%`YUuD&;6IpmbA z^g*)XI{Ws<=N}4&mLx2NF{QKbfYcm2fd}n+?$zkGpCyS&VGMcmDW&^98OA|T1z8b{ zgnOwejA`Fr)_=JvH}}ZF4wzw`R)5C~HFR@&*my8#rP^jsJ$b;QRljppAH0TrwK&iu zRXr{4?M^UYMb^mtm^m{V+c~wj!EU>%pp-03!l4US#KLk|s7uvNVo7C2d#Uwk8R{l; z=7IH)?SEQEWHgd+YjlThNz07lS&totE0000P5D~Wn-+_Wa#27Xc zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U|N3vA*22NaGQG zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#iqdw@AL`7MR}m`rwr|mZgU`8P7SBkL78fFf!WnuYWm$5Z0 zNXhDbCv&49sM544K|?c)WrFfiZvCi9h0O)B3Pgg&ebxsLQ05GG~ AQ2+n{ diff --git a/android/app/src/main/res/mipmap-hdpi/launcher_icon.png b/android/app/src/main/res/mipmap-hdpi/launcher_icon.png deleted file mode 100644 index c494fcd6e8d1e8addc2b70cdbe296fc8dbaa8a53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1451 zcmV;c1yuTpP);bU`+JMrzZX-zL^;R1EW4!FKL@J zR+HLd38rd=7P-o0K`7FK3p@2WmKbeQw$?tdO`<*%G%M@PLIe9ow&&7?tjOepU?)rqK_XkO0^4ed6k}*r1}no(34vaGo>@W zvG6!01VLYi%*r5s?LF<*7v|Vqrbg_5{k5*sZy}dw`-;ifK^SL6)3BCjv9D(97s8Ty z@^xHVrQNwI5Ho&?>JdGMklTw?k08k~IH{r2$YbbQ0x{xd$Su7}_gQFs`wHERSj+QF zN|~p75}w#L20%ZNn~x)JLG+uC1jumS$m0vS#s=RAlDGwJW14XONqp$(S)LD=jCO6*&YBG^6}ty0&67 zp1~MQyD&jg#1$B-I2^}9C&i`WXb*{E3T$Nt(hR5^g? z%?EGh=#ZUYyT+8zxilm>hSKqZIsS8^&61tiGKMRHQsthOQHc=q3go74V|XBCqzz*T zDc$`Jh;j(I{geSOP1{HwmfD!ydJ>mbI;6@0M0cL6_d@i>r^&-o7!!+pO4n)UR5^oG z+X9C<^=q=2WDSU-`urO^H!cqj>a(xJwhR(?$Yi3Gjy_!MhZAZMYiSnN4qMyk`v?IU zMde6RklU*sdoi|7OF&{{NTk}PHt@BzwgSzmp>sPofcFhbBcHqv14Jw+MOX%r@YLf5 zCN@SbWBB&gDXwaen?jk;$qFv7mK%>5_im+JciI>~s#`sA!4X-Gpmd%gbK}EQK+pv+sb^96Nyr?RxIj=(nFGiAiA$dGjfy z`#u@QK~V)+5sZX;sVR(U-(S{$xhXgI$iWVnVVzdT3^jCfdf0d{XrDeYH5yBvm~v?(I%6U`5u*{Fpg28rwOwx4~|^s-ToCOv0fHSH!|{Sg1?YO=3x9 zMtiCCXc_7zbLN5dknMk3fo~@mrdl|RpS}}R5BAq!e;s^Y#6q7V`;FH6Dp{N&;VF2C z9Dj>#lU^ODZII~^IAZ5m5=*Oa+2JQ;L7A9e4D+&`Hehms-cFY1$l^2!Ptx^2(~|Tr z&K0=CglgbF1%c{Dt~})OAk_ucouIg5RxuU`5iE=9Q5yY=M%LgJCI2Gvk;%$k+k|S9 z^7p2+IEYIUN5~n=Hgd+YjhwM;BWEnz$QjEva>lZazX5Z-%yV!002ovPDHLk FV1k@4w5tFB diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 17987b79bb8a35cc66c3c1fd44f5a5526c1b78be..15a00737fb47c67320a92a1b6fa575411ec99d1d 100644 GIT binary patch delta 918 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 E2NXt|asU7T literal 721 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy!iOI#yLg7ec#$`gxH85~pclTsBt za}(23gHjVyDhp4h+5i=O3-AeX1=1l$e`s#|#^}+&7(N@w0CIr{$Oe+Uk^K-ZP~83C zcc@hG6rikF&NPT(23>y!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R` zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg zoq1^2_p9@|WEo z*X_Uko@K)qYYv~>43eQGMdbiGbo>E~Q& zrYBH{QP^@Sti!`2)uG{irBBq@y*$B zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N zdG@vOZB4v_lF7Plrx+hxo7(fCV&}fHq)$ diff --git a/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png deleted file mode 100644 index 46456ed632ffbbd4879c0927b63d0bb4a2a465d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1934 zcmZ{lYdjN*AI2x!p~W_i%RN&%i&wEv$9b7fsA8gB6Ccbj9P(;sGBUB2QH2E*Z8l!3}c1T1i` z|K6_ok1wv8tz(>mKfn6Ta$lH(?{zl@!FK{(bQi&;F=a;JbiNAVAhkDjbJa zVIzL|cN>CkGEi!)W2l`i_Ec>H%tyU_ZJl0&0-Bznq&p*5<*&GvtfISeDH~E9uX=vT zvc9i>obbfj0q7SGIrz>_?#t1Y2KAW8HzbGr!M>cb#ZTD|B^Xx!zz61EW#Z+>p?>zueehX&*|ek14aCFt3X#2<>sMRz`^tK2 zA7o88PoMom>J&N3n$E;<1|BF)Z^RVOCQNOAZJO(Y4?UU9zI|G5+!4$f{iWA`Rusot z2jfp^PfUV0HMAk^MeFj=u8K z*%+M<&vHyGpm$e=Ia;q$FJi?_<4@L~H@=r4k;ZwC+8yaumtcIzMMz zii{c-%(1H>ba?ay?>IV1q8|MNUA=%$nb<;^O|=62cd2i~?Z8Pw?`l(Y0XN7mOLg!g&q`!Z!67A7X4{Nv>&4#WnmXAv z4Mu&;&^!jc;MQp#e; zl^8Mt?h$81KQNwb=7KS%AU1Puf%vqKnzndb{gH|G>$$IMqe@?9eI5=~sNzSW!8Yoj z3XP-fDrf0VyE|piUX8bDL{jPJbNFhxsJG@O1#mQzu!CU?>zZ2?7y&Iyx_$m?0d=@` zPgCA98qZ}j9gKkJvA`A|7rmav8?2=#NYOoPlFOKlz495PcHk&xSGQ!J*RwH@!PZ2aU zv#Zg<$ELVjn6}(DScBj-j`bYYEhNJToHBKLQkvgD4T5->(@dRq7rK`#*pU?!n-7$&~VGl?k;}A)~U$$rRX#TsM^TzkEN6XFO&w2 zac0>s#;paITES4V*P9DU-K{JK^jIbbTR;_Tp`@9keU)tu;d~0BJiMBCytuX36&F|Y zI4)>%%(QGutVMgko%ZO=HjI(pj<&o!o4BZRT$oUAYVbQQ5+@$H@^oGI;cZoPiR||M8b zn~(INW!VRriJ*cD{19m|UDV0w#hnG2*9$;V4ic)oLpqG*66ZS-th7E%zr`yt^(j^1HI(-{dWufjQU z;X?D)>z{G|&J~Ad?5MBp)7dWGDb-w~UI{T`2k2k)h&Avsf85}C4$|D7G&vTWV0*K0ALPLYA7upCoPghFdBxti|sQ z2~D@^#40<<+IAKqnT83?{mbzMzbE~mfg0uM)alvdpBdS;!ei>Sei)>Q|E0xZaR3N< z2{n=cNi8jGs%t<~ia>>4sqrIQm7sJvoy}Ii0wMSp?7)~0Q=`4{B@(NL?Jwa^xp0R6 zF{7xLb|a#ssdjD%>`e$J0#XqUCc3-l0s1jPa2(_m$`N5ngN>+WMIPJCFW9y|PJwvYeBA(8zB&Tbu=Wy7^%5yGBs| E2NXt|asU7T diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index d5f1c8d34e7a88e3f88bea192c3a370d44689c3c..30bfca105f773497c9498001938aa19f14a247d1 100644 GIT binary patch literal 2805 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 diff --git a/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png deleted file mode 100644 index 30bfca105f773497c9498001938aa19f14a247d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2805 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 diff --git a/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png deleted file mode 100644 index 3c670bf52a4874a6fe9cbdd4cb32ceebc9acedf6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3708 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 + package="de.karlorona.app"> diff --git a/android/build.gradle b/android/build.gradle index 4e7ce9c..3100ad2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,11 +1,13 @@ buildscript { + ext.kotlin_version = '1.3.50' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.3' + classpath 'com.android.tools.build:gradle:3.5.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -14,11 +16,6 @@ allprojects { google() jcenter() } - gradle.projectsEvaluated { - tasks.withType(JavaCompile) { - options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" - } - } } rootProject.buildDir = '../build' diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 8d54563..c3258bf 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -7,10 +7,13 @@ objects = { /* Begin PBXBuildFile section */ - 130B906A986766911CB3DE64 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 51BBB3ECB9FC6451C35FDDDD /* libPods-Runner.a */; }; 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 */; }; @@ -23,6 +26,8 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( + 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */, + 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -32,22 +37,19 @@ /* 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 = ""; }; - 2EE9721A8C082F6A356AEA8D /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 51BBB3ECB9FC6451C35FDDDD /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 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 = ""; }; - 8C7090B56D094C057488E289 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.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 = ""; }; - 97C146EE1CF9000F007C117D /* Karlo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Karlo.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 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 = ""; }; - CD6C080F3329C6BA86F1F648 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - F415314924375C6D00BB11C9 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -55,25 +57,20 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 130B906A986766911CB3DE64 /* libPods-Runner.a in Frameworks */, + 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */, + 3B80C3941E831B6300D905FE /* App.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 2BD08A8AE27DC5C9477A6CD2 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 51BBB3ECB9FC6451C35FDDDD /* libPods-Runner.a */, - ); - name = Frameworks; - sourceTree = ""; - }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( + 3B80C3931E831B6300D905FE /* App.framework */, 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, + 9740EEBA1CF902C7004384FC /* Flutter.framework */, 9740EEB21CF90195004384FC /* Debug.xcconfig */, 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, 9740EEB31CF90195004384FC /* Generated.xcconfig */, @@ -87,15 +84,13 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, - A651E6738BC900A85982A2FD /* Pods */, - 2BD08A8AE27DC5C9477A6CD2 /* Frameworks */, ); sourceTree = ""; }; 97C146EF1CF9000F007C117D /* Products */ = { isa = PBXGroup; children = ( - 97C146EE1CF9000F007C117D /* Karlo.app */, + 97C146EE1CF9000F007C117D /* Runner.app */, ); name = Products; sourceTree = ""; @@ -103,7 +98,6 @@ 97C146F01CF9000F007C117D /* Runner */ = { isa = PBXGroup; children = ( - F415314924375C6D00BB11C9 /* Runner.entitlements */, 97C146FA1CF9000F007C117D /* Main.storyboard */, 97C146FD1CF9000F007C117D /* Assets.xcassets */, 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, @@ -124,16 +118,6 @@ name = "Supporting Files"; sourceTree = ""; }; - A651E6738BC900A85982A2FD /* Pods */ = { - isa = PBXGroup; - children = ( - 8C7090B56D094C057488E289 /* Pods-Runner.debug.xcconfig */, - CD6C080F3329C6BA86F1F648 /* Pods-Runner.release.xcconfig */, - 2EE9721A8C082F6A356AEA8D /* Pods-Runner.profile.xcconfig */, - ); - path = Pods; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -141,14 +125,12 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 6E8EE74201762F3A045F23F1 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 71FF71FD4CAC66F3248E6A4B /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -156,7 +138,7 @@ ); name = Runner; productName = Runner; - productReference = 97C146EE1CF9000F007C117D /* Karlo.app */; + productReference = 97C146EE1CF9000F007C117D /* Runner.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -165,14 +147,12 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1140; - ORGANIZATIONNAME = wirvsvirushackathon.org; + LastUpgradeCheck = 1020; + ORGANIZATIONNAME = "The Chromium Authors"; TargetAttributes = { 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; - DevelopmentTeam = 85C9KM32UF; LastSwiftMigration = 1100; - ProvisioningStyle = Automatic; }; }; }; @@ -221,44 +201,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed\n/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin\n"; - }; - 6E8EE74201762F3A045F23F1 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - 71FF71FD4CAC66F3248E6A4B /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin"; }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; @@ -350,7 +293,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -365,41 +308,20 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 5; - DEVELOPMENT_TEAM = 85C9KM32UF; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 1.1.0; - OTHER_LDFLAGS = ( - "$(inherited)", - "-framework", - Flutter, - "-ObjC", - "-l\"FMDB\"", - "-l\"audioplayers\"", - "-l\"e2e\"", - "-l\"flutter_local_notifications\"", - "-l\"path_provider\"", - "-l\"sqflite\"", - "-l\"sqlite3\"", - "-l\"url_launcher\"", - ); PRODUCT_BUNDLE_IDENTIFIER = de.karlorona.app; - PRODUCT_NAME = Karlo; - PROVISIONING_PROFILE_SPECIFIER = ""; + PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; @@ -454,7 +376,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -504,7 +426,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -520,41 +442,20 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 5; - DEVELOPMENT_TEAM = 85C9KM32UF; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 1.1.0; - OTHER_LDFLAGS = ( - "$(inherited)", - "-framework", - Flutter, - "-ObjC", - "-l\"FMDB\"", - "-l\"audioplayers\"", - "-l\"e2e\"", - "-l\"flutter_local_notifications\"", - "-l\"path_provider\"", - "-l\"sqflite\"", - "-l\"sqlite3\"", - "-l\"url_launcher\"", - ); PRODUCT_BUNDLE_IDENTIFIER = de.karlorona.app; - PRODUCT_NAME = Karlo; - PROVISIONING_PROFILE_SPECIFIER = ""; + PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -568,41 +469,20 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 5; - DEVELOPMENT_TEAM = 85C9KM32UF; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 1.1.0; - OTHER_LDFLAGS = ( - "$(inherited)", - "-framework", - Flutter, - "-ObjC", - "-l\"FMDB\"", - "-l\"audioplayers\"", - "-l\"e2e\"", - "-l\"flutter_local_notifications\"", - "-l\"path_provider\"", - "-l\"sqflite\"", - "-l\"sqlite3\"", - "-l\"url_launcher\"", - ); PRODUCT_BUNDLE_IDENTIFIER = de.karlorona.app; - PRODUCT_NAME = Karlo; - PROVISIONING_PROFILE_SPECIFIER = ""; + PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 149f91c..a28140c 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ @@ -27,17 +27,19 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> + + - - + + + + diff --git a/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata index 21a3cc1..1d526a1 100644 --- a/ios/Runner.xcworkspace/contents.xcworkspacedata +++ b/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -4,7 +4,4 @@ - - diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 00d0e71..29b32d5 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -11,15 +11,15 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - Karlo + Karlorona CFBundlePackageType APPL CFBundleShortVersionString - $(MARKETING_VERSION) + $(FLUTTER_BUILD_NAME) CFBundleSignature ???? CFBundleVersion - $(CURRENT_PROJECT_VERSION) + $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS UILaunchStoryboardName @@ -29,6 +29,8 @@ UISupportedInterfaceOrientations UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight UISupportedInterfaceOrientations~ipad diff --git a/lib/activities/health-page.dart b/lib/activities/health-page.dart index ed59611..605b239 100644 --- a/lib/activities/health-page.dart +++ b/lib/activities/health-page.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:Karlo/scoped-model/main-model.dart'; +import 'package:Karlorona/scoped-model/main-model.dart'; import 'package:scoped_model/scoped_model.dart'; import 'activity-start-button.dart'; diff --git a/lib/activities/health/drink-page.dart b/lib/activities/health/drink-page.dart index 23b0ee1..b9994b2 100644 --- a/lib/activities/health/drink-page.dart +++ b/lib/activities/health/drink-page.dart @@ -1,12 +1,12 @@ -import 'package:Karlo/activities/activity-headline.dart'; +import 'package:Karlorona/activities/activity-headline.dart'; import 'package:flutter/material.dart'; -import 'package:Karlo/activities/designed-button.dart'; -import 'package:Karlo/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../../scoped-model/main-model.dart'; import '../../model/activity.dart'; -import '../done-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; class DrinkPage extends StatelessWidget { @override diff --git a/lib/activities/health/eat-page.dart b/lib/activities/health/eat-page.dart index f96e587..4fbdf47 100644 --- a/lib/activities/health/eat-page.dart +++ b/lib/activities/health/eat-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import '../../activities/designed-button.dart'; -import '../../activities/done-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../../scoped-model/main-model.dart'; import '../../model/activity.dart'; diff --git a/lib/activities/health/gym-page.dart b/lib/activities/health/gym-page.dart index c4dabe1..226dce5 100644 --- a/lib/activities/health/gym-page.dart +++ b/lib/activities/health/gym-page.dart @@ -1,7 +1,7 @@ -import 'package:Karlo/model/activity.dart'; +import 'package:Karlorona/model/activity.dart'; import 'package:flutter/material.dart'; -import 'package:Karlo/activities/designed-button.dart'; -import 'package:Karlo/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../../scoped-model/main-model.dart'; import '../../model/activity.dart'; diff --git a/lib/activities/health/run-page.dart b/lib/activities/health/run-page.dart index 39ee411..8c31c91 100644 --- a/lib/activities/health/run-page.dart +++ b/lib/activities/health/run-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:Karlo/activities/designed-button.dart'; -import 'package:Karlo/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../../scoped-model/main-model.dart'; import '../../model/activity.dart'; diff --git a/lib/activities/health/sleep-page.dart b/lib/activities/health/sleep-page.dart index 2518591..cfa3ad5 100644 --- a/lib/activities/health/sleep-page.dart +++ b/lib/activities/health/sleep-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:Karlo/activities/designed-button.dart'; -import 'package:Karlo/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../../scoped-model/main-model.dart'; import '../../model/activity.dart'; diff --git a/lib/activities/health/walk-page.dart b/lib/activities/health/walk-page.dart index 95dbeb4..58cb0e1 100644 --- a/lib/activities/health/walk-page.dart +++ b/lib/activities/health/walk-page.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:Karlo/activities/designed-button.dart'; -import 'package:Karlo/activities/done-button.dart'; -import 'package:Karlo/scoped-model/main-model.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; +import 'package:Karlorona/scoped-model/main-model.dart'; import 'package:scoped_model/scoped_model.dart'; import '../../model/activity.dart'; import '../activity-headline.dart'; diff --git a/lib/activities/hygiene-page.dart b/lib/activities/hygiene-page.dart index bd75960..637ab25 100644 --- a/lib/activities/hygiene-page.dart +++ b/lib/activities/hygiene-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:Karlo/activities/activity-start-button.dart'; -import 'package:Karlo/scoped-model/main-model.dart'; +import 'package:Karlorona/activities/activity-start-button.dart'; +import 'package:Karlorona/scoped-model/main-model.dart'; import 'package:scoped_model/scoped_model.dart'; class HygienePage extends StatefulWidget { diff --git a/lib/activities/hygiene/distance-page.dart b/lib/activities/hygiene/distance-page.dart index 9b71f8c..e34c389 100644 --- a/lib/activities/hygiene/distance-page.dart +++ b/lib/activities/hygiene/distance-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:Karlo/activities/designed-button.dart'; -import 'package:Karlo/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../../scoped-model/main-model.dart'; import '../../model/activity.dart'; diff --git a/lib/activities/hygiene/hand-page.dart b/lib/activities/hygiene/hand-page.dart index a61f942..60217e1 100644 --- a/lib/activities/hygiene/hand-page.dart +++ b/lib/activities/hygiene/hand-page.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:Karlo/activities/designed-button.dart'; -import 'package:Karlo/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../../scoped-model/main-model.dart'; import '../../model/activity.dart'; diff --git a/lib/activities/hygiene/handsface-page.dart b/lib/activities/hygiene/handsface-page.dart index 82d5bda..f8fe8d1 100644 --- a/lib/activities/hygiene/handsface-page.dart +++ b/lib/activities/hygiene/handsface-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:Karlo/activities/designed-button.dart'; -import 'package:Karlo/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../../scoped-model/main-model.dart'; import '../../model/activity.dart'; diff --git a/lib/activities/hygiene/smartdes-page.dart b/lib/activities/hygiene/smartdes-page.dart index efbc691..03b98e9 100644 --- a/lib/activities/hygiene/smartdes-page.dart +++ b/lib/activities/hygiene/smartdes-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:Karlo/activities/designed-button.dart'; -import 'package:Karlo/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../../scoped-model/main-model.dart'; import '../../model/activity.dart'; diff --git a/lib/activities/hygiene/sneeze-page.dart b/lib/activities/hygiene/sneeze-page.dart index 0f18ec7..ec10530 100644 --- a/lib/activities/hygiene/sneeze-page.dart +++ b/lib/activities/hygiene/sneeze-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:Karlo/activities/designed-button.dart'; -import 'package:Karlo/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../../scoped-model/main-model.dart'; import '../../model/activity.dart'; diff --git a/lib/activities/hygiene/ventilate-page.dart b/lib/activities/hygiene/ventilate-page.dart index 1e0eece..d2c97a3 100644 --- a/lib/activities/hygiene/ventilate-page.dart +++ b/lib/activities/hygiene/ventilate-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:Karlo/activities/designed-button.dart'; -import 'package:Karlo/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../../scoped-model/main-model.dart'; import '../../model/activity.dart'; diff --git a/lib/activities/psych-page.dart b/lib/activities/psych-page.dart index 56109ed..978ecd8 100644 --- a/lib/activities/psych-page.dart +++ b/lib/activities/psych-page.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:Karlo/scoped-model/main-model.dart'; +import 'package:Karlorona/scoped-model/main-model.dart'; import 'package:scoped_model/scoped_model.dart'; import 'activity-start-button.dart'; diff --git a/lib/activities/psych/daystruct-page.dart b/lib/activities/psych/daystruct-page.dart index 1cbd0ef..a124f31 100644 --- a/lib/activities/psych/daystruct-page.dart +++ b/lib/activities/psych/daystruct-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:Karlo/activities/designed-button.dart'; -import 'package:Karlo/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../../scoped-model/main-model.dart'; import '../../model/activity.dart'; diff --git a/lib/activities/psych/goal-page.dart b/lib/activities/psych/goal-page.dart index 25790a6..5b02c67 100644 --- a/lib/activities/psych/goal-page.dart +++ b/lib/activities/psych/goal-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:Karlo/activities/designed-button.dart'; -import 'package:Karlo/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../../scoped-model/main-model.dart'; import '../../model/activity.dart'; diff --git a/lib/activities/psych/medien-page.dart b/lib/activities/psych/medien-page.dart index d213453..70f1ff6 100644 --- a/lib/activities/psych/medien-page.dart +++ b/lib/activities/psych/medien-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:Karlo/activities/designed-button.dart'; -import 'package:Karlo/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../../scoped-model/main-model.dart'; import '../../model/activity.dart'; diff --git a/lib/activities/psych/social-page.dart b/lib/activities/psych/social-page.dart index 6e12e4f..f2d0426 100644 --- a/lib/activities/psych/social-page.dart +++ b/lib/activities/psych/social-page.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:Karlo/activities/designed-button.dart'; -import 'package:Karlo/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../../scoped-model/main-model.dart'; import '../../model/activity.dart'; diff --git a/lib/activities/psych/yoga-page.dart b/lib/activities/psych/yoga-page.dart index 11d31f6..1fac367 100644 --- a/lib/activities/psych/yoga-page.dart +++ b/lib/activities/psych/yoga-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:Karlo/activities/designed-button.dart'; -import 'package:Karlo/activities/done-button.dart'; +import 'package:Karlorona/activities/designed-button.dart'; +import 'package:Karlorona/activities/done-button.dart'; import 'package:scoped_model/scoped_model.dart'; import '../../scoped-model/main-model.dart'; import '../../model/activity.dart'; diff --git a/lib/app-container.dart b/lib/app-container.dart index 20fd512..f6ef436 100644 --- a/lib/app-container.dart +++ b/lib/app-container.dart @@ -1,6 +1,6 @@ import 'package:flutter/foundation.dart'; // To check for Debug/Release-Mode import 'package:flutter/material.dart'; -import 'package:Karlo/pages/welcome-page.dart'; +import 'package:Karlorona/pages/welcome-page.dart'; import 'package:scoped_model/scoped_model.dart'; import './scoped-model/main-model.dart'; diff --git a/lib/components/think-bubble.dart b/lib/components/think-bubble.dart index f27b477..24f995c 100644 --- a/lib/components/think-bubble.dart +++ b/lib/components/think-bubble.dart @@ -1,7 +1,7 @@ import 'dart:math'; import 'package:flutter/material.dart'; -import 'package:Karlo/scoped-model/main-model.dart'; +import 'package:Karlorona/scoped-model/main-model.dart'; import 'package:scoped_model/scoped_model.dart'; class ThinkBubble extends StatefulWidget { diff --git a/lib/database/db.dart b/lib/database/db.dart index 3034c5d..8b2e3f2 100644 --- a/lib/database/db.dart +++ b/lib/database/db.dart @@ -1,4 +1,4 @@ -import 'package:Karlo/model/activity.dart'; +import 'package:Karlorona/model/activity.dart'; import 'package:sqflite/sqflite.dart'; import 'package:path/path.dart'; diff --git a/lib/main.dart b/lib/main.dart index d9d904f..63a1533 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -48,8 +48,8 @@ import 'activities/psych/medien-page.dart'; import 'activities/psych/social-page.dart'; import 'activities/psych/yoga-page.dart'; -void main() => runApp(IchMacheEsRichtigODER()); -class IchMacheEsRichtigODER extends StatelessWidget { +void main() => runApp(Karlorona()); +class Karlorona extends StatelessWidget { final NotificationManager notificationManager = NotificationManager(); @override diff --git a/lib/notification-manager.dart b/lib/notification-manager.dart index 8ce5600..d1e1ebb 100644 --- a/lib/notification-manager.dart +++ b/lib/notification-manager.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; -import 'package:Karlo/pages/about-page.dart'; +import 'package:Karlorona/pages/about-page.dart'; import './main.dart'; diff --git a/lib/pages/activity-page.dart b/lib/pages/activity-page.dart index aa6c6a1..d3feb17 100644 --- a/lib/pages/activity-page.dart +++ b/lib/pages/activity-page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:Karlo/activities/activity-start-button.dart'; -import 'package:Karlo/scoped-model/main-model.dart'; +import 'package:Karlorona/activities/activity-start-button.dart'; +import 'package:Karlorona/scoped-model/main-model.dart'; import 'package:scoped_model/scoped_model.dart'; class ActivityPage extends StatelessWidget { diff --git a/lib/pages/mascot-page.dart b/lib/pages/mascot-page.dart index 365e787..5d1384a 100644 --- a/lib/pages/mascot-page.dart +++ b/lib/pages/mascot-page.dart @@ -1,8 +1,8 @@ import 'dart:math'; -import 'package:Karlo/components/think-bubble.dart'; +import 'package:Karlorona/components/think-bubble.dart'; import 'package:flutter/material.dart'; -import 'package:Karlo/scoped-model/main-model.dart'; +import 'package:Karlorona/scoped-model/main-model.dart'; import 'package:percent_indicator/percent_indicator.dart'; import 'package:scoped_model/scoped_model.dart'; diff --git a/lib/quiz/quiz-widget.dart b/lib/quiz/quiz-widget.dart index 8dedfb2..47f05b3 100644 --- a/lib/quiz/quiz-widget.dart +++ b/lib/quiz/quiz-widget.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:Karlo/scoped-model/main-model.dart'; +import 'package:Karlorona/scoped-model/main-model.dart'; import 'package:scoped_model/scoped_model.dart'; import '../quiz/question-page.dart'; import 'dart:convert'; diff --git a/lib/scoped-model/database-model.dart b/lib/scoped-model/database-model.dart index b25e498..719fa95 100644 --- a/lib/scoped-model/database-model.dart +++ b/lib/scoped-model/database-model.dart @@ -1,4 +1,4 @@ -import 'package:Karlo/model/activity.dart'; +import 'package:Karlorona/model/activity.dart'; import 'package:scoped_model/scoped_model.dart'; import '../database/db.dart'; diff --git a/pubspec.lock b/pubspec.lock index 9827307..f762ddd 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -108,7 +108,7 @@ packages: name: flutter_local_notifications url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.4.1" flutter_local_notifications_platform_interface: dependency: transitive description: @@ -207,7 +207,7 @@ packages: name: percent_indicator url: "https://pub.dartlang.org" source: hosted - version: "2.1.1+1" + version: "2.1.3" petitparser: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index c346102..125cd92 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,4 +1,4 @@ -name: Karlo +name: Karlorona description: Unsere App "Ich Mache es richtig, ODER?" im Rahmen des Hackathon \#WirvsVirus im Jahr 2020 gegen Corona / COVID-19 # The following defines the version and build number for your application. @@ -11,7 +11,7 @@ description: Unsere App "Ich Mache es richtig, ODER?" im Rahmen des Hackathon \# # 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: 2.0.0+6 +version: 2.0.0+7 environment: sdk: ">=2.1.0 <3.0.0" @@ -49,25 +49,30 @@ flutter_icons: # The following section is specific to Flutter. flutter: - assets: - - assets/images/ - - assets/images/logos/ - - assets/images/kater/ - - assets/images/icons/ - - assets/sounds/ - - assets/questions.json + # 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 + assets: + - assets/images/ + - assets/images/logos/ + - assets/images/kater/ + - assets/images/icons/ + - assets/sounds/ + - assets/questions.json + # 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 diff --git a/test/widget_test.dart b/test/widget_test.dart index 3562cd2..e341494 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -8,12 +8,12 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:Karlo/main.dart'; +import 'package:Karlorona/main.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async { // Build our app and trigger a frame. - await tester.pumpWidget(IchMacheEsRichtigODER()); + await tester.pumpWidget(Karlorona()); // Verify that our counter starts at 0. expect(find.text('0'), findsOneWidget);