commit f7b249d1d9c3f0c43215869ee58c1ab7a1e97f58 Author: Francis Santelices Date: Mon Mar 24 16:05:57 2025 +0800 Initial commit. Full UI and process of script conversion to Dart diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..79c113f --- /dev/null +++ b/.gitignore @@ -0,0 +1,45 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.build/ +.buildlog/ +.history +.svn/ +.swiftpm/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/.metadata b/.metadata new file mode 100644 index 0000000..7b701f0 --- /dev/null +++ b/.metadata @@ -0,0 +1,42 @@ +# 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: "c23637390482d4cf9598c3ce3f2be31aa7332daf" + channel: "stable" + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + - platform: android + create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + - platform: ios + create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + - platform: macos + create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + - platform: web + create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + - platform: windows + create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf + + # 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/README.md b/README.md new file mode 100644 index 0000000..c22351d --- /dev/null +++ b/README.md @@ -0,0 +1,16 @@ +# surface_tension_calculator + +App that calculates surface tension based on an image of a droplet + +## 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/analysis_options.yaml b/analysis_options.yaml new file mode 100644 index 0000000..0d29021 --- /dev/null +++ b/analysis_options.yaml @@ -0,0 +1,28 @@ +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. + +# The following line activates a set of recommended lints for Flutter apps, +# packages, and plugins designed to encourage good coding practices. +include: package:flutter_lints/flutter.yaml + +linter: + # The lint rules applied to this project can be customized in the + # section below to disable rules from the `package:flutter_lints/flutter.yaml` + # included above or to enable additional rules. A list of all available lints + # and their documentation is published at https://dart.dev/lints. + # + # Instead of disabling a lint rule for the entire project in the + # section below, it can also be suppressed for a single line of code + # or a specific dart file by using the `// ignore: name_of_lint` and + # `// ignore_for_file: name_of_lint` syntax on the line or in the file + # producing the lint. + rules: + # avoid_print: false # Uncomment to disable the `avoid_print` rule + # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/android/.gitignore b/android/.gitignore new file mode 100644 index 0000000..be3943c --- /dev/null +++ b/android/.gitignore @@ -0,0 +1,14 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java +.cxx/ + +# Remember to never publicly share your keystore. +# See https://flutter.dev/to/reference-keystore +key.properties +**/*.keystore +**/*.jks diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts new file mode 100644 index 0000000..677bd81 --- /dev/null +++ b/android/app/build.gradle.kts @@ -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.upisc.surface_tension_calculator" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_11.toString() + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId = "com.upisc.surface_tension_calculator" + // 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.getByName("debug") + } + } +} + +flutter { + source = "../.." +} diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..86ba464 --- /dev/null +++ b/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/android/app/src/main/kotlin/com/upisc/surface_tension_calculator/MainActivity.kt b/android/app/src/main/kotlin/com/upisc/surface_tension_calculator/MainActivity.kt new file mode 100644 index 0000000..2260220 --- /dev/null +++ b/android/app/src/main/kotlin/com/upisc/surface_tension_calculator/MainActivity.kt @@ -0,0 +1,5 @@ +package com.upisc.surface_tension_calculator + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity : FlutterActivity() diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..f74085f --- /dev/null +++ b/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 0000000..304732f --- /dev/null +++ b/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..db77bb4 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..17987b7 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..09d4391 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..d5f1c8d Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..4d6372e Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..06952be --- /dev/null +++ b/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..cb1ef88 --- /dev/null +++ b/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/android/build.gradle.kts b/android/build.gradle.kts new file mode 100644 index 0000000..89176ef --- /dev/null +++ b/android/build.gradle.kts @@ -0,0 +1,21 @@ +allprojects { + repositories { + google() + mavenCentral() + } +} + +val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get() +rootProject.layout.buildDirectory.value(newBuildDir) + +subprojects { + val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name) + project.layout.buildDirectory.value(newSubprojectBuildDir) +} +subprojects { + project.evaluationDependsOn(":app") +} + +tasks.register("clean") { + delete(rootProject.layout.buildDirectory) +} diff --git a/android/gradle.properties b/android/gradle.properties new file mode 100644 index 0000000..f018a61 --- /dev/null +++ b/android/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError +android.useAndroidX=true +android.enableJetifier=true diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..afa1e8e --- /dev/null +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts new file mode 100644 index 0000000..a439442 --- /dev/null +++ b/android/settings.gradle.kts @@ -0,0 +1,25 @@ +pluginManagement { + val flutterSdkPath = run { + val properties = java.util.Properties() + file("local.properties").inputStream().use { properties.load(it) } + val flutterSdkPath = properties.getProperty("flutter.sdk") + require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" } + flutterSdkPath + } + + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id("dev.flutter.flutter-plugin-loader") version "1.0.0" + id("com.android.application") version "8.7.0" apply false + id("org.jetbrains.kotlin.android") version "1.8.22" apply false +} + +include(":app") diff --git a/assets/ISC_Logo.png b/assets/ISC_Logo.png new file mode 100644 index 0000000..1c2d1a1 Binary files /dev/null and b/assets/ISC_Logo.png differ diff --git a/assets/ISC_Logo_White.png b/assets/ISC_Logo_White.png new file mode 100644 index 0000000..e0eff3b Binary files /dev/null and b/assets/ISC_Logo_White.png differ diff --git a/fonts/Montserrat-Black.ttf b/fonts/Montserrat-Black.ttf new file mode 100644 index 0000000..7bb6575 Binary files /dev/null and b/fonts/Montserrat-Black.ttf differ diff --git a/fonts/Montserrat-BlackItalic.ttf b/fonts/Montserrat-BlackItalic.ttf new file mode 100644 index 0000000..172e249 Binary files /dev/null and b/fonts/Montserrat-BlackItalic.ttf differ diff --git a/fonts/Montserrat-Bold.ttf b/fonts/Montserrat-Bold.ttf new file mode 100644 index 0000000..efddc83 Binary files /dev/null and b/fonts/Montserrat-Bold.ttf differ diff --git a/fonts/Montserrat-BoldItalic.ttf b/fonts/Montserrat-BoldItalic.ttf new file mode 100644 index 0000000..b7d8031 Binary files /dev/null and b/fonts/Montserrat-BoldItalic.ttf differ diff --git a/fonts/Montserrat-ExtraBold.ttf b/fonts/Montserrat-ExtraBold.ttf new file mode 100644 index 0000000..3059507 Binary files /dev/null and b/fonts/Montserrat-ExtraBold.ttf differ diff --git a/fonts/Montserrat-ExtraBoldItalic.ttf b/fonts/Montserrat-ExtraBoldItalic.ttf new file mode 100644 index 0000000..c21a396 Binary files /dev/null and b/fonts/Montserrat-ExtraBoldItalic.ttf differ diff --git a/fonts/Montserrat-ExtraLight.ttf b/fonts/Montserrat-ExtraLight.ttf new file mode 100644 index 0000000..f1b405e Binary files /dev/null and b/fonts/Montserrat-ExtraLight.ttf differ diff --git a/fonts/Montserrat-ExtraLightItalic.ttf b/fonts/Montserrat-ExtraLightItalic.ttf new file mode 100644 index 0000000..382293d Binary files /dev/null and b/fonts/Montserrat-ExtraLightItalic.ttf differ diff --git a/fonts/Montserrat-Italic-VariableFont_wght.ttf b/fonts/Montserrat-Italic-VariableFont_wght.ttf new file mode 100644 index 0000000..9c397d2 Binary files /dev/null and b/fonts/Montserrat-Italic-VariableFont_wght.ttf differ diff --git a/fonts/Montserrat-Italic.ttf b/fonts/Montserrat-Italic.ttf new file mode 100644 index 0000000..eee45ba Binary files /dev/null and b/fonts/Montserrat-Italic.ttf differ diff --git a/fonts/Montserrat-Light.ttf b/fonts/Montserrat-Light.ttf new file mode 100644 index 0000000..c5dfdb7 Binary files /dev/null and b/fonts/Montserrat-Light.ttf differ diff --git a/fonts/Montserrat-LightItalic.ttf b/fonts/Montserrat-LightItalic.ttf new file mode 100644 index 0000000..5bdce7f Binary files /dev/null and b/fonts/Montserrat-LightItalic.ttf differ diff --git a/fonts/Montserrat-Medium.ttf b/fonts/Montserrat-Medium.ttf new file mode 100644 index 0000000..dfc7e2f Binary files /dev/null and b/fonts/Montserrat-Medium.ttf differ diff --git a/fonts/Montserrat-MediumItalic.ttf b/fonts/Montserrat-MediumItalic.ttf new file mode 100644 index 0000000..ce56883 Binary files /dev/null and b/fonts/Montserrat-MediumItalic.ttf differ diff --git a/fonts/Montserrat-Regular.ttf b/fonts/Montserrat-Regular.ttf new file mode 100644 index 0000000..aa9033a Binary files /dev/null and b/fonts/Montserrat-Regular.ttf differ diff --git a/fonts/Montserrat-SemiBold.ttf b/fonts/Montserrat-SemiBold.ttf new file mode 100644 index 0000000..cbf44db Binary files /dev/null and b/fonts/Montserrat-SemiBold.ttf differ diff --git a/fonts/Montserrat-SemiBoldItalic.ttf b/fonts/Montserrat-SemiBoldItalic.ttf new file mode 100644 index 0000000..7f9153d Binary files /dev/null and b/fonts/Montserrat-SemiBoldItalic.ttf differ diff --git a/fonts/Montserrat-Thin.ttf b/fonts/Montserrat-Thin.ttf new file mode 100644 index 0000000..7c90a54 Binary files /dev/null and b/fonts/Montserrat-Thin.ttf differ diff --git a/fonts/Montserrat-ThinItalic.ttf b/fonts/Montserrat-ThinItalic.ttf new file mode 100644 index 0000000..94bcf55 Binary files /dev/null and b/fonts/Montserrat-ThinItalic.ttf differ diff --git a/fonts/Montserrat-VariableFont_wght.ttf b/fonts/Montserrat-VariableFont_wght.ttf new file mode 100644 index 0000000..656db66 Binary files /dev/null and b/fonts/Montserrat-VariableFont_wght.ttf differ diff --git a/fonts/OFL.txt b/fonts/OFL.txt new file mode 100644 index 0000000..57eeaca --- /dev/null +++ b/fonts/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2020 The Open Sans Project Authors (https://github.com/googlefonts/opensans) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/ios/.gitignore b/ios/.gitignore new file mode 100644 index 0000000..7a7f987 --- /dev/null +++ b/ios/.gitignore @@ -0,0 +1,34 @@ +**/dgph +*.mode1v3 +*.mode2v3 +*.moved-aside +*.pbxuser +*.perspectivev3 +**/*sync/ +.sconsign.dblite +.tags* +**/.vagrant/ +**/DerivedData/ +Icon? +**/Pods/ +**/.symlinks/ +profile +xcuserdata +**/.generated/ +Flutter/App.framework +Flutter/Flutter.framework +Flutter/Flutter.podspec +Flutter/Generated.xcconfig +Flutter/ephemeral/ +Flutter/app.flx +Flutter/app.zip +Flutter/flutter_assets/ +Flutter/flutter_export_environment.sh +ServiceDefinitions.json +Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. +!default.mode1v3 +!default.mode2v3 +!default.pbxuser +!default.perspectivev3 diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist new file mode 100644 index 0000000..7c56964 --- /dev/null +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + App + CFBundleIdentifier + io.flutter.flutter.app + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + App + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + MinimumOSVersion + 12.0 + + diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig new file mode 100644 index 0000000..ec97fc6 --- /dev/null +++ b/ios/Flutter/Debug.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include "Generated.xcconfig" diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig new file mode 100644 index 0000000..c4855bf --- /dev/null +++ b/ios/Flutter/Release.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include "Generated.xcconfig" diff --git a/ios/Podfile b/ios/Podfile new file mode 100644 index 0000000..e549ee2 --- /dev/null +++ b/ios/Podfile @@ -0,0 +1,43 @@ +# Uncomment this line to define a global platform for your project +# platform :ios, '12.0' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_ios_podfile_setup + +target 'Runner' do + use_frameworks! + + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) + end +end diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000..3a2c8c8 --- /dev/null +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,616 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXBuildFile section */ + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 97C146E61CF9000F007C117D /* Project object */; + proxyType = 1; + remoteGlobalIDString = 97C146ED1CF9000F007C117D; + remoteInfo = Runner; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 9705A1C41CF9048500538489 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; + 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; + 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; + 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 97C146EB1CF9000F007C117D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 331C8082294A63A400263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C807B294A618700263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 9740EEB11CF90186004384FC /* Flutter */ = { + isa = PBXGroup; + children = ( + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 9740EEB31CF90195004384FC /* Generated.xcconfig */, + ); + name = Flutter; + sourceTree = ""; + }; + 97C146E51CF9000F007C117D = { + isa = PBXGroup; + children = ( + 9740EEB11CF90186004384FC /* Flutter */, + 97C146F01CF9000F007C117D /* Runner */, + 97C146EF1CF9000F007C117D /* Products */, + 331C8082294A63A400263BE5 /* RunnerTests */, + ); + sourceTree = ""; + }; + 97C146EF1CF9000F007C117D /* Products */ = { + isa = PBXGroup; + children = ( + 97C146EE1CF9000F007C117D /* Runner.app */, + 331C8081294A63A400263BE5 /* RunnerTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 97C146F01CF9000F007C117D /* Runner */ = { + isa = PBXGroup; + children = ( + 97C146FA1CF9000F007C117D /* Main.storyboard */, + 97C146FD1CF9000F007C117D /* Assets.xcassets */, + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, + 97C147021CF9000F007C117D /* Info.plist */, + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, + ); + path = Runner; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 331C8080294A63A400263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + 331C807D294A63A400263BE5 /* Sources */, + 331C807F294A63A400263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C8086294A63A400263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 97C146ED1CF9000F007C117D /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 9740EEB61CF901F6004384FC /* Run Script */, + 97C146EA1CF9000F007C117D /* Sources */, + 97C146EB1CF9000F007C117D /* Frameworks */, + 97C146EC1CF9000F007C117D /* Resources */, + 9705A1C41CF9048500538489 /* Embed Frameworks */, + 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Runner; + productName = Runner; + productReference = 97C146EE1CF9000F007C117D /* Runner.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 97C146E61CF9000F007C117D /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1510; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 331C8080294A63A400263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 97C146ED1CF9000F007C117D; + }; + 97C146ED1CF9000F007C117D = { + CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 1100; + }; + }; + }; + buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 97C146E51CF9000F007C117D; + productRefGroup = 97C146EF1CF9000F007C117D /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 97C146ED1CF9000F007C117D /* Runner */, + 331C8080294A63A400263BE5 /* RunnerTests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 331C807F294A63A400263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EC1CF9000F007C117D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", + ); + name = "Thin Binary"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + }; + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 331C807D294A63A400263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EA1CF9000F007C117D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 331C8086294A63A400263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 97C146ED1CF9000F007C117D /* Runner */; + targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 97C146FA1CF9000F007C117D /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C146FB1CF9000F007C117D /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C147001CF9000F007C117D /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 249021D3217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Profile; + }; + 249021D4217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.upisc.surfaceTensionCalculator; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Profile; + }; + 331C8088294A63A400263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.upisc.surfaceTensionCalculator.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Debug; + }; + 331C8089294A63A400263BE5 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.upisc.surfaceTensionCalculator.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Release; + }; + 331C808A294A63A400263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.upisc.surfaceTensionCalculator.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Profile; + }; + 97C147031CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 97C147041CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 97C147061CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.upisc.surfaceTensionCalculator; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Debug; + }; + 97C147071CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.upisc.surfaceTensionCalculator; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C8088294A63A400263BE5 /* Debug */, + 331C8089294A63A400263BE5 /* Release */, + 331C808A294A63A400263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147031CF9000F007C117D /* Debug */, + 97C147041CF9000F007C117D /* Release */, + 249021D3217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147061CF9000F007C117D /* Debug */, + 97C147071CF9000F007C117D /* Release */, + 249021D4217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 97C146E61CF9000F007C117D /* Project object */; +} diff --git a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000..15cada4 --- /dev/null +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..1d526a1 --- /dev/null +++ b/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift new file mode 100644 index 0000000..6266644 --- /dev/null +++ b/ios/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import Flutter +import UIKit + +@main +@objc class AppDelegate: FlutterAppDelegate { + override func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? + ) -> Bool { + GeneratedPluginRegistrant.register(with: self) + return super.application(application, didFinishLaunchingWithOptions: launchOptions) + } +} diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..d36b1fa --- /dev/null +++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,122 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@1x.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@1x.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-App-83.5x83.5@2x.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "Icon-App-1024x1024@1x.png", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png new file mode 100644 index 0000000..dc9ada4 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png new file mode 100644 index 0000000..7353c41 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 0000000..797d452 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 0000000..6ed2d93 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png new file mode 100644 index 0000000..4cd7b00 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 0000000..fe73094 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png new file mode 100644 index 0000000..321773c Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png new file mode 100644 index 0000000..797d452 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 0000000..502f463 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png new file mode 100644 index 0000000..0ec3034 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 0000000..0ec3034 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 0000000..e9f5fea Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png new file mode 100644 index 0000000..84ac32a Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png new file mode 100644 index 0000000..8953cba Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png new file mode 100644 index 0000000..0467bf1 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json new file mode 100644 index 0000000..0bedcf2 --- /dev/null +++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "LaunchImage.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md new file mode 100644 index 0000000..89c2725 --- /dev/null +++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md @@ -0,0 +1,5 @@ +# Launch Screen Assets + +You can customize the launch screen with your own desired assets by replacing the image files in this directory. + +You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. \ No newline at end of file diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000..f2e259c --- /dev/null +++ b/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/Runner/Base.lproj/Main.storyboard b/ios/Runner/Base.lproj/Main.storyboard new file mode 100644 index 0000000..f3c2851 --- /dev/null +++ b/ios/Runner/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist new file mode 100644 index 0000000..70143ac --- /dev/null +++ b/ios/Runner/Info.plist @@ -0,0 +1,49 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + Surface Tension Calculator + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + surface_tension_calculator + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + CADisableMinimumFrameDurationOnPhone + + UIApplicationSupportsIndirectInputEvents + + + diff --git a/ios/Runner/Runner-Bridging-Header.h b/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 0000000..308a2a5 --- /dev/null +++ b/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" diff --git a/ios/RunnerTests/RunnerTests.swift b/ios/RunnerTests/RunnerTests.swift new file mode 100644 index 0000000..86a7c3b --- /dev/null +++ b/ios/RunnerTests/RunnerTests.swift @@ -0,0 +1,12 @@ +import Flutter +import UIKit +import XCTest + +class RunnerTests: XCTestCase { + + func testExample() { + // If you add code to the Runner application, consider adding tests here. + // See https://developer.apple.com/documentation/xctest for more information about using XCTest. + } + +} diff --git a/lib/main.dart b/lib/main.dart new file mode 100644 index 0000000..b00844b --- /dev/null +++ b/lib/main.dart @@ -0,0 +1,34 @@ +import 'package:flutter/material.dart'; +import 'package:surface_tension_calculator/routes/route_generator.dart'; +import 'package:surface_tension_calculator/routes/routes.dart'; +import 'package:surface_tension_calculator/utils/snackbar_utils.dart'; + +void main() { + WidgetsFlutterBinding.ensureInitialized(); + + runApp(const MyApp()); +} + +class MyApp extends StatelessWidget { + const MyApp({super.key}); + + @override + Widget build(BuildContext context) { + return MaterialApp( + scaffoldMessengerKey: SnackBarUtils.scaffoldKey, + title: 'Surface Tension Calculator', + theme: ThemeData( + fontFamily: 'Montserrat', + useMaterial3: true, + appBarTheme: const AppBarTheme( + centerTitle: true, + iconTheme: IconThemeData(color: Colors.white), + elevation: 0, + ), + colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple), + ), + initialRoute: MainUIRoutes.homeScreen, + onGenerateRoute: RouteGenerator.generateRoute, + ); + } +} diff --git a/lib/models/stc_output.dart b/lib/models/stc_output.dart new file mode 100644 index 0000000..0f21d57 --- /dev/null +++ b/lib/models/stc_output.dart @@ -0,0 +1,64 @@ +class STCOutput { + String negCoordFile; + String posCoordFile; + double syringeWidth; + String radiusCurvRange; + String shapeFactorRange; + String initXCoordRange; + String initAngleRange; + int paramCombinations; + int numProcessors; + double juza; + List bestOutput; + double lowestRMSD; + double surfaceTension; + double bestRadiusOfCurvature; + double bestShapeFactor; + double bestInitialXCoordinate; + double bestInitialAngle; + double elapsedTime; + + STCOutput({ + required this.negCoordFile, + required this.posCoordFile, + required this.syringeWidth, + required this.radiusCurvRange, + required this.shapeFactorRange, + required this.initXCoordRange, + required this.initAngleRange, + required this.paramCombinations, + required this.numProcessors, + required this.juza, + required this.bestOutput, + required this.lowestRMSD, + required this.surfaceTension, + required this.bestRadiusOfCurvature, + required this.bestShapeFactor, + required this.bestInitialXCoordinate, + required this.bestInitialAngle, + required this.elapsedTime, + }); + + static STCOutput clearOutput() { + return STCOutput( + negCoordFile: '', + posCoordFile: '', + syringeWidth: 0, + radiusCurvRange: '', + shapeFactorRange: '', + initXCoordRange: '', + initAngleRange: '', + paramCombinations: 0, + numProcessors: 0, + juza: 0, + bestOutput: [], + lowestRMSD: 0, + surfaceTension: 0, + bestRadiusOfCurvature: 0, + bestShapeFactor: 0, + bestInitialXCoordinate: 0, + bestInitialAngle: 0, + elapsedTime: 0, + ); + } +} diff --git a/lib/res/assets.dart b/lib/res/assets.dart new file mode 100644 index 0000000..2ddb872 --- /dev/null +++ b/lib/res/assets.dart @@ -0,0 +1,4 @@ +abstract class Assets { + static const String _assetPath = 'assets'; + static const String logo = '$_assetPath/ISC_Logo_White.png'; +} diff --git a/lib/res/strings.dart b/lib/res/strings.dart new file mode 100644 index 0000000..852a086 --- /dev/null +++ b/lib/res/strings.dart @@ -0,0 +1,22 @@ +abstract class Strings { + static const sampleOut = + 'Negative Cooridnate File : water-drop_Negative.dat\n' + 'Positive Cooridnate File : water-drop_Positive.dat\n' + 'Syringe Width (millimeter): 0.8049999999999999\n' + 'Radius of Curvature Range : 0.0001-2.0001 (interval: 20)\n' + 'Shape Factor Range : 0.0001-1.0001 (interval: 20)\n' + 'Initial X Coordinate Range: 0.0001-0.5001 (interval: 5)\n' + 'Initial Angle Range : 0.0001-0.5001 (interval: 5)\n' + 'Parameter Combinations : 10000\n' + 'Number of Process to Use : 8\n' + 'Juza 5-Plane (1/H) Std.Dev: 0.005252355255611812\n' + 'minimization success\n' + 'best output: [0.003522111582892356, 0.8302552101788515, 0.4880084250271468, 0.059397867545048805, 0.08677238094443798]\n\n' + 'Lowest RMSD : 0.003522111582892356\n' + 'Computed Surface Tension : 16.67287006223331\n' + 'Best Radius of Curvature : 0.8302552101788515\n' + 'Best Shape Factor : 0.4880084250271468\n' + 'Best Initial X Coordinate : 0.059397867545048805\n' + 'Best Initial Angle : 0.08677238094443798\n' + 'Lapsed Time in Seconds : 0.18291211128234863'; +} diff --git a/lib/routes/route_generator.dart b/lib/routes/route_generator.dart new file mode 100644 index 0000000..2734d57 --- /dev/null +++ b/lib/routes/route_generator.dart @@ -0,0 +1,49 @@ +import 'package:flutter/material.dart'; +import 'package:surface_tension_calculator/routes/routes.dart'; + +import '../screens/home_screen.dart'; + +class RouteGenerator { + static Route generateRoute(RouteSettings settings) { + // Getting arguments passed in while calling Navigator.pushNamed + final args = settings.arguments; + + switch (settings.name) { + case MainUIRoutes.homeScreen: + return MaterialPageRoute( + settings: settings, + builder: (_) => const HomeScreen(), + ); + case MainUIRoutes.resultsScreen: + // if (args is Map && args['student'] is Student) { + // return MaterialPageRoute( + // settings: settings, + // builder: (_) => DashboardScreen(student: args['student'])); + // } else { + return _errorRoute(); + // } + + default: + // If there is no such named route in the switch statement + return _errorRoute(); + } + } + + static Route _errorRoute() { + return MaterialPageRoute( + builder: (_) { + return Scaffold( + appBar: AppBar(title: const Text('Error')), + body: const Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Icon(Icons.construction_rounded, size: 65), + Center(child: Text('This page is under construction.')), + ], + ), + ); + }, + ); + } +} diff --git a/lib/routes/routes.dart b/lib/routes/routes.dart new file mode 100644 index 0000000..e2c49ae --- /dev/null +++ b/lib/routes/routes.dart @@ -0,0 +1,4 @@ +class MainUIRoutes { + static const homeScreen = '/home'; + static const resultsScreen = '/results'; +} diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart new file mode 100644 index 0000000..435663e --- /dev/null +++ b/lib/screens/home_screen.dart @@ -0,0 +1,309 @@ +import 'dart:io'; + +import 'package:file_picker/file_picker.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:surface_tension_calculator/models/stc_output.dart'; + +import '../res/assets.dart'; + +class HomeScreen extends StatefulWidget { + const HomeScreen({super.key}); + + @override + State createState() => _HomeScreenState(); +} + +class _HomeScreenState extends State { + PlatformFile? _imageFile; + STCOutput out = STCOutput.clearOutput(); + static const String scriptPath = 'scripts/img_V01.exe'; + + Future _pickImage() async { + try { + FilePickerResult? result = await FilePicker.platform.pickFiles( + type: FileType.image, + ); + if (result == null) return; + + setState(() { + _imageFile = result.files.first; + }); + } catch (e) {} + } + + Future _computeSTC() async { + final List args = [ + '-img', + _imageFile!.path ?? '', + '-out', + 'water-drop', + '-proc', + '8', + ]; + + await Process.run(scriptPath, args); + + out = STCOutput( + negCoordFile: 'negCoordFile', + posCoordFile: 'posCoordFile', + syringeWidth: 0.123, + radiusCurvRange: 'asd', + shapeFactorRange: 'asd', + initXCoordRange: 'asd', + initAngleRange: 'asd', + paramCombinations: 123, + numProcessors: 123, + juza: 12.09, + bestOutput: [0.123, 12.213], + lowestRMSD: 0.123, + surfaceTension: 0.123, + bestRadiusOfCurvature: 0.123, + bestShapeFactor: 0.123, + bestInitialXCoordinate: 123.123, + bestInitialAngle: 234.123, + elapsedTime: 12.12345, + ); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + body: SizedBox.expand( + child: Container( + padding: const EdgeInsets.only(top: 35.0, left: 25, right: 25), + color: Color(0xFF7B1113), + child: Column( + children: [ + buildHeader(), + const SizedBox(height: 20), + Container( + padding: const EdgeInsets.all(25), + decoration: BoxDecoration( + color: Colors.grey.shade300, + borderRadius: BorderRadius.circular(30), + ), + child: IntrinsicHeight( + child: Row( + children: [ + buildLeftImage(), + const SizedBox(width: 20), + const VerticalDivider(width: 20), + const SizedBox(width: 20), + buildRightResults(), + ], + ), + ), + ), + const SizedBox(height: 20), + buildFooter(), + ], + ), + ), + ), + ); + } + + Widget buildFooter() { + return Center( + child: Text( + '\u00a9 2025 UP Intelligent Systems Center', + style: TextStyle(color: Colors.white), + ), + ); + } + + Widget buildHeader() { + return IntrinsicHeight( + child: Row( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + const SizedBox(width: 20), + Image.asset(Assets.logo, height: 70), + const SizedBox(width: 10), + const VerticalDivider(), + const SizedBox(width: 10), + Text( + 'SURFACE TENSION CALCULATOR', + style: TextStyle( + fontSize: 45, + fontWeight: FontWeight.w500, + color: Colors.white, + ), + ), + ], + ), + ); + } + + Column buildLeftImage() { + return Column( + children: [ + if (_imageFile == null) + Container( + height: 400, + width: 500, + decoration: BoxDecoration( + color: Colors.grey.shade500, + borderRadius: BorderRadius.circular(30), + ), + child: Center(child: Text('No image uploaded')), + ), + if (_imageFile != null) + Container( + height: 400, + width: 500, + decoration: BoxDecoration( + color: Colors.grey.shade500, + borderRadius: BorderRadius.circular(30), + ), + child: Image.memory(Uint8List.fromList(_imageFile!.bytes!)), + ), + const SizedBox(height: 15), + Row( + children: [ + ElevatedButton( + onPressed: _pickImage, + child: Text('Upload Droplet Image'), + ), + const SizedBox(width: 10), + ElevatedButton( + onPressed: _imageFile == null ? null : _computeSTC, + child: Text('Compute Surface Tension'), + ), + ], + ), + ], + ); + } + + Widget buildRightResults() { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Results:', + style: TextStyle(fontSize: 30, fontWeight: FontWeight.w600), + ), + const SizedBox(height: 10), + SingleChildScrollView(child: buildResults()), + // Text(out), + ], + ); + } + + Widget buildResults() { + return Row( + children: [ + buildOutputFields(), + const SizedBox(width: 10), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(out.posCoordFile), + Text(out.posCoordFile), + Text(out.syringeWidth.toString()), + Text(out.radiusCurvRange), + Text(out.shapeFactorRange), + Text(out.initXCoordRange), + Text(out.initAngleRange), + Text(out.paramCombinations.toString()), + Text(out.numProcessors.toString()), + Text(out.juza.toString()), + Text(''), + Text(''), + Text(out.bestOutput.toString()), + Text(''), + Text(out.lowestRMSD.toString()), + Text(out.surfaceTension.toString()), + Text(out.bestRadiusOfCurvature.toString()), + Text(out.bestShapeFactor.toString()), + Text(out.bestInitialXCoordinate.toString()), + Text(out.bestInitialAngle.toString()), + Text(out.elapsedTime.toString()), + ], + ), + ], + ); //Text(Strings.sampleOut); + } + + Column buildOutputFields() { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Negative Coordinate File: ', + style: TextStyle(fontWeight: FontWeight.w600), + ), + Text( + 'Positive Coordinate File: ', + style: TextStyle(fontWeight: FontWeight.w600), + ), + Text( + 'Syringe Width (millimeter): ', + style: TextStyle(fontWeight: FontWeight.w600), + ), + Text( + 'Radius of Curvature: ', + style: TextStyle(fontWeight: FontWeight.w600), + ), + Text( + 'Shape Factor Range: ', + style: TextStyle(fontWeight: FontWeight.w600), + ), + Text( + 'Initial X Coordinate: ', + style: TextStyle(fontWeight: FontWeight.w600), + ), + Text( + 'Initial Angle Range: ', + style: TextStyle(fontWeight: FontWeight.w600), + ), + Text( + 'Parameter Combinations: ', + style: TextStyle(fontWeight: FontWeight.w600), + ), + Text( + 'Number of Process: ', + style: TextStyle(fontWeight: FontWeight.w600), + ), + Text( + 'Juza 5-Plane (1/H) Std.Dev: ', + style: TextStyle(fontWeight: FontWeight.w600), + ), + Text(''), + Text( + 'minimization success', + style: TextStyle(fontWeight: FontWeight.w600), + ), + Text('best output: ', style: TextStyle(fontWeight: FontWeight.w600)), + Text('', style: TextStyle(fontWeight: FontWeight.w600)), + Text('Lowest RMSD: ', style: TextStyle(fontWeight: FontWeight.w600)), + Text( + 'Computed Surface Tension: ', + style: TextStyle(fontWeight: FontWeight.w600), + ), + Text( + 'Best Radius of Curvature: ', + style: TextStyle(fontWeight: FontWeight.w600), + ), + Text( + 'Best Shape Factor: ', + style: TextStyle(fontWeight: FontWeight.w600), + ), + Text( + 'Best Initial X Coordinate: ', + style: TextStyle(fontWeight: FontWeight.w600), + ), + Text( + 'Best Initial Angle: ', + style: TextStyle(fontWeight: FontWeight.w600), + ), + Text( + 'Lapsed Time (seconds): ', + style: TextStyle(fontWeight: FontWeight.w600), + ), + ], + ); + } +} diff --git a/lib/scripts/compute_st.dart b/lib/scripts/compute_st.dart new file mode 100644 index 0000000..deefeb3 --- /dev/null +++ b/lib/scripts/compute_st.dart @@ -0,0 +1,361 @@ +import 'dart:io'; +import 'dart:math'; +import 'package:scidart/scidart.dart'; + +import 'extract_edge_coordinate.dart'; +import 'find_optimal_params_bashforthadams.dart'; +import 'juszas_equation.dart'; +import 'minimize_params_optimization.dart'; + +void computeST(List sysArgs) { + // Initial variable definitions + String imageFilePath = ""; + String outputFileName = ""; + String posPointsFileName = ""; + String negPointsFileName = ""; + int processCount = 2; + double syringeWidth = 0.70 * 1.15; + double minaRadcurv = 0.0001; + double maxaRadcurv = 2.0001; + double minbShapefact = 0.0001; + double maxbShapefact = 1.0001; + double minX = 0.0001; + double maxX = 0.5001; + double mintAngle = 0.0001; + double maxtAngle = 0.5001; + int aStep = 20; + int bStep = 20; + int xStep = 5; + int tStep = 5; + + int imageFlag = 0; + int posFileFlag = 0; + int negFileFlag = 0; + int outFlag = 0; + int counter = 0; + int solveMethod = 0; + + // Argument processing loop. + while (counter <= sysArgs.length - 1) { + String currentOption = sysArgs[counter]; + String currentValue = ""; + try { + currentValue = sysArgs[counter + 1]; + } catch (e) { + exit(0); + } + + if (currentOption == "-help") { + exit(0); + } else if (currentOption == "-img") { + imageFilePath = currentValue; + imageFlag = 1; + } else if (currentOption == "-filep") { + posPointsFileName = currentValue; + posFileFlag = 1; + } else if (currentOption == "-filen") { + negPointsFileName = currentValue; + negFileFlag = 1; + } else if (currentOption == "-out") { + outputFileName = currentValue; + outFlag = 1; + } else if (currentOption == "-proc") { + processCount = int.parse(currentValue); + } else if (currentOption == "-syrg") { + syringeWidth = double.parse(currentValue); + } else if (currentOption == "-a") { + minaRadcurv = double.parse(currentValue); + } else if (currentOption == "-A") { + maxaRadcurv = double.parse(currentValue); + } else if (currentOption == "-b") { + minbShapefact = double.parse(currentValue); + } else if (currentOption == "-B") { + maxbShapefact = double.parse(currentValue); + } else if (currentOption == "-x") { + minX = double.parse(currentValue); + } else if (currentOption == "-X") { + maxX = double.parse(currentValue); + } else if (currentOption == "-t") { + mintAngle = double.parse(currentValue); + } else if (currentOption == "-T") { + maxtAngle = double.parse(currentValue); + } else if (currentOption == "-ai") { + aStep = int.parse(currentValue); + } else if (currentOption == "-bi") { + bStep = int.parse(currentValue); + } else if (currentOption == "-xi") { + xStep = int.parse(currentValue); + } else if (currentOption == "-ti") { + tStep = int.parse(currentValue); + } else if (currentOption == "-solver") { + solveMethod = int.parse(currentValue); + } else { + exit(0); + } + counter = counter + 2; + } + + if (outFlag == 0 && imageFlag == 1) { + print("Output file name not set. (-out)"); + exit(0); + } + if (imageFlag == 1 && ((posFileFlag == 1) || (negFileFlag == 1))) { + print("Image(-img) can not be set with files option (-filep, -filen)."); + print("Either set image only or files only."); + exit(0); + } + if (imageFlag == 0 && + ((posFileFlag == 1 && negFileFlag == 0) || + (posFileFlag == 0 && negFileFlag == 1))) { + print( + "File inputs (-filep, -filen) should both be set if image input is not set.", + ); + exit(0); + } + + // Calculate ARange_radCurv + List ARange_radCurv = []; + double a = minaRadcurv; + double ahop = (maxaRadcurv - minaRadcurv) / (aStep - 1); + while (a <= maxaRadcurv) { + ARange_radCurv.add(a); + a += ahop; + if (ahop == 0.0) { + break; + } + } + if ((maxaRadcurv - ARange_radCurv[ARange_radCurv.length - 1] - ahop).abs() < + 0.000001 && + ahop != 0.0) { + ARange_radCurv.add(maxaRadcurv); + } + + // Calculate bRange_shapeFact + List brangeShapefact = []; + double b = minbShapefact; + double bhop = (maxbShapefact - minbShapefact) / (bStep - 1); + while (b <= maxbShapefact) { + brangeShapefact.add(b); + b += bhop; + if (bhop == 0) { + break; + } + } + if ((maxbShapefact - brangeShapefact[brangeShapefact.length - 1] - bhop) + .abs() < + 0.000001 && + bhop != 0.0) { + brangeShapefact.add(maxbShapefact); + } + + // Calculate XRange + List XRange = []; + double x = minX; + double xhop = (maxX - minX) / (xStep - 1); + while (x <= maxX) { + XRange.add(x); + x += xhop; + if (xhop == 0) { + break; + } + } + if ((maxX - XRange[XRange.length - 1] - xhop).abs() < 0.000001 && + xhop != 0.0) { + XRange.add(maxX); + } + + // Calculate TRange_angle + List TRange_angle = []; + double t = mintAngle; + double thop = (maxtAngle - mintAngle) / (tStep - 1); + while (t <= maxtAngle) { + TRange_angle.add(t); + t += thop; + if (thop == 0.0) { + break; + } + } + if ((maxtAngle - TRange_angle[TRange_angle.length - 1] - thop).abs() < + 0.000001 && + thop != 0.0) { + TRange_angle.add(maxtAngle); + } + + print("\n"); + if (imageFlag == 1) { + print("Image File : $imageFilePath"); + print("Output Name : $outputFileName"); + print("Negative Coordinate File : ${outputFileName}_Negative.dat"); + print("Positive Coordinate File : ${outputFileName}_Positive.dat"); + print("Syringe Width (millimeter): $syringeWidth"); + } else { + print("Negative Coordinate File : $negPointsFileName"); + print("Positive Coordinate File : $posPointsFileName"); + } + print( + "Radius of Curvature Range : $minaRadcurv-$maxaRadcurv (interval: ${ARange_radCurv.length})", + ); + print( + "Shape Factor Range : $minbShapefact-$maxbShapefact (interval: ${brangeShapefact.length})", + ); + print("Initial X Coordinate Range: $minX-$maxX (interval: ${XRange.length})"); + print( + "Initial Angle Range : $mintAngle-$maxtAngle (interval: ${TRange_angle.length})", + ); + print( + "Parameter Combinations : ${ARange_radCurv.length * brangeShapefact.length * XRange.length * TRange_angle.length}", + ); + print("Number of Process to Use : $processCount"); + + List> posEdgePts; + List> negEdgePts; + + if (imageFlag == 1) { + var result = extractEdgeCoordinate( + imageFilePath, + outputFileName, + syringeWidth, + ); + posEdgePts = result[0]; + negEdgePts = result[1]; + double deScaledMaxWidth = result[2]; + List dmsDiameters = List.from(result[3]); + + double HInv1 = HJuza(dmsDiameters[7] / deScaledMaxWidth, 0.8); + double HInv2 = HJuza(dmsDiameters[8] / deScaledMaxWidth, 0.9); + double HInv3 = HJuza(dmsDiameters[9] / deScaledMaxWidth, 1.0); + double HInv4 = HJuza(dmsDiameters[10] / deScaledMaxWidth, 1.1); + double HInv5 = HJuza(dmsDiameters[11] / deScaledMaxWidth, 1.2); + double HInvM = (0.20) * (HInv1 + HInv2 + HInv3 + HInv4 + HInv5); + double HInvSD = sqrt( + (0.20) * + ((HInv1 - HInvM) * (HInv1 - HInvM) + + (HInv2 - HInvM) * (HInv2 - HInvM) + + (HInv3 - HInvM) * (HInv3 - HInvM) + + (HInv4 - HInvM) * (HInv4 - HInvM) + + (HInv5 - HInvM) * (HInv5 - HInvM)), + ); + print("Juza 5-Plane (1/H) Std.Dev: $HInvSD"); + } else { + posEdgePts = []; + try { + List positiveLines = File(posPointsFileName).readAsLinesSync(); + for (var Line in positiveLines) { + List coordinate = Line.split(RegExp(r'\s+')); + //print(coordinate); + posEdgePts.add([ + double.parse(coordinate[0]), + double.parse(coordinate[1]), + ]); + } + } catch (e) { + print("Error reading positive points file."); + exit(0); + } + negEdgePts = []; + try { + List negativeLines = File(negPointsFileName).readAsLinesSync(); + for (var Line in negativeLines) { + List coordinate = Line.split(RegExp(r'\s+')); + //print(Coordinate); + negEdgePts.add([ + double.parse(coordinate[0]), + double.parse(coordinate[1]), + ]); + } + } catch (e) { + print("Error reading negative points file."); + exit(0); + } + } + + // Nested function bruteForce + List bruteForce() { + List> posList = []; + List> negList = []; + for (int processNo = 0; processNo < processCount; processNo++) { + posList.add(posEdgePts); + negList.add(negEdgePts); + //print(processNo); + } + + List> aRanges = []; + for (int processNo = 0; processNo < processCount; processNo++) { + aRanges.add([]); + } + + int i = 0; + for (var A in ARange_radCurv) { + aRanges[i % processCount].add(A); + i += 1; + } + + List> bestParams = []; // will store candidate tuples + List ticksQueue = []; // simulate ticks + + // Simulate process creation and execution. + for (int processNo = 0; processNo < processCount; processNo++) { + // In a real multiprocessing environment, each process would run concurrently. + // Here, we directly call the function. + findOptimalParameters( + posList[processNo], + negList[processNo], + aRanges[processNo], + brangeShapefact, + XRange, + TRange_angle, + bestParams, + ticksQueue, + ); + } + + stdout.write("\rParameter Search Progress : 0%"); + stdout.flush(); + int count = 0; + int totalTicks = ARange_radCurv.length; + // Simulate receiving ticks. + while (count < totalTicks) { + // Since ticks have been already added, just increment Count. + if (ticksQueue.isNotEmpty) { + ticksQueue.removeAt(0); + count += 1; + stdout.write( + "\rParameter Search Progress : ${(100 * (count / totalTicks)).toInt()}%", + ); + stdout.flush(); + } + } + print(""); + + List bestOutput = [999999999, 1, 1, 1, 1]; + for (var output in bestParams) { + if (output[0] < bestOutput[0]) { + bestOutput = output; + } + } + return bestOutput; + } + + // Nested function Optimize + List optimize() { + return optimizeParameters(posEdgePts, negEdgePts, 0.95, 0.3, 0.1, 0.2); + } + + // Record start time + var startTime = DateTime.now(); + + // Choose which solver to use. + List bestOutput = (solveMethod != 1) ? optimize() : bruteForce(); + + print("best output: $bestOutput"); + + print("\nLowest RMSD : ${bestOutput[0]}"); + // Computed Surface Tension: 9.8*bestOutput[1]/bestOutput[2] + print("Computed Surface Tension : ${9.8 * bestOutput[1] / bestOutput[2]}"); + print("Best Radius of Curvature : ${bestOutput[1]}"); + print("Best Shape Factor : ${bestOutput[2]}"); + print("Best Initial X Coordinate : ${bestOutput[3]}"); + print("Best Initial Angle : ${bestOutput[4]}"); + var elapsed = DateTime.now().difference(startTime).inSeconds; + print("Lapsed Time in Seconds : $elapsed"); +} diff --git a/lib/scripts/extract_edge_coordinate.dart b/lib/scripts/extract_edge_coordinate.dart new file mode 100644 index 0000000..9b2e969 --- /dev/null +++ b/lib/scripts/extract_edge_coordinate.dart @@ -0,0 +1,344 @@ +import 'dart:io'; +import 'dart:math'; + +List extractEdgeCoordinate( + String imageFilePath, + String outputFileName, + double syringeWidth, +) { + // Detect the edges of the image. + // All edge pixels will white(255) and rest of the pixels will be black(0). + List> Image = CV2.imread(imageFilePath, CV2.IMREAD_COLOR); + List> EdgeImage = CV2.Canny(Image, 100, 200); + + // Find the first edge point (white pixel). + // It is assumed that first edge point part of the syringe. + int NumOfRow = EdgeImage.length; + int NumOfCol = EdgeImage[0].length; + List EdgePoint = [0, 0]; + int EdgePointFlag = 0; + for (int RowIndex = 0; RowIndex < NumOfRow; RowIndex++) { + for (int ColIndex = 0; ColIndex < NumOfCol; ColIndex++) { + if (EdgeImage[RowIndex][ColIndex] == 255) { + EdgePoint = [RowIndex, ColIndex]; + EdgePointFlag = 1; + break; + } + } + if (EdgePointFlag == 1) { + break; + } + } + + // Color the all the syringe and droplet pixels differently (70). + // Determine the left-most, right-most, and bottom droplet pixels. + EdgeImage[EdgePoint[0]][EdgePoint[1]] = 70; + List> DropletEdgePoints = []; + DropletEdgePoints.add(EdgePoint); + int LeftMostCol = 9999999999; + int RightMostCol = 0; + int BottomMostRow = 0; + int BottomMostRow2 = 0; + int CenterCol = 0; + + while (DropletEdgePoints.length != 0) { + List CurrentPoint = DropletEdgePoints[0]; + DropletEdgePoints.remove(CurrentPoint); + List> NeighborPoints = []; + for (int RowOffset = -3; RowOffset < 4; RowOffset++) { + for (int ColOffset = -3; ColOffset < 4; ColOffset++) { + if (RowOffset != 0 || ColOffset != 0) { + NeighborPoints.add([ + CurrentPoint[0] + RowOffset, + CurrentPoint[1] + ColOffset, + ]); + } + } + } + for (List point in NeighborPoints) { + int PointRow = point[0]; + int PointCol = point[1]; + if ((0 <= PointRow && PointRow < NumOfRow) && + (0 <= PointCol && PointCol < NumOfCol)) { + if (EdgeImage[PointRow][PointCol] == 255) { + DropletEdgePoints.add([PointRow, PointCol]); + EdgeImage[PointRow][PointCol] = 70; + if (PointRow > BottomMostRow) { + BottomMostRow = PointRow; + } + if (PointCol > RightMostCol) { + RightMostCol = PointCol; + } + if (PointCol < LeftMostCol) { + LeftMostCol = PointCol; + } + } + } + } + } + + CenterCol = (LeftMostCol + RightMostCol) ~/ 2; + for (int Row = 0; Row < BottomMostRow + 1; Row++) { + if (EdgeImage[Row][CenterCol] == 70) { + BottomMostRow2 = Row; + } + } + BottomMostRow = BottomMostRow2; + + // Determine the transition row between the syringe pixels and the droplet pixels. + int PreviousWidth = 0; + int WidthIncCount = 5; + List WidthHistory = List.filled(WidthIncCount + 1, 0); + int TransitionRow = 0; + + for (int Row = 0; Row < BottomMostRow; Row++) { + int LeftEdgeCol = 0; + int RightEdgeCol = 9999999; + for (int Col = LeftMostCol - 1; Col < RightMostCol + 1; Col++) { + if (EdgeImage[Row][Col] == 70) { + LeftEdgeCol = Col; + break; + } + } + for (int Col = RightMostCol + 1; Col >= LeftMostCol - 1; Col--) { + if (EdgeImage[Row][Col] == 70) { + RightEdgeCol = Col; + break; + } + } + int CurrentWidth = RightEdgeCol - LeftEdgeCol; + if ((CurrentWidth != PreviousWidth) && + (0 < CurrentWidth) && + (CurrentWidth < (9999999 - NumOfCol))) { + for (int i = 0; i < WidthIncCount; i++) { + WidthHistory[i] = WidthHistory[i + 1]; + } + WidthHistory[WidthIncCount] = CurrentWidth; + } + int WidthIncreaseCount = 0; + for (int i = 0; i < WidthIncCount; i++) { + if (WidthHistory[i] < WidthHistory[i + 1]) { + WidthIncreaseCount += 1; + } + } + if (WidthIncreaseCount == WidthIncCount) { + TransitionRow = Row; + break; + } + if ((0 < CurrentWidth) && (CurrentWidth < (9999999 - NumOfCol))) { + PreviousWidth = CurrentWidth; + } + } + + // Determine the width of the syringe in terms of pixel count + int WidthSum = 0; + int WidthCount = 0; + int SyringeLevel = (0.75 * TransitionRow).toInt(); + for (int Row = 0; Row < TransitionRow; Row++) { + int RightEdgeCol = 9999999; + int LeftEdgeCol = 0; + for (int Col = LeftMostCol; Col < CenterCol + 1; Col++) { + if (EdgeImage[Row][Col] == 70) { + EdgeImage[Row][Col] = 255; + LeftEdgeCol = Col; + break; + } + } + for (int Col = RightMostCol; Col > CenterCol - 1; Col--) { + if (EdgeImage[Row][Col] == 70) { + EdgeImage[Row][Col] = 255; + RightEdgeCol = Col; + break; + } + } + int CurrentWidth = RightEdgeCol - LeftEdgeCol; + if (WidthCount <= SyringeLevel) { + if ((0 < CurrentWidth) && (CurrentWidth < (9999999 - NumOfCol))) { + WidthSum += CurrentWidth; + WidthCount += 1; + } + } + } + double AverageWidth = (WidthSum.toDouble()) / (WidthCount.toDouble()); + + // Extract the pixel coordinates of all droplet pixels (color: 70) + List> PositiveEdgePoints = []; + List> NegativeEdgePoints = []; + for (int Row = BottomMostRow; Row > TransitionRow - 1; Row--) { + for (int Col = LeftMostCol; Col < CenterCol + 1; Col++) { + if (EdgeImage[Row][Col] == 70) { + NegativeEdgePoints.add([Row, Col]); + break; + } + } + for (int Col = RightMostCol; Col > CenterCol; Col--) { + if (EdgeImage[Row][Col] == 70) { + PositiveEdgePoints.add([Row, Col]); + break; + } + } + } + + // Scale the point coordinates by using the syringe length + double SyringeWidth = syringeWidth; + double ScalingFactor = SyringeWidth / AverageWidth; + List> ScaledNegativeEdgePoints = []; + String negativeFileName = outputFileName + "_Negative.dat"; + IOSink NegativeCoordinatesFile = File(negativeFileName).openWrite(); + for (List point in NegativeEdgePoints) { + int Row = point[0]; + int Col = point[1]; + double Row2 = (ScalingFactor * (BottomMostRow - Row).toDouble()) + 0.0001; + double Col2 = ScalingFactor * (Col - CenterCol).toDouble(); + NegativeCoordinatesFile.write("$Col2 $Row2\n"); + ScaledNegativeEdgePoints.add([Col2, Row2]); + } + NegativeCoordinatesFile.close(); + + List> ScaledPositiveEdgePoints = []; + String positiveFileName = "${outputFileName}_Positive.dat"; + IOSink PositiveCoordinatesFile = File(positiveFileName).openWrite(); + for (List point in PositiveEdgePoints) { + int Row = point[0]; + int Col = point[1]; + double Row2 = (ScalingFactor * (BottomMostRow - Row).toDouble()) + 0.0001; + double Col2 = ScalingFactor * (Col - CenterCol).toDouble(); + PositiveCoordinatesFile.write("$Col2 $Row2\n"); + ScaledPositiveEdgePoints.add([Col2, Row2]); + } + PositiveCoordinatesFile.close(); + + // Draw the detected edge points of the droplet. + // List> Image2 = deepCopy(Image); + for (int Row = 0; Row < NumOfRow; Row++) { + for (int Col = 0; Col < NumOfCol; Col++) { + Image[Row][Col] = 0; + // For EdgeImage, since it is a separate 2D list of ints, set to 0. + EdgeImage[Row][Col] = 0; + } + } + for (List Point in PositiveEdgePoints) { + Image[Point[0]][Point[1]] = [0, 0, 255]; + EdgeImage[Point[0]][Point[1]] = 255; + } + for (List Point in NegativeEdgePoints) { + Image[Point[0]][Point[1]] = [0, 0, 255]; + EdgeImage[Point[0]][Point[1]] = 255; + } + + // Draw the center column of the drop + CV2.line( + Image, + Point(CenterCol.toDouble(), TransitionRow.toDouble()), + Point(CenterCol.toDouble(), BottomMostRow.toDouble()), + [0, 255, 0], + 1, + ); // image, start, end, color(BGR), thickness + + double MaxWidthRatio = 0.0; + for (int Row = BottomMostRow; Row > TransitionRow - 1; Row--) { + int RightCol = 99999; + int LeftCol = -1; + for (int Col = LeftMostCol; Col < CenterCol + 1; Col++) { + if (EdgeImage[Row][Col] == 255) { + LeftCol = Col; + break; + } + } + for (int Col = RightMostCol; Col > CenterCol; Col--) { + if (EdgeImage[Row][Col] == 255) { + RightCol = Col; + break; + } + } + double WidthRatio = + (RightCol - LeftCol).toDouble() / + (RightMostCol - LeftMostCol).toDouble(); + if (WidthRatio < 1.0 && WidthRatio > MaxWidthRatio) { + MaxWidthRatio = WidthRatio; + } + } + + List> RowWithMaxWidth = []; + for (int Row = BottomMostRow; Row > TransitionRow - 1; Row--) { + int RightCol = 99999; + int LeftCol = -1; + for (int Col = LeftMostCol; Col < CenterCol + 1; Col++) { + if (EdgeImage[Row][Col] == 255) { + LeftCol = Col; + break; + } + } + for (int Col = RightMostCol; Col > CenterCol; Col--) { + if (EdgeImage[Row][Col] == 255) { + RightCol = Col; + break; + } + } + double WidthRatio = + (RightCol - LeftCol).toDouble() / + (RightMostCol - LeftMostCol).toDouble(); + if (WidthRatio == MaxWidthRatio) { + RowWithMaxWidth.add([Row, LeftCol, RightCol]); + } + } + + // Draw the main diameter + int n = RowWithMaxWidth.length; + n = (n / 2).toInt(); + int Row = RowWithMaxWidth[n][0]; + int LeftCol = RowWithMaxWidth[n][1]; + int RightCol = RowWithMaxWidth[n][2]; + CV2.line( + Image, + Point(LeftCol.toDouble(), Row.toDouble()), + Point(RightCol.toDouble(), Row.toDouble()), + [0, 255, 0], + 1, + ); + + // Measure and draw the ten diameters + List Diameters = []; + int MaxWidth = RightMostCol - LeftMostCol; + for (int i = 1; i < 13; i++) { + for (int Col = LeftMostCol; Col < CenterCol + 1; Col++) { + if (EdgeImage[BottomMostRow - (i * MaxWidth ~/ 10)][Col] == 255) { + LeftCol = Col; + break; + } + } + for (int Col = RightMostCol; Col > CenterCol; Col--) { + if (EdgeImage[BottomMostRow - (i * MaxWidth ~/ 10)][Col] == 255) { + RightCol = Col; + break; + } + } + Diameters.add(RightCol - LeftCol); + CV2.line( + Image, + Point( + LeftCol.toDouble(), + (BottomMostRow - (i * MaxWidth ~/ 10)).toDouble(), + ), + Point( + RightCol.toDouble(), + (BottomMostRow - (i * MaxWidth ~/ 10)).toDouble(), + ), + [255, 0, 0], + 1, + ); + } + + // Scale the 12 drop diameters + for (int i = 0; i < 12; i++) { + Diameters[i] = (Diameters[i] * ScalingFactor).toInt(); + } + double ScaledMaxWidth = ScalingFactor * MaxWidth.toDouble(); + // double ScaledUpWidth = ScalingFactor * (RightCol - LeftCol).toDouble(); + return [ + ScaledPositiveEdgePoints, + ScaledNegativeEdgePoints, + ScaledMaxWidth, + Diameters, + ]; +} diff --git a/lib/scripts/find_optimal_params_bashforthadams.dart b/lib/scripts/find_optimal_params_bashforthadams.dart new file mode 100644 index 0000000..f2ccd20 --- /dev/null +++ b/lib/scripts/find_optimal_params_bashforthadams.dart @@ -0,0 +1,63 @@ +import 'dart:math'; + +import 'package:surface_tension_calculator/scripts/rk4.dart'; + +/// ========== FINDING OPTIMAL PARAMETERS for BASHFORTH-ADAMS SOLUTION ========== +void findOptimalParameters( + List posEdgePoints, + List negEdgePoints, + List aRangeRadCurv, + List bRangeShapeFact, + List xRange, + List tRangeAngle, + List params, + List ticks, +) { + var rk4PosTable = makeRK4Table(posEdgePoints); + var rk4NegTable = makeRK4Table(negEdgePoints); + + double minimumRMSD = 999999.0; + List bestParameters = [0, 0, 0, 0]; + + for (var aRadCurv in aRangeRadCurv) { + for (var bShapeFact in bRangeShapeFact) { + for (var x in xRange) { + for (var tAngle in tRangeAngle) { + double fTotalDiffSquared = 0.0; + rk4PosTable[0][3] = x; + rk4PosTable[0][4] = tAngle; + rk4NegTable[0][3] = x; + rk4NegTable[0][4] = tAngle; + fTotalDiffSquared += bashforthAdamsRK4( + rk4PosTable, + aRadCurv, + bShapeFact, + 1.0, + ); + fTotalDiffSquared += bashforthAdamsRK4( + rk4NegTable, + aRadCurv, + bShapeFact, + -1.0, + ); + + double currentRMSD = sqrt( + fTotalDiffSquared / (posEdgePoints.length + negEdgePoints.length), + ); + if (currentRMSD < minimumRMSD) { + minimumRMSD = currentRMSD; + bestParameters = [aRadCurv, bShapeFact, x, tAngle]; + } + } + ticks.add("#"); + } + } + } + + double aRadCurv = bestParameters[0]; + double bShapeFact = bestParameters[1]; + double x = bestParameters[2]; + double tAngle = bestParameters[3]; + // double st = (9.8 * aRadCurv) / bShapeFact; + params.add((minimumRMSD, aRadCurv, bShapeFact, x, tAngle)); +} diff --git a/lib/scripts/img_V01 b/lib/scripts/img_V01 new file mode 100755 index 0000000..20166d6 Binary files /dev/null and b/lib/scripts/img_V01 differ diff --git a/lib/scripts/img_V01.py b/lib/scripts/img_V01.py new file mode 100644 index 0000000..06234ff --- /dev/null +++ b/lib/scripts/img_V01.py @@ -0,0 +1,799 @@ +#!/usr/bin/env python + +# Surface Tension Calculation via Pendant Drop Method (Bashforth-Adams) +# Created by : Ren Tristan A. de la Cruz +# Created on : 2016 July 26 +# Last Modified : 2025 January 27 +# Contact : rentristandelacruz@gmail.com +# Contact : radelacruz@up.edu.ph + +# ========== IMPORTS ========== + +import math +import copy +import time +import sys +import cv2 +import multiprocessing +import numpy as np +import scipy.optimize #as spo + +# ========== READ THE IMAGE & EXTRACT THE EDGE COORDINATES ========== + +def ExtractEdgeCoordinate(_ImageFilePath, _OutputFileName, _SyringeWidth): + + # Detect the edges of the image. + # All edge pixels will white(255) and rest of the pixels will be black(0). + Image = cv2.imread(_ImageFilePath, cv2.IMREAD_COLOR) + EdgeImage = cv2.Canny(Image, 100, 200) + + # Find the first edge point (white pixel). + # It is assumed that first edge point part of the syringe. + NumOfRow, NumOfCol = EdgeImage.shape + EdgePoint = (0, 0) + EdgePointFlag = 0 + for RowIndex in range(NumOfRow): + for ColIndex in range(NumOfCol): + if EdgeImage[RowIndex, ColIndex] == 255: + EdgePoint = (RowIndex, ColIndex) + EdgePointFlag = 1 + break + if EdgePointFlag == 1: + break + + + # Color the all the syringe and droplet pixels differently (70). + # Determine the left-most, right-most, and bottom droplet pixels. + EdgeImage[EdgePoint] = 70 + DropletEdgePoints = [] + DropletEdgePoints.append(EdgePoint) + LeftMostCol = 9999999999 + RightMostCol = 0 + BottomMostRow = 0 + BottomMostRow2 = 0 + CenterCol = 0 + + while (len(DropletEdgePoints) != 0): + CurrentPoint = DropletEdgePoints[0] + DropletEdgePoints.remove(CurrentPoint) + NeighborPoints = [] + for RowOffset in range(-3,4, 1): + for ColOffset in range(-3,4,1): + if(RowOffset != 0 or ColOffset != 0): + NeighborPoints.append((CurrentPoint[0]+RowOffset, CurrentPoint[1]+ColOffset)) + for PointRow, PointCol in NeighborPoints: + if (0 <= PointRow and PointRow < NumOfRow) and (0 <= PointCol and PointCol < NumOfCol): + if EdgeImage[PointRow][PointCol] == 255: + DropletEdgePoints.append((PointRow, PointCol)) + EdgeImage[PointRow, PointCol] = 70 + if PointRow > BottomMostRow: + BottomMostRow = PointRow + if PointCol > RightMostCol: + RightMostCol = PointCol + if PointCol < LeftMostCol: + LeftMostCol = PointCol + + CenterCol = (LeftMostCol + RightMostCol)//2 + for Row in range(BottomMostRow + 1): + if EdgeImage[Row][CenterCol] == 70: + BottomMostRow2 = Row + BottomMostRow = BottomMostRow2 + + + # Determine the transition row between the syringe pixels and the droplet pixels. + PreviousWidth = 0 + WidthIncCount = 5 + WidthHistory = [0]*(WidthIncCount+1) + TransitionRow = 0 + + for Row in range(BottomMostRow): + LeftEdgeCol = 0 + RightEdgeCol = 9999999 + for Col in range(LeftMostCol-1, RightMostCol+1, 1): + if EdgeImage[Row,Col] == 70: + LeftEdgeCol = Col + break + for Col in range(RightMostCol+1, LeftMostCol-1, -1): + if EdgeImage[Row,Col] == 70: + RightEdgeCol = Col + break + CurrentWidth = RightEdgeCol - LeftEdgeCol + if (CurrentWidth != PreviousWidth) and (0 < CurrentWidth) and (CurrentWidth < (9999999-NumOfCol)): + for i in range(WidthIncCount): + WidthHistory[i] = WidthHistory[i+1] + WidthHistory[WidthIncCount] = CurrentWidth + WidthIncreaseCount = 0 + for i in range(WidthIncCount): + if WidthHistory[i] < WidthHistory[i+1]: + WidthIncreaseCount += 1 + if WidthIncreaseCount == WidthIncCount: + TransitionRow = Row + break + if (0 < CurrentWidth) and (CurrentWidth < (9999999-NumOfCol)): + PreviousWidth = CurrentWidth + + + # Determine the width of the syringe in terms of pixel count + WidthSum = 0 + WidthCount = 0 + SyringeLevel = int(0.75 * TransitionRow) + for Row in range(TransitionRow): + RightEdgeCol = 9999999 + LeftEdgeCol = 0 + for Col in range(LeftMostCol, CenterCol + 1, 1): + if EdgeImage[Row, Col] == 70: + EdgeImage[Row, Col] = 255 + LeftEdgeCol = Col + break + for Col in range(RightMostCol, CenterCol - 1, -1): + if EdgeImage[Row, Col] == 70: + EdgeImage[Row, Col] = 255 + RightEdgeCol = Col + break + CurrentWidth = RightEdgeCol - LeftEdgeCol + if WidthCount <= SyringeLevel: + if (0 < CurrentWidth) and (CurrentWidth < (9999999-NumOfCol)): + WidthSum += CurrentWidth + WidthCount += 1 + AverageWidth = float(WidthSum)/float(WidthCount) + + + # Extract the pixel coordinates of all droplet pixels (color: 70) + PositiveEdgePoints = [] + NegativeEdgePoints = [] + for Row in range(BottomMostRow, TransitionRow-1 ,-1): + for Col in range(LeftMostCol, CenterCol + 1, 1): + if EdgeImage[Row, Col] == 70: + NegativeEdgePoints.append((Row, Col)) + break + for Col in range(RightMostCol, CenterCol, -1): + if EdgeImage[Row, Col] == 70: + PositiveEdgePoints.append((Row, Col)) + break + + + # Scale the point coordinates by using the syringe length + SyringeWidth = _SyringeWidth + ScalingFactor = SyringeWidth/AverageWidth + ScaledNegativeEdgePoints = [] + NegativeCoordinatesFile = open(_OutputFileName+"_Negative.dat", 'w') + for Row, Col in NegativeEdgePoints: + Row2 = (ScalingFactor*float(BottomMostRow-Row)) + 0.0001 + Col2 = ScalingFactor*float(Col - CenterCol) + NegativeCoordinatesFile.write(str(Col2) + " " + str(Row2) + "\n") + ScaledNegativeEdgePoints.append((Col2,Row2)) + NegativeCoordinatesFile.close() + + ScaledPositiveEdgePoints = [] + PositiveCoordinatesFile = open(_OutputFileName+"_Positive.dat", 'w') + for Row, Col in PositiveEdgePoints: + Row2 = (ScalingFactor*float(BottomMostRow-Row)) + 0.0001 + Col2 = ScalingFactor*float(Col - CenterCol) + PositiveCoordinatesFile.write(str(Col2) + " " + str(Row2) + "\n") + ScaledPositiveEdgePoints.append((Col2, Row2)) + PositiveCoordinatesFile.close() + + + # Draw the detected edge points of the droplet. + Image2 = copy.deepcopy(Image) + for Row in range(0, NumOfRow): + for Col in range(0, NumOfCol): + Image[(Row,Col)] = 0 + EdgeImage[(Row,Col)] = 0 + for Point in PositiveEdgePoints: + Image[Point] = (0, 0, 255) + EdgeImage[Point] = 255 + for Point in NegativeEdgePoints: + Image[Point] = (0, 0, 255) + EdgeImage[Point] = 255 + + # Draw the center column of the drop + cv2.line(Image, (CenterCol, TransitionRow), (CenterCol, BottomMostRow), (0, 255, 0), 1) # image, start, end, color(BGR), thickness + + MaxWidthRatio = 0.0 + for Row in range(BottomMostRow, TransitionRow-1 ,-1): + RightCol = 99999 + LeftCol = -1 + for Col in range(LeftMostCol, CenterCol + 1, 1): + if EdgeImage[Row, Col] == 255: + LeftCol = Col + break + for Col in range(RightMostCol, CenterCol, -1): + if EdgeImage[Row, Col] == 255: + RightCol = Col + break + WidthRatio = float(RightCol - LeftCol)/float(RightMostCol-LeftMostCol) + if WidthRatio < 1.0 and WidthRatio > MaxWidthRatio: + MaxWidthRatio = WidthRatio + + RowWithMaxWidth = [] + for Row in range(BottomMostRow, TransitionRow-1 ,-1): + RightCol = 99999 + LeftCol = -1 + for Col in range(LeftMostCol, CenterCol + 1, 1): + if EdgeImage[Row, Col] == 255: + LeftCol = Col + break + for Col in range(RightMostCol, CenterCol, -1): + if EdgeImage[Row, Col] == 255: + RightCol = Col + break + WidthRatio = float(RightCol - LeftCol)/float(RightMostCol-LeftMostCol) + if WidthRatio == MaxWidthRatio: + RowWithMaxWidth.append((Row, LeftCol, RightCol)) + + # Draw the main diameter + n = len(RowWithMaxWidth) + n = int(n/2) + Row = RowWithMaxWidth[n][0] + LeftCol = RowWithMaxWidth[n][1] + RightCol = RowWithMaxWidth[n][2] + cv2.line(Image, (LeftCol, Row), (RightCol, Row), (0, 255, 0), 1) + + # Measure and draw the ten diameters + Diameters = [] + MaxWidth = RightMostCol - LeftMostCol + for i in range(1, 13, 1): + for Col in range(LeftMostCol, CenterCol + 1, 1): + if EdgeImage[BottomMostRow-int(i*MaxWidth/10.0), Col] == 255: + LeftCol = Col + break + for Col in range(RightMostCol, CenterCol, -1): + if EdgeImage[BottomMostRow-int(i*MaxWidth/10.0), Col] == 255: + RightCol = Col + break + Diameters.append(RightCol-LeftCol) + cv2.line(Image, (LeftCol, BottomMostRow-int(i*MaxWidth/10.0)), (RightCol, BottomMostRow-int(i*MaxWidth/10.0)), (255, 0, 0), 1) + + #DELETE THIS + #cv2.imwrite("1.jpg", Image) + #sys.exit() + + + # Scale the 12 drop diameters + for i in range(12): + Diameters[i] *= ScalingFactor + + ScaledMaxWidth = ScalingFactor*float(MaxWidth) + ScaledUpWidth = ScalingFactor*float(RightCol - LeftCol) + return ScaledPositiveEdgePoints, ScaledNegativeEdgePoints, ScaledMaxWidth, Diameters + + + +# ========== RK4 for BASHFORTH-ADAMS FORMULATION ========== + +def BashforthAdamsRK4(_afRK4Table, _fApexCurvature, _fShapeFactor, _fSign): + A = _fApexCurvature + A2 = 2.0/A + B = _fShapeFactor + KX0 = 1.0 + KT0 = 1.0 + Inv6 = 1.0/6.0 + fTotalDiffSquared = 0.0 + n = 1 + while n < len(_afRK4Table): + x = _afRK4Table[n-1][3] # predicted x + y = _afRK4Table[n-1][1] # actual y + t = _afRK4Table[n-1][4] # predicted angle + dy = _afRK4Table[n][2] # actual y diff + AG = 1.0 #AG: Added + ydy = y + 0.5 * dy + KX1 = dy * (1.0 / math.tan(t)) + KT1 = dy * (1.0 / math.sin(t)) * (A2 - (B * y) - (math.sin(t) / (AG * x))) # A -> AG + KX2 = dy * (1.0 / math.tan(t + 0.5 * KT1)) + STKT1 = math.sin(t + 0.5 * KT1) + KT2 = dy * (1.0 / STKT1) * (A2 - (B * ydy) - (STKT1 / (AG * (x + 0.5 * KX1)))) # A -> AG + KX3 = dy * (1.0 / math.tan(t + 0.5 * KT2)) + STKT2 = math.sin(t + 0.5 * KT2) + KT3 = dy * (1.0 / STKT2) * (A2 - (B * ydy) - (STKT2 / (AG * (x + 0.5 * KX2)))) # A -> AG + KX4 = dy * (1.0 / math.tan(t + KT3)) + STKT3 = math.sin(t + KT3) + KT4 = dy * (1.0 / STKT3) * (A2 - (B * (y + dy)) - (STKT3 / (AG * (x + KX3)))) # A -> AG + KX = (KX1 + 2.0 * (KX2 + KX3) + KX4) * Inv6 + KT = (KT1 + 2.0 * (KT2 + KT3) + KT4) * Inv6 + _afRK4Table[n][3] = x + KX + _afRK4Table[n][4] = t + KT + fTotalDiffSquared += (_afRK4Table[n][0] - (_fSign * _afRK4Table[n][3])) ** 2 + n += 1 + return fTotalDiffSquared + +def MakeRK4table(_edgePoints): + InitialValues = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0 , 0, 0, 0] + + rk4table = [] + rk4table.append(InitialValues) + yPrev = 0.0 + for x, y in _edgePoints: + EntryValues = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] + EntryValues[0] = x + EntryValues[1] = y + EntryValues[2] = y - yPrev + yPrev = y + rk4table.append(EntryValues) + + return rk4table + """ + RK4NegTable = [] + RK4NegTable.append(InitialValues) + yPrev = 0.0 + for x, y in _NegEdgePoints: + EntryValues = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] + EntryValues[0] = x + EntryValues[1] = y + EntryValues[2] = y - yPrev + yPrev = y + RK4NegTable.append(EntryValues) + + return RK4NegTable + """ + +# ========== FINDING OPTIMAL PARAMETERS for BASHFORTH-ADAMS SOLUTION ========== +def FindOptimalParameters(_PosEdgePoints, _NegEdgePoints, _ARange_radCurv, _BRange_shapeFact, _XRange, _TRange_angle, _Params, _Ticks): + + RK4PosTable = MakeRK4table(_PosEdgePoints) + RK4NegTable = MakeRK4table(_NegEdgePoints) + + MinimumRMSD = 999999.0 + BestParameters = [0, 0, 0, 0] + for A_radCurv in _ARange_radCurv: + for B_shapeFact in _BRange_shapeFact: + for X in _XRange: + for T_angle in _TRange_angle: + # x, y, dy, x*, t*, KX1, KT1, KX2, KT2, KX3, KT3, KX4, KT4 + fTotalDiffSquared = 0.0 + RK4PosTable[0][3] = X + RK4PosTable[0][4] = T_angle + RK4NegTable[0][3] = X + RK4NegTable[0][4] = T_angle + fTotalDiffSquared += BashforthAdamsRK4(RK4PosTable, A_radCurv, B_shapeFact, 1.0) + fTotalDiffSquared += BashforthAdamsRK4(RK4NegTable, A_radCurv, B_shapeFact, -1.0) + + CurrentRMSD = (fTotalDiffSquared/(len(_PosEdgePoints) + len(_NegEdgePoints)))**0.5 + if CurrentRMSD < MinimumRMSD: + MinimumRMSD = CurrentRMSD + BestParameters = [A_radCurv, B_shapeFact, X, T_angle] + _Ticks.put("#") + + A_radCurv = BestParameters[0] + B_shapeFact = BestParameters[1] + X = BestParameters[2] + T_angle = BestParameters[3] + ST = (9.8 * A_radCurv) / B_shapeFact + _Params.put((MinimumRMSD, A_radCurv, B_shapeFact, X, T_angle)) + + +# ========== FINDING OPTIMAL PARAMETERS USING MINIMZATION ========== +def OptimizeParameters(_PosEdgePoints, _NegEdgePoints, _AGuess_radCurv, _BGuess_shapeFact, _XGuess, _TGuess_angle): + + RK4PosTable = MakeRK4table(_PosEdgePoints) + RK4NegTable = MakeRK4table(_NegEdgePoints) + """ + ARG_RAD = 0 + ARG_SHAPE = 1 + ARG_X = 2 + ARG_ANGLE = 3 + """ + + def msd(args): + A_radCurv = args[0] + B_shapeFact = args[1] + X = args[2] + T_angle = args[3] + + RK4PosTable[0][3] = X + RK4PosTable[0][4] = T_angle + RK4NegTable[0][3] = X + RK4NegTable[0][4] = T_angle + fTotalDiffSquared = BashforthAdamsRK4(RK4PosTable, A_radCurv, B_shapeFact, 1.0) + BashforthAdamsRK4(RK4NegTable, A_radCurv, B_shapeFact, -1.0) + + return (fTotalDiffSquared/(len(_PosEdgePoints) + len(_NegEdgePoints)))**0.5 + + + optResult = scipy.optimize.minimize(msd, [_AGuess_radCurv, _BGuess_shapeFact, _XGuess, _TGuess_angle]) + if optResult.success: + print("minimization success") + #print(optResult.x) + #print(optResult.fun) + return [float(optResult.fun)] + optResult.x.tolist() + else: + return [9999999,0,0,0,0] + + +# ========== Juza's equation for 1/H ========== + +def HJuza(_S_diamRatio, _K): + # LowerS, UpperS, Ke, Kex, Kep, K3, K2, K1, K0 + + # 0.82 - 0.999 + Coefficient8 = [[ 0.82, 0.83, 1791452.8, 533.85850, 170.55837, -81676.15812, 202187.89690, -166836.27680, 45888.22973], + [ 0.83, 0.84, 189.07578, 272.52455, 72.730022, -19963.60152, 50019.79936, -41775.38186, 11629.85610], + [ 0.84, 0.85, 7.1549709, 165.45945, 35.285687, -6944.66848, 17609.43832, -14883.84379, 4193.34232], + [ 0.85, 0.87, 1.1496269, 95.066407, 12.600013, -2158.91585, 5571.60176, -4792.82331, 1374.26272], + [ 0.87, 0.895, 0.47873040, 50.357240, 0.089787883, -567.76534, 1503.51828, -1327.11835, 390.45562], + [ 0.895, 0.93, 0.35255000, 25.498893, -5.4176608, -165.99710, 454.58851, -414.93772, 126.23908], + [ 0.93, 0.97, 0.32002037, 6.8474560, -8.0901766, -102.84970, 293.25377, -278.69176, 88.27639], + [ 0.97, 0.99, 0.30845061, -32.343947, -10.455428, -475.69091, 1398.86173, -1371.17931, 448.00538], + [ 0.99, 0.999, 0.30110729, -333.50440, -15.711260, -11334.69334, 33822.93507, -33642.61426, 11154.37157]] + + # 0.635 - 0.997 + Coefficient9 = [[ 0.635, 0.645, 58249804, 119.64583, 89.483167, -28072.11478, 53918.28040, -34519.94034, 7366.77050], + [ 0.645, 0.66, 5100.2910, 70.920100, 46.811007, -9051.10879, 17726.62108, -15572.21470, 2518.10214], + [ 0.66, 0.685, 19.518159, 38.509198, 19.951285, -2338.00251, 4719.64936, -3175.58038, 712.17229], + [ 0.685, 0.72, 1.3823760, 20.055606, 5.9746092, -522.67397, 1102.26575, -774.75596, 181.49582], + [ 0.72, 0.77, 0.49074291, 10.484929, -0.31885445, -111.99730, 250.54286, -186.78287, 46.40581], + [ 0.77, 0.84, 0.34607161, 5.4063548, -2.9788620, -24.21100, 58.53312, -47.15244, 12.65668], + [ 0.84, 0.93, 0.31342828, 2.1140055, -4.1151543, -9.16969, 24.37544, -21.58758, 6.36954], + [ 0.93, 0.98, 0.30397966, -3.6334200, -4.9395699, -29.80626, 85.43510, -81.61766, 25.98669], + [ 0.98, 0.997, 0.30007321, -34.095653, -6.1531194, -434.11439, 1287.65238, -1273.10762, 419.56923]] + + # 0.17 - 0.983 + Coefficient10 = [[ 0.17, 0.30, 0.31081678, -0.086278355, -2.7023254, -13.95071, 10.30398, -2.49619, 0.19805], + [ 0.30, 0.45, 0.30636442, -0.094871613, -2.7246428, 0.38766, -0.44128, 0.16613, -0.02068], + [ 0.45, 0.68, 0.31156188, -0.063734909, -2.6789763, 0.41537, -0.71168, 0.40321, -0.07551], + [ 0.68, 0.90, 0.31195754, -0.092720991, -2.6863859, -0.44813, 1.06637, -0.84260, 0.22106], + [ 0.90, 0.983, 0.30712046, -1.5619311, -2.9809169, -5.74538, 16.23781, -15.29128, 4.79808]] + + # 0.06 - 0.953 + Coefficient11 = [[ 0.06, 0.08, 1.6030433, 0.043380701, -0.15208454, -1341.32950, 282.27311, -19.71010, 0.45664], + [ 0.08, 0.13, 0.85491410, -0.056761738, -0.65372414, -160.97221, 50.59168, -5.23625, 0.17842], + [ 0.13, 0.20, 0.57401485, -0.15265815, -1.0443069, -42.79943, 21.22139, -3.47357, 0.18765], + [ 0.20, 0.30, 0.41622542, -0.27871823, -1.4464670, -14.08741, 10.58863, -2.63159, 0.21621], + [ 0.30, 0.44, 0.33587066, -0.42674255, -1.8022482, -3.22540, 3.58964, -1.32194, 0.16106], + [ 0.44, 0.75, 0.31504207, -0.51197565, -1.9499037, 0.07609, -0.13681, 0.08090, -0.01572], + [ 0.75, 0.953, 0.31658938, -0.49808609, -1.9290368, -0.24018, 0.61450, -0.52258, 0.14771]] + + # 0.10 - 0.902 + Coefficient12 = [[ 0.10, 0.12, 103.56308, 1.2019976, 4.4869062, -6625.95443, 2292.46751, -264.28560, 10.15218], + [ 0.12, 0.14, 2.1585254, 0.34129627, 0.83653215, -742.15388, 289.52312, -37.59979, 1.62555], + [ 0.14, 0.19, 0.65654048, 0.031877859, -0.37693028, -66.92134, 33.18430, -5.45788, 0.29773], + [ 0.19, 0.27, 0.45076908, -0.10378254, -0.82836350, -10.66154, 7.36263, -1.68453, 0.12768], + [ 0.27, 0.40, 0.37085833, -0.21965481, -1.1287016, -2.87493, 2.88810, -0.95966, 0.10546], + [ 0.40, 0.55, 0.33605594, -0.33317467, -1.3397591, -0.70394, 1.00402, -0.47492, 0.07450], + [ 0.55, 0.902, 0.32790337, -0.39597877, -1.4180887, 0.00490, -0.01070, 0.00769, -0.00182]] + + if ( _K == 0.8): + Coeff = Coefficient8 + if ( _K == 0.9): + Coeff = Coefficient9 + if ( _K == 1.0): + Coeff = Coefficient10 + if ( _K == 1.1): + Coeff = Coefficient11 + if ( _K == 1.2): + Coeff = Coefficient12 + + # Juza 1996/1997 Equation: 8 + for Entry_k in Coeff: + if (Entry_k[0] <= _S_diamRatio) and (_S_diamRatio <= Entry_k[1]): + HInv = Entry_k[2] * _S_diamRatio**(Entry_k[3] * math.log(_S_diamRatio) + Entry_k[4]) + Entry_k[5] * (_S_diamRatio**3.0) + Entry_k[6] * (_S_diamRatio **2.0) + Entry_k[7] * _S_diamRatio + Entry_k[8] + return HInv + break + + return 0 + + + +# ========== USAGE PRINTER ========== + +def PrintCorrectUsage(): + print("\nDESCRIPTION:\n") + print("This program will take an image or a set of files (coordinate points) representing") + print("a droplet and will process the data to calculate the surface tension of the droplet.") + print("When an image file is set, the program will extract the coordinate of the points") + print("representing the edge of the droplet. When the files are set, it is assume that they") + print("will already contain the points representing the edge of the droplet. RK4 will be") + print("use to solve the Bashforth-Adams set of equations to get the parameters for surface") + print("tension calculation. parameters: A (apex radius curvature) and B (shape factor)") + print("\nUSAGE:\n") + print("Syntax 1: ./img.py -option1 value1 -option2 value2") + print("Syntax 2: python img.py -option1 value1 -option2 value2\n") + print("Options:") + print("-help : Prints this help message. ") + print("-out : Reference name for all the output files (coordinate files, RK4 dump, etc.).") + print(" : This should always be set. ") + print("-img : Image file to be processed. ") + print(" : When this is set, the file name inputs (-filep, -filen) should not be set.") + print("-filep : File containing the positive(x) point coordinates to be processed.") + print(" : If this is set, -filen should also be set and -img should not be set.") + print("-filen : File containing the negative(x) point coordinates to be processed.") + print(" : If this is set, -filep should also be set and -img should not be set.") + print("-proc : The number of processor to use.") + print(" : If not specified the default value is 2.") + print("-syrg : This is the syringe width in millimeters.") + print(" : If not specified the default value is 0.805 mm.") + print("-a : RK4 Parameter: minimum value for alpha (radius of curvature at apex).") + print(" : If not specified the default value is 0.0001") + print("-A : RK4 Parameter: maximum value for alpha (radius of curvature at apex).") + print(" : If not specified the default value is 2.0001") + print("-b : RK4 Parameter: minimum value for beta (shape factor).") + print(" : If not specified the default value is 0.0001") + print("-B : RK4 Parameter: minimum value for beta (shape factor).") + print(" : If not specified the default value is 0.5001.") + print("-x : RK4 Parameter: minimum value for x (initial guessed x coordinate).") + print(" : If not specified the default value is 0.0001.") + print("-X : RK4 Parameter: maximum value for x (initial guessed x coordinate).") + print(" : If not specified the default value is 0.5001.") + print("-t : RK4 Parameter: minimum value for t (initial guessed angle).") + print(" : If not specified the default value is 0.0001.") + print("-T : RK4 Parameter: maximum value for t (initial guessed angle).") + print(" : If not specified the default value is 0.5001.") + print("-ai : RK4 Parameter: alpha interval - the number of values to consider between min alpha and max alpha.") + print(" : If not specified the default value is 20.") + print("-bi : RK4 Parameter: beta interval - the number of values to consider between min beta and max beta.") + print(" : If not specified the default value is 20.") + print("-xi : RK4 Parameter: x interval - the number of values to consider between min x and max x.") + print(" : If not specified the default value is 5.") + print("-ti : RK4 Parameter: angle interval - the number of values to consider between min angle and max angle.") + print(" : If not specified the default value is 5.") + print("-solver : 1 for divide and conquer scanning.") + print(" : If not specified, optimization will be used to solve the parameters.") + print("\nSAMPLE USAGE:\n") + print("1. Calculate surface tension of a drop using default values.") + print("./img.py -img water-drop.jpg -out water-drop") + print("python img.py -img water-drop.jpg -out water-drop\n") + print("2. Uses 4 processors for calculation.") + print("./img.py -img water-drop.jpg -out water-drop -proc 4\n") + print("3. Setting interval sizes for A and B parameters (search for 30 possible values for A and B).") + print("./img.py -img water-drop.jpg -out water-drop -ai 30 -bi 30\n") + print("4. Setting min (0.00001) and max (1.5) values for parameter.") + print("./img.py -img water-drop.jpg -out water-drop -a 0.00001 -A 1.5\n") + + + +# ========== MAIN ========== + +if __name__ == '__main__': + + ImageFilePath = "" + OutputFileName = "" + PosPointsFileName = "" + NegPointsFileName = "" + ProcessCount = 2 + SyringeWidth = 0.70 * 1.15 + MinA_radCurv = 0.0001 + MaxA_radCurv = 2.0001 + MinB_shapeFact = 0.0001 + MaxB_shapeFact = 1.0001 + MinX = 0.0001 + MaxX = 0.5001 + MinT_angle = 0.0001 + MaxT_angle = 0.5001 + AStep = 20 + BStep = 20 + XStep = 5 + TStep = 5 + + if (len(sys.argv) <= 1): + PrintCorrectUsage() + sys.exit() + + ImageFlag = 0 + PosFileFlag = 0 + NegFileFlag = 0 + OutFlag = 0 + Counter = 1 + SolveMethod = 0 + + while (Counter <= len(sys.argv)-1): + + CurrentOption = sys.argv[Counter] + try: + CurrentValue = sys.argv[Counter+1] + except: + PrintCorrectUsage() + sys.exit() + + if CurrentOption == "-help": + PrintCorrectUsage() + sys.exit() + elif CurrentOption == "-img": + ImageFilePath = CurrentValue + ImageFlag = 1 + elif CurrentOption == "-filep": + PosPointsFileName = CurrentValue + PosFileFlag = 1 + elif CurrentOption == "-filen": + NegPointsFileName = CurrentValue + NegFileFlag = 1 + elif CurrentOption == "-out": + OutputFileName = CurrentValue + OutFlag = 1 + elif CurrentOption == "-proc": + ProcessCount = int(CurrentValue) + elif CurrentOption == "-syrg": + SyringeWidth = float(CurrentValue) + elif CurrentOption == "-a": + MinA_radCurv = float(CurrentValue) + elif CurrentOption == "-A": + MaxA_radCurv = float(CurrentValue) + elif CurrentOption == "-b": + MinB_shapeFact = float(CurrentValue) + elif CurrentOption == "-B": + MaxB_shapeFact = float(CurrentValue) + elif CurrentOption == "-x": + MinX = float(CurrentValue) + elif CurrentOption == "-X": + MaxX = float(CurrentValue) + elif CurrentOption == "-t": + MinT_angle = float(CurrentValue) + elif CurrentOption == "-T": + MaxT_angle = float(CurrentValue) + elif CurrentOption == "-ai": + AStep = int(CurrentValue) + elif CurrentOption == "-bi": + BStep = int(CurrentValue) + elif CurrentOption == "-xi": + XStep = int(CurrentValue) + elif CurrentOption == "-ti": + TStep = int(CurrentValue) + elif CurrentOption == "-solver": + SolveMethod = int(CurrentValue) + else: + PrintCorrectUsage() + sys.exit() + Counter = Counter + 2 + + if (OutFlag == 0 and ImageFlag == 1): + print("Output file name not set. (-out)") + PrintCorrectUsage() + sys.exit() + if (ImageFlag == 1 and ((PosFileFlag == 1) or (NegFileFlag == 1))): + print("Image(-img) can not be set with files option (-filep, -filen).") + print("Either set image only or files only.") + PrintCorrectUsage() + sys.exit() + if (ImageFlag == 0 and ((PosFileFlag == 1 and NegFileFlag == 0) or (PosFileFlag == 0 and NegFileFlag == 1))): + print("File inputs (-filep, -filen) should both be set if image input is not set.") + PrintCorrectUsage() + sys.exit() + + ARange_radCurv = [] + a = MinA_radCurv + ahop = float(MaxA_radCurv - MinA_radCurv)/float(AStep-1) + while (a <= MaxA_radCurv): + ARange_radCurv.append(a) + a += ahop + if ahop == 0.0: + break + if(np.abs(MaxA_radCurv - ARange_radCurv[len(ARange_radCurv)-1] - ahop) < 0.000001 and ahop != 0.0): + ARange_radCurv.append(MaxA_radCurv) + + BRange_shapeFact = [] + b = MinB_shapeFact + bhop = float(MaxB_shapeFact - MinB_shapeFact)/float(BStep-1) + while (b <= MaxB_shapeFact): + BRange_shapeFact.append(b) + b += bhop + if bhop == 0: + break + if(np.abs(MaxB_shapeFact - BRange_shapeFact[len(BRange_shapeFact)-1] - bhop) < 0.000001 and bhop != 0.0): + BRange_shapeFact.append(MaxB_shapeFact) + + XRange = [] + x = MinX + xhop = float(MaxX - MinX)/float(XStep-1) + while (x <= MaxX): + XRange.append(x) + x += xhop + if xhop == 0: + break + if(np.abs(MaxX - XRange[len(XRange)-1] - xhop) < 0.000001 and xhop != 0.0): + XRange.append(MaxX) + + TRange_angle = [] + t = MinT_angle + thop = float(MaxT_angle - MinT_angle)/float(TStep-1) + while (t <= MaxT_angle): + TRange_angle.append(t) + t += thop + if thop == 0.0: + break + if(np.abs(MaxT_angle - TRange_angle[len(TRange_angle)-1] - thop) < 0.000001 and thop != 0.0): + TRange_angle.append(MaxT_angle) + + + print("\n") + if (ImageFlag == 1): + print("Image File : " + ImageFilePath) + print("Output Name : " + OutputFileName) + print("Negative Cooridnate File : " + OutputFileName + "_Negative.dat") + print("Positive Cooridnate File : " + OutputFileName + "_Positive.dat") + print("Syringe Width (millimeter): " + str(SyringeWidth)) + else: + print("Negative Cooridnate File : " + NegPointsFileName) + print("Positive Cooridnate File : " + PosPointsFileName) + print("Radius of Curvature Range : " + str(MinA_radCurv) + "-" + str(MaxA_radCurv) + " (interval: "+str(len(ARange_radCurv))+")") + print("Shape Factor Range : " + str(MinB_shapeFact) + "-" + str(MaxB_shapeFact) + " (interval: "+str(len(BRange_shapeFact))+")") + print("Initial X Coordinate Range: " + str(MinX) + "-" + str(MaxX) + " (interval: "+str(len(XRange))+")") + print("Initial Angle Range : " + str(MinT_angle) + "-" + str(MaxT_angle) + " (interval: "+str(len(TRange_angle))+")") + print("Parameter Combinations : " + str(len(ARange_radCurv) * len(BRange_shapeFact) * len(XRange) * len(TRange_angle))) + print("Number of Process to Use : " + str(ProcessCount)) + + if (ImageFlag == 1): + Pos_edgePts, Neg_edgePts, De_scaledMaxWidth, Dms_diamters = ExtractEdgeCoordinate(ImageFilePath, OutputFileName, SyringeWidth) + HInv1 = HJuza(Dms_diamters[7]/De_scaledMaxWidth, 0.8) + HInv2 = HJuza(Dms_diamters[8]/De_scaledMaxWidth, 0.9) + HInv3 = HJuza(Dms_diamters[9]/De_scaledMaxWidth, 1.0) + HInv4 = HJuza(Dms_diamters[10]/De_scaledMaxWidth, 1.1) + HInv5 = HJuza(Dms_diamters[11]/De_scaledMaxWidth, 1.2) + HInvM = (0.20)*(HInv1 + HInv2 + HInv3 + HInv4 + HInv5) + HInvSD = math.sqrt((0.20)*( (HInv1-HInvM)**2.0 + (HInv2-HInvM)**2.0 + (HInv3-HInvM)**2.0 + (HInv4-HInvM)**2.0 + (HInv5-HInvM)**2.0)) + print("Juza 5-Plane (1/H) Std.Dev: " + str(HInvSD)) + else: + Pos_edgePts = [] + PositivePointFile = open(PosPointsFileName,'r') + for Line in PositivePointFile: + Coordinate = Line.split() + #print(Coordinate) + Pos_edgePts.append((float(Coordinate[0]), float(Coordinate[1]))) + PositivePointFile.close() + Neg_edgePts = [] + NegativePointFile = open(NegPointsFileName,'r') + for Line in NegativePointFile: + Coordinate = Line.split() + #print(Coordinate) + Neg_edgePts.append((float(Coordinate[0]), float(Coordinate[1]))) + NegativePointFile.close() + + def BruteForce(): + PosList = [] + NegList = [] + for ProcessNo in range(ProcessCount): + PosList.append(copy.deepcopy(Pos_edgePts)) + NegList.append(copy.deepcopy(Neg_edgePts)) + #print(ProcessNo) + + ARanges = [] + for ProcessNo in range(ProcessCount): + ARanges.append([]) + + i = 0 + for A in ARange_radCurv: + ARanges[i%ProcessCount].append(A) + i += 1 + + BestParams = multiprocessing.Queue() + TicksQueue = multiprocessing.Queue() + Processes = [] + + for ProcessNo in range(ProcessCount): + Processes.append(multiprocessing.Process(name='Search ' + str(ProcessNo), target=FindOptimalParameters, args=(PosList[ProcessNo], NegList[ProcessNo], ARanges[ProcessNo], BRange_shapeFact, XRange, TRange_angle, BestParams, TicksQueue))) + + for aProcess in Processes: + aProcess.start() + + sys.stdout.write("\rParameter Search Progress : 0%") + sys.stdout.flush() + Count = 0 + while(Count < len(ARange_radCurv)): + t = TicksQueue.get() + Count += 1 + sys.stdout.write("\rParameter Search Progress : " + str(int(100*float(Count)/float(len(ARange_radCurv)))) + "%") + sys.stdout.flush() + + for aProcess in Processes: + aProcess.join() + + BestOutput = (999999999, 1, 1, 1 ,1) + while not BestParams.empty(): + Output = BestParams.get() + if Output[0] < BestOutput[0]: + BestOutput = Output + return BestOutput + + def Optimize(): + return OptimizeParameters(Pos_edgePts, Neg_edgePts, 0.95, 0.3, 0.1, 0.2) + + starttime = time.time() + + BestOutput = Optimize() if 1 != SolveMethod else BruteForce() + + print("best output: " + str(BestOutput)) + + print("\nLowest RMSD : " + str(BestOutput[0])) + print("Computed Surface Tension : " + str(9.8*BestOutput[1]/BestOutput[2])) + print("Best Radius of Curvature : " + str(BestOutput[1])) + print("Best Shape Factor : " + str(BestOutput[2])) + print("Best Initial X Coordinate : " + str(BestOutput[3])) + print("Best Initial Angle : " + str(BestOutput[4])) + print("Lapsed Time in Seconds : " + str(time.time() -starttime)) diff --git a/lib/scripts/juszas_equation.dart b/lib/scripts/juszas_equation.dart new file mode 100644 index 0000000..8a3f84a --- /dev/null +++ b/lib/scripts/juszas_equation.dart @@ -0,0 +1,466 @@ +// ========== Juza's equation for 1/H ========== +import 'dart:math'; + +double HJuza(double _S_diamRatio, double _K) { + // LowerS, UpperS, Ke, Kex, Kep, K3, K2, K1, K0 + + // 0.82 - 0.999 + List> Coefficient8 = [ + [ + 0.82, + 0.83, + 1791452.8, + 533.85850, + 170.55837, + -81676.15812, + 202187.89690, + -166836.27680, + 45888.22973, + ], + [ + 0.83, + 0.84, + 189.07578, + 272.52455, + 72.730022, + -19963.60152, + 50019.79936, + -41775.38186, + 11629.85610, + ], + [ + 0.84, + 0.85, + 7.1549709, + 165.45945, + 35.285687, + -6944.66848, + 17609.43832, + -14883.84379, + 4193.34232, + ], + [ + 0.85, + 0.87, + 1.1496269, + 95.066407, + 12.600013, + -2158.91585, + 5571.60176, + -4792.82331, + 1374.26272, + ], + [ + 0.87, + 0.895, + 0.47873040, + 50.357240, + 0.089787883, + -567.76534, + 1503.51828, + -1327.11835, + 390.45562, + ], + [ + 0.895, + 0.93, + 0.35255000, + 25.498893, + -5.4176608, + -165.99710, + 454.58851, + -414.93772, + 126.23908, + ], + [ + 0.93, + 0.97, + 0.32002037, + 6.8474560, + -8.0901766, + -102.84970, + 293.25377, + -278.69176, + 88.27639, + ], + [ + 0.97, + 0.99, + 0.30845061, + -32.343947, + -10.455428, + -475.69091, + 1398.86173, + -1371.17931, + 448.00538, + ], + [ + 0.99, + 0.999, + 0.30110729, + -333.50440, + -15.711260, + -11334.69334, + 33822.93507, + -33642.61426, + 11154.37157, + ], + ]; + + // 0.635 - 0.997 + List> Coefficient9 = [ + [ + 0.635, + 0.645, + 58249804, + 119.64583, + 89.483167, + -28072.11478, + 53918.28040, + -34519.94034, + 7366.77050, + ], + [ + 0.645, + 0.66, + 5100.2910, + 70.920100, + 46.811007, + -9051.10879, + 17726.62108, + -15572.21470, + 2518.10214, + ], + [ + 0.66, + 0.685, + 19.518159, + 38.509198, + 19.951285, + -2338.00251, + 4719.64936, + -3175.58038, + 712.17229, + ], + [ + 0.685, + 0.72, + 1.3823760, + 20.055606, + 5.9746092, + -522.67397, + 1102.26575, + -774.75596, + 181.49582, + ], + [ + 0.72, + 0.77, + 0.49074291, + 10.484929, + -0.31885445, + -111.99730, + 250.54286, + -186.78287, + 46.40581, + ], + [ + 0.77, + 0.84, + 0.34607161, + 5.4063548, + -2.9788620, + -24.21100, + 58.53312, + -47.15244, + 12.65668, + ], + [ + 0.84, + 0.93, + 0.31342828, + 2.1140055, + -4.1151543, + -9.16969, + 24.37544, + -21.58758, + 6.36954, + ], + [ + 0.93, + 0.98, + 0.30397966, + -3.6334200, + -4.9395699, + -29.80626, + 85.43510, + -81.61766, + 25.98669, + ], + [ + 0.98, + 0.997, + 0.30007321, + -34.095653, + -6.1531194, + -434.11439, + 1287.65238, + -1273.10762, + 419.56923, + ], + ]; + + // 0.17 - 0.983 + List> Coefficient10 = [ + [ + 0.17, + 0.30, + 0.31081678, + -0.086278355, + -2.7023254, + -13.95071, + 10.30398, + -2.49619, + 0.19805, + ], + [ + 0.30, + 0.45, + 0.30636442, + -0.094871613, + -2.7246428, + 0.38766, + -0.44128, + 0.16613, + -0.02068, + ], + [ + 0.45, + 0.68, + 0.31156188, + -0.063734909, + -2.6789763, + 0.41537, + -0.71168, + 0.40321, + -0.07551, + ], + [ + 0.68, + 0.90, + 0.31195754, + -0.092720991, + -2.6863859, + -0.44813, + 1.06637, + -0.84260, + 0.22106, + ], + [ + 0.90, + 0.983, + 0.30712046, + -1.5619311, + -2.9809169, + -5.74538, + 16.23781, + -15.29128, + 4.79808, + ], + ]; + + // 0.06 - 0.953 + List> Coefficient11 = [ + [ + 0.06, + 0.08, + 1.6030433, + 0.043380701, + -0.15208454, + -1341.32950, + 282.27311, + -19.71010, + 0.45664, + ], + [ + 0.08, + 0.13, + 0.85491410, + -0.056761738, + -0.65372414, + -160.97221, + 50.59168, + -5.23625, + 0.17842, + ], + [ + 0.13, + 0.20, + 0.57401485, + -0.15265815, + -1.0443069, + -42.79943, + 21.22139, + -3.47357, + 0.18765, + ], + [ + 0.20, + 0.30, + 0.41622542, + -0.27871823, + -1.4464670, + -14.08741, + 10.58863, + -2.63159, + 0.21621, + ], + [ + 0.30, + 0.44, + 0.33587066, + -0.42674255, + -1.8022482, + -3.22540, + 3.58964, + -1.32194, + 0.16106, + ], + [ + 0.44, + 0.75, + 0.31504207, + -0.51197565, + -1.9499037, + 0.07609, + -0.13681, + 0.08090, + -0.01572, + ], + [ + 0.75, + 0.953, + 0.31658938, + -0.49808609, + -1.9290368, + -0.24018, + 0.61450, + -0.52258, + 0.14771, + ], + ]; + + // 0.10 - 0.902 + List> Coefficient12 = [ + [ + 0.10, + 0.12, + 103.56308, + 1.2019976, + 4.4869062, + -6625.95443, + 2292.46751, + -264.28560, + 10.15218, + ], + [ + 0.12, + 0.14, + 2.1585254, + 0.34129627, + 0.83653215, + -742.15388, + 289.52312, + -37.59979, + 1.62555, + ], + [ + 0.14, + 0.19, + 0.65654048, + 0.031877859, + -0.37693028, + -66.92134, + 33.18430, + -5.45788, + 0.29773, + ], + [ + 0.19, + 0.27, + 0.45076908, + -0.10378254, + -0.82836350, + -10.66154, + 7.36263, + -1.68453, + 0.12768, + ], + [ + 0.27, + 0.40, + 0.37085833, + -0.21965481, + -1.1287016, + -2.87493, + 2.88810, + -0.95966, + 0.10546, + ], + [ + 0.40, + 0.55, + 0.33605594, + -0.33317467, + -1.3397591, + -0.70394, + 1.00402, + -0.47492, + 0.07450, + ], + [ + 0.55, + 0.902, + 0.32790337, + -0.39597877, + -1.4180887, + 0.00490, + -0.01070, + 0.00769, + -0.00182, + ], + ]; + + List> Coeff = []; + if (_K == 0.8) { + Coeff = Coefficient8; + } + if (_K == 0.9) { + Coeff = Coefficient9; + } + if (_K == 1.0) { + Coeff = Coefficient10; + } + if (_K == 1.1) { + Coeff = Coefficient11; + } + if (_K == 1.2) { + Coeff = Coefficient12; + } + + // Juza 1996/1997 Equation: 8 + for (var Entry_k in Coeff) { + if (Entry_k[0] <= _S_diamRatio && _S_diamRatio <= Entry_k[1]) { + double HInv = + Entry_k[2] * + pow(_S_diamRatio, (Entry_k[3] * log(_S_diamRatio) + Entry_k[4])) + + Entry_k[5] * pow(_S_diamRatio, 3.0) + + Entry_k[6] * pow(_S_diamRatio, 2.0) + + Entry_k[7] * _S_diamRatio + + Entry_k[8]; + return HInv; + } + } + + return 0; +} diff --git a/lib/scripts/minimize_params_optimization.dart b/lib/scripts/minimize_params_optimization.dart new file mode 100644 index 0000000..703acc6 --- /dev/null +++ b/lib/scripts/minimize_params_optimization.dart @@ -0,0 +1,48 @@ +import 'dart:math'; + +import 'package:surface_tension_calculator/scripts/rk4.dart'; + +/// ========== FINDING OPTIMAL PARAMETERS USING MINIMZATION ========== +List optimizeParameters( + List posEdgePoints, + List negEdgePoints, + double aGuessRadCurv, + double bGuessShapeFact, + double xGuess, + double tGuessAngle, +) { + var rk4PosTable = makeRK4Table(posEdgePoints); + var rk4NegTable = makeRK4Table(negEdgePoints); + + double msd(List args) { + double aRadCurv = args[0]; + double bShapeFact = args[1]; + double x = args[2]; + double tAngle = args[3]; + + rk4PosTable[0][3] = x; + rk4PosTable[0][4] = tAngle; + rk4NegTable[0][3] = x; + rk4NegTable[0][4] = tAngle; + double fTotalDiffSquared = + bashforthAdamsRK4(rk4PosTable, aRadCurv, bShapeFact, 1.0) + + bashforthAdamsRK4(rk4NegTable, aRadCurv, bShapeFact, -1.0); + + return sqrt( + fTotalDiffSquared / (posEdgePoints.length + negEdgePoints.length), + ); + } + + var optResult = minimize(msd, [ + aGuessRadCurv, + bGuessShapeFact, + xGuess, + tGuessAngle, + ]); + if (optResult.success) { + print("minimization success"); + return [optResult.fun.toDouble()] + optResult.x; + } else { + return [9999999, 0, 0, 0, 0]; + } +} diff --git a/lib/scripts/rk4.dart b/lib/scripts/rk4.dart new file mode 100644 index 0000000..b88cb91 --- /dev/null +++ b/lib/scripts/rk4.dart @@ -0,0 +1,78 @@ +import 'dart:math'; + +/// ========== RK4 for BASHFORTH-ADAMS FORMULATION ========== +double bashforthAdamsRK4( + List> afRK4Table, + double fApexCurvature, + double fShapeFactor, + double fSign, +) { + double A = fApexCurvature; + double A2 = 2.0 / A; + double B = fShapeFactor; + // double KX0 = 1.0; + // double KT0 = 1.0; + double inv6 = 1.0 / 6.0; + double fTotalDiffSquared = 0.0; + int n = 1; + + while (n < afRK4Table.length) { + double x = afRK4Table[n - 1][3]; // predicted x + double y = afRK4Table[n - 1][1]; // actual y + double t = afRK4Table[n - 1][4]; // predicted angle + double dy = afRK4Table[n][2]; // actual y diff + double AG = 1.0; // AG: Added + double ydy = y + 0.5 * dy; + double KX1 = dy * (1.0 / tan(t)); + double KT1 = + dy * (1.0 / sin(t)) * (A2 - (B * y) - (sin(t) / (AG * x))); // A -> AG + double KX2 = dy * (1.0 / tan(t + 0.5 * KT1)); + double STKT1 = sin(t + 0.5 * KT1); + double KT2 = + dy * + (1.0 / STKT1) * + (A2 - (B * ydy) - (STKT1 / (AG * (x + 0.5 * KX1)))); // A -> AG + double KX3 = dy * (1.0 / tan(t + 0.5 * KT2)); + double STKT2 = sin(t + 0.5 * KT2); + double KT3 = + dy * + (1.0 / STKT2) * + (A2 - (B * ydy) - (STKT2 / (AG * (x + 0.5 * KX2)))); // A -> AG + double KX4 = dy * (1.0 / tan(t + KT3)); + double STKT3 = sin(t + KT3); + double KT4 = + dy * + (1.0 / STKT3) * + (A2 - (B * (y + dy)) - (STKT3 / (AG * (x + KX3)))); // A -> AG + double KX = (KX1 + 2.0 * (KX2 + KX3) + KX4) * inv6; + double KT = (KT1 + 2.0 * (KT2 + KT3) + KT4) * inv6; + + afRK4Table[n][3] = x + KX; + afRK4Table[n][4] = t + KT; + fTotalDiffSquared += pow(afRK4Table[n][0] - (fSign * afRK4Table[n][3]), 2); + n += 1; + } + + return fTotalDiffSquared; +} + +List> makeRK4Table(List edgePoints) { + List initialValues = List.filled(13, 0.0); + + List> rk4Table = []; + rk4Table.add(initialValues); + double yPrev = 0.0; + + for (var point in edgePoints) { + List entryValues = List.filled(13, 0.0); + double x = point[0]; + double y = point[1]; + entryValues[0] = x; + entryValues[1] = y; + entryValues[2] = y - yPrev; + yPrev = y; + rk4Table.add(entryValues); + } + + return rk4Table; +} diff --git a/lib/utils/snackbar_utils.dart b/lib/utils/snackbar_utils.dart new file mode 100644 index 0000000..09df691 --- /dev/null +++ b/lib/utils/snackbar_utils.dart @@ -0,0 +1,124 @@ +import 'package:flutter/material.dart'; + +class SnackBarUtils { + static final scaffoldKey = GlobalKey(); + + static void showError(String error) { + _showBasicSnackBar(error, + textColor: Colors.black, + snackbarColor: Colors.amber, + snackbarIcon: Icons.error_outline); + } + + static void showSuccess(String message) { + _showBasicSnackBar(message, snackbarColor: Colors.green); + } + + static void showLoading(String message) { + _showBasicSnackBar(message, + textColor: Colors.black, + iconColor: Colors.black, + snackbarColor: Colors.white); + } + + static void showLoadingWithProgress(String message, + {required ValueNotifier notifier}) { + _showProgressBar(message, notifier: notifier); + } + + static void hideSnackBar() { + scaffoldKey.currentState?.hideCurrentSnackBar(); + } + + static void _showBasicSnackBar(String message, + {Color textColor = Colors.black, + Color snackbarColor = Colors.teal, + IconData snackbarIcon = Icons.info_outline, + Color iconColor = Colors.black}) { + scaffoldKey.currentState?.showSnackBar( + SnackBar( + behavior: SnackBarBehavior.floating, + duration: Duration(seconds: 10), + width: 500, + content: Container( + margin: const EdgeInsets.only(bottom: 25), + padding: const EdgeInsets.all(8.0), + decoration: BoxDecoration( + color: snackbarColor, + borderRadius: BorderRadius.circular(30.0), + border: Border.all(color: Colors.black, width: 3), + ), + child: Row( + children: [ + Icon(snackbarIcon, color: iconColor), + const SizedBox(width: 8), + Expanded( + child: Text( + message, + style: + TextStyle(color: textColor, fontWeight: FontWeight.w500), + maxLines: 3, + ), + ), + ], + ), + ), + backgroundColor: Colors.transparent, + elevation: 0.0, + ), + ); + } + + static void _showProgressBar( + String message, { + required ValueNotifier notifier, + Color textColor = Colors.black, + Color snackbarColor = Colors.amber, + IconData snackbarIcon = Icons.info_outline, + Color iconColor = Colors.black, + }) { + double height = 15.0; + + scaffoldKey.currentState?.showSnackBar( + SnackBar( + behavior: SnackBarBehavior.floating, + width: 500, + duration: const Duration(days: 1), + content: Container( + margin: const EdgeInsets.only(bottom: 25), + padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 15), + decoration: BoxDecoration( + color: snackbarColor, + borderRadius: BorderRadius.circular(30.0), + border: Border.all(color: Colors.black, width: 3), + ), + child: ValueListenableBuilder( + valueListenable: notifier, + builder: (_, double value, Widget? child) { + return Row( + children: [ + Icon(snackbarIcon, color: iconColor), + const SizedBox(width: 8), + Text(message, + style: TextStyle(color: textColor), maxLines: 3), + const SizedBox(width: 8), + Expanded( + child: LinearProgressIndicator( + backgroundColor: Colors.amber, + color: Colors.white38, + minHeight: height, + value: value, + borderRadius: BorderRadius.circular(30.0), + ), + ), + ], + ); + }, + ), + ), + backgroundColor: Colors.transparent, + elevation: 0.0, + ), + ); + } +} \ No newline at end of file diff --git a/macos/.gitignore b/macos/.gitignore new file mode 100644 index 0000000..746adbb --- /dev/null +++ b/macos/.gitignore @@ -0,0 +1,7 @@ +# Flutter-related +**/Flutter/ephemeral/ +**/Pods/ + +# Xcode-related +**/dgph +**/xcuserdata/ diff --git a/macos/Flutter/Flutter-Debug.xcconfig b/macos/Flutter/Flutter-Debug.xcconfig new file mode 100644 index 0000000..4b81f9b --- /dev/null +++ b/macos/Flutter/Flutter-Debug.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/macos/Flutter/Flutter-Release.xcconfig b/macos/Flutter/Flutter-Release.xcconfig new file mode 100644 index 0000000..5caa9d1 --- /dev/null +++ b/macos/Flutter/Flutter-Release.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift new file mode 100644 index 0000000..774a6b8 --- /dev/null +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -0,0 +1,12 @@ +// +// Generated file. Do not edit. +// + +import FlutterMacOS +import Foundation + +import file_picker + +func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin")) +} diff --git a/macos/Podfile b/macos/Podfile new file mode 100644 index 0000000..29c8eb3 --- /dev/null +++ b/macos/Podfile @@ -0,0 +1,42 @@ +platform :osx, '10.14' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\"" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_macos_podfile_setup + +target 'Runner' do + use_frameworks! + + flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_macos_build_settings(target) + end +end diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000..760c652 --- /dev/null +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,705 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXAggregateTarget section */ + 33CC111A2044C6BA0003C045 /* Flutter Assemble */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */; + buildPhases = ( + 33CC111E2044C6BF0003C045 /* ShellScript */, + ); + dependencies = ( + ); + name = "Flutter Assemble"; + productName = FLX; + }; +/* End PBXAggregateTarget section */ + +/* Begin PBXBuildFile section */ + 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC10EC2044A3C60003C045; + remoteInfo = Runner; + }; + 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC111A2044C6BA0003C045; + remoteInfo = FLX; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 33CC110E2044A8840003C045 /* Bundle Framework */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Bundle Framework"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; + 33CC10ED2044A3C60003C045 /* surface_tension_calculator.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "surface_tension_calculator.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; + 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; + 33CC10F72044A3C60003C045 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Runner/Info.plist; sourceTree = ""; }; + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainFlutterWindow.swift; sourceTree = ""; }; + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = ""; }; + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = ""; }; + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = ""; }; + 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; + 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; + 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 331C80D2294CF70F00263BE5 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10EA2044A3C60003C045 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 331C80D6294CF71000263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C80D7294CF71000263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 33BA886A226E78AF003329D5 /* Configs */ = { + isa = PBXGroup; + children = ( + 33E5194F232828860026EE4D /* AppInfo.xcconfig */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */, + ); + path = Configs; + sourceTree = ""; + }; + 33CC10E42044A3C60003C045 = { + isa = PBXGroup; + children = ( + 33FAB671232836740065AC1E /* Runner */, + 33CEB47122A05771004F2AC0 /* Flutter */, + 331C80D6294CF71000263BE5 /* RunnerTests */, + 33CC10EE2044A3C60003C045 /* Products */, + D73912EC22F37F3D000D13A0 /* Frameworks */, + ); + sourceTree = ""; + }; + 33CC10EE2044A3C60003C045 /* Products */ = { + isa = PBXGroup; + children = ( + 33CC10ED2044A3C60003C045 /* surface_tension_calculator.app */, + 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 33CC11242044D66E0003C045 /* Resources */ = { + isa = PBXGroup; + children = ( + 33CC10F22044A3C60003C045 /* Assets.xcassets */, + 33CC10F42044A3C60003C045 /* MainMenu.xib */, + 33CC10F72044A3C60003C045 /* Info.plist */, + ); + name = Resources; + path = ..; + sourceTree = ""; + }; + 33CEB47122A05771004F2AC0 /* Flutter */ = { + isa = PBXGroup; + children = ( + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */, + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */, + ); + path = Flutter; + sourceTree = ""; + }; + 33FAB671232836740065AC1E /* Runner */ = { + isa = PBXGroup; + children = ( + 33CC10F02044A3C60003C045 /* AppDelegate.swift */, + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */, + 33E51913231747F40026EE4D /* DebugProfile.entitlements */, + 33E51914231749380026EE4D /* Release.entitlements */, + 33CC11242044D66E0003C045 /* Resources */, + 33BA886A226E78AF003329D5 /* Configs */, + ); + path = Runner; + sourceTree = ""; + }; + D73912EC22F37F3D000D13A0 /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 331C80D4294CF70F00263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + 331C80D1294CF70F00263BE5 /* Sources */, + 331C80D2294CF70F00263BE5 /* Frameworks */, + 331C80D3294CF70F00263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C80DA294CF71000263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C80D5294CF71000263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 33CC10EC2044A3C60003C045 /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 33CC10E92044A3C60003C045 /* Sources */, + 33CC10EA2044A3C60003C045 /* Frameworks */, + 33CC10EB2044A3C60003C045 /* Resources */, + 33CC110E2044A8840003C045 /* Bundle Framework */, + 3399D490228B24CF009A79C7 /* ShellScript */, + ); + buildRules = ( + ); + dependencies = ( + 33CC11202044C79F0003C045 /* PBXTargetDependency */, + ); + name = Runner; + productName = Runner; + productReference = 33CC10ED2044A3C60003C045 /* surface_tension_calculator.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 33CC10E52044A3C60003C045 /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + LastSwiftUpdateCheck = 0920; + LastUpgradeCheck = 1510; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 331C80D4294CF70F00263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 33CC10EC2044A3C60003C045; + }; + 33CC10EC2044A3C60003C045 = { + CreatedOnToolsVersion = 9.2; + LastSwiftMigration = 1100; + ProvisioningStyle = Automatic; + SystemCapabilities = { + com.apple.Sandbox = { + enabled = 1; + }; + }; + }; + 33CC111A2044C6BA0003C045 = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Manual; + }; + }; + }; + buildConfigurationList = 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 33CC10E42044A3C60003C045; + productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 33CC10EC2044A3C60003C045 /* Runner */, + 331C80D4294CF70F00263BE5 /* RunnerTests */, + 33CC111A2044C6BA0003C045 /* Flutter Assemble */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 331C80D3294CF70F00263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10EB2044A3C60003C045 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */, + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3399D490228B24CF009A79C7 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; + }; + 33CC111E2044C6BF0003C045 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + Flutter/ephemeral/FlutterInputs.xcfilelist, + ); + inputPaths = ( + Flutter/ephemeral/tripwire, + ); + outputFileListPaths = ( + Flutter/ephemeral/FlutterOutputs.xcfilelist, + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 331C80D1294CF70F00263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10E92044A3C60003C045 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */, + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */, + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 331C80DA294CF71000263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC10EC2044A3C60003C045 /* Runner */; + targetProxy = 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */; + }; + 33CC11202044C79F0003C045 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */; + targetProxy = 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 33CC10F42044A3C60003C045 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 33CC10F52044A3C60003C045 /* Base */, + ); + name = MainMenu.xib; + path = Runner; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 331C80DB294CF71000263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.upisc.surfaceTensionCalculator.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/surface_tension_calculator.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/surface_tension_calculator"; + }; + name = Debug; + }; + 331C80DC294CF71000263BE5 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.upisc.surfaceTensionCalculator.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/surface_tension_calculator.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/surface_tension_calculator"; + }; + name = Release; + }; + 331C80DD294CF71000263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.upisc.surfaceTensionCalculator.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/surface_tension_calculator.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/surface_tension_calculator"; + }; + name = Profile; + }; + 338D0CE9231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Profile; + }; + 338D0CEA231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Profile; + }; + 338D0CEB231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Profile; + }; + 33CC10F92044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 33CC10FA2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Release; + }; + 33CC10FC2044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + }; + name = Debug; + }; + 33CC10FD2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Release; + }; + 33CC111C2044C6BA0003C045 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 33CC111D2044C6BA0003C045 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C80DB294CF71000263BE5 /* Debug */, + 331C80DC294CF71000263BE5 /* Release */, + 331C80DD294CF71000263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10F92044A3C60003C045 /* Debug */, + 33CC10FA2044A3C60003C045 /* Release */, + 338D0CE9231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10FC2044A3C60003C045 /* Debug */, + 33CC10FD2044A3C60003C045 /* Release */, + 338D0CEA231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC111C2044C6BA0003C045 /* Debug */, + 33CC111D2044C6BA0003C045 /* Release */, + 338D0CEB231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 33CC10E52044A3C60003C045 /* Project object */; +} diff --git a/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000..4c7462d --- /dev/null +++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/macos/Runner.xcworkspace/contents.xcworkspacedata b/macos/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..1d526a1 --- /dev/null +++ b/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/macos/Runner/AppDelegate.swift b/macos/Runner/AppDelegate.swift new file mode 100644 index 0000000..b3c1761 --- /dev/null +++ b/macos/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import Cocoa +import FlutterMacOS + +@main +class AppDelegate: FlutterAppDelegate { + override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { + return true + } + + override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool { + return true + } +} diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..a2ec33f --- /dev/null +++ b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_16.png", + "scale" : "1x" + }, + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "2x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "1x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_64.png", + "scale" : "2x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_128.png", + "scale" : "1x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "1x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "2x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_1024.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png new file mode 100644 index 0000000..82b6f9d Binary files /dev/null and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png new file mode 100644 index 0000000..13b35eb Binary files /dev/null and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png new file mode 100644 index 0000000..0a3f5fa Binary files /dev/null and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png new file mode 100644 index 0000000..bdb5722 Binary files /dev/null and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png new file mode 100644 index 0000000..f083318 Binary files /dev/null and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png new file mode 100644 index 0000000..326c0e7 Binary files /dev/null and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png new file mode 100644 index 0000000..2f1632c Binary files /dev/null and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/macos/Runner/Base.lproj/MainMenu.xib b/macos/Runner/Base.lproj/MainMenu.xib new file mode 100644 index 0000000..80e867a --- /dev/null +++ b/macos/Runner/Base.lproj/MainMenu.xib @@ -0,0 +1,343 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig new file mode 100644 index 0000000..e046a48 --- /dev/null +++ b/macos/Runner/Configs/AppInfo.xcconfig @@ -0,0 +1,14 @@ +// Application-level settings for the Runner target. +// +// This may be replaced with something auto-generated from metadata (e.g., pubspec.yaml) in the +// future. If not, the values below would default to using the project name when this becomes a +// 'flutter create' template. + +// The application's name. By default this is also the title of the Flutter window. +PRODUCT_NAME = surface_tension_calculator + +// The application's bundle identifier +PRODUCT_BUNDLE_IDENTIFIER = com.upisc.surfaceTensionCalculator + +// The copyright displayed in application information +PRODUCT_COPYRIGHT = Copyright © 2025 com.upisc. All rights reserved. diff --git a/macos/Runner/Configs/Debug.xcconfig b/macos/Runner/Configs/Debug.xcconfig new file mode 100644 index 0000000..36b0fd9 --- /dev/null +++ b/macos/Runner/Configs/Debug.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Debug.xcconfig" +#include "Warnings.xcconfig" diff --git a/macos/Runner/Configs/Release.xcconfig b/macos/Runner/Configs/Release.xcconfig new file mode 100644 index 0000000..dff4f49 --- /dev/null +++ b/macos/Runner/Configs/Release.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Release.xcconfig" +#include "Warnings.xcconfig" diff --git a/macos/Runner/Configs/Warnings.xcconfig b/macos/Runner/Configs/Warnings.xcconfig new file mode 100644 index 0000000..42bcbf4 --- /dev/null +++ b/macos/Runner/Configs/Warnings.xcconfig @@ -0,0 +1,13 @@ +WARNING_CFLAGS = -Wall -Wconditional-uninitialized -Wnullable-to-nonnull-conversion -Wmissing-method-return-type -Woverlength-strings +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_PRAGMA_PACK = YES +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +GCC_WARN_STRICT_SELECTOR_MATCH = YES +CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +GCC_WARN_SHADOW = YES +CLANG_WARN_UNREACHABLE_CODE = YES diff --git a/macos/Runner/DebugProfile.entitlements b/macos/Runner/DebugProfile.entitlements new file mode 100644 index 0000000..dddb8a3 --- /dev/null +++ b/macos/Runner/DebugProfile.entitlements @@ -0,0 +1,12 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.cs.allow-jit + + com.apple.security.network.server + + + diff --git a/macos/Runner/Info.plist b/macos/Runner/Info.plist new file mode 100644 index 0000000..4789daa --- /dev/null +++ b/macos/Runner/Info.plist @@ -0,0 +1,32 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIconFile + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSMinimumSystemVersion + $(MACOSX_DEPLOYMENT_TARGET) + NSHumanReadableCopyright + $(PRODUCT_COPYRIGHT) + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + diff --git a/macos/Runner/MainFlutterWindow.swift b/macos/Runner/MainFlutterWindow.swift new file mode 100644 index 0000000..3cc05eb --- /dev/null +++ b/macos/Runner/MainFlutterWindow.swift @@ -0,0 +1,15 @@ +import Cocoa +import FlutterMacOS + +class MainFlutterWindow: NSWindow { + override func awakeFromNib() { + let flutterViewController = FlutterViewController() + let windowFrame = self.frame + self.contentViewController = flutterViewController + self.setFrame(windowFrame, display: true) + + RegisterGeneratedPlugins(registry: flutterViewController) + + super.awakeFromNib() + } +} diff --git a/macos/Runner/Release.entitlements b/macos/Runner/Release.entitlements new file mode 100644 index 0000000..852fa1a --- /dev/null +++ b/macos/Runner/Release.entitlements @@ -0,0 +1,8 @@ + + + + + com.apple.security.app-sandbox + + + diff --git a/macos/RunnerTests/RunnerTests.swift b/macos/RunnerTests/RunnerTests.swift new file mode 100644 index 0000000..61f3bd1 --- /dev/null +++ b/macos/RunnerTests/RunnerTests.swift @@ -0,0 +1,12 @@ +import Cocoa +import FlutterMacOS +import XCTest + +class RunnerTests: XCTestCase { + + func testExample() { + // If you add code to the Runner application, consider adding tests here. + // See https://developer.apple.com/documentation/xctest for more information about using XCTest. + } + +} diff --git a/pubspec.lock b/pubspec.lock new file mode 100644 index 0000000..408fb93 --- /dev/null +++ b/pubspec.lock @@ -0,0 +1,282 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + async: + dependency: transitive + description: + name: async + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 + url: "https://pub.dev" + source: hosted + version: "2.12.0" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + characters: + dependency: transitive + description: + name: characters + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 + url: "https://pub.dev" + source: hosted + version: "1.4.0" + clock: + dependency: transitive + description: + name: clock + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b + url: "https://pub.dev" + source: hosted + version: "1.1.2" + collection: + dependency: transitive + description: + name: collection + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + url: "https://pub.dev" + source: hosted + version: "1.19.1" + cross_file: + dependency: transitive + description: + name: cross_file + sha256: "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670" + url: "https://pub.dev" + source: hosted + version: "0.3.4+2" + cupertino_icons: + dependency: "direct main" + description: + name: cupertino_icons + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 + url: "https://pub.dev" + source: hosted + version: "1.0.8" + fake_async: + dependency: transitive + description: + name: fake_async + sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" + url: "https://pub.dev" + source: hosted + version: "1.3.2" + ffi: + dependency: transitive + description: + name: ffi + sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + file_picker: + dependency: "direct main" + description: + name: file_picker + sha256: "8d938fd5c11dc81bf1acd4f7f0486c683fe9e79a0b13419e27730f9ce4d8a25b" + url: "https://pub.dev" + source: hosted + version: "9.2.1" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_lints: + dependency: "direct dev" + description: + name: flutter_lints + sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" + url: "https://pub.dev" + source: hosted + version: "5.0.0" + flutter_plugin_android_lifecycle: + dependency: transitive + description: + name: flutter_plugin_android_lifecycle + sha256: "5a1e6fb2c0561958d7e4c33574674bda7b77caaca7a33b758876956f2902eea3" + url: "https://pub.dev" + source: hosted + version: "2.0.27" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec + url: "https://pub.dev" + source: hosted + version: "10.0.8" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 + url: "https://pub.dev" + source: hosted + version: "3.0.9" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" + lints: + dependency: transitive + description: + name: lints + sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 + url: "https://pub.dev" + source: hosted + version: "5.1.1" + matcher: + dependency: transitive + description: + name: matcher + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 + url: "https://pub.dev" + source: hosted + version: "0.12.17" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + url: "https://pub.dev" + source: hosted + version: "0.11.1" + meta: + dependency: transitive + description: + name: meta + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + url: "https://pub.dev" + source: hosted + version: "1.16.0" + path: + dependency: transitive + description: + name: path + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + url: "https://pub.dev" + source: hosted + version: "1.9.1" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" + source: hosted + version: "2.1.8" + scidart: + dependency: "direct main" + description: + name: scidart + sha256: af816eed552cadb6a9a324c594515b0cdff41617839345c382047927bd8dc02d + url: "https://pub.dev" + source: hosted + version: "0.0.2-dev.12" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + source_span: + dependency: transitive + description: + name: source_span + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" + url: "https://pub.dev" + source: hosted + version: "1.10.1" + stack_trace: + dependency: transitive + description: + name: stack_trace + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" + url: "https://pub.dev" + source: hosted + version: "1.12.1" + stream_channel: + dependency: transitive + description: + name: stream_channel + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + string_scanner: + dependency: transitive + description: + name: string_scanner + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" + url: "https://pub.dev" + source: hosted + version: "1.4.1" + term_glyph: + dependency: transitive + description: + name: term_glyph + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" + url: "https://pub.dev" + source: hosted + version: "1.2.2" + test_api: + dependency: transitive + description: + name: test_api + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd + url: "https://pub.dev" + source: hosted + version: "0.7.4" + vector_math: + dependency: transitive + description: + name: vector_math + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" + url: "https://pub.dev" + source: hosted + version: "14.3.1" + web: + dependency: transitive + description: + name: web + sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" + url: "https://pub.dev" + source: hosted + version: "1.1.1" + win32: + dependency: transitive + description: + name: win32 + sha256: dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f + url: "https://pub.dev" + source: hosted + version: "5.12.0" +sdks: + dart: ">=3.7.2 <4.0.0" + flutter: ">=3.27.0" diff --git a/pubspec.yaml b/pubspec.yaml new file mode 100644 index 0000000..14bbdad --- /dev/null +++ b/pubspec.yaml @@ -0,0 +1,42 @@ +name: surface_tension_calculator +description: "App that calculates surface tension based on an image of a droplet" +publish_to: 'none' # Remove this line if you wish to publish to pub.dev + +version: 1.0.0+1 + +environment: + sdk: ^3.7.2 + +dependencies: + flutter: + sdk: flutter + cupertino_icons: ^1.0.8 + file_picker: ^9.2.1 + # Script dependencies + scidart: ^0.0.2-dev.12 + +dev_dependencies: + flutter_test: + sdk: flutter + + flutter_lints: ^5.0.0 + +flutter: + uses-material-design: true + assets: + - fonts/ + - assets/ + fonts: + - family: Montserrat + fonts: + - asset: fonts/Montserrat-Regular.ttf + - asset: fonts/Montserrat-ExtraBold.ttf + weight: 900 + - asset: fonts/Montserrat-Bold.ttf + weight: 700 + - asset: fonts/Montserrat-Medium.ttf + weight: 600 + - asset: fonts/Montserrat-Italic.ttf + style: italic + - asset: fonts/Montserrat-Light.ttf + weight: 400 diff --git a/test/widget_test.dart b/test/widget_test.dart new file mode 100644 index 0000000..69269e5 --- /dev/null +++ b/test/widget_test.dart @@ -0,0 +1,30 @@ +// This is a basic Flutter widget test. +// +// To perform an interaction with a widget in your test, use the WidgetTester +// utility in the flutter_test package. For example, you can send tap and scroll +// gestures. You can also use WidgetTester to find child widgets in the widget +// tree, read text, and verify that the values of widget properties are correct. + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; + +import 'package:surface_tension_calculator/main.dart'; + +void main() { + testWidgets('Counter increments smoke test', (WidgetTester tester) async { + // Build our app and trigger a frame. + await tester.pumpWidget(const MyApp()); + + // Verify that our counter starts at 0. + expect(find.text('0'), findsOneWidget); + expect(find.text('1'), findsNothing); + + // Tap the '+' icon and trigger a frame. + await tester.tap(find.byIcon(Icons.add)); + await tester.pump(); + + // Verify that our counter has incremented. + expect(find.text('0'), findsNothing); + expect(find.text('1'), findsOneWidget); + }); +} diff --git a/web/favicon.png b/web/favicon.png new file mode 100644 index 0000000..8aaa46a Binary files /dev/null and b/web/favicon.png differ diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png new file mode 100644 index 0000000..b749bfe Binary files /dev/null and b/web/icons/Icon-192.png differ diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png new file mode 100644 index 0000000..88cfd48 Binary files /dev/null and b/web/icons/Icon-512.png differ diff --git a/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000..eb9b4d7 Binary files /dev/null and b/web/icons/Icon-maskable-192.png differ diff --git a/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000..d69c566 Binary files /dev/null and b/web/icons/Icon-maskable-512.png differ diff --git a/web/index.html b/web/index.html new file mode 100644 index 0000000..2fdd18c --- /dev/null +++ b/web/index.html @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + surface_tension_calculator + + + + + + diff --git a/web/manifest.json b/web/manifest.json new file mode 100644 index 0000000..696b2c8 --- /dev/null +++ b/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "surface_tension_calculator", + "short_name": "surface_tension_calculator", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "App that calculates surface tension based on an image of a droplet", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +} diff --git a/windows/.gitignore b/windows/.gitignore new file mode 100644 index 0000000..d492d0d --- /dev/null +++ b/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ephemeral/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt new file mode 100644 index 0000000..a5ad5f5 --- /dev/null +++ b/windows/CMakeLists.txt @@ -0,0 +1,108 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(surface_tension_calculator LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "surface_tension_calculator") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(VERSION 3.14...3.25) + +# Define build configuration option. +get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if(IS_MULTICONFIG) + set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" + CACHE STRING "" FORCE) +else() + if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") + endif() +endif() +# Define settings for the Profile build mode. +set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") +set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") + +# Use Unicode for all projects. +add_definitions(-DUNICODE -D_UNICODE) + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_17) + target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") + target_compile_options(${TARGET} PRIVATE /EHsc) + target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") + target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# Support files are copied into place next to the executable, so that it can +# run in place. This is done instead of making a separate bundle (as on Linux) +# so that building and running from within Visual Studio will work. +set(BUILD_BUNDLE_DIR "$") +# Make the "install" step default, as it's required to run. +set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + CONFIGURATIONS Profile;Release + COMPONENT Runtime) diff --git a/windows/flutter/CMakeLists.txt b/windows/flutter/CMakeLists.txt new file mode 100644 index 0000000..903f489 --- /dev/null +++ b/windows/flutter/CMakeLists.txt @@ -0,0 +1,109 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.14) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. +set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") + +# Set fallback configurations for older versions of the flutter tool. +if (NOT DEFINED FLUTTER_TARGET_PLATFORM) + set(FLUTTER_TARGET_PLATFORM "windows-x64") +endif() + +# === Flutter Library === +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "flutter_export.h" + "flutter_windows.h" + "flutter_messenger.h" + "flutter_plugin_registrar.h" + "flutter_texture_registrar.h" +) +list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") +add_dependencies(flutter flutter_assemble) + +# === Wrapper === +list(APPEND CPP_WRAPPER_SOURCES_CORE + "core_implementations.cc" + "standard_codec.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_PLUGIN + "plugin_registrar.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_APP + "flutter_engine.cc" + "flutter_view_controller.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") + +# Wrapper sources needed for a plugin. +add_library(flutter_wrapper_plugin STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} +) +apply_standard_settings(flutter_wrapper_plugin) +set_target_properties(flutter_wrapper_plugin PROPERTIES + POSITION_INDEPENDENT_CODE ON) +set_target_properties(flutter_wrapper_plugin PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) +target_include_directories(flutter_wrapper_plugin PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_plugin flutter_assemble) + +# Wrapper sources needed for the runner. +add_library(flutter_wrapper_app STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_APP} +) +apply_standard_settings(flutter_wrapper_app) +target_link_libraries(flutter_wrapper_app PUBLIC flutter) +target_include_directories(flutter_wrapper_app PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_app flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") +set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} + ${PHONY_OUTPUT} + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" + ${FLUTTER_TARGET_PLATFORM} $ + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} +) diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..8b6d468 --- /dev/null +++ b/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,11 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + + +void RegisterPlugins(flutter::PluginRegistry* registry) { +} diff --git a/windows/flutter/generated_plugin_registrant.h b/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..dc139d8 --- /dev/null +++ b/windows/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void RegisterPlugins(flutter::PluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake new file mode 100644 index 0000000..b93c4c3 --- /dev/null +++ b/windows/flutter/generated_plugins.cmake @@ -0,0 +1,23 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/windows/runner/CMakeLists.txt b/windows/runner/CMakeLists.txt new file mode 100644 index 0000000..394917c --- /dev/null +++ b/windows/runner/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.14) +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} WIN32 + "flutter_window.cpp" + "main.cpp" + "utils.cpp" + "win32_window.cpp" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" + "Runner.rc" + "runner.exe.manifest" +) + +# 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 build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + +# Disable Windows macros that collide with C++ standard library functions. +target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") + +# Add dependency libraries and include directories. Add any application-specific +# dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) +target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib") +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc new file mode 100644 index 0000000..e9013bc --- /dev/null +++ b/windows/runner/Runner.rc @@ -0,0 +1,121 @@ +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APP_ICON ICON "resources\\app_icon.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD +#else +#define VERSION_AS_NUMBER 1,0,0,0 +#endif + +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION +#else +#define VERSION_AS_STRING "1.0.0" +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_AS_NUMBER + PRODUCTVERSION VERSION_AS_NUMBER + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "com.upisc" "\0" + VALUE "FileDescription", "surface_tension_calculator" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "surface_tension_calculator" "\0" + VALUE "LegalCopyright", "Copyright (C) 2025 com.upisc. All rights reserved." "\0" + VALUE "OriginalFilename", "surface_tension_calculator.exe" "\0" + VALUE "ProductName", "surface_tension_calculator" "\0" + VALUE "ProductVersion", VERSION_AS_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/windows/runner/flutter_window.cpp b/windows/runner/flutter_window.cpp new file mode 100644 index 0000000..955ee30 --- /dev/null +++ b/windows/runner/flutter_window.cpp @@ -0,0 +1,71 @@ +#include "flutter_window.h" + +#include + +#include "flutter/generated_plugin_registrant.h" + +FlutterWindow::FlutterWindow(const flutter::DartProject& project) + : project_(project) {} + +FlutterWindow::~FlutterWindow() {} + +bool FlutterWindow::OnCreate() { + if (!Win32Window::OnCreate()) { + return false; + } + + RECT frame = GetClientArea(); + + // The size here must match the window dimensions to avoid unnecessary surface + // creation / destruction in the startup path. + flutter_controller_ = std::make_unique( + frame.right - frame.left, frame.bottom - frame.top, project_); + // Ensure that basic setup of the controller was successful. + if (!flutter_controller_->engine() || !flutter_controller_->view()) { + return false; + } + RegisterPlugins(flutter_controller_->engine()); + SetChildContent(flutter_controller_->view()->GetNativeWindow()); + + flutter_controller_->engine()->SetNextFrameCallback([&]() { + this->Show(); + }); + + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + + return true; +} + +void FlutterWindow::OnDestroy() { + if (flutter_controller_) { + flutter_controller_ = nullptr; + } + + Win32Window::OnDestroy(); +} + +LRESULT +FlutterWindow::MessageHandler(HWND hwnd, UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + // Give Flutter, including plugins, an opportunity to handle window messages. + if (flutter_controller_) { + std::optional result = + flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, + lparam); + if (result) { + return *result; + } + } + + switch (message) { + case WM_FONTCHANGE: + flutter_controller_->engine()->ReloadSystemFonts(); + break; + } + + return Win32Window::MessageHandler(hwnd, message, wparam, lparam); +} diff --git a/windows/runner/flutter_window.h b/windows/runner/flutter_window.h new file mode 100644 index 0000000..6da0652 --- /dev/null +++ b/windows/runner/flutter_window.h @@ -0,0 +1,33 @@ +#ifndef RUNNER_FLUTTER_WINDOW_H_ +#define RUNNER_FLUTTER_WINDOW_H_ + +#include +#include + +#include + +#include "win32_window.h" + +// A window that does nothing but host a Flutter view. +class FlutterWindow : public Win32Window { + public: + // Creates a new FlutterWindow hosting a Flutter view running |project|. + explicit FlutterWindow(const flutter::DartProject& project); + virtual ~FlutterWindow(); + + protected: + // Win32Window: + bool OnCreate() override; + void OnDestroy() override; + LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, + LPARAM const lparam) noexcept override; + + private: + // The project to run. + flutter::DartProject project_; + + // The Flutter instance hosted by this window. + std::unique_ptr flutter_controller_; +}; + +#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/windows/runner/main.cpp b/windows/runner/main.cpp new file mode 100644 index 0000000..b720a7e --- /dev/null +++ b/windows/runner/main.cpp @@ -0,0 +1,43 @@ +#include +#include +#include + +#include "flutter_window.h" +#include "utils.h" + +int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, + _In_ wchar_t *command_line, _In_ int show_command) { + // Attach to console when present (e.g., 'flutter run') or create a + // new console when running with a debugger. + if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { + CreateAndAttachConsole(); + } + + // Initialize COM, so that it is available for use in the library and/or + // plugins. + ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + + flutter::DartProject project(L"data"); + + std::vector command_line_arguments = + GetCommandLineArguments(); + + project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); + + FlutterWindow window(project); + Win32Window::Point origin(10, 10); + Win32Window::Size size(1280, 720); + if (!window.Create(L"surface_tension_calculator", origin, size)) { + return EXIT_FAILURE; + } + window.SetQuitOnClose(true); + + ::MSG msg; + while (::GetMessage(&msg, nullptr, 0, 0)) { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + } + + ::CoUninitialize(); + return EXIT_SUCCESS; +} diff --git a/windows/runner/resource.h b/windows/runner/resource.h new file mode 100644 index 0000000..66a65d1 --- /dev/null +++ b/windows/runner/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Runner.rc +// +#define IDI_APP_ICON 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico new file mode 100644 index 0000000..c04e20c Binary files /dev/null and b/windows/runner/resources/app_icon.ico differ diff --git a/windows/runner/runner.exe.manifest b/windows/runner/runner.exe.manifest new file mode 100644 index 0000000..153653e --- /dev/null +++ b/windows/runner/runner.exe.manifest @@ -0,0 +1,14 @@ + + + + + PerMonitorV2 + + + + + + + + + diff --git a/windows/runner/utils.cpp b/windows/runner/utils.cpp new file mode 100644 index 0000000..3a0b465 --- /dev/null +++ b/windows/runner/utils.cpp @@ -0,0 +1,65 @@ +#include "utils.h" + +#include +#include +#include +#include + +#include + +void CreateAndAttachConsole() { + if (::AllocConsole()) { + FILE *unused; + if (freopen_s(&unused, "CONOUT$", "w", stdout)) { + _dup2(_fileno(stdout), 1); + } + if (freopen_s(&unused, "CONOUT$", "w", stderr)) { + _dup2(_fileno(stdout), 2); + } + std::ios::sync_with_stdio(); + FlutterDesktopResyncOutputStreams(); + } +} + +std::vector GetCommandLineArguments() { + // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. + int argc; + wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); + if (argv == nullptr) { + return std::vector(); + } + + std::vector command_line_arguments; + + // Skip the first argument as it's the binary name. + for (int i = 1; i < argc; i++) { + command_line_arguments.push_back(Utf8FromUtf16(argv[i])); + } + + ::LocalFree(argv); + + return command_line_arguments; +} + +std::string Utf8FromUtf16(const wchar_t* utf16_string) { + if (utf16_string == nullptr) { + return std::string(); + } + 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()) { + return utf8_string; + } + utf8_string.resize(target_length); + int converted_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + input_length, utf8_string.data(), target_length, nullptr, nullptr); + if (converted_length == 0) { + return std::string(); + } + return utf8_string; +} diff --git a/windows/runner/utils.h b/windows/runner/utils.h new file mode 100644 index 0000000..3879d54 --- /dev/null +++ b/windows/runner/utils.h @@ -0,0 +1,19 @@ +#ifndef RUNNER_UTILS_H_ +#define RUNNER_UTILS_H_ + +#include +#include + +// Creates a console for the process, and redirects stdout and stderr to +// it for both the runner and the Flutter library. +void CreateAndAttachConsole(); + +// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string +// encoded in UTF-8. Returns an empty std::string on failure. +std::string Utf8FromUtf16(const wchar_t* utf16_string); + +// Gets the command line arguments passed in as a std::vector, +// encoded in UTF-8. Returns an empty std::vector on failure. +std::vector GetCommandLineArguments(); + +#endif // RUNNER_UTILS_H_ diff --git a/windows/runner/win32_window.cpp b/windows/runner/win32_window.cpp new file mode 100644 index 0000000..60608d0 --- /dev/null +++ b/windows/runner/win32_window.cpp @@ -0,0 +1,288 @@ +#include "win32_window.h" + +#include +#include + +#include "resource.h" + +namespace { + +/// Window attribute that enables dark mode window decorations. +/// +/// Redefined in case the developer's machine has a Windows SDK older than +/// version 10.0.22000.0. +/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute +#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE +#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 +#endif + +constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; + +/// Registry key for app theme preference. +/// +/// A value of 0 indicates apps should use dark mode. A non-zero or missing +/// value indicates apps should use light mode. +constexpr const wchar_t kGetPreferredBrightnessRegKey[] = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; +constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme"; + +// The number of Win32Window objects that currently exist. +static int g_active_window_count = 0; + +using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); + +// Scale helper to convert logical scaler values to physical using passed in +// scale factor +int Scale(int source, double scale_factor) { + return static_cast(source * scale_factor); +} + +// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. +// This API is only needed for PerMonitor V1 awareness mode. +void EnableFullDpiSupportIfAvailable(HWND hwnd) { + HMODULE user32_module = LoadLibraryA("User32.dll"); + if (!user32_module) { + return; + } + auto enable_non_client_dpi_scaling = + reinterpret_cast( + GetProcAddress(user32_module, "EnableNonClientDpiScaling")); + if (enable_non_client_dpi_scaling != nullptr) { + enable_non_client_dpi_scaling(hwnd); + } + FreeLibrary(user32_module); +} + +} // namespace + +// Manages the Win32Window's window class registration. +class WindowClassRegistrar { + public: + ~WindowClassRegistrar() = default; + + // Returns the singleton registrar instance. + static WindowClassRegistrar* GetInstance() { + if (!instance_) { + instance_ = new WindowClassRegistrar(); + } + return instance_; + } + + // Returns the name of the window class, registering the class if it hasn't + // previously been registered. + const wchar_t* GetWindowClass(); + + // Unregisters the window class. Should only be called if there are no + // instances of the window. + void UnregisterWindowClass(); + + private: + WindowClassRegistrar() = default; + + static WindowClassRegistrar* instance_; + + bool class_registered_ = false; +}; + +WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; + +const wchar_t* WindowClassRegistrar::GetWindowClass() { + if (!class_registered_) { + WNDCLASS window_class{}; + window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); + window_class.lpszClassName = kWindowClassName; + window_class.style = CS_HREDRAW | CS_VREDRAW; + window_class.cbClsExtra = 0; + window_class.cbWndExtra = 0; + window_class.hInstance = GetModuleHandle(nullptr); + window_class.hIcon = + LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); + window_class.hbrBackground = 0; + window_class.lpszMenuName = nullptr; + window_class.lpfnWndProc = Win32Window::WndProc; + RegisterClass(&window_class); + class_registered_ = true; + } + return kWindowClassName; +} + +void WindowClassRegistrar::UnregisterWindowClass() { + UnregisterClass(kWindowClassName, nullptr); + class_registered_ = false; +} + +Win32Window::Win32Window() { + ++g_active_window_count; +} + +Win32Window::~Win32Window() { + --g_active_window_count; + Destroy(); +} + +bool Win32Window::Create(const std::wstring& title, + const Point& origin, + const Size& size) { + Destroy(); + + const wchar_t* window_class = + WindowClassRegistrar::GetInstance()->GetWindowClass(); + + const POINT target_point = {static_cast(origin.x), + static_cast(origin.y)}; + HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); + UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); + double scale_factor = dpi / 96.0; + + HWND window = CreateWindow( + window_class, title.c_str(), WS_OVERLAPPEDWINDOW, + Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), + Scale(size.width, scale_factor), Scale(size.height, scale_factor), + nullptr, nullptr, GetModuleHandle(nullptr), this); + + if (!window) { + return false; + } + + UpdateTheme(window); + + return OnCreate(); +} + +bool Win32Window::Show() { + return ShowWindow(window_handle_, SW_SHOWNORMAL); +} + +// static +LRESULT CALLBACK Win32Window::WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + if (message == WM_NCCREATE) { + auto window_struct = reinterpret_cast(lparam); + SetWindowLongPtr(window, GWLP_USERDATA, + reinterpret_cast(window_struct->lpCreateParams)); + + auto that = static_cast(window_struct->lpCreateParams); + EnableFullDpiSupportIfAvailable(window); + that->window_handle_ = window; + } else if (Win32Window* that = GetThisFromHandle(window)) { + return that->MessageHandler(window, message, wparam, lparam); + } + + return DefWindowProc(window, message, wparam, lparam); +} + +LRESULT +Win32Window::MessageHandler(HWND hwnd, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + switch (message) { + case WM_DESTROY: + window_handle_ = nullptr; + Destroy(); + if (quit_on_close_) { + PostQuitMessage(0); + } + return 0; + + case WM_DPICHANGED: { + auto newRectSize = reinterpret_cast(lparam); + LONG newWidth = newRectSize->right - newRectSize->left; + LONG newHeight = newRectSize->bottom - newRectSize->top; + + SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, + newHeight, SWP_NOZORDER | SWP_NOACTIVATE); + + return 0; + } + case WM_SIZE: { + RECT rect = GetClientArea(); + if (child_content_ != nullptr) { + // Size and position the child window. + MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, + rect.bottom - rect.top, TRUE); + } + return 0; + } + + case WM_ACTIVATE: + if (child_content_ != nullptr) { + SetFocus(child_content_); + } + return 0; + + case WM_DWMCOLORIZATIONCOLORCHANGED: + UpdateTheme(hwnd); + return 0; + } + + return DefWindowProc(window_handle_, message, wparam, lparam); +} + +void Win32Window::Destroy() { + OnDestroy(); + + if (window_handle_) { + DestroyWindow(window_handle_); + window_handle_ = nullptr; + } + if (g_active_window_count == 0) { + WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); + } +} + +Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { + return reinterpret_cast( + GetWindowLongPtr(window, GWLP_USERDATA)); +} + +void Win32Window::SetChildContent(HWND content) { + child_content_ = content; + SetParent(content, window_handle_); + RECT frame = GetClientArea(); + + MoveWindow(content, frame.left, frame.top, frame.right - frame.left, + frame.bottom - frame.top, true); + + SetFocus(child_content_); +} + +RECT Win32Window::GetClientArea() { + RECT frame; + GetClientRect(window_handle_, &frame); + return frame; +} + +HWND Win32Window::GetHandle() { + return window_handle_; +} + +void Win32Window::SetQuitOnClose(bool quit_on_close) { + quit_on_close_ = quit_on_close; +} + +bool Win32Window::OnCreate() { + // No-op; provided for subclasses. + return true; +} + +void Win32Window::OnDestroy() { + // No-op; provided for subclasses. +} + +void Win32Window::UpdateTheme(HWND const window) { + DWORD light_mode; + DWORD light_mode_size = sizeof(light_mode); + LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey, + kGetPreferredBrightnessRegValue, + RRF_RT_REG_DWORD, nullptr, &light_mode, + &light_mode_size); + + if (result == ERROR_SUCCESS) { + BOOL enable_dark_mode = light_mode == 0; + DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE, + &enable_dark_mode, sizeof(enable_dark_mode)); + } +} diff --git a/windows/runner/win32_window.h b/windows/runner/win32_window.h new file mode 100644 index 0000000..e901dde --- /dev/null +++ b/windows/runner/win32_window.h @@ -0,0 +1,102 @@ +#ifndef RUNNER_WIN32_WINDOW_H_ +#define RUNNER_WIN32_WINDOW_H_ + +#include + +#include +#include +#include + +// A class abstraction for a high DPI-aware Win32 Window. Intended to be +// inherited from by classes that wish to specialize with custom +// rendering and input handling +class Win32Window { + public: + struct Point { + unsigned int x; + unsigned int y; + Point(unsigned int x, unsigned int y) : x(x), y(y) {} + }; + + struct Size { + unsigned int width; + unsigned int height; + Size(unsigned int width, unsigned int height) + : width(width), height(height) {} + }; + + Win32Window(); + virtual ~Win32Window(); + + // Creates a win32 window with |title| that is positioned and sized using + // |origin| and |size|. New windows are created on the default monitor. Window + // sizes are specified to the OS in physical pixels, hence to ensure a + // consistent size this function will scale the inputted width and height as + // as appropriate for the default monitor. The window is invisible until + // |Show| is called. Returns true if the window was created successfully. + bool Create(const std::wstring& title, const Point& origin, const Size& size); + + // Show the current window. Returns true if the window was successfully shown. + bool Show(); + + // Release OS resources associated with window. + void Destroy(); + + // Inserts |content| into the window tree. + void SetChildContent(HWND content); + + // Returns the backing Window handle to enable clients to set icon and other + // window properties. Returns nullptr if the window has been destroyed. + HWND GetHandle(); + + // If true, closing this window will quit the application. + void SetQuitOnClose(bool quit_on_close); + + // Return a RECT representing the bounds of the current client area. + RECT GetClientArea(); + + protected: + // Processes and route salient window messages for mouse handling, + // size change and DPI. Delegates handling of these to member overloads that + // inheriting classes can handle. + virtual LRESULT MessageHandler(HWND window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Called when CreateAndShow is called, allowing subclass window-related + // setup. Subclasses should return false if setup fails. + virtual bool OnCreate(); + + // Called when Destroy is called. + virtual void OnDestroy(); + + private: + friend class WindowClassRegistrar; + + // OS callback called by message pump. Handles the WM_NCCREATE message which + // is passed when the non-client area is being created and enables automatic + // non-client DPI scaling so that the non-client area automatically + // responds to changes in DPI. All other messages are handled by + // MessageHandler. + static LRESULT CALLBACK WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Retrieves a class instance pointer for |window| + static Win32Window* GetThisFromHandle(HWND const window) noexcept; + + // Update the window frame's theme to match the system theme. + static void UpdateTheme(HWND const window); + + bool quit_on_close_ = false; + + // window handle for top level window. + HWND window_handle_ = nullptr; + + // window handle for hosted content. + HWND child_content_ = nullptr; +}; + +#endif // RUNNER_WIN32_WINDOW_H_