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 c4cc798..112dfc4 100644 Binary files a/android/app/src/main/res/drawable/app_icon.png and b/android/app/src/main/res/drawable/app_icon.png differ 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 db77bb4..c494fcd 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ 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 c494fcd..0000000 Binary files a/android/app/src/main/res/mipmap-hdpi/launcher_icon.png and /dev/null differ 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 17987b7..15a0073 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/launcher_icon.png b/android/app/src/main/res/mipmap-mdpi/launcher_icon.png deleted file mode 100644 index 15a0073..0000000 Binary files a/android/app/src/main/res/mipmap-mdpi/launcher_icon.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 09d4391..46456ed 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ 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 46456ed..0000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png and /dev/null differ 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 d5f1c8d..30bfca1 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ 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 30bfca1..0000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 4d6372e..3c670bf 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ 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 3c670bf..0000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png and /dev/null differ diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml index bdc1d9e..90cc078 100644 --- a/android/app/src/profile/AndroidManifest.xml +++ b/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,5 @@ + 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);