diff --git a/Mobile/.metadata b/Mobile/.metadata deleted file mode 100644 index d2765fc..0000000 --- a/Mobile/.metadata +++ /dev/null @@ -1,45 +0,0 @@ -# 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: "54e66469a933b60ddf175f858f82eaeb97e48c8d" - channel: "stable" - -project_type: app - -# Tracks metadata for the flutter migrate command -migration: - platforms: - - platform: root - create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d - base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d - - platform: android - create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d - base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d - - platform: ios - create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d - base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d - - platform: linux - create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d - base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d - - platform: macos - create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d - base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d - - platform: web - create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d - base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d - - platform: windows - create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d - base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d - - # User provided section - - # List of Local paths (relative to this file) that should be - # ignored by the migrate tool. - # - # Files that are not part of the templates will be ignored by default. - unmanaged_files: - - 'lib/main.dart' - - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/Mobile/android/app/build.gradle b/Mobile/android/app/build.gradle deleted file mode 100644 index d1eac33..0000000 --- a/Mobile/android/app/build.gradle +++ /dev/null @@ -1,67 +0,0 @@ -plugins { - id "com.android.application" - id "kotlin-android" - id "dev.flutter.flutter-gradle-plugin" -} - -def localProperties = new Properties() -def localPropertiesFile = rootProject.file('local.properties') -if (localPropertiesFile.exists()) { - localPropertiesFile.withReader('UTF-8') { reader -> - localProperties.load(reader) - } -} - -def flutterVersionCode = localProperties.getProperty('flutter.versionCode') -if (flutterVersionCode == null) { - flutterVersionCode = '1' -} - -def flutterVersionName = localProperties.getProperty('flutter.versionName') -if (flutterVersionName == null) { - flutterVersionName = '1.0' -} - -android { - namespace "com.example.mobile" - compileSdk flutter.compileSdkVersion - ndkVersion flutter.ndkVersion - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = '1.8' - } - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } - - defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.example.mobile" - // You can update the following values to match your application needs. - // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. - minSdkVersion flutter.minSdkVersion - targetSdkVersion flutter.targetSdkVersion - 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 {} diff --git a/Mobile/android/gradle.properties b/Mobile/android/gradle.properties deleted file mode 100644 index 598d13f..0000000 --- a/Mobile/android/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -org.gradle.jvmargs=-Xmx4G -android.useAndroidX=true -android.enableJetifier=true diff --git a/Mobile/build/1906162ccb255627e94d2d17da8fe11e.cache.dill.track.dill b/Mobile/build/1906162ccb255627e94d2d17da8fe11e.cache.dill.track.dill deleted file mode 100644 index 7fa4260..0000000 Binary files a/Mobile/build/1906162ccb255627e94d2d17da8fe11e.cache.dill.track.dill and /dev/null differ diff --git a/Mobile/build/29623abfbcf15264bf2b14b8dfdb6011/_composite.stamp b/Mobile/build/29623abfbcf15264bf2b14b8dfdb6011/_composite.stamp deleted file mode 100644 index 1b2d28c..0000000 --- a/Mobile/build/29623abfbcf15264bf2b14b8dfdb6011/_composite.stamp +++ /dev/null @@ -1 +0,0 @@ -{"inputs":[],"outputs":[]} \ No newline at end of file diff --git a/Mobile/build/29623abfbcf15264bf2b14b8dfdb6011/gen_dart_plugin_registrant.stamp b/Mobile/build/29623abfbcf15264bf2b14b8dfdb6011/gen_dart_plugin_registrant.stamp deleted file mode 100644 index 1b2d28c..0000000 --- a/Mobile/build/29623abfbcf15264bf2b14b8dfdb6011/gen_dart_plugin_registrant.stamp +++ /dev/null @@ -1 +0,0 @@ -{"inputs":[],"outputs":[]} \ No newline at end of file diff --git a/Mobile/build/29623abfbcf15264bf2b14b8dfdb6011/gen_localizations.stamp b/Mobile/build/29623abfbcf15264bf2b14b8dfdb6011/gen_localizations.stamp deleted file mode 100644 index 1b2d28c..0000000 --- a/Mobile/build/29623abfbcf15264bf2b14b8dfdb6011/gen_localizations.stamp +++ /dev/null @@ -1 +0,0 @@ -{"inputs":[],"outputs":[]} \ No newline at end of file diff --git a/Mobile/build/8f264e038ea189c3c7110ab09ae876d1/_composite.stamp b/Mobile/build/8f264e038ea189c3c7110ab09ae876d1/_composite.stamp deleted file mode 100644 index 1b2d28c..0000000 --- a/Mobile/build/8f264e038ea189c3c7110ab09ae876d1/_composite.stamp +++ /dev/null @@ -1 +0,0 @@ -{"inputs":[],"outputs":[]} \ No newline at end of file diff --git a/Mobile/build/8f264e038ea189c3c7110ab09ae876d1/gen_dart_plugin_registrant.stamp b/Mobile/build/8f264e038ea189c3c7110ab09ae876d1/gen_dart_plugin_registrant.stamp deleted file mode 100644 index 1b2d28c..0000000 --- a/Mobile/build/8f264e038ea189c3c7110ab09ae876d1/gen_dart_plugin_registrant.stamp +++ /dev/null @@ -1 +0,0 @@ -{"inputs":[],"outputs":[]} \ No newline at end of file diff --git a/Mobile/build/8f264e038ea189c3c7110ab09ae876d1/gen_localizations.stamp b/Mobile/build/8f264e038ea189c3c7110ab09ae876d1/gen_localizations.stamp deleted file mode 100644 index 1b2d28c..0000000 --- a/Mobile/build/8f264e038ea189c3c7110ab09ae876d1/gen_localizations.stamp +++ /dev/null @@ -1 +0,0 @@ -{"inputs":[],"outputs":[]} \ No newline at end of file diff --git a/Mobile/build/web/.dockerignore b/Mobile/build/web/.dockerignore deleted file mode 100644 index 0881874..0000000 --- a/Mobile/build/web/.dockerignore +++ /dev/null @@ -1,11 +0,0 @@ -.git -build/ -.idea -.vscode -*.iml -*.log -.dart_tool/ -.packages -.flutter-plugins -.flutter-plugins-dependencies -.flutter-versions diff --git a/Mobile/build/web/.last_build_id b/Mobile/build/web/.last_build_id deleted file mode 100644 index 9bebe46..0000000 --- a/Mobile/build/web/.last_build_id +++ /dev/null @@ -1 +0,0 @@ -516798f188c0e5e5f173ebddd87b8d0b \ No newline at end of file diff --git a/Mobile/build/web/Dockerfile b/Mobile/build/web/Dockerfile deleted file mode 100644 index 77a6905..0000000 --- a/Mobile/build/web/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM nginx:alpine - -# Copy the config files -ADD ./conf/ /etc/nginx/ -# Clears the static files -RUN rm -rf /usr/share/nginx/html -# Copy the static web content -ADD . /usr/share/nginx/html - -# Suggests to bind port 80 to any port of the host system -EXPOSE 80 \ No newline at end of file diff --git a/Mobile/build/web/conf/app.conf b/Mobile/build/web/conf/app.conf deleted file mode 100644 index 74dc709..0000000 --- a/Mobile/build/web/conf/app.conf +++ /dev/null @@ -1,13 +0,0 @@ -server { - listen 80; - root /usr/share/nginx/html; - - # Enables Gzip compression for efficiency - gzip on; - gzip_types text/plain text/javascript text/css application/json; - - # Handles routing for static files and serves index.html as a fallback - location / { - try_files $uri $uri/ /index.html; - } -} diff --git a/Mobile/build/web/conf/nginx.conf b/Mobile/build/web/conf/nginx.conf deleted file mode 100644 index 884138c..0000000 --- a/Mobile/build/web/conf/nginx.conf +++ /dev/null @@ -1,5 +0,0 @@ -events {} - -http { - include /etc/nginx/app.conf; -} diff --git a/Mobile/build/web/flutter_service_worker.js b/Mobile/build/web/flutter_service_worker.js deleted file mode 100644 index 6bd2477..0000000 --- a/Mobile/build/web/flutter_service_worker.js +++ /dev/null @@ -1,206 +0,0 @@ -'use strict'; -const MANIFEST = 'flutter-app-manifest'; -const TEMP = 'flutter-temp-cache'; -const CACHE_NAME = 'flutter-app-cache'; - -const RESOURCES = {"assets/AssetManifest.bin": "693635b5258fe5f1cda720cf224f158c", -"assets/AssetManifest.bin.json": "69a99f98c8b1fb8111c5fb961769fcd8", -"assets/AssetManifest.json": "2efbb41d7877d10aac9d091f58ccd7b9", -"assets/FontManifest.json": "dc3d03800ccca4601324923c0b1d6d57", -"assets/fonts/MaterialIcons-Regular.otf": "0bce9903b954d8e416b6fe79155f122c", -"assets/NOTICES": "12f6a7042ed1645a5cabf5d072de4770", -"assets/packages/cupertino_icons/assets/CupertinoIcons.ttf": "e986ebe42ef785b27164c36a9abc7818", -"assets/shaders/ink_sparkle.frag": "ecc85a2e95f5e9f53123dcaf8cb9b6ce", -"canvaskit/canvaskit.js": "c86fbd9e7b17accae76e5ad116583dc4", -"canvaskit/canvaskit.js.symbols": "38cba9233b92472a36ff011dc21c2c9f", -"canvaskit/canvaskit.wasm": "3d2a2d663e8c5111ac61a46367f751ac", -"canvaskit/chromium/canvaskit.js": "43787ac5098c648979c27c13c6f804c3", -"canvaskit/chromium/canvaskit.js.symbols": "4525682ef039faeb11f24f37436dca06", -"canvaskit/chromium/canvaskit.wasm": "f5934e694f12929ed56a671617acd254", -"canvaskit/skwasm.js": "445e9e400085faead4493be2224d95aa", -"canvaskit/skwasm.js.symbols": "741d50ffba71f89345996b0aa8426af8", -"canvaskit/skwasm.wasm": "e42815763c5d05bba43f9d0337fa7d84", -"canvaskit/skwasm.worker.js": "bfb704a6c714a75da9ef320991e88b03", -"conf/app.conf": "27b9f8f06e2c2ba98a11a9a2b7d808b2", -"conf/nginx.conf": "6b627505ce964c6c803ec3a50243940c", -"Dockerfile": "814e0c8e66fb59c1d44cb098b2ab06d2", -"favicon.png": "5dcef449791fa27946b3d35ad8803796", -"flutter.js": "c71a09214cb6f5f8996a531350400a9a", -"icons/Icon-192.png": "ac9a721a12bbc803b44f645561ecb1e1", -"icons/Icon-512.png": "96e752610906ba2a93c65f8abe1645f1", -"icons/Icon-maskable-192.png": "c457ef57daa1d16f64b27b786ec2ea3c", -"icons/Icon-maskable-512.png": "301a7604d45b3e739efc881eb04896ea", -"index.html": "48f49a7687916ae75958435b3e706b15", -"/": "48f49a7687916ae75958435b3e706b15", -"main.dart.js": "a41b85bb4fd7ed263adb109950286daf", -"manifest.json": "6818dc0048f086a6849c17ab04b5b189", -"version.json": "9ed43ffa08b5c3b81f0154dc4943c58e"}; -// The application shell files that are downloaded before a service worker can -// start. -const CORE = ["main.dart.js", -"index.html", -"assets/AssetManifest.bin.json", -"assets/FontManifest.json"]; - -// During install, the TEMP cache is populated with the application shell files. -self.addEventListener("install", (event) => { - self.skipWaiting(); - return event.waitUntil( - caches.open(TEMP).then((cache) => { - return cache.addAll( - CORE.map((value) => new Request(value, {'cache': 'reload'}))); - }) - ); -}); -// During activate, the cache is populated with the temp files downloaded in -// install. If this service worker is upgrading from one with a saved -// MANIFEST, then use this to retain unchanged resource files. -self.addEventListener("activate", function(event) { - return event.waitUntil(async function() { - try { - var contentCache = await caches.open(CACHE_NAME); - var tempCache = await caches.open(TEMP); - var manifestCache = await caches.open(MANIFEST); - var manifest = await manifestCache.match('manifest'); - // When there is no prior manifest, clear the entire cache. - if (!manifest) { - await caches.delete(CACHE_NAME); - contentCache = await caches.open(CACHE_NAME); - for (var request of await tempCache.keys()) { - var response = await tempCache.match(request); - await contentCache.put(request, response); - } - await caches.delete(TEMP); - // Save the manifest to make future upgrades efficient. - await manifestCache.put('manifest', new Response(JSON.stringify(RESOURCES))); - // Claim client to enable caching on first launch - self.clients.claim(); - return; - } - var oldManifest = await manifest.json(); - var origin = self.location.origin; - for (var request of await contentCache.keys()) { - var key = request.url.substring(origin.length + 1); - if (key == "") { - key = "/"; - } - // If a resource from the old manifest is not in the new cache, or if - // the MD5 sum has changed, delete it. Otherwise the resource is left - // in the cache and can be reused by the new service worker. - if (!RESOURCES[key] || RESOURCES[key] != oldManifest[key]) { - await contentCache.delete(request); - } - } - // Populate the cache with the app shell TEMP files, potentially overwriting - // cache files preserved above. - for (var request of await tempCache.keys()) { - var response = await tempCache.match(request); - await contentCache.put(request, response); - } - await caches.delete(TEMP); - // Save the manifest to make future upgrades efficient. - await manifestCache.put('manifest', new Response(JSON.stringify(RESOURCES))); - // Claim client to enable caching on first launch - self.clients.claim(); - return; - } catch (err) { - // On an unhandled exception the state of the cache cannot be guaranteed. - console.error('Failed to upgrade service worker: ' + err); - await caches.delete(CACHE_NAME); - await caches.delete(TEMP); - await caches.delete(MANIFEST); - } - }()); -}); -// The fetch handler redirects requests for RESOURCE files to the service -// worker cache. -self.addEventListener("fetch", (event) => { - if (event.request.method !== 'GET') { - return; - } - var origin = self.location.origin; - var key = event.request.url.substring(origin.length + 1); - // Redirect URLs to the index.html - if (key.indexOf('?v=') != -1) { - key = key.split('?v=')[0]; - } - if (event.request.url == origin || event.request.url.startsWith(origin + '/#') || key == '') { - key = '/'; - } - // If the URL is not the RESOURCE list then return to signal that the - // browser should take over. - if (!RESOURCES[key]) { - return; - } - // If the URL is the index.html, perform an online-first request. - if (key == '/') { - return onlineFirst(event); - } - event.respondWith(caches.open(CACHE_NAME) - .then((cache) => { - return cache.match(event.request).then((response) => { - // Either respond with the cached resource, or perform a fetch and - // lazily populate the cache only if the resource was successfully fetched. - return response || fetch(event.request).then((response) => { - if (response && Boolean(response.ok)) { - cache.put(event.request, response.clone()); - } - return response; - }); - }) - }) - ); -}); -self.addEventListener('message', (event) => { - // SkipWaiting can be used to immediately activate a waiting service worker. - // This will also require a page refresh triggered by the main worker. - if (event.data === 'skipWaiting') { - self.skipWaiting(); - return; - } - if (event.data === 'downloadOffline') { - downloadOffline(); - return; - } -}); -// Download offline will check the RESOURCES for all files not in the cache -// and populate them. -async function downloadOffline() { - var resources = []; - var contentCache = await caches.open(CACHE_NAME); - var currentContent = {}; - for (var request of await contentCache.keys()) { - var key = request.url.substring(origin.length + 1); - if (key == "") { - key = "/"; - } - currentContent[key] = true; - } - for (var resourceKey of Object.keys(RESOURCES)) { - if (!currentContent[resourceKey]) { - resources.push(resourceKey); - } - } - return contentCache.addAll(resources); -} -// Attempt to download the resource online before falling back to -// the offline cache. -function onlineFirst(event) { - return event.respondWith( - fetch(event.request).then((response) => { - return caches.open(CACHE_NAME).then((cache) => { - cache.put(event.request, response.clone()); - return response; - }); - }).catch((error) => { - return caches.open(CACHE_NAME).then((cache) => { - return cache.match(event.request).then((response) => { - if (response != null) { - return response; - } - throw error; - }); - }); - }) - ); -} diff --git a/Mobile/lib/global_components.dart b/Mobile/lib/global_components.dart deleted file mode 100644 index 2bfdb75..0000000 --- a/Mobile/lib/global_components.dart +++ /dev/null @@ -1,18 +0,0 @@ -import 'package:flutter/material.dart'; - -class PrimaryButton extends StatelessWidget { - final void Function()? onPressed; - final Widget child; - - const PrimaryButton( - {super.key, required this.onPressed, required this.child}); - - @override - Widget build(BuildContext context) { - return TextButton( - onPressed: onPressed, - style: TextButton.styleFrom( - backgroundColor: Colors.blue, foregroundColor: Colors.white), - child: child); - } -} diff --git a/Mobile/.gitignore b/mobile/.gitignore similarity index 84% rename from Mobile/.gitignore rename to mobile/.gitignore index 99e2a1e..79c113f 100644 --- a/Mobile/.gitignore +++ b/mobile/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related @@ -29,9 +31,7 @@ migrate_working_dir/ .flutter-plugins-dependencies .pub-cache/ .pub/ -#/build/e514a05cd739d52d8e7038a04d724576 -#/build/flutter_assets -#/build/2794971a5855e7decd7bb368de5d49d1.cache.dill.track.dill +/build/ # Symbolication related app.*.symbols diff --git a/mobile/.metadata b/mobile/.metadata new file mode 100644 index 0000000..fac5aec --- /dev/null +++ b/mobile/.metadata @@ -0,0 +1,45 @@ +# 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: "68415ad1d920f6fe5ec284f5c2febf7c4dd5b0b3" + channel: "stable" + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: 68415ad1d920f6fe5ec284f5c2febf7c4dd5b0b3 + base_revision: 68415ad1d920f6fe5ec284f5c2febf7c4dd5b0b3 + - platform: android + create_revision: 68415ad1d920f6fe5ec284f5c2febf7c4dd5b0b3 + base_revision: 68415ad1d920f6fe5ec284f5c2febf7c4dd5b0b3 + - platform: ios + create_revision: 68415ad1d920f6fe5ec284f5c2febf7c4dd5b0b3 + base_revision: 68415ad1d920f6fe5ec284f5c2febf7c4dd5b0b3 + - platform: linux + create_revision: 68415ad1d920f6fe5ec284f5c2febf7c4dd5b0b3 + base_revision: 68415ad1d920f6fe5ec284f5c2febf7c4dd5b0b3 + - platform: macos + create_revision: 68415ad1d920f6fe5ec284f5c2febf7c4dd5b0b3 + base_revision: 68415ad1d920f6fe5ec284f5c2febf7c4dd5b0b3 + - platform: web + create_revision: 68415ad1d920f6fe5ec284f5c2febf7c4dd5b0b3 + base_revision: 68415ad1d920f6fe5ec284f5c2febf7c4dd5b0b3 + - platform: windows + create_revision: 68415ad1d920f6fe5ec284f5c2febf7c4dd5b0b3 + base_revision: 68415ad1d920f6fe5ec284f5c2febf7c4dd5b0b3 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/Mobile/readme.md b/mobile/README.md similarity index 100% rename from Mobile/readme.md rename to mobile/README.md diff --git a/Mobile/analysis_options.yaml b/mobile/analysis_options.yaml similarity index 100% rename from Mobile/analysis_options.yaml rename to mobile/analysis_options.yaml diff --git a/Mobile/android/.gitignore b/mobile/android/.gitignore similarity index 69% rename from Mobile/android/.gitignore rename to mobile/android/.gitignore index 6f56801..55afd91 100644 --- a/Mobile/android/.gitignore +++ b/mobile/android/.gitignore @@ -7,7 +7,7 @@ gradle-wrapper.jar GeneratedPluginRegistrant.java # Remember to never publicly share your keystore. -# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +# See https://flutter.dev/to/reference-keystore key.properties **/*.keystore **/*.jks diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle new file mode 100644 index 0000000..aa34c77 --- /dev/null +++ b/mobile/android/app/build.gradle @@ -0,0 +1,44 @@ +plugins { + id "com.android.application" + id "kotlin-android" + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id "dev.flutter.flutter-gradle-plugin" +} + +android { + namespace = "com.example.mobile" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8 + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId = "com.example.mobile" + // You can update the following values to match your application needs. + // For more information, see: https://flutter.dev/to/review-gradle-config. + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + versionCode = flutter.versionCode + versionName = flutter.versionName + } + + 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 = "../.." +} diff --git a/Mobile/android/app/src/debug/AndroidManifest.xml b/mobile/android/app/src/debug/AndroidManifest.xml similarity index 100% rename from Mobile/android/app/src/debug/AndroidManifest.xml rename to mobile/android/app/src/debug/AndroidManifest.xml diff --git a/Mobile/android/app/src/main/AndroidManifest.xml b/mobile/android/app/src/main/AndroidManifest.xml similarity index 98% rename from Mobile/android/app/src/main/AndroidManifest.xml rename to mobile/android/app/src/main/AndroidManifest.xml index de26880..ef5beb7 100644 --- a/Mobile/android/app/src/main/AndroidManifest.xml +++ b/mobile/android/app/src/main/AndroidManifest.xml @@ -7,6 +7,7 @@ android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" + android:taskAffinity="" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" @@ -31,7 +32,7 @@ android:value="2" /> diff --git a/Mobile/android/app/src/main/kotlin/com/example/mobile/MainActivity.kt b/mobile/android/app/src/main/kotlin/com/example/mobile/MainActivity.kt similarity index 100% rename from Mobile/android/app/src/main/kotlin/com/example/mobile/MainActivity.kt rename to mobile/android/app/src/main/kotlin/com/example/mobile/MainActivity.kt diff --git a/Mobile/android/app/src/main/res/drawable-v21/launch_background.xml b/mobile/android/app/src/main/res/drawable-v21/launch_background.xml similarity index 100% rename from Mobile/android/app/src/main/res/drawable-v21/launch_background.xml rename to mobile/android/app/src/main/res/drawable-v21/launch_background.xml diff --git a/Mobile/android/app/src/main/res/drawable/launch_background.xml b/mobile/android/app/src/main/res/drawable/launch_background.xml similarity index 100% rename from Mobile/android/app/src/main/res/drawable/launch_background.xml rename to mobile/android/app/src/main/res/drawable/launch_background.xml diff --git a/Mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from Mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/Mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from Mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/Mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from Mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/Mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from Mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/Mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from Mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/Mobile/android/app/src/main/res/values-night/styles.xml b/mobile/android/app/src/main/res/values-night/styles.xml similarity index 100% rename from Mobile/android/app/src/main/res/values-night/styles.xml rename to mobile/android/app/src/main/res/values-night/styles.xml diff --git a/Mobile/android/app/src/main/res/values/styles.xml b/mobile/android/app/src/main/res/values/styles.xml similarity index 100% rename from Mobile/android/app/src/main/res/values/styles.xml rename to mobile/android/app/src/main/res/values/styles.xml diff --git a/Mobile/android/app/src/profile/AndroidManifest.xml b/mobile/android/app/src/profile/AndroidManifest.xml similarity index 100% rename from Mobile/android/app/src/profile/AndroidManifest.xml rename to mobile/android/app/src/profile/AndroidManifest.xml diff --git a/Mobile/android/build.gradle b/mobile/android/build.gradle similarity index 77% rename from Mobile/android/build.gradle rename to mobile/android/build.gradle index bc157bd..d2ffbff 100644 --- a/Mobile/android/build.gradle +++ b/mobile/android/build.gradle @@ -5,12 +5,12 @@ allprojects { } } -rootProject.buildDir = '../build' +rootProject.buildDir = "../build" subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" } subprojects { - project.evaluationDependsOn(':app') + project.evaluationDependsOn(":app") } tasks.register("clean", Delete) { diff --git a/mobile/android/gradle.properties b/mobile/android/gradle.properties new file mode 100644 index 0000000..2597170 --- /dev/null +++ b/mobile/android/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError +android.useAndroidX=true +android.enableJetifier=true diff --git a/Mobile/android/gradle/wrapper/gradle-wrapper.properties b/mobile/android/gradle/wrapper/gradle-wrapper.properties similarity index 92% rename from Mobile/android/gradle/wrapper/gradle-wrapper.properties rename to mobile/android/gradle/wrapper/gradle-wrapper.properties index e1ca574..7bb2df6 100644 --- a/Mobile/android/gradle/wrapper/gradle-wrapper.properties +++ b/mobile/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/Mobile/android/settings.gradle b/mobile/android/settings.gradle similarity index 66% rename from Mobile/android/settings.gradle rename to mobile/android/settings.gradle index 1d6d19b..b9e43bd 100644 --- a/Mobile/android/settings.gradle +++ b/mobile/android/settings.gradle @@ -5,10 +5,9 @@ pluginManagement { def flutterSdkPath = properties.getProperty("flutter.sdk") assert flutterSdkPath != null, "flutter.sdk not set in local.properties" return flutterSdkPath - } - settings.ext.flutterSdkPath = flutterSdkPath() + }() - includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") repositories { google() @@ -19,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false - id "org.jetbrains.kotlin.android" version "1.7.10" apply false + id "com.android.application" version "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.8.22" apply false } include ":app" diff --git a/Mobile/ios/.gitignore b/mobile/ios/.gitignore similarity index 100% rename from Mobile/ios/.gitignore rename to mobile/ios/.gitignore diff --git a/Mobile/ios/Flutter/AppFrameworkInfo.plist b/mobile/ios/Flutter/AppFrameworkInfo.plist similarity index 100% rename from Mobile/ios/Flutter/AppFrameworkInfo.plist rename to mobile/ios/Flutter/AppFrameworkInfo.plist diff --git a/Mobile/ios/Flutter/Debug.xcconfig b/mobile/ios/Flutter/Debug.xcconfig similarity index 100% rename from Mobile/ios/Flutter/Debug.xcconfig rename to mobile/ios/Flutter/Debug.xcconfig diff --git a/Mobile/ios/Flutter/Release.xcconfig b/mobile/ios/Flutter/Release.xcconfig similarity index 100% rename from Mobile/ios/Flutter/Release.xcconfig rename to mobile/ios/Flutter/Release.xcconfig diff --git a/Mobile/ios/Runner.xcodeproj/project.pbxproj b/mobile/ios/Runner.xcodeproj/project.pbxproj similarity index 100% rename from Mobile/ios/Runner.xcodeproj/project.pbxproj rename to mobile/ios/Runner.xcodeproj/project.pbxproj diff --git a/Mobile/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/mobile/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from Mobile/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to mobile/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/Mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from Mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from Mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/Mobile/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/mobile/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 100% rename from Mobile/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to mobile/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme diff --git a/Mobile/ios/Runner.xcworkspace/contents.xcworkspacedata b/mobile/ios/Runner.xcworkspace/contents.xcworkspacedata similarity index 100% rename from Mobile/ios/Runner.xcworkspace/contents.xcworkspacedata rename to mobile/ios/Runner.xcworkspace/contents.xcworkspacedata diff --git a/Mobile/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/mobile/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from Mobile/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to mobile/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Mobile/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/mobile/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from Mobile/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to mobile/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/Mobile/ios/Runner/AppDelegate.swift b/mobile/ios/Runner/AppDelegate.swift similarity index 95% rename from Mobile/ios/Runner/AppDelegate.swift rename to mobile/ios/Runner/AppDelegate.swift index 70693e4..6266644 100644 --- a/Mobile/ios/Runner/AppDelegate.swift +++ b/mobile/ios/Runner/AppDelegate.swift @@ -1,7 +1,7 @@ -import UIKit import Flutter +import UIKit -@UIApplicationMain +@main @objc class AppDelegate: FlutterAppDelegate { override func application( _ application: UIApplication, diff --git a/Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json rename to mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png similarity index 100% rename from Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png rename to mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png diff --git a/Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png similarity index 100% rename from Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png rename to mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png diff --git a/Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png similarity index 100% rename from Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png rename to mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png diff --git a/Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png similarity index 100% rename from Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png rename to mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png diff --git a/Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png similarity index 100% rename from Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png rename to mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png diff --git a/Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png similarity index 100% rename from Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png rename to mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png diff --git a/Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png similarity index 100% rename from Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png rename to mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png diff --git a/Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png similarity index 100% rename from Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png rename to mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png diff --git a/Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png similarity index 100% rename from Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png rename to mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png diff --git a/Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png similarity index 100% rename from Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png rename to mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png diff --git a/Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png similarity index 100% rename from Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png rename to mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png diff --git a/Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png similarity index 100% rename from Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png rename to mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png diff --git a/Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png similarity index 100% rename from Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png rename to mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png diff --git a/Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png similarity index 100% rename from Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png rename to mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png diff --git a/Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png similarity index 100% rename from Mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png rename to mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png diff --git a/Mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json similarity index 100% rename from Mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json rename to mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json diff --git a/Mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png similarity index 100% rename from Mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png rename to mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png diff --git a/Mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png similarity index 100% rename from Mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png rename to mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png diff --git a/Mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png similarity index 100% rename from Mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png rename to mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png diff --git a/Mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md similarity index 100% rename from Mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md rename to mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md diff --git a/Mobile/ios/Runner/Base.lproj/LaunchScreen.storyboard b/mobile/ios/Runner/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from Mobile/ios/Runner/Base.lproj/LaunchScreen.storyboard rename to mobile/ios/Runner/Base.lproj/LaunchScreen.storyboard diff --git a/Mobile/ios/Runner/Base.lproj/Main.storyboard b/mobile/ios/Runner/Base.lproj/Main.storyboard similarity index 100% rename from Mobile/ios/Runner/Base.lproj/Main.storyboard rename to mobile/ios/Runner/Base.lproj/Main.storyboard diff --git a/Mobile/ios/Runner/Info.plist b/mobile/ios/Runner/Info.plist similarity index 100% rename from Mobile/ios/Runner/Info.plist rename to mobile/ios/Runner/Info.plist diff --git a/Mobile/ios/Runner/Runner-Bridging-Header.h b/mobile/ios/Runner/Runner-Bridging-Header.h similarity index 100% rename from Mobile/ios/Runner/Runner-Bridging-Header.h rename to mobile/ios/Runner/Runner-Bridging-Header.h diff --git a/Mobile/ios/RunnerTests/RunnerTests.swift b/mobile/ios/RunnerTests/RunnerTests.swift similarity index 100% rename from Mobile/ios/RunnerTests/RunnerTests.swift rename to mobile/ios/RunnerTests/RunnerTests.swift diff --git a/Mobile/lib/dashboard.dart b/mobile/lib/dashboard.dart similarity index 100% rename from Mobile/lib/dashboard.dart rename to mobile/lib/dashboard.dart diff --git a/mobile/lib/global_components.dart b/mobile/lib/global_components.dart new file mode 100644 index 0000000..f8debba --- /dev/null +++ b/mobile/lib/global_components.dart @@ -0,0 +1,45 @@ +import 'package:flutter/material.dart'; + +class PrimaryButton extends StatelessWidget { + final void Function()? onPressed; + final Widget child; + + const PrimaryButton( + {super.key, required this.onPressed, required this.child}); + + @override + Widget build(BuildContext context) { + return TextButton( + onPressed: onPressed, + style: TextButton.styleFrom( + backgroundColor: Colors.blue, foregroundColor: Colors.white), + child: child); + } +} + +class PrimaryInput extends StatelessWidget { + final double width; + final double height; + final String label; + final String placeholderText; + + const PrimaryInput( + {super.key, + this.width = 300, + this.height = 100, + required this.label, + required this.placeholderText}); + + @override + Widget build(BuildContext context) { + return SizedBox( + width: width, + height: height, + child: TextField( + decoration: InputDecoration( + border: const OutlineInputBorder(), + label: Text(label), + hintText: placeholderText), + )); + } +} diff --git a/Mobile/lib/landing_page.dart b/mobile/lib/landing_page.dart similarity index 100% rename from Mobile/lib/landing_page.dart rename to mobile/lib/landing_page.dart diff --git a/Mobile/lib/log_in_page.dart b/mobile/lib/log_in_page.dart similarity index 61% rename from Mobile/lib/log_in_page.dart rename to mobile/lib/log_in_page.dart index 2bf1b34..167b13d 100644 --- a/Mobile/lib/log_in_page.dart +++ b/mobile/lib/log_in_page.dart @@ -2,33 +2,6 @@ import 'package:flutter/material.dart'; import 'dashboard.dart'; import 'global_components.dart'; -class PrimaryInput extends StatelessWidget { - final double width; - final double height; - final String label; - final String placeholderText; - - const PrimaryInput( - {super.key, - this.width = 300, - this.height = 100, - required this.label, - required this.placeholderText}); - - @override - Widget build(BuildContext context) { - return SizedBox( - width: width, - height: height, - child: TextField( - decoration: InputDecoration( - border: const OutlineInputBorder(), - label: Text(label), - hintText: placeholderText), - )); - } -} - class LogInPage extends StatelessWidget { const LogInPage({super.key}); diff --git a/Mobile/lib/main.dart b/mobile/lib/main.dart similarity index 96% rename from Mobile/lib/main.dart rename to mobile/lib/main.dart index 324104d..a4ef6d1 100644 --- a/Mobile/lib/main.dart +++ b/mobile/lib/main.dart @@ -11,7 +11,7 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { return MaterialApp( - title: 'Flutter Demo', + title: 'Fresh Plaza', theme: ThemeData( colorScheme: ColorScheme.fromSeed(seedColor: Colors.blue), useMaterial3: true, diff --git a/mobile/lib/register_page.dart b/mobile/lib/register_page.dart new file mode 100644 index 0000000..63b1c68 --- /dev/null +++ b/mobile/lib/register_page.dart @@ -0,0 +1,36 @@ +import 'package:flutter/material.dart'; +import 'global_components.dart'; +import 'log_in_page.dart'; + +class RegisterPage extends StatelessWidget { + const RegisterPage({super.key}); + + @override + Widget build(BuildContext context) { + return Scaffold( + body: Row(mainAxisAlignment: MainAxisAlignment.center, children: [ + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Text( + "Opret bruger", + style: TextStyle(fontSize: 64), + ), + const PrimaryInput(label: "Fornavn", placeholderText: "Fornavn"), + const PrimaryInput( + label: "Mail/Tlf", + placeholderText: "f.eks. example@example.com eller 12345678"), + const PrimaryInput(label: "Password", placeholderText: "*********"), + const PrimaryInput( + label: "Password (igen)", placeholderText: "*********"), + PrimaryButton( + onPressed: () => { + Navigator.of(context).push(MaterialPageRoute( + builder: (context) => const LogInPage())) + }, + child: const Text("Opret bruger")) + ], + ) + ])); + } +} diff --git a/Mobile/linux/.gitignore b/mobile/linux/.gitignore similarity index 100% rename from Mobile/linux/.gitignore rename to mobile/linux/.gitignore diff --git a/Mobile/linux/CMakeLists.txt b/mobile/linux/CMakeLists.txt similarity index 85% rename from Mobile/linux/CMakeLists.txt rename to mobile/linux/CMakeLists.txt index b82e8db..9a39eb1 100644 --- a/Mobile/linux/CMakeLists.txt +++ b/mobile/linux/CMakeLists.txt @@ -1,5 +1,5 @@ # Project-level configuration. -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.13) project(runner LANGUAGES CXX) # The name of the executable created for the application. Change this to change @@ -54,25 +54,8 @@ add_subdirectory(${FLUTTER_MANAGED_DIR}) find_package(PkgConfig REQUIRED) pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) -add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") - -# Define the application target. To change its name, change BINARY_NAME above, -# not the value here, or `flutter run` will no longer work. -# -# Any new source files that you add to the application should be added here. -add_executable(${BINARY_NAME} - "main.cc" - "my_application.cc" - "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" -) - -# Apply the standard set of build settings. This can be removed for applications -# that need different build settings. -apply_standard_settings(${BINARY_NAME}) - -# Add dependency libraries. Add any application-specific dependencies here. -target_link_libraries(${BINARY_NAME} PRIVATE flutter) -target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") # Run the Flutter tool portions of the build. This must not be removed. add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/Mobile/linux/flutter/CMakeLists.txt b/mobile/linux/flutter/CMakeLists.txt similarity index 100% rename from Mobile/linux/flutter/CMakeLists.txt rename to mobile/linux/flutter/CMakeLists.txt diff --git a/Mobile/linux/flutter/generated_plugin_registrant.cc b/mobile/linux/flutter/generated_plugin_registrant.cc similarity index 100% rename from Mobile/linux/flutter/generated_plugin_registrant.cc rename to mobile/linux/flutter/generated_plugin_registrant.cc diff --git a/Mobile/linux/flutter/generated_plugin_registrant.h b/mobile/linux/flutter/generated_plugin_registrant.h similarity index 100% rename from Mobile/linux/flutter/generated_plugin_registrant.h rename to mobile/linux/flutter/generated_plugin_registrant.h diff --git a/Mobile/linux/flutter/generated_plugins.cmake b/mobile/linux/flutter/generated_plugins.cmake similarity index 100% rename from Mobile/linux/flutter/generated_plugins.cmake rename to mobile/linux/flutter/generated_plugins.cmake diff --git a/mobile/linux/runner/CMakeLists.txt b/mobile/linux/runner/CMakeLists.txt new file mode 100644 index 0000000..e97dabc --- /dev/null +++ b/mobile/linux/runner/CMakeLists.txt @@ -0,0 +1,26 @@ +cmake_minimum_required(VERSION 3.13) +project(runner LANGUAGES CXX) + +# Define the application target. To change its name, change BINARY_NAME in the +# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer +# work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} + "main.cc" + "my_application.cc" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add preprocessor definitions for the application ID. +add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") + +# Add dependency libraries. Add any application-specific dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter) +target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) + +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") diff --git a/Mobile/linux/main.cc b/mobile/linux/runner/main.cc similarity index 100% rename from Mobile/linux/main.cc rename to mobile/linux/runner/main.cc diff --git a/Mobile/linux/my_application.cc b/mobile/linux/runner/my_application.cc similarity index 93% rename from Mobile/linux/my_application.cc rename to mobile/linux/runner/my_application.cc index 0388019..8c77818 100644 --- a/Mobile/linux/my_application.cc +++ b/mobile/linux/runner/my_application.cc @@ -117,6 +117,12 @@ static void my_application_class_init(MyApplicationClass* klass) { static void my_application_init(MyApplication* self) {} MyApplication* my_application_new() { + // Set the program name to the application ID, which helps various systems + // like GTK and desktop environments map this running application to its + // corresponding .desktop file. This ensures better integration by allowing + // the application to be recognized beyond its binary name. + g_set_prgname(APPLICATION_ID); + return MY_APPLICATION(g_object_new(my_application_get_type(), "application-id", APPLICATION_ID, "flags", G_APPLICATION_NON_UNIQUE, diff --git a/Mobile/linux/my_application.h b/mobile/linux/runner/my_application.h similarity index 100% rename from Mobile/linux/my_application.h rename to mobile/linux/runner/my_application.h diff --git a/Mobile/macos/.gitignore b/mobile/macos/.gitignore similarity index 100% rename from Mobile/macos/.gitignore rename to mobile/macos/.gitignore diff --git a/Mobile/macos/Flutter/Flutter-Debug.xcconfig b/mobile/macos/Flutter/Flutter-Debug.xcconfig similarity index 100% rename from Mobile/macos/Flutter/Flutter-Debug.xcconfig rename to mobile/macos/Flutter/Flutter-Debug.xcconfig diff --git a/Mobile/macos/Flutter/Flutter-Release.xcconfig b/mobile/macos/Flutter/Flutter-Release.xcconfig similarity index 100% rename from Mobile/macos/Flutter/Flutter-Release.xcconfig rename to mobile/macos/Flutter/Flutter-Release.xcconfig diff --git a/Mobile/macos/Flutter/GeneratedPluginRegistrant.swift b/mobile/macos/Flutter/GeneratedPluginRegistrant.swift similarity index 100% rename from Mobile/macos/Flutter/GeneratedPluginRegistrant.swift rename to mobile/macos/Flutter/GeneratedPluginRegistrant.swift diff --git a/Mobile/macos/Runner.xcodeproj/project.pbxproj b/mobile/macos/Runner.xcodeproj/project.pbxproj similarity index 100% rename from Mobile/macos/Runner.xcodeproj/project.pbxproj rename to mobile/macos/Runner.xcodeproj/project.pbxproj diff --git a/Mobile/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/mobile/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from Mobile/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to mobile/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Mobile/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/mobile/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 100% rename from Mobile/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to mobile/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme diff --git a/Mobile/macos/Runner.xcworkspace/contents.xcworkspacedata b/mobile/macos/Runner.xcworkspace/contents.xcworkspacedata similarity index 100% rename from Mobile/macos/Runner.xcworkspace/contents.xcworkspacedata rename to mobile/macos/Runner.xcworkspace/contents.xcworkspacedata diff --git a/Mobile/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/mobile/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from Mobile/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to mobile/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Mobile/macos/Runner/AppDelegate.swift b/mobile/macos/Runner/AppDelegate.swift similarity index 62% rename from Mobile/macos/Runner/AppDelegate.swift rename to mobile/macos/Runner/AppDelegate.swift index d53ef64..b3c1761 100644 --- a/Mobile/macos/Runner/AppDelegate.swift +++ b/mobile/macos/Runner/AppDelegate.swift @@ -1,9 +1,13 @@ import Cocoa import FlutterMacOS -@NSApplicationMain +@main class AppDelegate: FlutterAppDelegate { override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { return true } + + override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool { + return true + } } diff --git a/Mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json rename to mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/Mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png similarity index 100% rename from Mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png rename to mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png diff --git a/Mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png similarity index 100% rename from Mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png rename to mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png diff --git a/Mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png similarity index 100% rename from Mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png rename to mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png diff --git a/Mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png similarity index 100% rename from Mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png rename to mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png diff --git a/Mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png similarity index 100% rename from Mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png rename to mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png diff --git a/Mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png similarity index 100% rename from Mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png rename to mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png diff --git a/Mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png similarity index 100% rename from Mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png rename to mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png diff --git a/Mobile/macos/Runner/Base.lproj/MainMenu.xib b/mobile/macos/Runner/Base.lproj/MainMenu.xib similarity index 100% rename from Mobile/macos/Runner/Base.lproj/MainMenu.xib rename to mobile/macos/Runner/Base.lproj/MainMenu.xib diff --git a/Mobile/macos/Runner/Configs/AppInfo.xcconfig b/mobile/macos/Runner/Configs/AppInfo.xcconfig similarity index 89% rename from Mobile/macos/Runner/Configs/AppInfo.xcconfig rename to mobile/macos/Runner/Configs/AppInfo.xcconfig index fabd3f8..ebe2895 100644 --- a/Mobile/macos/Runner/Configs/AppInfo.xcconfig +++ b/mobile/macos/Runner/Configs/AppInfo.xcconfig @@ -11,4 +11,4 @@ PRODUCT_NAME = mobile PRODUCT_BUNDLE_IDENTIFIER = com.example.mobile // The copyright displayed in application information -PRODUCT_COPYRIGHT = Copyright © 2024 com.example. All rights reserved. +PRODUCT_COPYRIGHT = Copyright © 2025 com.example. All rights reserved. diff --git a/Mobile/macos/Runner/Configs/Debug.xcconfig b/mobile/macos/Runner/Configs/Debug.xcconfig similarity index 100% rename from Mobile/macos/Runner/Configs/Debug.xcconfig rename to mobile/macos/Runner/Configs/Debug.xcconfig diff --git a/Mobile/macos/Runner/Configs/Release.xcconfig b/mobile/macos/Runner/Configs/Release.xcconfig similarity index 100% rename from Mobile/macos/Runner/Configs/Release.xcconfig rename to mobile/macos/Runner/Configs/Release.xcconfig diff --git a/Mobile/macos/Runner/Configs/Warnings.xcconfig b/mobile/macos/Runner/Configs/Warnings.xcconfig similarity index 100% rename from Mobile/macos/Runner/Configs/Warnings.xcconfig rename to mobile/macos/Runner/Configs/Warnings.xcconfig diff --git a/Mobile/macos/Runner/DebugProfile.entitlements b/mobile/macos/Runner/DebugProfile.entitlements similarity index 100% rename from Mobile/macos/Runner/DebugProfile.entitlements rename to mobile/macos/Runner/DebugProfile.entitlements diff --git a/Mobile/macos/Runner/Info.plist b/mobile/macos/Runner/Info.plist similarity index 100% rename from Mobile/macos/Runner/Info.plist rename to mobile/macos/Runner/Info.plist diff --git a/Mobile/macos/Runner/MainFlutterWindow.swift b/mobile/macos/Runner/MainFlutterWindow.swift similarity index 100% rename from Mobile/macos/Runner/MainFlutterWindow.swift rename to mobile/macos/Runner/MainFlutterWindow.swift diff --git a/Mobile/macos/Runner/Release.entitlements b/mobile/macos/Runner/Release.entitlements similarity index 100% rename from Mobile/macos/Runner/Release.entitlements rename to mobile/macos/Runner/Release.entitlements diff --git a/Mobile/macos/RunnerTests/RunnerTests.swift b/mobile/macos/RunnerTests/RunnerTests.swift similarity index 100% rename from Mobile/macos/RunnerTests/RunnerTests.swift rename to mobile/macos/RunnerTests/RunnerTests.swift index 5418c9f..61f3bd1 100644 --- a/Mobile/macos/RunnerTests/RunnerTests.swift +++ b/mobile/macos/RunnerTests/RunnerTests.swift @@ -1,5 +1,5 @@ -import FlutterMacOS import Cocoa +import FlutterMacOS import XCTest class RunnerTests: XCTestCase { diff --git a/Mobile/pubspec.lock b/mobile/pubspec.lock similarity index 78% rename from Mobile/pubspec.lock rename to mobile/pubspec.lock index b03e60c..55f199c 100644 --- a/Mobile/pubspec.lock +++ b/mobile/pubspec.lock @@ -49,14 +49,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.8" - equatable: - dependency: transitive - description: - name: equatable - sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2 - url: "https://pub.dev" - source: hosted - version: "2.0.5" fake_async: dependency: transitive description: @@ -65,14 +57,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.1" - fl_chart: - dependency: "direct main" - description: - name: fl_chart - sha256: d0f0d49112f2f4b192481c16d05b6418bd7820e021e265a3c22db98acf7ed7fb - url: "https://pub.dev" - source: hosted - version: "0.68.0" flutter: dependency: "direct main" description: flutter @@ -82,31 +66,15 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c" + sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "5.0.0" flutter_test: dependency: "direct dev" description: flutter source: sdk version: "0.0.0" - http: - dependency: "direct main" - description: - name: http - sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 - url: "https://pub.dev" - source: hosted - version: "1.2.2" - http_parser: - dependency: transitive - description: - name: http_parser - sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" - url: "https://pub.dev" - source: hosted - version: "4.0.2" leak_tracker: dependency: transitive description: @@ -135,10 +103,10 @@ packages: dependency: transitive description: name: lints - sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" + sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "5.1.1" matcher: dependency: transitive description: @@ -224,14 +192,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.3" - typed_data: - dependency: transitive - description: - name: typed_data - sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c - url: "https://pub.dev" - source: hosted - version: "1.3.2" vector_math: dependency: transitive description: @@ -248,14 +208,6 @@ packages: url: "https://pub.dev" source: hosted version: "14.3.0" - web: - dependency: transitive - description: - name: web - sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062 - url: "https://pub.dev" - source: hosted - version: "1.0.0" sdks: - dart: ">=3.4.0 <4.0.0" + dart: ">=3.6.1 <4.0.0" flutter: ">=3.18.0-18.0.pre.54" diff --git a/Mobile/pubspec.yaml b/mobile/pubspec.yaml similarity index 91% rename from Mobile/pubspec.yaml rename to mobile/pubspec.yaml index 110fb76..a26d816 100644 --- a/Mobile/pubspec.yaml +++ b/mobile/pubspec.yaml @@ -2,7 +2,7 @@ name: mobile description: "A new Flutter project." # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. -publish_to: "none" # Remove this line if you wish to publish to pub.dev +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 @@ -19,7 +19,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 environment: - sdk: ">=3.3.4 <4.0.0" + sdk: ^3.6.1 # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions @@ -30,12 +30,10 @@ environment: dependencies: flutter: sdk: flutter - http: ^1.2.2 - fl_chart: ^0.68.0 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.6 + cupertino_icons: ^1.0.8 dev_dependencies: flutter_test: @@ -46,13 +44,14 @@ dev_dependencies: # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^4.0.0 + flutter_lints: ^5.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 packages. 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. @@ -64,10 +63,10 @@ flutter: # - 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 + # https://flutter.dev/to/resolution-aware-images # For details regarding adding assets from package dependencies, see - # https://flutter.dev/assets-and-images/#from-packages + # https://flutter.dev/to/asset-from-package # To add custom fonts to your application, add a fonts section here, # in this "flutter" section. Each entry in this list should have a @@ -87,4 +86,4 @@ flutter: # weight: 700 # # For details regarding fonts from package dependencies, - # see https://flutter.dev/custom-fonts/#from-packages + # see https://flutter.dev/to/font-from-package diff --git a/Mobile/test/widget_test.dart b/mobile/test/widget_test.dart similarity index 100% rename from Mobile/test/widget_test.dart rename to mobile/test/widget_test.dart diff --git a/Mobile/web/favicon.png b/mobile/web/favicon.png similarity index 100% rename from Mobile/web/favicon.png rename to mobile/web/favicon.png diff --git a/Mobile/web/icons/Icon-192.png b/mobile/web/icons/Icon-192.png similarity index 100% rename from Mobile/web/icons/Icon-192.png rename to mobile/web/icons/Icon-192.png diff --git a/Mobile/web/icons/Icon-512.png b/mobile/web/icons/Icon-512.png similarity index 100% rename from Mobile/web/icons/Icon-512.png rename to mobile/web/icons/Icon-512.png diff --git a/Mobile/web/icons/Icon-maskable-192.png b/mobile/web/icons/Icon-maskable-192.png similarity index 100% rename from Mobile/web/icons/Icon-maskable-192.png rename to mobile/web/icons/Icon-maskable-192.png diff --git a/Mobile/web/icons/Icon-maskable-512.png b/mobile/web/icons/Icon-maskable-512.png similarity index 100% rename from Mobile/web/icons/Icon-maskable-512.png rename to mobile/web/icons/Icon-maskable-512.png diff --git a/Mobile/web/index.html b/mobile/web/index.html similarity index 60% rename from Mobile/web/index.html rename to mobile/web/index.html index 3402a1c..44689e6 100644 --- a/Mobile/web/index.html +++ b/mobile/web/index.html @@ -21,7 +21,7 @@ - + @@ -31,29 +31,8 @@ mobile - - - - - + diff --git a/Mobile/web/manifest.json b/mobile/web/manifest.json similarity index 100% rename from Mobile/web/manifest.json rename to mobile/web/manifest.json diff --git a/Mobile/windows/.gitignore b/mobile/windows/.gitignore similarity index 100% rename from Mobile/windows/.gitignore rename to mobile/windows/.gitignore diff --git a/Mobile/windows/CMakeLists.txt b/mobile/windows/CMakeLists.txt similarity index 100% rename from Mobile/windows/CMakeLists.txt rename to mobile/windows/CMakeLists.txt diff --git a/Mobile/windows/flutter/CMakeLists.txt b/mobile/windows/flutter/CMakeLists.txt similarity index 100% rename from Mobile/windows/flutter/CMakeLists.txt rename to mobile/windows/flutter/CMakeLists.txt diff --git a/Mobile/windows/flutter/generated_plugin_registrant.cc b/mobile/windows/flutter/generated_plugin_registrant.cc similarity index 100% rename from Mobile/windows/flutter/generated_plugin_registrant.cc rename to mobile/windows/flutter/generated_plugin_registrant.cc diff --git a/Mobile/windows/flutter/generated_plugin_registrant.h b/mobile/windows/flutter/generated_plugin_registrant.h similarity index 100% rename from Mobile/windows/flutter/generated_plugin_registrant.h rename to mobile/windows/flutter/generated_plugin_registrant.h diff --git a/Mobile/windows/flutter/generated_plugins.cmake b/mobile/windows/flutter/generated_plugins.cmake similarity index 100% rename from Mobile/windows/flutter/generated_plugins.cmake rename to mobile/windows/flutter/generated_plugins.cmake diff --git a/Mobile/windows/runner/CMakeLists.txt b/mobile/windows/runner/CMakeLists.txt similarity index 100% rename from Mobile/windows/runner/CMakeLists.txt rename to mobile/windows/runner/CMakeLists.txt diff --git a/Mobile/windows/runner/Runner.rc b/mobile/windows/runner/Runner.rc similarity index 97% rename from Mobile/windows/runner/Runner.rc rename to mobile/windows/runner/Runner.rc index 1a8eab3..388ee67 100644 --- a/Mobile/windows/runner/Runner.rc +++ b/mobile/windows/runner/Runner.rc @@ -93,7 +93,7 @@ BEGIN VALUE "FileDescription", "mobile" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" VALUE "InternalName", "mobile" "\0" - VALUE "LegalCopyright", "Copyright (C) 2024 com.example. All rights reserved." "\0" + VALUE "LegalCopyright", "Copyright (C) 2025 com.example. All rights reserved." "\0" VALUE "OriginalFilename", "mobile.exe" "\0" VALUE "ProductName", "mobile" "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0" diff --git a/Mobile/windows/runner/flutter_window.cpp b/mobile/windows/runner/flutter_window.cpp similarity index 100% rename from Mobile/windows/runner/flutter_window.cpp rename to mobile/windows/runner/flutter_window.cpp diff --git a/Mobile/windows/runner/flutter_window.h b/mobile/windows/runner/flutter_window.h similarity index 100% rename from Mobile/windows/runner/flutter_window.h rename to mobile/windows/runner/flutter_window.h diff --git a/Mobile/windows/runner/main.cpp b/mobile/windows/runner/main.cpp similarity index 100% rename from Mobile/windows/runner/main.cpp rename to mobile/windows/runner/main.cpp diff --git a/Mobile/windows/runner/resource.h b/mobile/windows/runner/resource.h similarity index 100% rename from Mobile/windows/runner/resource.h rename to mobile/windows/runner/resource.h diff --git a/Mobile/windows/runner/resources/app_icon.ico b/mobile/windows/runner/resources/app_icon.ico similarity index 100% rename from Mobile/windows/runner/resources/app_icon.ico rename to mobile/windows/runner/resources/app_icon.ico diff --git a/Mobile/windows/runner/runner.exe.manifest b/mobile/windows/runner/runner.exe.manifest similarity index 68% rename from Mobile/windows/runner/runner.exe.manifest rename to mobile/windows/runner/runner.exe.manifest index a42ea76..153653e 100644 --- a/Mobile/windows/runner/runner.exe.manifest +++ b/mobile/windows/runner/runner.exe.manifest @@ -9,12 +9,6 @@ - - - - - - diff --git a/Mobile/windows/runner/utils.cpp b/mobile/windows/runner/utils.cpp similarity index 93% rename from Mobile/windows/runner/utils.cpp rename to mobile/windows/runner/utils.cpp index b2b0873..3a0b465 100644 --- a/Mobile/windows/runner/utils.cpp +++ b/mobile/windows/runner/utils.cpp @@ -45,13 +45,13 @@ std::string Utf8FromUtf16(const wchar_t* utf16_string) { if (utf16_string == nullptr) { return std::string(); } - int target_length = ::WideCharToMultiByte( + unsigned int target_length = ::WideCharToMultiByte( CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, -1, nullptr, 0, nullptr, nullptr) -1; // remove the trailing null character int input_length = (int)wcslen(utf16_string); std::string utf8_string; - if (target_length <= 0 || target_length > utf8_string.max_size()) { + if (target_length == 0 || target_length > utf8_string.max_size()) { return utf8_string; } utf8_string.resize(target_length); diff --git a/Mobile/windows/runner/utils.h b/mobile/windows/runner/utils.h similarity index 100% rename from Mobile/windows/runner/utils.h rename to mobile/windows/runner/utils.h diff --git a/Mobile/windows/runner/win32_window.cpp b/mobile/windows/runner/win32_window.cpp similarity index 100% rename from Mobile/windows/runner/win32_window.cpp rename to mobile/windows/runner/win32_window.cpp diff --git a/Mobile/windows/runner/win32_window.h b/mobile/windows/runner/win32_window.h similarity index 100% rename from Mobile/windows/runner/win32_window.h rename to mobile/windows/runner/win32_window.h