commit 2c10480ffd8d42438af75b3e4d292209843d8d76 Author: Bossanyi Tibor Date: Sun May 24 10:04:37 2020 +0200 Aitrainer_app 0.0.1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f3c2053 --- /dev/null +++ b/.gitignore @@ -0,0 +1,44 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub-cache/ +.pub/ +/build/ + +# Web related +lib/generated_plugin_registrant.dart + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Exceptions to above rules. +!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages diff --git a/.metadata b/.metadata new file mode 100644 index 0000000..17bcb3e --- /dev/null +++ b/.metadata @@ -0,0 +1,10 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: 2738a1148ba6c9a6114df62358109407c3ef2553 + channel: beta + +project_type: app diff --git a/README.md b/README.md new file mode 100644 index 0000000..36dd1b8 --- /dev/null +++ b/README.md @@ -0,0 +1,6 @@ +# aitrainer_app + +The AITRAINER Mobile Application + +Prototye 0.0.1 + diff --git a/android/.gitignore b/android/.gitignore new file mode 100644 index 0000000..bc2100d --- /dev/null +++ b/android/.gitignore @@ -0,0 +1,7 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java diff --git a/android/app/build.gradle b/android/app/build.gradle new file mode 100644 index 0000000..cc19d7a --- /dev/null +++ b/android/app/build.gradle @@ -0,0 +1,63 @@ +def localProperties = new Properties() +def localPropertiesFile = rootProject.file('local.properties') +if (localPropertiesFile.exists()) { + localPropertiesFile.withReader('UTF-8') { reader -> + localProperties.load(reader) + } +} + +def flutterRoot = localProperties.getProperty('flutter.sdk') +if (flutterRoot == null) { + throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") +} + +def flutterVersionCode = localProperties.getProperty('flutter.versionCode') +if (flutterVersionCode == null) { + flutterVersionCode = '1' +} + +def flutterVersionName = localProperties.getProperty('flutter.versionName') +if (flutterVersionName == null) { + flutterVersionName = '1.0' +} + +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" + +android { + compileSdkVersion 28 + + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } + + lintOptions { + disable 'InvalidPackage' + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId "com.aitrainer.aitrainer_app" + minSdkVersion 16 + targetSdkVersion 28 + versionCode flutterVersionCode.toInteger() + versionName flutterVersionName + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig signingConfigs.debug + } + } +} + +flutter { + source '../..' +} + +dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" +} diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..3bb6bcd --- /dev/null +++ b/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..709929d --- /dev/null +++ b/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + diff --git a/android/app/src/main/kotlin/com/aitrainer/aitrainer_app/MainActivity.kt b/android/app/src/main/kotlin/com/aitrainer/aitrainer_app/MainActivity.kt new file mode 100644 index 0000000..758cfde --- /dev/null +++ b/android/app/src/main/kotlin/com/aitrainer/aitrainer_app/MainActivity.kt @@ -0,0 +1,5 @@ +package com.aitrainer.aitrainer_app + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity: FlutterActivity() diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 0000000..304732f --- /dev/null +++ b/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..db77bb4 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png 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 new file mode 100644 index 0000000..17987b7 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png 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 new file mode 100644 index 0000000..09d4391 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png 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 new file mode 100644 index 0000000..d5f1c8d Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png 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 new file mode 100644 index 0000000..4d6372e Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..1f83a33 --- /dev/null +++ b/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 0000000..3bb6bcd --- /dev/null +++ b/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/android/assets/images/cover.jpg b/android/assets/images/cover.jpg new file mode 100644 index 0000000..76d84e3 Binary files /dev/null and b/android/assets/images/cover.jpg differ diff --git a/android/build.gradle b/android/build.gradle new file mode 100644 index 0000000..3100ad2 --- /dev/null +++ b/android/build.gradle @@ -0,0 +1,31 @@ +buildscript { + ext.kotlin_version = '1.3.50' + repositories { + google() + jcenter() + } + + dependencies { + classpath 'com.android.tools.build:gradle:3.5.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +rootProject.buildDir = '../build' +subprojects { + project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { + project.evaluationDependsOn(':app') +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/android/gradle.properties b/android/gradle.properties new file mode 100644 index 0000000..38c8d45 --- /dev/null +++ b/android/gradle.properties @@ -0,0 +1,4 @@ +org.gradle.jvmargs=-Xmx1536M +android.enableR8=true +android.useAndroidX=true +android.enableJetifier=true diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..296b146 --- /dev/null +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Fri Jun 23 08:50:38 CEST 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/android/settings.gradle b/android/settings.gradle new file mode 100644 index 0000000..d3b6a40 --- /dev/null +++ b/android/settings.gradle @@ -0,0 +1,15 @@ +// Copyright 2014 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +include ':app' + +def localPropertiesFile = new File(rootProject.projectDir, "local.properties") +def properties = new Properties() + +assert localPropertiesFile.exists() +localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + +def flutterSdkPath = properties.getProperty("flutter.sdk") +assert flutterSdkPath != null, "flutter.sdk not set in local.properties" +apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/ios/.gitignore b/ios/.gitignore new file mode 100644 index 0000000..e96ef60 --- /dev/null +++ b/ios/.gitignore @@ -0,0 +1,32 @@ +*.mode1v3 +*.mode2v3 +*.moved-aside +*.pbxuser +*.perspectivev3 +**/*sync/ +.sconsign.dblite +.tags* +**/.vagrant/ +**/DerivedData/ +Icon? +**/Pods/ +**/.symlinks/ +profile +xcuserdata +**/.generated/ +Flutter/App.framework +Flutter/Flutter.framework +Flutter/Flutter.podspec +Flutter/Generated.xcconfig +Flutter/app.flx +Flutter/app.zip +Flutter/flutter_assets/ +Flutter/flutter_export_environment.sh +ServiceDefinitions.json +Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. +!default.mode1v3 +!default.mode2v3 +!default.pbxuser +!default.perspectivev3 diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist new file mode 100644 index 0000000..6b4c0f7 --- /dev/null +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + App + CFBundleIdentifier + io.flutter.flutter.app + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + App + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + MinimumOSVersion + 8.0 + + diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig new file mode 100644 index 0000000..592ceee --- /dev/null +++ b/ios/Flutter/Debug.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig new file mode 100644 index 0000000..592ceee --- /dev/null +++ b/ios/Flutter/Release.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000..d1f80c4 --- /dev/null +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,503 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 9705A1C41CF9048500538489 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; + 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; + 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 97C146EB1CF9000F007C117D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 9740EEB11CF90186004384FC /* Flutter */ = { + isa = PBXGroup; + children = ( + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 9740EEB31CF90195004384FC /* Generated.xcconfig */, + ); + name = Flutter; + sourceTree = ""; + }; + 97C146E51CF9000F007C117D = { + isa = PBXGroup; + children = ( + 9740EEB11CF90186004384FC /* Flutter */, + 97C146F01CF9000F007C117D /* Runner */, + 97C146EF1CF9000F007C117D /* Products */, + ); + sourceTree = ""; + }; + 97C146EF1CF9000F007C117D /* Products */ = { + isa = PBXGroup; + children = ( + 97C146EE1CF9000F007C117D /* Runner.app */, + ); + name = Products; + sourceTree = ""; + }; + 97C146F01CF9000F007C117D /* Runner */ = { + isa = PBXGroup; + children = ( + 97C146FA1CF9000F007C117D /* Main.storyboard */, + 97C146FD1CF9000F007C117D /* Assets.xcassets */, + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, + 97C147021CF9000F007C117D /* Info.plist */, + 97C146F11CF9000F007C117D /* Supporting Files */, + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, + ); + path = Runner; + sourceTree = ""; + }; + 97C146F11CF9000F007C117D /* Supporting Files */ = { + isa = PBXGroup; + children = ( + ); + name = "Supporting Files"; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 97C146ED1CF9000F007C117D /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 9740EEB61CF901F6004384FC /* Run Script */, + 97C146EA1CF9000F007C117D /* Sources */, + 97C146EB1CF9000F007C117D /* Frameworks */, + 97C146EC1CF9000F007C117D /* Resources */, + 9705A1C41CF9048500538489 /* Embed Frameworks */, + 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Runner; + productName = Runner; + productReference = 97C146EE1CF9000F007C117D /* Runner.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 97C146E61CF9000F007C117D /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 1020; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 97C146ED1CF9000F007C117D = { + CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 1100; + }; + }; + }; + buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 97C146E51CF9000F007C117D; + productRefGroup = 97C146EF1CF9000F007C117D /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 97C146ED1CF9000F007C117D /* Runner */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 97C146EC1CF9000F007C117D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Thin Binary"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + }; + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 97C146EA1CF9000F007C117D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 97C146FA1CF9000F007C117D /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C146FB1CF9000F007C117D /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C147001CF9000F007C117D /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 249021D3217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Profile; + }; + 249021D4217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.aitrainer.aitrainer_app; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Profile; + }; + 97C147031CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 97C147041CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 97C147061CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.aitrainer.aitrainer_app; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Debug; + }; + 97C147071CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.aitrainer.aitrainer_app; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147031CF9000F007C117D /* Debug */, + 97C147041CF9000F007C117D /* Release */, + 249021D3217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147061CF9000F007C117D /* Debug */, + 97C147071CF9000F007C117D /* Release */, + 249021D4217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 97C146E61CF9000F007C117D /* Project object */; +} diff --git a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..1d526a1 --- /dev/null +++ b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000..a28140c --- /dev/null +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..1d526a1 --- /dev/null +++ b/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift new file mode 100644 index 0000000..70693e4 --- /dev/null +++ b/ios/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import UIKit +import Flutter + +@UIApplicationMain +@objc class AppDelegate: FlutterAppDelegate { + override func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? + ) -> Bool { + GeneratedPluginRegistrant.register(with: self) + return super.application(application, didFinishLaunchingWithOptions: launchOptions) + } +} diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..d36b1fa --- /dev/null +++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,122 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@1x.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@1x.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-App-83.5x83.5@2x.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "Icon-App-1024x1024@1x.png", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png new file mode 100644 index 0000000..dc9ada4 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png new file mode 100644 index 0000000..28c6bf0 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 0000000..2ccbfd9 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 0000000..f091b6b Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png new file mode 100644 index 0000000..4cde121 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 0000000..d0ef06e Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png new file mode 100644 index 0000000..dcdc230 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png new file mode 100644 index 0000000..2ccbfd9 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 0000000..c8f9ed8 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png new file mode 100644 index 0000000..a6d6b86 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 0000000..a6d6b86 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 0000000..75b2d16 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png new file mode 100644 index 0000000..c4df70d Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png new file mode 100644 index 0000000..6a84f41 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png new file mode 100644 index 0000000..d0e1f58 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json new file mode 100644 index 0000000..0bedcf2 --- /dev/null +++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "LaunchImage.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md new file mode 100644 index 0000000..89c2725 --- /dev/null +++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md @@ -0,0 +1,5 @@ +# Launch Screen Assets + +You can customize the launch screen with your own desired assets by replacing the image files in this directory. + +You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. \ No newline at end of file diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000..f2e259c --- /dev/null +++ b/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/Runner/Base.lproj/Main.storyboard b/ios/Runner/Base.lproj/Main.storyboard new file mode 100644 index 0000000..f3c2851 --- /dev/null +++ b/ios/Runner/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist new file mode 100644 index 0000000..f64123a --- /dev/null +++ b/ios/Runner/Info.plist @@ -0,0 +1,45 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + aitrainer_app + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + + diff --git a/ios/Runner/Runner-Bridging-Header.h b/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 0000000..308a2a5 --- /dev/null +++ b/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" diff --git a/lib/main.dart b/lib/main.dart new file mode 100644 index 0000000..2bec108 --- /dev/null +++ b/lib/main.dart @@ -0,0 +1,235 @@ +import 'package:aitrainer_app/view/customer_modify_page.dart'; +import 'package:aitrainer_app/view/customer_new_page.dart'; +import 'package:aitrainer_app/view/exercise_new_page.dart'; +import 'package:aitrainer_app/view/exercise_type_modify_page.dart'; +import 'package:aitrainer_app/view/exercise_type_new_page.dart'; +import 'package:aitrainer_app/viewmodel/exercise_changing_view_model.dart'; +import 'package:flutter/material.dart'; +import 'package:aitrainer_app/view/customer_list_page.dart'; +import 'package:aitrainer_app/view/exercise_type_list_page.dart'; +import 'package:aitrainer_app/widgets/nav_drawer.dart'; +import 'package:provider/provider.dart'; +import 'package:flutter_localizations/flutter_localizations.dart'; + +void main() { + runApp( + ChangeNotifierProvider( + // Initialize the model in the builder. That way, Provider + // can own Models's lifecycle, making sure to call `dispose` + // when not needed anymore. + create: (context) => ExerciseChangingViewModel(null), + child: AitrainerApp(), + ), + ); +} + +class AitrainerApp extends StatelessWidget { + + @override + Widget build(BuildContext context) { + return MaterialApp( + localizationsDelegates: [ + // ... app-specific localization delegate[s] here + GlobalMaterialLocalizations.delegate, + GlobalWidgetsLocalizations.delegate, + GlobalCupertinoLocalizations.delegate, + ], + supportedLocales: [ + const Locale('en'), // English + const Locale('hu'), // Hungarian + // ... other locales the app supports + ], + routes: { + 'home': (context) => AitrainerHome(), + 'customersPage': (context) => CustomerListPage(), + 'customerNewPage': (context) => CustomerNewPage(), + 'customerModifyPage': (context) => CustomerModifyPage(), + 'exerciseTypeListPage': (context) => ExerciseTypeListPage(), + 'exerciseTypeNewPage': (context) => ExerciseTypeNewPage(), + 'exerciseTypeModifyPage': (context) => ExerciseTypeModifyPage(), + 'exerciseNewPage': (context) => ExerciseNewPage(), + }, + initialRoute: 'home', + title: 'Aitrainer Demo', + theme: ThemeData( + primarySwatch: Colors.green, + ), + home: AitrainerHome(), + ); + } +} + +class AitrainerHome extends StatelessWidget { + final _biggerFont = const TextStyle(fontSize: 24.0, color: Color.fromRGBO(94, 123, 122, 0.9)); + @override + Widget build(BuildContext context) { + return Scaffold( + drawer: NavDrawer(), + appBar: AppBar( + title: Text('Menu'), + ), + body: Center( + child: Text( + 'Welcome to the AITRAINER', + style: _biggerFont), + ), + ); + } +} + +/* +class CustomerScreen extends StatelessWidget { + @override + Widget build(BuildContext context) { + return Scaffold( + drawer: NavDrawer(), + appBar: AppBar( + title: Text('Customers'), + ), + body: Center( + child: CustomerListPage(), + ), + ); + } +} +*/ + +/* class AitrainerApp extends StatelessWidget { + @override + Widget build(BuildContext context) { + return MaterialApp( + title: "AITRAINER customers", + home: + ChangeNotifierProvider( + create: (context) => CustomerListViewModel(), + child: CustomerListPage(), + ) + ); + } +} + +*/ + +/* +// #docregion MyApp +class MyApp extends StatelessWidget { + // #docregion build + @override + Widget build(BuildContext context) { + return MaterialApp( + title: 'Startup Name Generator', + theme: ThemeData( // Add the 3 lines from here... + primaryColor: Colors.white, + ), + home: RandomWords(), + ); + } +// #enddocregion build +} +// #enddocregion MyApp + +// #docregion RWS-var +class RandomWordsState extends State { + final _suggestions = []; + final _biggerFont = const TextStyle(fontSize: 18.0); + final Set _saved = Set(); + + // #enddocregion RWS-var + + // #docregion _buildSuggestions + Widget _buildSuggestions() { + return ListView.builder( + padding: const EdgeInsets.all(16.0), + itemBuilder: /*1*/ (context, i) { + if (i.isOdd) return Divider(); /*2*/ + + final index = i ~/ 2; /*3*/ + if (index >= _suggestions.length) { + _suggestions.addAll(generateWordPairs().take(10)); /*4*/ + } + return _buildRow(_suggestions[index]); + }); + } + // #enddocregion _buildSuggestions + + // #docregion _buildRow + Widget _buildRow(WordPair pair) { + final bool alreadySaved = _saved.contains(pair); + return ListTile( + title: Text( + pair.asPascalCase, + style: _biggerFont, + ), + trailing: Icon( // Add the lines from here... + alreadySaved ? Icons.favorite : Icons.favorite_border, + color: alreadySaved ? Colors.red : null, + ), + onTap: () { // Add 9 lines from here... + setState(() { + if (alreadySaved) { + _saved.remove(pair); + } else { + _saved.add(pair); + } + }); + }, + ); + } + // #enddocregion _buildRow + + // #docregion RWS-build + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Text('Startup Name Generator'), + actions: [ // Add 3 lines from here... + IconButton(icon: Icon(Icons.list), onPressed: _pushSaved), + ], + ), + body: _buildSuggestions(), + ); + } + + void _pushSaved() { + Navigator.of(context).push( + MaterialPageRoute( // Add 20 lines from here... + builder: (BuildContext context) { + final Iterable tiles = _saved.map( + (WordPair pair) { + return ListTile( + title: Text( + pair.asPascalCase, + style: _biggerFont, + ), + ); + }, + ); + final List divided = ListTile + .divideTiles( + context: context, + tiles: tiles, + ).toList(); + return Scaffold( // Add 6 lines from here... + appBar: AppBar( + title: Text('Saved Suggestions'), + ), + body: ListView(children: divided), + ); + }, + + ), + + ); + } +// #enddocregion RWS-build +// #docregion RWS-var +} +// #enddocregion RWS-var + +class RandomWords extends StatefulWidget { + @override + RandomWordsState createState() => new RandomWordsState(); +} + +*/ diff --git a/lib/model/customer.dart b/lib/model/customer.dart new file mode 100644 index 0000000..a4f6dc9 --- /dev/null +++ b/lib/model/customer.dart @@ -0,0 +1,32 @@ +class Customer { + String name; + String email; + String firstName; + String sex; + int age; + String active; + int customerId; + + + Customer({this.customerId, this.name, this.firstName, this.email, this.sex, this.age, this.active}); + + Customer.fromJson(Map json) { + this.customerId = json['customer_id']; + this.name = json['name']; + this.firstName = json['firstname']; + this.email = json['email']; + this.sex = json['sex']; + this.age = json['age']; + this.active = json['active']; + } + + Map toJson() => + { + "name": name, + "firstName": firstName, + "email": email, + "age": age, + "sex": sex, + "active": 'Y' + }; +} \ No newline at end of file diff --git a/lib/model/exercise.dart b/lib/model/exercise.dart new file mode 100644 index 0000000..ee232ae --- /dev/null +++ b/lib/model/exercise.dart @@ -0,0 +1,29 @@ +import 'package:intl/intl.dart'; + +class Exercise { + int exerciseId; + int exerciseTypeId; + int customerId; + int quantity; + DateTime datetimeExercise; + + + + Exercise({this.exerciseTypeId, this.customerId, this.quantity, this.datetimeExercise}); + + Exercise.fromJson(Map json) { + this.exerciseTypeId = json['exerciseTypeId']; + this.customerId = json['customerId']; + this.quantity = json['quantity']; + this.datetimeExercise = json['datetimeExercise']; + } + + Map toJson() => + { + "exerciseTypeId": exerciseTypeId, + "customerId": customerId, + "quantity": quantity, + + "datetimeExercise": DateFormat('yyyy-MM-dd HH:mm:ss').format(this.datetimeExercise), + }; +} \ No newline at end of file diff --git a/lib/model/exercise_type.dart b/lib/model/exercise_type.dart new file mode 100644 index 0000000..58ea476 --- /dev/null +++ b/lib/model/exercise_type.dart @@ -0,0 +1,22 @@ +import 'package:flutter/services.dart'; + +class ExerciseType { + int exerciseTypeId; + String name; + String description; + BinaryCodec video; + + ExerciseType({this.name, this.description}); + + ExerciseType.fromJson(Map json) { + this.exerciseTypeId = json['exerciseTypeId']; + this.name = json['name']; + this.description = json['description']; + } + + Map toJson() => + { + "name": name, + "description": description, + }; +} \ No newline at end of file diff --git a/lib/service/api.dart b/lib/service/api.dart new file mode 100644 index 0000000..46b2b25 --- /dev/null +++ b/lib/service/api.dart @@ -0,0 +1,28 @@ +import 'dart:convert'; +import 'package:http/http.dart' as http; + +class APIClient { + final String _baseUrl = 'http://andio.eu:8888/api/'; + + Future get(String endPoint, String param) async { + final url = _baseUrl + endPoint + param; + final response = await http.get(url, headers: {'Content-Type': 'application/json'}); + if(response.statusCode == 200) { + return utf8.decode(response.bodyBytes); + } else { + throw Exception("Unable to perform HTTP request!"); + } + } + + Future post(String endPoint, String body) async { + final url = _baseUrl + endPoint; + print(" ------------ http/post endpoint $endPoint body $body"); + final response = await http.post(url, + headers: {'Content-Type': 'application/json'}, + body: body + ); + print(" ------------ response: " + response.body.toString()); + return response.body; + } + +} \ No newline at end of file diff --git a/lib/service/customer_service.dart b/lib/service/customer_service.dart new file mode 100644 index 0000000..700fc7f --- /dev/null +++ b/lib/service/customer_service.dart @@ -0,0 +1,32 @@ +import 'dart:convert'; +import 'package:aitrainer_app/model/customer.dart'; +import 'package:aitrainer_app/service/api.dart'; + + +class CustomerApi { + final APIClient _client=new APIClient(); + + Future> getRealCustomers(String param) async { + final body = await _client.get("customers/", param); + final Iterable json = jsonDecode(body); + final List customers = json.map( (customer) => Customer.fromJson(customer) ).toList(); + + return customers; + } + + Future saveCustomer(Customer customer) async { + String body = JsonEncoder().convert(customer.toJson()); + print(" ===== saving exerciseType id: " + customer.customerId.toString() + ":" + body ); + await _client.post( + "customers/"+customer.customerId.toString(), + body); + } + + Future addCustomer(Customer customer) async { + String body = JsonEncoder().convert(customer.toJson()); + print(" ===== add new customer: " + body ); + await _client.post( + "customers", + body); + } +} \ No newline at end of file diff --git a/lib/service/exercise_service.dart b/lib/service/exercise_service.dart new file mode 100644 index 0000000..d89ddd5 --- /dev/null +++ b/lib/service/exercise_service.dart @@ -0,0 +1,33 @@ +import 'dart:convert'; +import 'package:aitrainer_app/model/exercise.dart'; +import 'package:aitrainer_app/service/api.dart'; + + +class ExerciseApi { + final APIClient _client=new APIClient(); + + Future> getExerciseTypes(String param) async { + final body = await _client.get("exercises", param); + final Iterable json = jsonDecode(body); + final List exerciseTypes = json.map( (exerciseType) => Exercise.fromJson(exerciseType) ).toList(); + + return exerciseTypes; + } + + Future saveExercise(Exercise exercise) async { + String body = JsonEncoder().convert(exercise.toJson()); + print(" ===== saving exercise id: " + exercise.exerciseId.toString() + ":" + body ); + await _client.post( + "exercises/"+exercise.exerciseId.toString(), + body); + } + + Future addExercise(Exercise exercise) async { + String body = JsonEncoder().convert(exercise.toJson()); + print(" ===== add new exercise: " + body ); + await _client.post( + "exercises", + body); + } + +} \ No newline at end of file diff --git a/lib/service/exercisetype_service.dart b/lib/service/exercisetype_service.dart new file mode 100644 index 0000000..80ea54c --- /dev/null +++ b/lib/service/exercisetype_service.dart @@ -0,0 +1,32 @@ +import 'dart:convert'; +import 'package:aitrainer_app/model/exercise_type.dart'; +import 'package:aitrainer_app/service/api.dart'; + + +class ExerciseTypeApi { + final APIClient _client=new APIClient(); + + Future> getExerciseTypes(String param) async { + final body = await _client.get("exercise_type", param); + final Iterable json = jsonDecode(body); + final List exerciseTypes = json.map( (exerciseType) => ExerciseType.fromJson(exerciseType) ).toList(); + + return exerciseTypes; + } + + Future saveExerciseType(ExerciseType exerciseType) async { + String body = JsonEncoder().convert(exerciseType.toJson()); + print(" ===== saving exerciseType id: " + exerciseType.exerciseTypeId.toString() + ":" + body ); + await _client.post( + "exercise_type/"+exerciseType.exerciseTypeId.toString(), + body); + } + + Future addExerciseType(ExerciseType exerciseType) async { + String body = JsonEncoder().convert(exerciseType.toJson()); + print(" ===== add new exerciseType: " + body ); + await _client.post( + "exercise_type", + body); + } +} \ No newline at end of file diff --git a/lib/view/customer_list_page.dart b/lib/view/customer_list_page.dart new file mode 100644 index 0000000..fe8eba0 --- /dev/null +++ b/lib/view/customer_list_page.dart @@ -0,0 +1,93 @@ +import 'package:aitrainer_app/viewmodel/customer_changing_view_model.dart'; +import 'package:aitrainer_app/viewmodel/customer_view_model.dart'; +import 'package:aitrainer_app/widgets/nav_drawer.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:aitrainer_app/widgets/customer_list_widget.dart'; + +class CustomerListPage extends StatefulWidget{ + _CustomerListPageState createState() => _CustomerListPageState(); +} + +class _CustomerListPageState extends State { + //final TextEditingController _controller = TextEditingController(); + Future> _customers; + final _customerViewModel = CustomerChangingViewModel(null); + + @override + void initState() { + super.initState(); + _customers = _customerViewModel.getCustomers(); + } + + @override + Widget build(BuildContext context) { + + //final customerViewModel = CustomerChangingViewModel(null); + + return Scaffold( + drawer: NavDrawer(), + appBar: AppBar( + title: Text("Real customers") + ), + body: Center( + child: FutureBuilder>( + future: _customers, + builder: (context, snapshot) { + if (snapshot.hasData) { + return CustomerListWidget(customers: _customerViewModel.customerList); + } else if (snapshot.hasError) { + return Text("${snapshot.error}"); + } + + // By default, show a loading spinner. + return CircularProgressIndicator(); + }, + ), + ), + /* body: Container( + padding: EdgeInsets.all(10), + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.height, + child: Column(children: [ + Container( + padding: EdgeInsets.only(left: 10), + decoration: BoxDecoration( + color: Colors.grey, + borderRadius: BorderRadius.circular(10) + ), + child: TextField( + controller: _controller, + onSubmitted: (value) { + if(value.isNotEmpty) { + customerViewModel.getCustomers(); + _controller.clear(); + } + }, + style: TextStyle(color: Colors.white), + decoration: InputDecoration( + hintText: "Search", + hintStyle: TextStyle(color: Colors.white), + border: InputBorder.none + ), + + ), + ), + Expanded( + child: CustomerListWidget(customers: customerViewModel.customers)), + ]), + + ), */ + floatingActionButton: FloatingActionButton( + onPressed: () => Navigator.pushNamed( + context, + 'customerNewPage', + ), + child: Icon(Icons.add,), + mini: true, + ) + + ); + } + +} \ No newline at end of file diff --git a/lib/view/customer_modify_page.dart b/lib/view/customer_modify_page.dart new file mode 100644 index 0000000..59820eb --- /dev/null +++ b/lib/view/customer_modify_page.dart @@ -0,0 +1,29 @@ +import 'package:flutter/material.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:aitrainer_app/widgets/nav_drawer.dart'; + +class CustomerModifyPage extends StatefulWidget{ + _CustomerModifyPageState createState() => _CustomerModifyPageState(); +} + +class _CustomerModifyPageState extends State { + //final _formKey = GlobalKey(); + + @override + Widget build(BuildContext context) { + return Scaffold( + drawer: NavDrawer(), + appBar: AppBar( + title: Text('Modify customer'), + ), + body: Center( + child: Text('Modify customer'), + ), + floatingActionButton: FloatingActionButton( + onPressed: () => {}, + child: Icon(Icons.save,), + mini: true, + ) + ); + } +} \ No newline at end of file diff --git a/lib/view/customer_new_page.dart b/lib/view/customer_new_page.dart new file mode 100644 index 0000000..43f6b79 --- /dev/null +++ b/lib/view/customer_new_page.dart @@ -0,0 +1,112 @@ +import 'package:aitrainer_app/viewmodel/customer_changing_view_model.dart'; +import 'package:aitrainer_app/viewmodel/customer_view_model.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:aitrainer_app/widgets/nav_drawer.dart'; + +class CustomerNewPage extends StatefulWidget{ + _CustomerNewPageState createState() => _CustomerNewPageState(); +} + +class _CustomerNewPageState extends State { + final CustomerViewModel customer = CustomerViewModel(); + String groupValue = "m"; + final _formKey = GlobalKey(); + + @override + Widget build(BuildContext context) { + CustomerChangingViewModel model; + customer.createNew(); + customer.setSex(groupValue); + return Scaffold( + drawer: NavDrawer(), + appBar: AppBar( + title: Text('New customer'), + ), + body: Center( + child: Form( + key: _formKey, + child: Column( + children: [ + TextFormField( + decoration: InputDecoration( + border: OutlineInputBorder(), + labelText: 'Name', + ), + validator: (input) => input.length == 0 ? "Please type the name" : null, + onChanged: (input) => customer.setName(input), + ), + TextFormField( + decoration: InputDecoration( + border: OutlineInputBorder(), + labelText: 'First Name', + ), + validator: (input) => input.length == 0 ? "Please type the first name" : null, + onChanged: (input) => customer.setFirstName(input), + ), + TextFormField( + decoration: InputDecoration( + border: OutlineInputBorder(), + labelText: 'Email', + ), + validator: (String input) { + RegExp exp = new RegExp(r"[\w._]+\@[\w._]+.[a-z]+", + caseSensitive: false, + multiLine: false,); + String ret = exp.hasMatch(input) == true ? + null: + "Please type an email address"; + return ret; + }, + onChanged: (input) => customer.setEmail(input), + ), + TextFormField( + decoration: InputDecoration( + border: OutlineInputBorder(), + labelText: 'Age', + ), + validator: (input) => (int.parse(input) < 99 && int.parse(input) > 0) ? + null : + "Please type the right age 0-99", + onChanged: (input) => customer.setAge(int.parse(input)), + ), + RadioListTile( + title: const Text('Man'), + value: "m", + groupValue: groupValue, + onChanged: (input) => { + setState(() { + groupValue = input; + customer.setSex(input); + } + )}, + + ),RadioListTile( + title: const Text('Woman'), + value: "w", + groupValue: groupValue, + onChanged: (input) => { + setState(() { + groupValue = input; + customer.setSex(input); + } + )}, + ), + ]) + ), + ), + floatingActionButton: FloatingActionButton( + onPressed: () => { + if (_formKey.currentState.validate()) { + model = CustomerChangingViewModel(customer), + model.addCustomer(), + model.addNewCustomerToList(customer), + Navigator.pop(context), + } + }, + child: Icon(Icons.save,), + mini: true, + ) + ); + } +} \ No newline at end of file diff --git a/lib/view/exercise_new_page.dart b/lib/view/exercise_new_page.dart new file mode 100644 index 0000000..17c629f --- /dev/null +++ b/lib/view/exercise_new_page.dart @@ -0,0 +1,108 @@ +import 'package:aitrainer_app/viewmodel/exercise_changing_view_model.dart'; +import 'package:aitrainer_app/widgets/nav_drawer.dart'; +import 'package:intl/intl.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; +import 'package:datetime_picker_formfield/datetime_picker_formfield.dart'; + +class ExerciseNewPage extends StatefulWidget{ + _ExerciseNewPageState createState() => _ExerciseNewPageState(); +} + +class _ExerciseNewPageState extends State { + final _formKey = GlobalKey(); + final format = DateFormat("yyyy-MM-dd HH:mm"); + + @override + Widget build(BuildContext context) { + ExerciseChangingViewModel model = Provider.of(context, listen: false); + model.createNewModel(); + return Scaffold( + drawer: NavDrawer(), + appBar: AppBar( + title: Text('New exercise'), + ), + body: Center( + child: Form( + key: _formKey, + child: Column( + children: [ + TextFormField( + decoration: InputDecoration( + border: OutlineInputBorder(), + labelText: 'Name', + ), + readOnly: true, + initialValue: model != null && model.customer != null ? model.customer.name + " " + model.customer.firstName : "Please select a customer", + ), + TextFormField( + decoration: InputDecoration( + border: OutlineInputBorder(), + labelText: 'Exercise', + ), + readOnly: true, + initialValue: model != null && model.exerciseType != null ? model.exerciseType.name : "Please select an exercise", + ), + TextFormField( + decoration: InputDecoration( + border: OutlineInputBorder(), + labelText: 'Quantity', + ), + validator: (input) => (int.parse(input) < 1000 && int.parse(input) > 0) ? + null : + "Please type the right quantity 0-1000", + onChanged: (input) => model.exerciseViewModel.setQuantity(int.parse(input)), + ), + + Text('Exercise date and time'), + DateTimeField( + format: format, + initialValue: DateTime.now(), + onShowPicker: (context, currentValue) async { + final date = await showDatePicker( + context: context, + firstDate: DateTime(1900), + initialDate: DateTime.now(), + lastDate: DateTime(2100), + builder: (context, child) => Localizations.override( + context: context, + locale: Locale('hu'), + child: child, + ), + ); + if (date != null) { + final time = await showTimePicker( + context: context, + initialTime: + TimeOfDay.fromDateTime(currentValue ?? DateTime.now()), + builder: (context, child) => Localizations.override( + context: context, + locale: Locale('hu'), + child: child, + ), + ); + return DateTimeField.combine(date, time); + } else { + return currentValue; + } + }, + onChanged: (input) => model.exerciseViewModel.setDatetimeExercise(input), + ), + ]), + ) + ), + floatingActionButton: FloatingActionButton( + onPressed: () => { + if (_formKey.currentState.validate()) { + //model = ExerciseChangingViewModel(model.exerciseViewModel), + model.addExercise(), + Navigator.pop(context), + } + }, + child: Icon(Icons.save,), + mini: true, + ) + ); + } +} diff --git a/lib/view/exercise_type_list_page.dart b/lib/view/exercise_type_list_page.dart new file mode 100644 index 0000000..ce19ebb --- /dev/null +++ b/lib/view/exercise_type_list_page.dart @@ -0,0 +1,59 @@ +import 'package:aitrainer_app/viewmodel/exercise_type_changing_view_model.dart'; +import 'package:aitrainer_app/viewmodel/exercise_type_view_model.dart'; +import 'package:aitrainer_app/widgets/exercise_type_list_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:aitrainer_app/widgets/nav_drawer.dart'; + +class ExerciseTypeListPage extends StatefulWidget{ + _ExerciseTypeListPageState createState() => _ExerciseTypeListPageState(); +} + +class _ExerciseTypeListPageState extends State { + Future> _exerciseTypes; + final _exerciseTypeViewModel = ExerciseTypeChangingViewModel(null); + + // Push the page and remove everything else + navigateToPage(BuildContext context, String page) { + Navigator.of(context).pushNamedAndRemoveUntil(page, (Route route) => false); + } + + @override + void initState() { + super.initState(); + _exerciseTypes = _exerciseTypeViewModel.getExerciseTypes(); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + drawer: NavDrawer(), + appBar: AppBar( + title: Text('Exercises'), + ), + body: Center( + child: FutureBuilder>( + future: _exerciseTypes, + builder: (context, snapshot) { + if (snapshot.hasData) { + return ExerciseTypeListWidget(exerciseTypes: _exerciseTypeViewModel.exerciseTypeList); + } else if (snapshot.hasError) { + return Text("${snapshot.error}"); + } + + // By default, show a loading spinner. + return CircularProgressIndicator(); + }, + ), + ), + floatingActionButton: FloatingActionButton( + onPressed: () => Navigator.pushNamed( + context, + 'exerciseTypeNewPage', + ), + child: Icon(Icons.add,), + mini: true, + ) + ); + } +} \ No newline at end of file diff --git a/lib/view/exercise_type_modify_page.dart b/lib/view/exercise_type_modify_page.dart new file mode 100644 index 0000000..2ba415a --- /dev/null +++ b/lib/view/exercise_type_modify_page.dart @@ -0,0 +1,67 @@ +import 'package:aitrainer_app/viewmodel/exercise_type_changing_view_model.dart'; +import 'package:aitrainer_app/viewmodel/exercise_type_view_model.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:aitrainer_app/widgets/nav_drawer.dart'; + +// ignore: must_be_immutable +class ExerciseTypeModifyPage extends StatefulWidget{ + ExerciseTypeViewModel exerciseTypeViewModel; + ExerciseTypeModifyPage({this.exerciseTypeViewModel}); + _ExerciseTypeModifyPageState createState() => _ExerciseTypeModifyPageState(); +} + +class _ExerciseTypeModifyPageState extends State { + final _formKey = GlobalKey(); + + @override + Widget build(BuildContext context) { + final ExerciseTypeViewModel exerciseType = ModalRoute.of(context).settings.arguments; + ExerciseTypeChangingViewModel changeModel; + return Scaffold( + drawer: NavDrawer(), + appBar: AppBar( + title: Text('Modify "' + exerciseType.name + '"' ), + ), + body: Center( + child: Form( + key:_formKey, + child: Column( + children: [ + TextFormField( + initialValue: exerciseType.name, + decoration: InputDecoration( + border: OutlineInputBorder(), + labelText: 'Exercise', + ), + validator: (input) => input.length == 0 ? "Please type the name of the exercise" : null, + onChanged: (input) => exerciseType.setName(input), + ) , + TextFormField( + initialValue: exerciseType.description, + minLines: 4, + maxLines: 10, + decoration: InputDecoration( + border: OutlineInputBorder(), + labelText: 'Description', + ), + onChanged: (input) => exerciseType.setDescription(input), + ) + ], + ), + ), + ), + floatingActionButton: FloatingActionButton( + onPressed: () => { + if (_formKey.currentState.validate()) { + changeModel = ExerciseTypeChangingViewModel(exerciseType), + changeModel.saveExerciseType(), + Navigator.pop(context), + } + }, + child: Icon(Icons.save,), + mini: true, + ) + ); + } +} diff --git a/lib/view/exercise_type_new_page.dart b/lib/view/exercise_type_new_page.dart new file mode 100644 index 0000000..c568428 --- /dev/null +++ b/lib/view/exercise_type_new_page.dart @@ -0,0 +1,64 @@ +import 'package:aitrainer_app/viewmodel/exercise_type_changing_view_model.dart'; +import 'package:aitrainer_app/viewmodel/exercise_type_view_model.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:aitrainer_app/widgets/nav_drawer.dart'; + +class ExerciseTypeNewPage extends StatefulWidget{ + _ExerciseTypeNewPageState createState() => _ExerciseTypeNewPageState(); +} + +class _ExerciseTypeNewPageState extends State { + final ExerciseTypeViewModel exerciseType = ExerciseTypeViewModel(); + final _formKey = GlobalKey(); + + @override + Widget build(BuildContext context) { + ExerciseTypeChangingViewModel model; + exerciseType.createNew(); + return Scaffold( + drawer: NavDrawer(), + appBar: AppBar( + title: Text('New exercise'), + ), + body: Center( + child: Form( + key: _formKey, + child: Column( + children: [ + TextFormField( + decoration: InputDecoration( + border: OutlineInputBorder(), + labelText: 'Exercise', + ), + validator: (input) => input.length == 0 ? "Please type the name of the exercise" : null, + onChanged: (input) => exerciseType.setName(input), + ) , + TextFormField( + minLines: 4, + maxLines: 10, + decoration: InputDecoration( + border: OutlineInputBorder(), + labelText: 'Description', + ), + onChanged: (input) => exerciseType.setDescription(input), + ) + ], + ), + ), + ), + floatingActionButton: FloatingActionButton( + onPressed: () => { + if (_formKey.currentState.validate()) { + model = ExerciseTypeChangingViewModel(exerciseType), + model.addExerciseType(), + model.addNewExercise(exerciseType), + Navigator.pop(context), + } + }, + child: Icon(Icons.save,), + mini: true, + ) + ); + } +} \ No newline at end of file diff --git a/lib/viewmodel/customer_changing_view_model.dart b/lib/viewmodel/customer_changing_view_model.dart new file mode 100644 index 0000000..d4cc0ae --- /dev/null +++ b/lib/viewmodel/customer_changing_view_model.dart @@ -0,0 +1,37 @@ +import 'package:aitrainer_app/service/customer_service.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:aitrainer_app/model/customer.dart'; + +import 'customer_view_model.dart'; + +class CustomerChangingViewModel extends ChangeNotifier { + CustomerViewModel customer = CustomerViewModel(); + List customerList = List(); + + CustomerChangingViewModel(customer) { + this.customer = customer; + } + + Future addCustomer() async { + this.customer = customer; + final Customer modelCustomer = customer.getCustomer(); + await CustomerApi().addCustomer(modelCustomer); + } + + Future saveCustomer() async { + this.customer = customer; + final Customer modelCustomer = customer.getCustomer(); + await CustomerApi().saveCustomer(modelCustomer); + } + + Future> getCustomers() async { + final results = await CustomerApi().getRealCustomers(""); + this.customerList = results.map((item) => CustomerViewModel(customer: item)).toList(); + notifyListeners(); + return this.customerList; + } + + addNewCustomerToList(CustomerViewModel customerViewModel) { + customerList.add(customerViewModel); + } +} \ No newline at end of file diff --git a/lib/viewmodel/customer_view_model.dart b/lib/viewmodel/customer_view_model.dart new file mode 100644 index 0000000..36a2ce8 --- /dev/null +++ b/lib/viewmodel/customer_view_model.dart @@ -0,0 +1,51 @@ +import 'package:aitrainer_app/model/customer.dart'; + +class CustomerViewModel { + Customer customer; + bool visibleDetails = false; + + CustomerViewModel({this.customer}); + + String get name { + return this.customer.name; + } + + String get firstName { + return this.customer.firstName; + } + + String get sex { + return this.customer.sex == "m" ? "Man" : "Woman"; + } + + int get age { + return this.customer.age; + } + + setName(String name) { + this.customer.name = name; + } + setFirstName(String firstName) { + this.customer.firstName = firstName; + } + + setEmail(String email) { + this.customer.email = email; + } + + setAge(int age) { + this.customer.age = age; + } + + setSex(String sex) { + this.customer.sex = sex; + } + + createNew() { + this.customer = Customer(); + } + + Customer getCustomer() { + return this.customer; + } +} diff --git a/lib/viewmodel/exercise_changing_view_model.dart b/lib/viewmodel/exercise_changing_view_model.dart new file mode 100644 index 0000000..60cff9a --- /dev/null +++ b/lib/viewmodel/exercise_changing_view_model.dart @@ -0,0 +1,46 @@ +import 'package:aitrainer_app/model/customer.dart'; +import 'package:aitrainer_app/model/exercise.dart'; +import 'package:aitrainer_app/model/exercise_type.dart'; +import 'package:aitrainer_app/service/exercise_service.dart'; +import 'package:flutter/cupertino.dart'; + +import 'exercise_view_model.dart'; + +class ExerciseChangingViewModel with ChangeNotifier { + Customer customer; + ExerciseType exerciseType; + + ExerciseViewModel exerciseViewModel = ExerciseViewModel(); + + ExerciseChangingViewModel(exerciseViewModel) { + this.exerciseViewModel = exerciseViewModel; + } + + int quantity; + + setCustomer(Customer customer) { + this.customer = customer; + } + + setExerciseType( ExerciseType exerciseType) { + this.exerciseType = exerciseType; + } + + setQuantity(int quantity) { + this.quantity = quantity; + } + + addExercise() async { + this.exerciseViewModel = exerciseViewModel; + final Exercise modelExercise = exerciseViewModel.getExercise(); + modelExercise.customerId = this.customer.customerId; + modelExercise.exerciseTypeId = this.exerciseType.exerciseTypeId; + await ExerciseApi().addExercise(modelExercise); + } + + createNewModel() { + exerciseViewModel = ExerciseViewModel(); + exerciseViewModel.createNew(); + } + +} \ No newline at end of file diff --git a/lib/viewmodel/exercise_type_changing_view_model.dart b/lib/viewmodel/exercise_type_changing_view_model.dart new file mode 100644 index 0000000..3c53aca --- /dev/null +++ b/lib/viewmodel/exercise_type_changing_view_model.dart @@ -0,0 +1,36 @@ +import 'package:aitrainer_app/model/exercise_type.dart'; +import 'package:aitrainer_app/viewmodel/exercise_type_view_model.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:aitrainer_app/service/exercisetype_service.dart'; + +class ExerciseTypeChangingViewModel extends ChangeNotifier { + ExerciseTypeViewModel exerciseType = ExerciseTypeViewModel(); + List exerciseTypeList = List(); + + ExerciseTypeChangingViewModel(exerciseType) { + this.exerciseType = exerciseType; + } + + Future addExerciseType() async { + this.exerciseType = exerciseType; + final ExerciseType modelExerciseType = exerciseType.getExerciseType(); + await ExerciseTypeApi().addExerciseType(modelExerciseType); + } + + Future saveExerciseType() async { + this.exerciseType = exerciseType; + final ExerciseType modelExerciseType = exerciseType.getExerciseType(); + await ExerciseTypeApi().saveExerciseType(modelExerciseType); + } + + Future> getExerciseTypes() async { + final results = await ExerciseTypeApi().getExerciseTypes(""); + this.exerciseTypeList = results.map((item) => ExerciseTypeViewModel( exerciseType: item) ).toList(); + notifyListeners(); + return this.exerciseTypeList; + } + + addNewExercise(ExerciseTypeViewModel exerciseTypeViewModel) { + exerciseTypeList.add(exerciseTypeViewModel); + } +} \ No newline at end of file diff --git a/lib/viewmodel/exercise_type_view_model.dart b/lib/viewmodel/exercise_type_view_model.dart new file mode 100644 index 0000000..f666366 --- /dev/null +++ b/lib/viewmodel/exercise_type_view_model.dart @@ -0,0 +1,36 @@ +import 'package:aitrainer_app/model/exercise_type.dart'; + +class ExerciseTypeViewModel { + ExerciseType exerciseType; + bool visible = false; + + ExerciseTypeViewModel( {this.exerciseType} ); + + String get name { + return this.exerciseType.name; + } + + setName(String name) { + this.exerciseType.name = name; + } + + String get description { + return this.exerciseType.description; + } + + setDescription(String description) { + this.exerciseType.description = description; + } + + int get exerciseTypeId { + return this.exerciseType.exerciseTypeId; + } + + ExerciseType getExerciseType() { + return this.exerciseType; + } + + createNew() { + this.exerciseType = ExerciseType(); + } +} \ No newline at end of file diff --git a/lib/viewmodel/exercise_view_model.dart b/lib/viewmodel/exercise_view_model.dart new file mode 100644 index 0000000..af0065e --- /dev/null +++ b/lib/viewmodel/exercise_view_model.dart @@ -0,0 +1,23 @@ +import 'package:aitrainer_app/model/exercise.dart'; + +class ExerciseViewModel { + Exercise exercise; + ExerciseViewModel({this.exercise}); + + createNew() { + this.exercise = Exercise(); + exercise.datetimeExercise = DateTime.now(); + } + + setQuantity(int quantity) { + this.exercise.quantity = quantity; + } + + setDatetimeExercise(DateTime datetimeExercise) { + this.exercise.datetimeExercise = datetimeExercise; + } + + Exercise getExercise() { + return this.exercise; + } +} \ No newline at end of file diff --git a/lib/widgets/customer_list_widget.dart b/lib/widgets/customer_list_widget.dart new file mode 100644 index 0000000..3503ef4 --- /dev/null +++ b/lib/widgets/customer_list_widget.dart @@ -0,0 +1,67 @@ +import 'package:aitrainer_app/viewmodel/exercise_changing_view_model.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:aitrainer_app/viewmodel/customer_view_model.dart'; +import 'package:provider/provider.dart'; + +class CustomerListWidget extends StatefulWidget { + static const routeName = '/customer_list'; + final List customers; + + CustomerListWidget({this.customers}); + + @override + _CustomerListWidget createState() => _CustomerListWidget(); + +} + +class _CustomerListWidget extends State { + + + @override + Widget build(BuildContext context) { + return ListView.builder( + itemCount: widget.customers.length, + itemBuilder: (context, index) { + + final customer = widget.customers[index]; + + return ListTile( + contentPadding: EdgeInsets.all(10), + leading:Icon(Icons.accessibility), + title: Text(customer.name + " " + customer.firstName), + subtitle: + Container( + child: Visibility( + visible: customer.visibleDetails, + child: Row( + children: [ + Text(customer.age.toString() + " years, " + customer.sex), + new RaisedButton( + child: new Text('Modify'), + color: Color.fromRGBO(244, 122, 22, 0.9), + onPressed: () => { + + }, + ), + new RaisedButton( + child: new Text('Select'), + color: Colors.blueGrey, + onPressed: () => { + Provider.of(context, listen: false).setCustomer(customer.customer), + Navigator.pop(context) + }, + ), + ], + ), + ), + ), + onTap: () { setState( () { + customer.visibleDetails = true; + }); + }, + ); + }, + ); + } +} \ No newline at end of file diff --git a/lib/widgets/datetime_picker.dart b/lib/widgets/datetime_picker.dart new file mode 100644 index 0000000..2f5b5d6 --- /dev/null +++ b/lib/widgets/datetime_picker.dart @@ -0,0 +1,65 @@ +import 'package:flutter_datetime_picker/flutter_datetime_picker.dart'; + +class CustomPicker extends CommonPickerModel { + String digits(int value, int length) { + return '$value'.padLeft(length, "0"); + } + + CustomPicker({DateTime currentTime, LocaleType locale}) : super(locale: locale) { + this.currentTime = currentTime ?? DateTime.now(); + this.setLeftIndex(this.currentTime.hour); + this.setMiddleIndex(this.currentTime.minute); + this.setRightIndex(this.currentTime.second); + } + + @override + String leftStringAtIndex(int index) { + if (index >= 0 && index < 24) { + return this.digits(index, 2); + } else { + return null; + } + } + + @override + String middleStringAtIndex(int index) { + if (index >= 0 && index < 60) { + return this.digits(index, 2); + } else { + return null; + } + } + + @override + String rightStringAtIndex(int index) { + if (index >= 0 && index < 60) { + return this.digits(index, 2); + } else { + return null; + } + } + + @override + String leftDivider() { + return "|"; + } + + @override + String rightDivider() { + return "|"; + } + + @override + List layoutProportions() { + return [1, 2, 1]; + } + + @override + DateTime finalTime() { + return currentTime.isUtc + ? DateTime.utc(currentTime.year, currentTime.month, currentTime.day, + this.currentLeftIndex(), this.currentMiddleIndex(), this.currentRightIndex()) + : DateTime(currentTime.year, currentTime.month, currentTime.day, this.currentLeftIndex(), + this.currentMiddleIndex(), this.currentRightIndex()); + } +} \ No newline at end of file diff --git a/lib/widgets/exercise_type_list_widget.dart b/lib/widgets/exercise_type_list_widget.dart new file mode 100644 index 0000000..9e3cb3d --- /dev/null +++ b/lib/widgets/exercise_type_list_widget.dart @@ -0,0 +1,75 @@ +import 'package:aitrainer_app/viewmodel/exercise_changing_view_model.dart'; +import 'package:aitrainer_app/viewmodel/exercise_type_view_model.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class ExerciseTypeListWidget extends StatefulWidget { + final List exerciseTypes; + ExerciseTypeListWidget({this.exerciseTypes}); + + @override + _ExerciseTypeListWidgetState createState() => _ExerciseTypeListWidgetState(); +} + +class _ExerciseTypeListWidgetState extends State { + //static const routeName = '/exercise_type_list'; + bool visible = false; + + // Push the page and remove everything else + navigateToPage(BuildContext context, String page) { + Navigator.of(context).pushNamedAndRemoveUntil(page, (Route route) => false); + } + + @override + Widget build(BuildContext context) { + + return ListView.builder( + itemCount: widget.exerciseTypes.length, + itemBuilder: (context, index) { + + final exerciseType = widget.exerciseTypes[index]; + + return ListTile( + contentPadding: EdgeInsets.all(10), + leading: Icon(Icons.directions_run), + title: Text(exerciseType.name), + subtitle: + Container( + child: Visibility( + visible: exerciseType.visible, + child: Column( + children: [ + Text(exerciseType.description), + new RaisedButton( + child: new Text('Modify'), + color: Color.fromRGBO(244, 122, 22, 0.9), + onPressed: () => { + Navigator.pushNamed( + context, + 'exerciseTypeModifyPage', + arguments: exerciseType + ) + }, + ), + new RaisedButton( + child: new Text('Select'), + color: Colors.blueGrey, + onPressed: () => { + Navigator.pop(context), + Provider.of(context, listen: false).setExerciseType(exerciseType.exerciseType), + }, + ), + ], + ), + ), + ), + onTap: () { setState( () { + exerciseType.visible = true; + }); + }, + ); + }, + ); + } +} diff --git a/lib/widgets/nav_drawer.dart b/lib/widgets/nav_drawer.dart new file mode 100644 index 0000000..c84bb61 --- /dev/null +++ b/lib/widgets/nav_drawer.dart @@ -0,0 +1,44 @@ +import 'package:flutter/material.dart'; + +class NavDrawer extends StatelessWidget { + @override + Widget build(BuildContext context) { + return Drawer( + child: ListView( + padding: EdgeInsets.zero, + children: [ + DrawerHeader( + child: Text( + 'Customers And Exercises', + style: TextStyle(color: Colors.blue, fontSize: 25), + ), + + ), + ListTile( + leading: Icon(Icons.home), + title: Text('Home'), + onTap: () => Navigator.of(context).pushNamed('home'), + ), + + ListTile( + leading: Icon(Icons.people), + title: Text('Customers'), + //onTap: () => navigateToPage(context, 'customersPage'), + onTap: () => Navigator.of(context).pushNamed('customersPage'), + ), + + ListTile( + leading: Icon(Icons.directions_run), + title: Text('Exercises'), + onTap: () => Navigator.of(context).pushNamed('exerciseTypeListPage'), + ), + ListTile( + leading: Icon(Icons.arrow_upward), + title: Text("TRAINING!"), + onTap: () => Navigator.of(context).pushNamed('exerciseNewPage'), + ), + ], + ), + ); + } +} \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock new file mode 100644 index 0000000..22be0b8 --- /dev/null +++ b/pubspec.lock @@ -0,0 +1,201 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + async: + dependency: transitive + description: + name: async + url: "https://pub.dartlang.org" + source: hosted + version: "2.4.1" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + charcode: + dependency: transitive + description: + name: charcode + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.3" + clock: + dependency: transitive + description: + name: clock + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" + collection: + dependency: transitive + description: + name: collection + url: "https://pub.dartlang.org" + source: hosted + version: "1.14.12" + cupertino_icons: + dependency: "direct main" + description: + name: cupertino_icons + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.3" + datetime_picker_formfield: + dependency: "direct dev" + description: + name: datetime_picker_formfield + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_datetime_picker: + dependency: "direct dev" + description: + name: flutter_datetime_picker + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.8" + flutter_localizations: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + http: + dependency: "direct dev" + description: + name: http + url: "https://pub.dartlang.org" + source: hosted + version: "0.12.1" + http_parser: + dependency: transitive + description: + name: http_parser + url: "https://pub.dartlang.org" + source: hosted + version: "3.1.4" + intl: + dependency: "direct dev" + description: + name: intl + url: "https://pub.dartlang.org" + source: hosted + version: "0.16.1" + matcher: + dependency: transitive + description: + name: matcher + url: "https://pub.dartlang.org" + source: hosted + version: "0.12.6" + meta: + dependency: transitive + description: + name: meta + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.8" + path: + dependency: transitive + description: + name: path + url: "https://pub.dartlang.org" + source: hosted + version: "1.7.0" + pedantic: + dependency: transitive + description: + name: pedantic + url: "https://pub.dartlang.org" + source: hosted + version: "1.9.0" + provider: + dependency: "direct dev" + description: + name: provider + url: "https://pub.dartlang.org" + source: hosted + version: "3.2.0" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.99" + source_span: + dependency: transitive + description: + name: source_span + url: "https://pub.dartlang.org" + source: hosted + version: "1.7.0" + stack_trace: + dependency: transitive + description: + name: stack_trace + url: "https://pub.dartlang.org" + source: hosted + version: "1.9.3" + stream_channel: + dependency: transitive + description: + name: stream_channel + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + string_scanner: + dependency: transitive + description: + name: string_scanner + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.5" + term_glyph: + dependency: transitive + description: + name: term_glyph + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" + test_api: + dependency: transitive + description: + name: test_api + url: "https://pub.dartlang.org" + source: hosted + version: "0.2.15" + typed_data: + dependency: transitive + description: + name: typed_data + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.6" + vector_math: + dependency: transitive + description: + name: vector_math + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.8" +sdks: + dart: ">=2.7.0 <3.0.0" + flutter: ">=1.0.0 <2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml new file mode 100644 index 0000000..3dd4280 --- /dev/null +++ b/pubspec.yaml @@ -0,0 +1,85 @@ +name: aitrainer_app +description: Aitrainer Mobile Application in Flutter/Dart + +# The following line prevents the package from being accidentally published to +# pub.dev using `pub publish`. This is preferred for private packages. +publish_to: 'none' # Remove this line if you wish to publish to pub.dev + +# The following defines the version and build number for your application. +# A version number is three numbers separated by dots, like 1.2.43 +# followed by an optional build number separated by a +. +# Both the version and the builder number may be overridden in flutter +# build by specifying --build-name and --build-number, respectively. +# In Android, build-name is used as versionName while build-number used as versionCode. +# Read more about Android versioning at https://developer.android.com/studio/publish/versioning +# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. +# Read more about iOS versioning at +# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html +version: 1.0.0+1 + +environment: + sdk: ">=2.7.0 <3.0.0" + +dependencies: + flutter: + sdk: flutter + + # The following adds the Cupertino Icons font to your application. + # Use with the CupertinoIcons class for iOS style icons. + cupertino_icons: ^0.1.3 + + flutter_localizations: + sdk: flutter + +dev_dependencies: + flutter_test: + sdk: flutter + + http: 0.12.1 + provider: ^3.2.0 + intl: 0.16.1 + flutter_datetime_picker: ^1.3.8 + datetime_picker_formfield: ^1.0.0 + + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + +# The following section is specific to Flutter. +flutter: + + # The following line ensures that the Material Icons font is + # included with your application, so that you can use the icons in + # the material Icons class. + uses-material-design: true + + # To add assets to your application, add an assets section, like this: + # assets: + # - images/a_dot_burr.jpeg + # - images/a_dot_ham.jpeg + + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.dev/assets-and-images/#resolution-aware. + + # For details regarding adding assets from package dependencies, see + # https://flutter.dev/assets-and-images/#from-packages + + # To add custom fonts to your application, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + # fonts: + # - family: Schyler + # fonts: + # - asset: fonts/Schyler-Regular.ttf + # - asset: fonts/Schyler-Italic.ttf + # style: italic + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts from package dependencies, + # see https://flutter.dev/custom-fonts/#from-packages diff --git a/test/widget_test.dart b/test/widget_test.dart new file mode 100644 index 0000000..ec3fb30 --- /dev/null +++ b/test/widget_test.dart @@ -0,0 +1,30 @@ +// This is a basic Flutter widget test. +// +// To perform an interaction with a widget in your test, use the WidgetTester +// utility that Flutter provides. For example, you can send tap and scroll +// gestures. You can also use WidgetTester to find child widgets in the widget +// tree, read text, and verify that the values of widget properties are correct. + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; + +import 'package:aitrainer_app/main.dart'; + +void main() { + testWidgets('Counter increments smoke test', (WidgetTester tester) async { + // Build our app and trigger a frame. + await tester.pumpWidget(AitrainerApp()); + + // Verify that our counter starts at 0. + expect(find.text('0'), findsOneWidget); + expect(find.text('1'), findsNothing); + + // Tap the '+' icon and trigger a frame. + await tester.tap(find.byIcon(Icons.add)); + await tester.pump(); + + // Verify that our counter has incremented. + expect(find.text('0'), findsNothing); + expect(find.text('1'), findsOneWidget); + }); +}