diff --git a/unit2/.gitignore b/.gitignore similarity index 100% rename from unit2/.gitignore rename to .gitignore diff --git a/unit2/.metadata b/.metadata similarity index 100% rename from unit2/.metadata rename to .metadata diff --git a/README.md b/README.md index e69de29..9a223c4 100644 --- a/README.md +++ b/README.md @@ -0,0 +1,16 @@ +# unit2 + +A new Flutter project. + +## Getting Started + +This project is a starting point for a Flutter application. + +A few resources to get you started if this is your first Flutter project: + +- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) +- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) + +For help getting started with Flutter development, view the +[online documentation](https://docs.flutter.dev/), which offers tutorials, +samples, guidance on mobile development, and a full API reference. diff --git a/unit2/analysis_options.yaml b/analysis_options.yaml similarity index 100% rename from unit2/analysis_options.yaml rename to analysis_options.yaml diff --git a/unit2/android/.gitignore b/android/.gitignore similarity index 100% rename from unit2/android/.gitignore rename to android/.gitignore diff --git a/unit2/android/app/build.gradle b/android/app/build.gradle similarity index 100% rename from unit2/android/app/build.gradle rename to android/app/build.gradle diff --git a/unit2/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml similarity index 100% rename from unit2/android/app/src/debug/AndroidManifest.xml rename to android/app/src/debug/AndroidManifest.xml diff --git a/unit2/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml similarity index 100% rename from unit2/android/app/src/main/AndroidManifest.xml rename to android/app/src/main/AndroidManifest.xml diff --git a/unit2/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java b/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java similarity index 100% rename from unit2/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java rename to android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java diff --git a/unit2/android/app/src/main/kotlin/com/example/unit2/MainActivity.kt b/android/app/src/main/kotlin/com/example/unit2/MainActivity.kt similarity index 100% rename from unit2/android/app/src/main/kotlin/com/example/unit2/MainActivity.kt rename to android/app/src/main/kotlin/com/example/unit2/MainActivity.kt diff --git a/unit2/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml similarity index 100% rename from unit2/android/app/src/main/res/drawable-v21/launch_background.xml rename to android/app/src/main/res/drawable-v21/launch_background.xml diff --git a/unit2/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml similarity index 100% rename from unit2/android/app/src/main/res/drawable/launch_background.xml rename to android/app/src/main/res/drawable/launch_background.xml diff --git a/unit2/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from unit2/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/unit2/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from unit2/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/unit2/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from unit2/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/unit2/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from unit2/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/unit2/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from unit2/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/unit2/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml similarity index 100% rename from unit2/android/app/src/main/res/values-night/styles.xml rename to android/app/src/main/res/values-night/styles.xml diff --git a/unit2/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml similarity index 100% rename from unit2/android/app/src/main/res/values/styles.xml rename to android/app/src/main/res/values/styles.xml diff --git a/unit2/android/app/src/main/res/xml/file_provider_path.xml b/android/app/src/main/res/xml/file_provider_path.xml similarity index 100% rename from unit2/android/app/src/main/res/xml/file_provider_path.xml rename to android/app/src/main/res/xml/file_provider_path.xml diff --git a/unit2/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml similarity index 100% rename from unit2/android/app/src/profile/AndroidManifest.xml rename to android/app/src/profile/AndroidManifest.xml diff --git a/unit2/android/build.gradle b/android/build.gradle similarity index 100% rename from unit2/android/build.gradle rename to android/build.gradle diff --git a/unit2/android/gradle.properties b/android/gradle.properties similarity index 100% rename from unit2/android/gradle.properties rename to android/gradle.properties diff --git a/unit2/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from unit2/android/gradle/wrapper/gradle-wrapper.properties rename to android/gradle/wrapper/gradle-wrapper.properties diff --git a/unit2/android/settings.gradle b/android/settings.gradle similarity index 100% rename from unit2/android/settings.gradle rename to android/settings.gradle diff --git a/unit2/assets/fonts/LexendDeca-Bold.ttf b/assets/fonts/LexendDeca-Bold.ttf similarity index 100% rename from unit2/assets/fonts/LexendDeca-Bold.ttf rename to assets/fonts/LexendDeca-Bold.ttf diff --git a/unit2/assets/fonts/LexendDeca-Light.ttf b/assets/fonts/LexendDeca-Light.ttf similarity index 100% rename from unit2/assets/fonts/LexendDeca-Light.ttf rename to assets/fonts/LexendDeca-Light.ttf diff --git a/unit2/assets/fonts/LexendDeca-Medium.ttf b/assets/fonts/LexendDeca-Medium.ttf similarity index 100% rename from unit2/assets/fonts/LexendDeca-Medium.ttf rename to assets/fonts/LexendDeca-Medium.ttf diff --git a/unit2/assets/fonts/LexendDeca-Regular.ttf b/assets/fonts/LexendDeca-Regular.ttf similarity index 100% rename from unit2/assets/fonts/LexendDeca-Regular.ttf rename to assets/fonts/LexendDeca-Regular.ttf diff --git a/unit2/assets/fonts/LexendDeca-SemiBold.ttf b/assets/fonts/LexendDeca-SemiBold.ttf similarity index 100% rename from unit2/assets/fonts/LexendDeca-SemiBold.ttf rename to assets/fonts/LexendDeca-SemiBold.ttf diff --git a/unit2/assets/fonts/LexendDeca-VariableFont_wght.ttf b/assets/fonts/LexendDeca-VariableFont_wght.ttf similarity index 100% rename from unit2/assets/fonts/LexendDeca-VariableFont_wght.ttf rename to assets/fonts/LexendDeca-VariableFont_wght.ttf diff --git a/unit2/assets/pngs/bg.png b/assets/pngs/bg.png similarity index 100% rename from unit2/assets/pngs/bg.png rename to assets/pngs/bg.png diff --git a/unit2/assets/pngs/qr-scan.png b/assets/pngs/qr-scan.png similarity index 100% rename from unit2/assets/pngs/qr-scan.png rename to assets/pngs/qr-scan.png diff --git a/unit2/assets/svgs/add_mobile.svg b/assets/svgs/add_mobile.svg similarity index 100% rename from unit2/assets/svgs/add_mobile.svg rename to assets/svgs/add_mobile.svg diff --git a/unit2/assets/svgs/assign.svg b/assets/svgs/assign.svg similarity index 100% rename from unit2/assets/svgs/assign.svg rename to assets/svgs/assign.svg diff --git a/unit2/assets/svgs/download.svg b/assets/svgs/download.svg similarity index 100% rename from unit2/assets/svgs/download.svg rename to assets/svgs/download.svg diff --git a/unit2/assets/svgs/emergency.png b/assets/svgs/emergency.png similarity index 100% rename from unit2/assets/svgs/emergency.png rename to assets/svgs/emergency.png diff --git a/unit2/assets/svgs/empty.svg b/assets/svgs/empty.svg similarity index 100% rename from unit2/assets/svgs/empty.svg rename to assets/svgs/empty.svg diff --git a/unit2/assets/svgs/error.svg b/assets/svgs/error.svg similarity index 100% rename from unit2/assets/svgs/error.svg rename to assets/svgs/error.svg diff --git a/unit2/assets/svgs/female.svg b/assets/svgs/female.svg similarity index 100% rename from unit2/assets/svgs/female.svg rename to assets/svgs/female.svg diff --git a/unit2/assets/svgs/logo.svg b/assets/svgs/logo.svg similarity index 100% rename from unit2/assets/svgs/logo.svg rename to assets/svgs/logo.svg diff --git a/unit2/assets/svgs/male.svg b/assets/svgs/male.svg similarity index 100% rename from unit2/assets/svgs/male.svg rename to assets/svgs/male.svg diff --git a/unit2/assets/svgs/no_module.svg b/assets/svgs/no_module.svg similarity index 100% rename from unit2/assets/svgs/no_module.svg rename to assets/svgs/no_module.svg diff --git a/unit2/assets/svgs/request_sos.svg b/assets/svgs/request_sos.svg similarity index 100% rename from unit2/assets/svgs/request_sos.svg rename to assets/svgs/request_sos.svg diff --git a/unit2/assets/svgs/settings.svg b/assets/svgs/settings.svg similarity index 100% rename from unit2/assets/svgs/settings.svg rename to assets/svgs/settings.svg diff --git a/unit2/assets/svgs/sos.svg b/assets/svgs/sos.svg similarity index 100% rename from unit2/assets/svgs/sos.svg rename to assets/svgs/sos.svg diff --git a/unit2/assets/svgs/switch.svg b/assets/svgs/switch.svg similarity index 100% rename from unit2/assets/svgs/switch.svg rename to assets/svgs/switch.svg diff --git a/unit2/assets/svgs/timeout.svg b/assets/svgs/timeout.svg similarity index 100% rename from unit2/assets/svgs/timeout.svg rename to assets/svgs/timeout.svg diff --git a/unit2/assets/svgs/welcome.svg b/assets/svgs/welcome.svg similarity index 100% rename from unit2/assets/svgs/welcome.svg rename to assets/svgs/welcome.svg diff --git a/unit2/assets/svgs/workspace.svg b/assets/svgs/workspace.svg similarity index 100% rename from unit2/assets/svgs/workspace.svg rename to assets/svgs/workspace.svg diff --git a/unit2/ios/.gitignore b/ios/.gitignore similarity index 100% rename from unit2/ios/.gitignore rename to ios/.gitignore diff --git a/unit2/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist similarity index 100% rename from unit2/ios/Flutter/AppFrameworkInfo.plist rename to ios/Flutter/AppFrameworkInfo.plist diff --git a/unit2/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig similarity index 100% rename from unit2/ios/Flutter/Debug.xcconfig rename to ios/Flutter/Debug.xcconfig diff --git a/unit2/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig similarity index 100% rename from unit2/ios/Flutter/Release.xcconfig rename to ios/Flutter/Release.xcconfig diff --git a/unit2/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj similarity index 100% rename from unit2/ios/Runner.xcodeproj/project.pbxproj rename to ios/Runner.xcodeproj/project.pbxproj diff --git a/unit2/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from unit2/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/unit2/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from unit2/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/unit2/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from unit2/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/unit2/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 100% rename from unit2/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme diff --git a/unit2/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata similarity index 100% rename from unit2/ios/Runner.xcworkspace/contents.xcworkspacedata rename to ios/Runner.xcworkspace/contents.xcworkspacedata diff --git a/unit2/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from unit2/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/unit2/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from unit2/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/unit2/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift similarity index 100% rename from unit2/ios/Runner/AppDelegate.swift rename to ios/Runner/AppDelegate.swift diff --git a/unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png similarity index 100% rename from unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png diff --git a/unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png similarity index 100% rename from unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png diff --git a/unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png similarity index 100% rename from unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png diff --git a/unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png similarity index 100% rename from unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png diff --git a/unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png similarity index 100% rename from unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png diff --git a/unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png similarity index 100% rename from unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png diff --git a/unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png similarity index 100% rename from unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png diff --git a/unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png similarity index 100% rename from unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png diff --git a/unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png similarity index 100% rename from unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png diff --git a/unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png similarity index 100% rename from unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png diff --git a/unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png similarity index 100% rename from unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png diff --git a/unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png similarity index 100% rename from unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png diff --git a/unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png similarity index 100% rename from unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png diff --git a/unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png similarity index 100% rename from unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png diff --git a/unit2/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 similarity index 100% rename from unit2/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png rename to ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png diff --git a/unit2/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json similarity index 100% rename from unit2/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json rename to ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json diff --git a/unit2/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png similarity index 100% rename from unit2/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png rename to ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png diff --git a/unit2/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png similarity index 100% rename from unit2/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png rename to ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png diff --git a/unit2/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png similarity index 100% rename from unit2/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png rename to ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png diff --git a/unit2/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md similarity index 100% rename from unit2/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md rename to ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md diff --git a/unit2/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from unit2/ios/Runner/Base.lproj/LaunchScreen.storyboard rename to ios/Runner/Base.lproj/LaunchScreen.storyboard diff --git a/unit2/ios/Runner/Base.lproj/Main.storyboard b/ios/Runner/Base.lproj/Main.storyboard similarity index 100% rename from unit2/ios/Runner/Base.lproj/Main.storyboard rename to ios/Runner/Base.lproj/Main.storyboard diff --git a/unit2/ios/Runner/Info.plist b/ios/Runner/Info.plist similarity index 100% rename from unit2/ios/Runner/Info.plist rename to ios/Runner/Info.plist diff --git a/unit2/ios/Runner/Runner-Bridging-Header.h b/ios/Runner/Runner-Bridging-Header.h similarity index 100% rename from unit2/ios/Runner/Runner-Bridging-Header.h rename to ios/Runner/Runner-Bridging-Header.h diff --git a/unit2/lib/bloc/bloc/user_bloc.dart b/lib/bloc/bloc/user_bloc.dart similarity index 100% rename from unit2/lib/bloc/bloc/user_bloc.dart rename to lib/bloc/bloc/user_bloc.dart diff --git a/unit2/lib/bloc/bloc/user_event.dart b/lib/bloc/bloc/user_event.dart similarity index 100% rename from unit2/lib/bloc/bloc/user_event.dart rename to lib/bloc/bloc/user_event.dart diff --git a/unit2/lib/bloc/bloc/user_state.dart b/lib/bloc/bloc/user_state.dart similarity index 100% rename from unit2/lib/bloc/bloc/user_state.dart rename to lib/bloc/bloc/user_state.dart diff --git a/unit2/lib/main.dart b/lib/main.dart similarity index 100% rename from unit2/lib/main.dart rename to lib/main.dart diff --git a/unit2/lib/model/login_data/employee_info/department.dart b/lib/model/login_data/employee_info/department.dart similarity index 100% rename from unit2/lib/model/login_data/employee_info/department.dart rename to lib/model/login_data/employee_info/department.dart diff --git a/unit2/lib/model/login_data/employee_info/employee_info.dart b/lib/model/login_data/employee_info/employee_info.dart similarity index 100% rename from unit2/lib/model/login_data/employee_info/employee_info.dart rename to lib/model/login_data/employee_info/employee_info.dart diff --git a/unit2/lib/model/login_data/employee_info/head.dart b/lib/model/login_data/employee_info/head.dart similarity index 100% rename from unit2/lib/model/login_data/employee_info/head.dart rename to lib/model/login_data/employee_info/head.dart diff --git a/unit2/lib/model/login_data/employee_info/office.dart b/lib/model/login_data/employee_info/office.dart similarity index 100% rename from unit2/lib/model/login_data/employee_info/office.dart rename to lib/model/login_data/employee_info/office.dart diff --git a/unit2/lib/model/login_data/employee_info/position_class.dart b/lib/model/login_data/employee_info/position_class.dart similarity index 100% rename from unit2/lib/model/login_data/employee_info/position_class.dart rename to lib/model/login_data/employee_info/position_class.dart diff --git a/unit2/lib/model/login_data/user_info/assigned_area.dart b/lib/model/login_data/user_info/assigned_area.dart similarity index 100% rename from unit2/lib/model/login_data/user_info/assigned_area.dart rename to lib/model/login_data/user_info/assigned_area.dart diff --git a/unit2/lib/model/login_data/user_info/login_user.dart b/lib/model/login_data/user_info/login_user.dart similarity index 100% rename from unit2/lib/model/login_data/user_info/login_user.dart rename to lib/model/login_data/user_info/login_user.dart diff --git a/unit2/lib/model/login_data/user_info/module.dart b/lib/model/login_data/user_info/module.dart similarity index 100% rename from unit2/lib/model/login_data/user_info/module.dart rename to lib/model/login_data/user_info/module.dart diff --git a/unit2/lib/model/login_data/user_info/role.dart b/lib/model/login_data/user_info/role.dart similarity index 100% rename from unit2/lib/model/login_data/user_info/role.dart rename to lib/model/login_data/user_info/role.dart diff --git a/unit2/lib/model/login_data/user_info/user_data.dart b/lib/model/login_data/user_info/user_data.dart similarity index 100% rename from unit2/lib/model/login_data/user_info/user_data.dart rename to lib/model/login_data/user_info/user_data.dart diff --git a/unit2/lib/model/login_data/version_info.dart b/lib/model/login_data/version_info.dart similarity index 100% rename from unit2/lib/model/login_data/version_info.dart rename to lib/model/login_data/version_info.dart diff --git a/unit2/lib/screens/docsms/components/doc_info_tile.dart b/lib/screens/docsms/components/doc_info_tile.dart similarity index 100% rename from unit2/lib/screens/docsms/components/doc_info_tile.dart rename to lib/screens/docsms/components/doc_info_tile.dart diff --git a/unit2/lib/screens/docsms/request_receipt.dart b/lib/screens/docsms/request_receipt.dart similarity index 100% rename from unit2/lib/screens/docsms/request_receipt.dart rename to lib/screens/docsms/request_receipt.dart diff --git a/unit2/lib/screens/sos/add_mobile.dart b/lib/screens/sos/add_mobile.dart similarity index 100% rename from unit2/lib/screens/sos/add_mobile.dart rename to lib/screens/sos/add_mobile.dart diff --git a/unit2/lib/screens/sos/components/mobile.dart b/lib/screens/sos/components/mobile.dart similarity index 100% rename from unit2/lib/screens/sos/components/mobile.dart rename to lib/screens/sos/components/mobile.dart diff --git a/unit2/lib/screens/sos/request_sos.dart b/lib/screens/sos/request_sos.dart similarity index 100% rename from unit2/lib/screens/sos/request_sos.dart rename to lib/screens/sos/request_sos.dart diff --git a/unit2/lib/screens/sos/sos_received.dart b/lib/screens/sos/sos_received.dart similarity index 100% rename from unit2/lib/screens/sos/sos_received.dart rename to lib/screens/sos/sos_received.dart diff --git a/unit2/lib/screens/unit2/basic-info/basic-info.dart b/lib/screens/unit2/basic-info/basic-info.dart similarity index 100% rename from unit2/lib/screens/unit2/basic-info/basic-info.dart rename to lib/screens/unit2/basic-info/basic-info.dart diff --git a/unit2/lib/screens/unit2/basic-info/components/cover-image.dart b/lib/screens/unit2/basic-info/components/cover-image.dart similarity index 100% rename from unit2/lib/screens/unit2/basic-info/components/cover-image.dart rename to lib/screens/unit2/basic-info/components/cover-image.dart diff --git a/unit2/lib/screens/unit2/homepage.dart/components/dashboard.dart b/lib/screens/unit2/homepage.dart/components/dashboard.dart similarity index 100% rename from unit2/lib/screens/unit2/homepage.dart/components/dashboard.dart rename to lib/screens/unit2/homepage.dart/components/dashboard.dart diff --git a/unit2/lib/screens/unit2/homepage.dart/components/drawer-screen.dart b/lib/screens/unit2/homepage.dart/components/drawer-screen.dart similarity index 100% rename from unit2/lib/screens/unit2/homepage.dart/components/drawer-screen.dart rename to lib/screens/unit2/homepage.dart/components/drawer-screen.dart diff --git a/unit2/lib/screens/unit2/homepage.dart/components/empty_module.dart b/lib/screens/unit2/homepage.dart/components/empty_module.dart similarity index 100% rename from unit2/lib/screens/unit2/homepage.dart/components/empty_module.dart rename to lib/screens/unit2/homepage.dart/components/empty_module.dart diff --git a/unit2/lib/screens/unit2/homepage.dart/components/menu-screen.dart b/lib/screens/unit2/homepage.dart/components/menu-screen.dart similarity index 100% rename from unit2/lib/screens/unit2/homepage.dart/components/menu-screen.dart rename to lib/screens/unit2/homepage.dart/components/menu-screen.dart diff --git a/unit2/lib/screens/unit2/homepage.dart/components/menu.dart b/lib/screens/unit2/homepage.dart/components/menu.dart similarity index 100% rename from unit2/lib/screens/unit2/homepage.dart/components/menu.dart rename to lib/screens/unit2/homepage.dart/components/menu.dart diff --git a/unit2/lib/screens/unit2/homepage.dart/module-screen.dart b/lib/screens/unit2/homepage.dart/module-screen.dart similarity index 100% rename from unit2/lib/screens/unit2/homepage.dart/module-screen.dart rename to lib/screens/unit2/homepage.dart/module-screen.dart diff --git a/unit2/lib/screens/unit2/login/components/login-via-qr-label.dart b/lib/screens/unit2/login/components/login-via-qr-label.dart similarity index 100% rename from unit2/lib/screens/unit2/login/components/login-via-qr-label.dart rename to lib/screens/unit2/login/components/login-via-qr-label.dart diff --git a/unit2/lib/screens/unit2/login/components/showAlert.dart b/lib/screens/unit2/login/components/showAlert.dart similarity index 100% rename from unit2/lib/screens/unit2/login/components/showAlert.dart rename to lib/screens/unit2/login/components/showAlert.dart diff --git a/unit2/lib/screens/unit2/login/components/update_required.dart b/lib/screens/unit2/login/components/update_required.dart similarity index 100% rename from unit2/lib/screens/unit2/login/components/update_required.dart rename to lib/screens/unit2/login/components/update_required.dart diff --git a/unit2/lib/screens/unit2/login/functions/get_app_version.dart b/lib/screens/unit2/login/functions/get_app_version.dart similarity index 100% rename from unit2/lib/screens/unit2/login/functions/get_app_version.dart rename to lib/screens/unit2/login/functions/get_app_version.dart diff --git a/unit2/lib/screens/unit2/login/functions/press-again-to-exit.dart b/lib/screens/unit2/login/functions/press-again-to-exit.dart similarity index 100% rename from unit2/lib/screens/unit2/login/functions/press-again-to-exit.dart rename to lib/screens/unit2/login/functions/press-again-to-exit.dart diff --git a/lib/screens/unit2/login/login.dart b/lib/screens/unit2/login/login.dart new file mode 100644 index 0000000..bd2d590 --- /dev/null +++ b/lib/screens/unit2/login/login.dart @@ -0,0 +1,314 @@ +import 'package:barcode_scan2/barcode_scan2.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:flutter_form_builder/flutter_form_builder.dart'; +import 'package:fluttericon/font_awesome5_icons.dart'; +import 'package:form_builder_validators/form_builder_validators.dart'; +import 'package:flutter_progress_hud/flutter_progress_hud.dart'; +import 'package:unit2/bloc/bloc/user_bloc.dart'; +import 'package:unit2/screens/unit2/login/components/update_required.dart'; +import 'package:unit2/utils/text_container.dart'; +import 'package:unit2/widgets/error_state.dart'; +import '../../../widgets/splash_screen.dart'; +import '../../../widgets/wave.dart'; +import '../../../utils/global.dart'; +import '../../../theme-data.dart/colors.dart'; +import '../../../theme-data.dart/form-style.dart'; +import '../../../theme-data.dart/btn-style.dart'; +import './components/login-via-qr-label.dart'; +import './functions/press-again-to-exit.dart'; + +class UniT2Login extends StatefulWidget { + const UniT2Login({super.key}); + + @override + State createState() => _UniT2LoginState(); +} + +class _UniT2LoginState extends State { + final _formKey = GlobalKey(); + bool showSuffixIcon = false; + bool _showPassword = true; + @override + Widget build(BuildContext context) { + return WillPopScope( + onWillPop: pressAgainToExit, + child: Scaffold( + body: ProgressHUD( + child: BlocConsumer(listener: (context, state) { + if (state is UserLoggedIn) { + final progress = ProgressHUD.of(context); + progress!.dismiss(); + Navigator.pushReplacementNamed(context, '/module-screen'); + } + if (state is UuidLoaded) { + Navigator.pushNamed(context, '/qr-login'); + } + }, builder: (context, state) { + if (state is VersionLoaded) { + return Builder(builder: (context) { + if (state.versionInfo!.version != state.apkVersion) { + return SizedBox( + child: SingleChildScrollView( + child: Stack( + alignment: Alignment.center, + children: [ + Positioned( + bottom: 0, + right: 0, + child: + WaveReverse(height: blockSizeVertical * 7)), + SizedBox( + height: blockSizeVertical * 100, + child: FormBuilder( + key: _formKey, + child: Padding( + padding: + const EdgeInsets.symmetric(horizontal: 25), + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + SvgPicture.asset( + 'assets/svgs/logo.svg', + height: blockSizeVertical * 12, + allowDrawingOutsideViewBox: true, + color: primary, + ), + + Text( + welcome, + style: TextStyle( + fontSize: blockSizeVertical * 4, + fontWeight: FontWeight.w600), + ), + Text(unitApp, + style: TextStyle( + fontSize: blockSizeVertical * 6, + fontWeight: FontWeight.w800, + letterSpacing: .2, + height: 1, + color: primary)), + // Text( + // loginToContinue, + // style: TextStyle( + // fontSize: blockSizeVertical * 1.7, + // height: 1.5, + // fontWeight: FontWeight.w600), + // ), + SizedBox( + height: blockSizeVertical * 3, + ), + // USERNAME + FormBuilderTextField( + name: 'username', + validator: + FormBuilderValidators.required( + errorText: usernameRequired), + autofocus: false, + style: const TextStyle( + fontWeight: FontWeight.bold, + color: Colors.black87), + decoration: + loginTextFieldStyle().copyWith()), + SizedBox( + height: blockSizeVertical * 1.5, + ), + // PASSWORD + FormBuilderTextField( + name: 'password', + validator: FormBuilderValidators.required( + errorText: passwordRequired), + onChanged: (value) { + value!.isEmpty + ? setState(() { + showSuffixIcon = false; + }) + : setState(() { + showSuffixIcon = true; + }); + }, + autofocus: false, + style: const TextStyle( + fontWeight: FontWeight.bold, + color: Colors.black87), + decoration: + loginTextFieldStyle().copyWith( + suffixIcon: Visibility( + visible: showSuffixIcon, + child: _showPassword + ? IconButton( + icon: Icon( + FontAwesome5 + .eye_slash, + size: 24, + color: Theme.of( + context) + .textTheme + .displayLarge + ?.color), + onPressed: () { + setState(() { + _showPassword = + false; + }); + }, + ) + : IconButton( + onPressed: () { + setState(() { + _showPassword = + true; + }); + }, + icon: Icon( + FontAwesome5.eye, + size: 24, + color: Theme.of( + context) + .textTheme + .displayLarge + ?.color)), + ), + prefixIcon: const Icon( + Icons.lock, + color: primary, + ), + labelText: "Password", + hintText: enterPassword), + obscureText: _showPassword ? true : false, + ), + SizedBox( + height: blockSizeVertical * 2, + ), + SizedBox( + height: blockSizeVertical * 7, + // Login Button + child: SizedBox( + width: + MediaQuery.of(context).size.width, + child: ElevatedButton( + style: mainBtnStyle( + second, + Colors.transparent, + Colors.white54), + child: const Text( + login, + style: + TextStyle(color: Colors.white), + ), + onPressed: () { + final progress = + ProgressHUD.of(context); + + FocusScope.of(context).unfocus(); + + if (_formKey.currentState! + .saveAndValidate()) { + progress?.showWithText( + 'Logging in...', + ); + + BlocProvider.of(context) + .add(UserLogin( + username: _formKey + .currentState! + .value['username'], + password: _formKey + .currentState! + .value['password'])); + } + }, + ), + ), + ), + SizedBox( + height: blockSizeVertical * 1.5, + ), + + SizedBox( + height: blockSizeVertical * 7, + child: SizedBox( + width: + MediaQuery.of(context).size.width, + child: ElevatedButton.icon( + style: mainBtnStyle( + Colors.white, + second, + primary.withOpacity(.4)), + icon: const Icon( + Icons.qr_code, + color: second, + ), + label: const Text( + loginViaQr, + style: TextStyle(color: second), + ), + onPressed: () { + context + .read() + .add(GetUuid()); + }, + ), + )), + SizedBox( + height: blockSizeVertical * 1, + ), + const LoginViaQr( + text: emergencyReponseLabel), + SizedBox( + height: blockSizeVertical * 1, + ), + // REQUEST SOS + SizedBox( + height: screenHeight * .07, + width: MediaQuery.of(context).size.width, + child: ElevatedButton.icon( + icon: const Icon( + FontAwesome5.life_ring, + color: Colors.white, + ), + style: mainBtnStyle( + third, + Colors.transparent, + Colors.white38), + onPressed: () {}, + label: const Text( + requestSOS, + style: + TextStyle(color: Colors.white), + )), + ) + ], + ), + ), + ), + ), + ], + ), + ), + ); + } else { + return Update( + apkVersion: state.apkVersion!, + currenVersion: state.versionInfo!.version!, + ); + } + }); + } + if (state is UserError) { + return ErrorState( + message: state.message, + ); + } + if (state is SplashScreen) { + return const UniTSplashScreen(); + } + return Container(); + }), + ), + ), + ); + } +} diff --git a/unit2/lib/screens/unit2/login/qr_login.dart b/lib/screens/unit2/login/qr_login.dart similarity index 100% rename from unit2/lib/screens/unit2/login/qr_login.dart rename to lib/screens/unit2/login/qr_login.dart diff --git a/unit2/lib/screens/unit2/roles/qr_code_scanner.dart/components/custom_switch.dart b/lib/screens/unit2/roles/qr_code_scanner.dart/components/custom_switch.dart similarity index 100% rename from unit2/lib/screens/unit2/roles/qr_code_scanner.dart/components/custom_switch.dart rename to lib/screens/unit2/roles/qr_code_scanner.dart/components/custom_switch.dart diff --git a/unit2/lib/screens/unit2/roles/qr_code_scanner.dart/components/save_settings.dart b/lib/screens/unit2/roles/qr_code_scanner.dart/components/save_settings.dart similarity index 100% rename from unit2/lib/screens/unit2/roles/qr_code_scanner.dart/components/save_settings.dart rename to lib/screens/unit2/roles/qr_code_scanner.dart/components/save_settings.dart diff --git a/unit2/lib/screens/unit2/roles/qr_code_scanner.dart/scan.dart b/lib/screens/unit2/roles/qr_code_scanner.dart/scan.dart similarity index 100% rename from unit2/lib/screens/unit2/roles/qr_code_scanner.dart/scan.dart rename to lib/screens/unit2/roles/qr_code_scanner.dart/scan.dart diff --git a/unit2/lib/screens/unit2/roles/qr_code_scanner.dart/settings_screen.dart b/lib/screens/unit2/roles/qr_code_scanner.dart/settings_screen.dart similarity index 100% rename from unit2/lib/screens/unit2/roles/qr_code_scanner.dart/settings_screen.dart rename to lib/screens/unit2/roles/qr_code_scanner.dart/settings_screen.dart diff --git a/unit2/lib/screens/unit2/roles/registration_in_charge/components/add.dart b/lib/screens/unit2/roles/registration_in_charge/components/add.dart similarity index 100% rename from unit2/lib/screens/unit2/roles/registration_in_charge/components/add.dart rename to lib/screens/unit2/roles/registration_in_charge/components/add.dart diff --git a/unit2/lib/screens/unit2/roles/registration_in_charge/components/request_qr.dart b/lib/screens/unit2/roles/registration_in_charge/components/request_qr.dart similarity index 100% rename from unit2/lib/screens/unit2/roles/registration_in_charge/components/request_qr.dart rename to lib/screens/unit2/roles/registration_in_charge/components/request_qr.dart diff --git a/unit2/lib/screens/unit2/roles/registration_in_charge/components/sync.dart b/lib/screens/unit2/roles/registration_in_charge/components/sync.dart similarity index 100% rename from unit2/lib/screens/unit2/roles/registration_in_charge/components/sync.dart rename to lib/screens/unit2/roles/registration_in_charge/components/sync.dart diff --git a/unit2/lib/screens/unit2/roles/registration_in_charge/components/view.dart b/lib/screens/unit2/roles/registration_in_charge/components/view.dart similarity index 100% rename from unit2/lib/screens/unit2/roles/registration_in_charge/components/view.dart rename to lib/screens/unit2/roles/registration_in_charge/components/view.dart diff --git a/unit2/lib/screens/unit2/roles/registration_in_charge/home.dart b/lib/screens/unit2/roles/registration_in_charge/home.dart similarity index 100% rename from unit2/lib/screens/unit2/roles/registration_in_charge/home.dart rename to lib/screens/unit2/roles/registration_in_charge/home.dart diff --git a/unit2/lib/screens/unit2/signature/signature_pad.dart b/lib/screens/unit2/signature/signature_pad.dart similarity index 100% rename from unit2/lib/screens/unit2/signature/signature_pad.dart rename to lib/screens/unit2/signature/signature_pad.dart diff --git a/unit2/lib/sevices/login_service/auth_service.dart b/lib/sevices/login_service/auth_service.dart similarity index 100% rename from unit2/lib/sevices/login_service/auth_service.dart rename to lib/sevices/login_service/auth_service.dart diff --git a/unit2/lib/test_data.dart b/lib/test_data.dart similarity index 100% rename from unit2/lib/test_data.dart rename to lib/test_data.dart diff --git a/unit2/lib/theme-data.dart/btn-style.dart b/lib/theme-data.dart/btn-style.dart similarity index 100% rename from unit2/lib/theme-data.dart/btn-style.dart rename to lib/theme-data.dart/btn-style.dart diff --git a/unit2/lib/theme-data.dart/colors.dart b/lib/theme-data.dart/colors.dart similarity index 100% rename from unit2/lib/theme-data.dart/colors.dart rename to lib/theme-data.dart/colors.dart diff --git a/unit2/lib/theme-data.dart/form-style.dart b/lib/theme-data.dart/form-style.dart similarity index 100% rename from unit2/lib/theme-data.dart/form-style.dart rename to lib/theme-data.dart/form-style.dart diff --git a/unit2/lib/theme-data.dart/text-styles.dart b/lib/theme-data.dart/text-styles.dart similarity index 100% rename from unit2/lib/theme-data.dart/text-styles.dart rename to lib/theme-data.dart/text-styles.dart diff --git a/unit2/lib/utils/alerts.dart b/lib/utils/alerts.dart similarity index 100% rename from unit2/lib/utils/alerts.dart rename to lib/utils/alerts.dart diff --git a/unit2/lib/utils/app_router.dart b/lib/utils/app_router.dart similarity index 100% rename from unit2/lib/utils/app_router.dart rename to lib/utils/app_router.dart diff --git a/unit2/lib/utils/cpu_architecture.dart b/lib/utils/cpu_architecture.dart similarity index 100% rename from unit2/lib/utils/cpu_architecture.dart rename to lib/utils/cpu_architecture.dart diff --git a/unit2/lib/utils/global.dart b/lib/utils/global.dart similarity index 100% rename from unit2/lib/utils/global.dart rename to lib/utils/global.dart diff --git a/unit2/lib/utils/global_context.dart b/lib/utils/global_context.dart similarity index 100% rename from unit2/lib/utils/global_context.dart rename to lib/utils/global_context.dart diff --git a/unit2/lib/utils/request.dart b/lib/utils/request.dart similarity index 100% rename from unit2/lib/utils/request.dart rename to lib/utils/request.dart diff --git a/unit2/lib/utils/router.dart b/lib/utils/router.dart similarity index 100% rename from unit2/lib/utils/router.dart rename to lib/utils/router.dart diff --git a/unit2/lib/utils/scanner.dart b/lib/utils/scanner.dart similarity index 100% rename from unit2/lib/utils/scanner.dart rename to lib/utils/scanner.dart diff --git a/unit2/lib/utils/screen_info.dart b/lib/utils/screen_info.dart similarity index 100% rename from unit2/lib/utils/screen_info.dart rename to lib/utils/screen_info.dart diff --git a/unit2/lib/utils/text_container.dart b/lib/utils/text_container.dart similarity index 100% rename from unit2/lib/utils/text_container.dart rename to lib/utils/text_container.dart diff --git a/unit2/lib/utils/urls.dart b/lib/utils/urls.dart similarity index 100% rename from unit2/lib/utils/urls.dart rename to lib/utils/urls.dart diff --git a/unit2/lib/utils/validators.dart b/lib/utils/validators.dart similarity index 100% rename from unit2/lib/utils/validators.dart rename to lib/utils/validators.dart diff --git a/unit2/lib/widgets/costum_divider.dart b/lib/widgets/costum_divider.dart similarity index 100% rename from unit2/lib/widgets/costum_divider.dart rename to lib/widgets/costum_divider.dart diff --git a/unit2/lib/widgets/error_state.dart b/lib/widgets/error_state.dart similarity index 100% rename from unit2/lib/widgets/error_state.dart rename to lib/widgets/error_state.dart diff --git a/unit2/lib/widgets/label.dart b/lib/widgets/label.dart similarity index 100% rename from unit2/lib/widgets/label.dart rename to lib/widgets/label.dart diff --git a/unit2/lib/widgets/splash_screen.dart b/lib/widgets/splash_screen.dart similarity index 100% rename from unit2/lib/widgets/splash_screen.dart rename to lib/widgets/splash_screen.dart diff --git a/unit2/lib/widgets/text_icon.dart b/lib/widgets/text_icon.dart similarity index 100% rename from unit2/lib/widgets/text_icon.dart rename to lib/widgets/text_icon.dart diff --git a/unit2/lib/widgets/wave.dart b/lib/widgets/wave.dart similarity index 100% rename from unit2/lib/widgets/wave.dart rename to lib/widgets/wave.dart diff --git a/unit2/linux/.gitignore b/linux/.gitignore similarity index 100% rename from unit2/linux/.gitignore rename to linux/.gitignore diff --git a/unit2/linux/CMakeLists.txt b/linux/CMakeLists.txt similarity index 100% rename from unit2/linux/CMakeLists.txt rename to linux/CMakeLists.txt diff --git a/unit2/linux/flutter/CMakeLists.txt b/linux/flutter/CMakeLists.txt similarity index 100% rename from unit2/linux/flutter/CMakeLists.txt rename to linux/flutter/CMakeLists.txt diff --git a/unit2/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc similarity index 100% rename from unit2/linux/flutter/generated_plugin_registrant.cc rename to linux/flutter/generated_plugin_registrant.cc diff --git a/unit2/linux/flutter/generated_plugin_registrant.h b/linux/flutter/generated_plugin_registrant.h similarity index 100% rename from unit2/linux/flutter/generated_plugin_registrant.h rename to linux/flutter/generated_plugin_registrant.h diff --git a/unit2/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake similarity index 100% rename from unit2/linux/flutter/generated_plugins.cmake rename to linux/flutter/generated_plugins.cmake diff --git a/unit2/linux/main.cc b/linux/main.cc similarity index 100% rename from unit2/linux/main.cc rename to linux/main.cc diff --git a/unit2/linux/my_application.cc b/linux/my_application.cc similarity index 100% rename from unit2/linux/my_application.cc rename to linux/my_application.cc diff --git a/unit2/linux/my_application.h b/linux/my_application.h similarity index 100% rename from unit2/linux/my_application.h rename to linux/my_application.h diff --git a/unit2/macos/.gitignore b/macos/.gitignore similarity index 100% rename from unit2/macos/.gitignore rename to macos/.gitignore diff --git a/unit2/macos/Flutter/Flutter-Debug.xcconfig b/macos/Flutter/Flutter-Debug.xcconfig similarity index 100% rename from unit2/macos/Flutter/Flutter-Debug.xcconfig rename to macos/Flutter/Flutter-Debug.xcconfig diff --git a/unit2/macos/Flutter/Flutter-Release.xcconfig b/macos/Flutter/Flutter-Release.xcconfig similarity index 100% rename from unit2/macos/Flutter/Flutter-Release.xcconfig rename to macos/Flutter/Flutter-Release.xcconfig diff --git a/unit2/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift similarity index 100% rename from unit2/macos/Flutter/GeneratedPluginRegistrant.swift rename to macos/Flutter/GeneratedPluginRegistrant.swift diff --git a/unit2/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj similarity index 100% rename from unit2/macos/Runner.xcodeproj/project.pbxproj rename to macos/Runner.xcodeproj/project.pbxproj diff --git a/unit2/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from unit2/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/unit2/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 100% rename from unit2/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme diff --git a/unit2/macos/Runner.xcworkspace/contents.xcworkspacedata b/macos/Runner.xcworkspace/contents.xcworkspacedata similarity index 100% rename from unit2/macos/Runner.xcworkspace/contents.xcworkspacedata rename to macos/Runner.xcworkspace/contents.xcworkspacedata diff --git a/unit2/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from unit2/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/unit2/macos/Runner/AppDelegate.swift b/macos/Runner/AppDelegate.swift similarity index 100% rename from unit2/macos/Runner/AppDelegate.swift rename to macos/Runner/AppDelegate.swift diff --git a/unit2/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from unit2/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json rename to macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/unit2/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png similarity index 100% rename from unit2/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png rename to macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png diff --git a/unit2/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png similarity index 100% rename from unit2/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png rename to macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png diff --git a/unit2/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png similarity index 100% rename from unit2/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png rename to macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png diff --git a/unit2/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png similarity index 100% rename from unit2/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png rename to macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png diff --git a/unit2/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png similarity index 100% rename from unit2/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png rename to macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png diff --git a/unit2/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png similarity index 100% rename from unit2/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png rename to macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png diff --git a/unit2/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png similarity index 100% rename from unit2/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png rename to macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png diff --git a/unit2/macos/Runner/Base.lproj/MainMenu.xib b/macos/Runner/Base.lproj/MainMenu.xib similarity index 100% rename from unit2/macos/Runner/Base.lproj/MainMenu.xib rename to macos/Runner/Base.lproj/MainMenu.xib diff --git a/unit2/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig similarity index 100% rename from unit2/macos/Runner/Configs/AppInfo.xcconfig rename to macos/Runner/Configs/AppInfo.xcconfig diff --git a/unit2/macos/Runner/Configs/Debug.xcconfig b/macos/Runner/Configs/Debug.xcconfig similarity index 100% rename from unit2/macos/Runner/Configs/Debug.xcconfig rename to macos/Runner/Configs/Debug.xcconfig diff --git a/unit2/macos/Runner/Configs/Release.xcconfig b/macos/Runner/Configs/Release.xcconfig similarity index 100% rename from unit2/macos/Runner/Configs/Release.xcconfig rename to macos/Runner/Configs/Release.xcconfig diff --git a/unit2/macos/Runner/Configs/Warnings.xcconfig b/macos/Runner/Configs/Warnings.xcconfig similarity index 100% rename from unit2/macos/Runner/Configs/Warnings.xcconfig rename to macos/Runner/Configs/Warnings.xcconfig diff --git a/unit2/macos/Runner/DebugProfile.entitlements b/macos/Runner/DebugProfile.entitlements similarity index 100% rename from unit2/macos/Runner/DebugProfile.entitlements rename to macos/Runner/DebugProfile.entitlements diff --git a/unit2/macos/Runner/Info.plist b/macos/Runner/Info.plist similarity index 100% rename from unit2/macos/Runner/Info.plist rename to macos/Runner/Info.plist diff --git a/unit2/macos/Runner/MainFlutterWindow.swift b/macos/Runner/MainFlutterWindow.swift similarity index 100% rename from unit2/macos/Runner/MainFlutterWindow.swift rename to macos/Runner/MainFlutterWindow.swift diff --git a/unit2/macos/Runner/Release.entitlements b/macos/Runner/Release.entitlements similarity index 100% rename from unit2/macos/Runner/Release.entitlements rename to macos/Runner/Release.entitlements diff --git a/unit2/notes.txt b/notes.txt similarity index 100% rename from unit2/notes.txt rename to notes.txt diff --git a/unit2/pubspec.lock b/pubspec.lock similarity index 100% rename from unit2/pubspec.lock rename to pubspec.lock diff --git a/unit2/pubspec.yaml b/pubspec.yaml similarity index 100% rename from unit2/pubspec.yaml rename to pubspec.yaml diff --git a/unit2/test/widget_test.dart b/test/widget_test.dart similarity index 100% rename from unit2/test/widget_test.dart rename to test/widget_test.dart diff --git a/unit2/README.md b/unit2/README.md deleted file mode 100644 index 9a223c4..0000000 --- a/unit2/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# unit2 - -A new Flutter project. - -## Getting Started - -This project is a starting point for a Flutter application. - -A few resources to get you started if this is your first Flutter project: - -- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) -- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) - -For help getting started with Flutter development, view the -[online documentation](https://docs.flutter.dev/), which offers tutorials, -samples, guidance on mobile development, and a full API reference. diff --git a/unit2/lib/screens/unit2/login/login.dart b/unit2/lib/screens/unit2/login/login.dart deleted file mode 100644 index e3e7e3a..0000000 --- a/unit2/lib/screens/unit2/login/login.dart +++ /dev/null @@ -1,292 +0,0 @@ -import 'package:barcode_scan2/barcode_scan2.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_svg/flutter_svg.dart'; -import 'package:flutter_form_builder/flutter_form_builder.dart'; -import 'package:fluttericon/font_awesome5_icons.dart'; -import 'package:form_builder_validators/form_builder_validators.dart'; -import 'package:flutter_progress_hud/flutter_progress_hud.dart'; -import 'package:unit2/bloc/bloc/user_bloc.dart'; -import 'package:unit2/screens/unit2/login/components/update_required.dart'; -import 'package:unit2/utils/text_container.dart'; -import 'package:unit2/widgets/error_state.dart'; -import '../../../widgets/splash_screen.dart'; -import '../../../widgets/wave.dart'; -import '../../../utils/global.dart'; -import '../../../theme-data.dart/colors.dart'; -import '../../../theme-data.dart/form-style.dart'; -import '../../../theme-data.dart/btn-style.dart'; -import './components/login-via-qr-label.dart'; -import './functions/press-again-to-exit.dart'; - -class UniT2Login extends StatefulWidget { - const UniT2Login({super.key}); - - @override - State createState() => _UniT2LoginState(); -} - -class _UniT2LoginState extends State { - final _formKey = GlobalKey(); - bool showSuffixIcon = false; - bool _showPassword = true; - @override - Widget build(BuildContext context) { - return WillPopScope( - onWillPop: pressAgainToExit, - child: Scaffold( - body: ProgressHUD( - child: BlocConsumer(listener: (context, state) { - if (state is UserLoggedIn) { - final progress = ProgressHUD.of(context); - progress!.dismiss(); - Navigator.pushReplacementNamed(context, '/module-screen'); - } - if (state is UuidLoaded) { - Navigator.pushNamed(context, '/qr-login'); - } - }, builder: (context, state) { - if (state is VersionLoaded) { - return Builder(builder: (context) { - if(state.versionInfo!.version == state.apkVersion){ - return SizedBox( - child: SingleChildScrollView( - child: Stack( - alignment: Alignment.center, - children: [ - Positioned( - bottom: 0, - right: 0, - child: WaveReverse(height: blockSizeVertical * 7)), - SizedBox( - height: blockSizeVertical * 100, - child: FormBuilder( - key: _formKey, - child: Padding( - padding: - const EdgeInsets.symmetric(horizontal: 25), - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - SvgPicture.asset( - 'assets/svgs/logo.svg', - height: blockSizeVertical * 12, - allowDrawingOutsideViewBox: true, - color: primary, - ), - - Text( - welcome, - style: TextStyle( - fontSize: blockSizeVertical * 4, - fontWeight: FontWeight.w600), - ), - Text(unitApp, - style: TextStyle( - fontSize: blockSizeVertical * 6, - fontWeight: FontWeight.w800, - letterSpacing: .2, - height: 1, - color: primary)), - // Text( - // loginToContinue, - // style: TextStyle( - // fontSize: blockSizeVertical * 1.7, - // height: 1.5, - // fontWeight: FontWeight.w600), - // ), - SizedBox( - height: blockSizeVertical * 3, - ), - // USERNAME - FormBuilderTextField( - name: 'username', - validator: FormBuilderValidators.required( - errorText: usernameRequired), - autofocus: false, - style: const TextStyle( - fontWeight: FontWeight.bold, - color: Colors.black87), - decoration: - loginTextFieldStyle().copyWith()), - SizedBox( - height: blockSizeVertical * 1.5, - ), - // PASSWORD - FormBuilderTextField( - name: 'password', - validator: FormBuilderValidators.required( - errorText: passwordRequired), - onChanged: (value) { - value!.isEmpty - ? setState(() { - showSuffixIcon = false; - }) - : setState(() { - showSuffixIcon = true; - }); - }, - autofocus: false, - style: const TextStyle( - fontWeight: FontWeight.bold, - color: Colors.black87), - decoration: loginTextFieldStyle().copyWith( - suffixIcon: Visibility( - visible: showSuffixIcon, - child: _showPassword - ? IconButton( - icon: Icon( - FontAwesome5.eye_slash, - size: 24, - color: Theme.of(context) - .textTheme - .displayLarge - ?.color), - onPressed: () { - setState(() { - _showPassword = false; - }); - }, - ) - : IconButton( - onPressed: () { - setState(() { - _showPassword = true; - }); - }, - icon: Icon(FontAwesome5.eye, - size: 24, - color: Theme.of(context) - .textTheme - .displayLarge - ?.color)), - ), - prefixIcon: const Icon( - Icons.lock, - color: primary, - ), - labelText: "Password", - hintText: enterPassword), - obscureText: _showPassword ? true : false, - ), - SizedBox( - height: blockSizeVertical * 2, - ), - SizedBox( - height: blockSizeVertical * 7, - // Login Button - child: SizedBox( - width: MediaQuery.of(context).size.width, - child: ElevatedButton( - style: mainBtnStyle(second, - Colors.transparent, Colors.white54), - child: const Text( - login, - style: TextStyle(color: Colors.white), - ), - onPressed: () { - final progress = - ProgressHUD.of(context); - - FocusScope.of(context).unfocus(); - - if (_formKey.currentState! - .saveAndValidate()) { - progress?.showWithText( - 'Logging in...', - ); - - BlocProvider.of(context) - .add(UserLogin( - username: - _formKey.currentState!.value['username'], - password:_formKey.currentState!.value['password'] - )); - } - }, - ), - ), - ), - SizedBox( - height: blockSizeVertical * 1.5, - ), - - SizedBox( - height: blockSizeVertical * 7, - child: SizedBox( - width: - MediaQuery.of(context).size.width, - child: ElevatedButton.icon( - style: mainBtnStyle(Colors.white, - second, primary.withOpacity(.4)), - icon: const Icon( - Icons.qr_code, - color: second, - ), - label: const Text( - loginViaQr, - style: TextStyle(color: second), - ), - onPressed: () { - context - .read() - .add(GetUuid()); - }, - ), - )), - SizedBox( - height: blockSizeVertical * 1, - ), - const LoginViaQr(text: emergencyReponseLabel), - SizedBox( - height: blockSizeVertical * 1, - ), - // REQUEST SOS - SizedBox( - height: screenHeight * .07, - width: MediaQuery.of(context).size.width, - child: ElevatedButton.icon( - icon: const Icon( - FontAwesome5.life_ring, - color: Colors.white, - ), - style: mainBtnStyle(third, - Colors.transparent, Colors.white38), - onPressed: () { - }, - label: const Text( - requestSOS, - style: TextStyle(color: Colors.white), - )), - ) - ], - ), - ), - ), - ), - ], - ), - ), - ); - }else{ - return Update(apkVersion: state.apkVersion!,currenVersion: state.versionInfo!.version!,); - } - - }); - } - if (state is UserError) { - return ErrorState( - message: state.message, - ); - } - if (state is SplashScreen) { - return const UniTSplashScreen(); - } - return Container(); - }), - ), - ), - ); - } -} diff --git a/unit2/web/favicon.png b/web/favicon.png similarity index 100% rename from unit2/web/favicon.png rename to web/favicon.png diff --git a/unit2/web/icons/Icon-192.png b/web/icons/Icon-192.png similarity index 100% rename from unit2/web/icons/Icon-192.png rename to web/icons/Icon-192.png diff --git a/unit2/web/icons/Icon-512.png b/web/icons/Icon-512.png similarity index 100% rename from unit2/web/icons/Icon-512.png rename to web/icons/Icon-512.png diff --git a/unit2/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png similarity index 100% rename from unit2/web/icons/Icon-maskable-192.png rename to web/icons/Icon-maskable-192.png diff --git a/unit2/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png similarity index 100% rename from unit2/web/icons/Icon-maskable-512.png rename to web/icons/Icon-maskable-512.png diff --git a/unit2/web/index.html b/web/index.html similarity index 100% rename from unit2/web/index.html rename to web/index.html diff --git a/unit2/web/manifest.json b/web/manifest.json similarity index 100% rename from unit2/web/manifest.json rename to web/manifest.json diff --git a/unit2/windows/.gitignore b/windows/.gitignore similarity index 100% rename from unit2/windows/.gitignore rename to windows/.gitignore diff --git a/unit2/windows/CMakeLists.txt b/windows/CMakeLists.txt similarity index 100% rename from unit2/windows/CMakeLists.txt rename to windows/CMakeLists.txt diff --git a/unit2/windows/flutter/CMakeLists.txt b/windows/flutter/CMakeLists.txt similarity index 100% rename from unit2/windows/flutter/CMakeLists.txt rename to windows/flutter/CMakeLists.txt diff --git a/unit2/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc similarity index 100% rename from unit2/windows/flutter/generated_plugin_registrant.cc rename to windows/flutter/generated_plugin_registrant.cc diff --git a/unit2/windows/flutter/generated_plugin_registrant.h b/windows/flutter/generated_plugin_registrant.h similarity index 100% rename from unit2/windows/flutter/generated_plugin_registrant.h rename to windows/flutter/generated_plugin_registrant.h diff --git a/unit2/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake similarity index 100% rename from unit2/windows/flutter/generated_plugins.cmake rename to windows/flutter/generated_plugins.cmake diff --git a/unit2/windows/runner/CMakeLists.txt b/windows/runner/CMakeLists.txt similarity index 100% rename from unit2/windows/runner/CMakeLists.txt rename to windows/runner/CMakeLists.txt diff --git a/unit2/windows/runner/Runner.rc b/windows/runner/Runner.rc similarity index 100% rename from unit2/windows/runner/Runner.rc rename to windows/runner/Runner.rc diff --git a/unit2/windows/runner/flutter_window.cpp b/windows/runner/flutter_window.cpp similarity index 100% rename from unit2/windows/runner/flutter_window.cpp rename to windows/runner/flutter_window.cpp diff --git a/unit2/windows/runner/flutter_window.h b/windows/runner/flutter_window.h similarity index 100% rename from unit2/windows/runner/flutter_window.h rename to windows/runner/flutter_window.h diff --git a/unit2/windows/runner/main.cpp b/windows/runner/main.cpp similarity index 100% rename from unit2/windows/runner/main.cpp rename to windows/runner/main.cpp diff --git a/unit2/windows/runner/resource.h b/windows/runner/resource.h similarity index 100% rename from unit2/windows/runner/resource.h rename to windows/runner/resource.h diff --git a/unit2/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico similarity index 100% rename from unit2/windows/runner/resources/app_icon.ico rename to windows/runner/resources/app_icon.ico diff --git a/unit2/windows/runner/runner.exe.manifest b/windows/runner/runner.exe.manifest similarity index 100% rename from unit2/windows/runner/runner.exe.manifest rename to windows/runner/runner.exe.manifest diff --git a/unit2/windows/runner/utils.cpp b/windows/runner/utils.cpp similarity index 100% rename from unit2/windows/runner/utils.cpp rename to windows/runner/utils.cpp diff --git a/unit2/windows/runner/utils.h b/windows/runner/utils.h similarity index 100% rename from unit2/windows/runner/utils.h rename to windows/runner/utils.h diff --git a/unit2/windows/runner/win32_window.cpp b/windows/runner/win32_window.cpp similarity index 100% rename from unit2/windows/runner/win32_window.cpp rename to windows/runner/win32_window.cpp diff --git a/unit2/windows/runner/win32_window.h b/windows/runner/win32_window.h similarity index 100% rename from unit2/windows/runner/win32_window.h rename to windows/runner/win32_window.h