commit fa0d47f5100a981bd801c8cd51b40da0535f8171 Author: Bilal Khan Date: Tue Jun 24 18:48:28 2025 +0800 Initial commit 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..c9704a8 --- /dev/null +++ b/.metadata @@ -0,0 +1,45 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: "be698c48a6750c8cb8e61c740ca9991bb947aba2" + channel: "stable" + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: be698c48a6750c8cb8e61c740ca9991bb947aba2 + base_revision: be698c48a6750c8cb8e61c740ca9991bb947aba2 + - platform: android + create_revision: be698c48a6750c8cb8e61c740ca9991bb947aba2 + base_revision: be698c48a6750c8cb8e61c740ca9991bb947aba2 + - platform: ios + create_revision: be698c48a6750c8cb8e61c740ca9991bb947aba2 + base_revision: be698c48a6750c8cb8e61c740ca9991bb947aba2 + - platform: linux + create_revision: be698c48a6750c8cb8e61c740ca9991bb947aba2 + base_revision: be698c48a6750c8cb8e61c740ca9991bb947aba2 + - platform: macos + create_revision: be698c48a6750c8cb8e61c740ca9991bb947aba2 + base_revision: be698c48a6750c8cb8e61c740ca9991bb947aba2 + - platform: web + create_revision: be698c48a6750c8cb8e61c740ca9991bb947aba2 + base_revision: be698c48a6750c8cb8e61c740ca9991bb947aba2 + - platform: windows + create_revision: be698c48a6750c8cb8e61c740ca9991bb947aba2 + base_revision: be698c48a6750c8cb8e61c740ca9991bb947aba2 + + # 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..b33b143 --- /dev/null +++ b/README.md @@ -0,0 +1,16 @@ +# tempp + +A new Flutter project. + +## Getting Started + +This project is a starting point for a Flutter application. + +A few resources to get you started if this is your first Flutter project: + +- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) +- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) + +For help getting started with Flutter development, view the +[online documentation](https://docs.flutter.dev/), which offers tutorials, +samples, guidance on mobile development, and a full API reference. diff --git a/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..b3ee655 --- /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.example.tempp" + 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.example.tempp" + // 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..41b2f49 --- /dev/null +++ b/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/app/src/main/kotlin/com/example/tempp/MainActivity.kt b/android/app/src/main/kotlin/com/example/tempp/MainActivity.kt new file mode 100644 index 0000000..0223bf3 --- /dev/null +++ b/android/app/src/main/kotlin/com/example/tempp/MainActivity.kt @@ -0,0 +1,5 @@ +package com.example.tempp + +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/ic_launcher-web.png b/android/app/src/main/res/ic_launcher-web.png new file mode 100644 index 0000000..dafd845 Binary files /dev/null and b/android/app/src/main/res/ic_launcher-web.png differ diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file 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..fb14a03 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-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..9892fb7 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..385ddaf Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-ldpi/ic_launcher.png b/android/app/src/main/res/mipmap-ldpi/ic_launcher.png new file mode 100644 index 0000000..06e8bce Binary files /dev/null and b/android/app/src/main/res/mipmap-ldpi/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..411addd 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-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..a1ef0f7 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..cfe9383 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.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..29db470 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-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..352760b Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..ca72695 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.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..fb28341 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-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..5a0bbea Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..a04229c Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.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..e1310f6 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/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..83de460 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..b2f05fb Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/playstore-icon.png b/android/app/src/main/res/playstore-icon.png new file mode 100644 index 0000000..7c9c578 Binary files /dev/null and b/android/app/src/main/res/playstore-icon.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/ic_launcher_background.xml b/android/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..ce02eaa --- /dev/null +++ b/android/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #af0557 + \ No newline at end of file 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..ac3b479 --- /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.12-all.zip diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts new file mode 100644 index 0000000..ab39a10 --- /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.3" apply false + id("org.jetbrains.kotlin.android") version "2.1.0" apply false +} + +include(":app") diff --git a/assets/accountImages/accountDetailContainer.png b/assets/accountImages/accountDetailContainer.png new file mode 100644 index 0000000..457dd0d Binary files /dev/null and b/assets/accountImages/accountDetailContainer.png differ diff --git a/assets/accountImages/brownBanner.png b/assets/accountImages/brownBanner.png new file mode 100644 index 0000000..7f28220 Binary files /dev/null and b/assets/accountImages/brownBanner.png differ diff --git a/assets/accountImages/dottedLine.png b/assets/accountImages/dottedLine.png new file mode 100644 index 0000000..998d48f Binary files /dev/null and b/assets/accountImages/dottedLine.png differ diff --git a/assets/accountImages/edit.png b/assets/accountImages/edit.png new file mode 100644 index 0000000..a58933f Binary files /dev/null and b/assets/accountImages/edit.png differ diff --git a/assets/accountImages/eyeClose.jpg b/assets/accountImages/eyeClose.jpg new file mode 100644 index 0000000..29fb097 Binary files /dev/null and b/assets/accountImages/eyeClose.jpg differ diff --git a/assets/accountImages/eyeIcon.png b/assets/accountImages/eyeIcon.png new file mode 100644 index 0000000..db0921a Binary files /dev/null and b/assets/accountImages/eyeIcon.png differ diff --git a/assets/accountImages/eye_close-removebg-preview.png b/assets/accountImages/eye_close-removebg-preview.png new file mode 100644 index 0000000..f39e2c7 Binary files /dev/null and b/assets/accountImages/eye_close-removebg-preview.png differ diff --git a/assets/accountImages/eye_close.png b/assets/accountImages/eye_close.png new file mode 100644 index 0000000..0b7bf72 Binary files /dev/null and b/assets/accountImages/eye_close.png differ diff --git a/assets/accountImages/greenBanner.png b/assets/accountImages/greenBanner.png new file mode 100644 index 0000000..2f514e1 Binary files /dev/null and b/assets/accountImages/greenBanner.png differ diff --git a/assets/featureImages/firstGridIcon.png b/assets/featureImages/firstGridIcon.png new file mode 100644 index 0000000..897b728 Binary files /dev/null and b/assets/featureImages/firstGridIcon.png differ diff --git a/assets/featureImages/firstRowIcon.png b/assets/featureImages/firstRowIcon.png new file mode 100644 index 0000000..bc6fabc Binary files /dev/null and b/assets/featureImages/firstRowIcon.png differ diff --git a/assets/featureImages/fourthGridIcon.png b/assets/featureImages/fourthGridIcon.png new file mode 100644 index 0000000..def6223 Binary files /dev/null and b/assets/featureImages/fourthGridIcon.png differ diff --git a/assets/featureImages/fourthRowIcon.png b/assets/featureImages/fourthRowIcon.png new file mode 100644 index 0000000..7097063 Binary files /dev/null and b/assets/featureImages/fourthRowIcon.png differ diff --git a/assets/featureImages/secondGridIcon.png b/assets/featureImages/secondGridIcon.png new file mode 100644 index 0000000..1770f27 Binary files /dev/null and b/assets/featureImages/secondGridIcon.png differ diff --git a/assets/featureImages/secondRowIcon.png b/assets/featureImages/secondRowIcon.png new file mode 100644 index 0000000..51ad65d Binary files /dev/null and b/assets/featureImages/secondRowIcon.png differ diff --git a/assets/featureImages/thirdGridIcon.png b/assets/featureImages/thirdGridIcon.png new file mode 100644 index 0000000..a44bef5 Binary files /dev/null and b/assets/featureImages/thirdGridIcon.png differ diff --git a/assets/featureImages/thirdRowIcon.png b/assets/featureImages/thirdRowIcon.png new file mode 100644 index 0000000..2bf88c3 Binary files /dev/null and b/assets/featureImages/thirdRowIcon.png differ diff --git a/assets/fonts/SourceHanSansCN-Bold.otf b/assets/fonts/SourceHanSansCN-Bold.otf new file mode 100644 index 0000000..4b3429a Binary files /dev/null and b/assets/fonts/SourceHanSansCN-Bold.otf differ diff --git a/assets/fonts/SourceHanSansCN-Medium.otf b/assets/fonts/SourceHanSansCN-Medium.otf new file mode 100644 index 0000000..53e03e0 Binary files /dev/null and b/assets/fonts/SourceHanSansCN-Medium.otf differ diff --git a/assets/fonts/SourceHanSansCN-Regular.otf b/assets/fonts/SourceHanSansCN-Regular.otf new file mode 100644 index 0000000..886f82f Binary files /dev/null and b/assets/fonts/SourceHanSansCN-Regular.otf differ diff --git a/assets/fullFeatureImages/row1First.png b/assets/fullFeatureImages/row1First.png new file mode 100644 index 0000000..9f984d8 Binary files /dev/null and b/assets/fullFeatureImages/row1First.png differ diff --git a/assets/fullFeatureImages/row1Second.png b/assets/fullFeatureImages/row1Second.png new file mode 100644 index 0000000..fc9b189 Binary files /dev/null and b/assets/fullFeatureImages/row1Second.png differ diff --git a/assets/fullFeatureImages/row1Third.png b/assets/fullFeatureImages/row1Third.png new file mode 100644 index 0000000..e611871 Binary files /dev/null and b/assets/fullFeatureImages/row1Third.png differ diff --git a/assets/fullFeatureImages/row2first.png b/assets/fullFeatureImages/row2first.png new file mode 100644 index 0000000..705abed Binary files /dev/null and b/assets/fullFeatureImages/row2first.png differ diff --git a/assets/fullFeatureImages/row3Second.png b/assets/fullFeatureImages/row3Second.png new file mode 100644 index 0000000..8e8f6f4 Binary files /dev/null and b/assets/fullFeatureImages/row3Second.png differ diff --git a/assets/fullFeatureImages/row3Third.png b/assets/fullFeatureImages/row3Third.png new file mode 100644 index 0000000..705abed Binary files /dev/null and b/assets/fullFeatureImages/row3Third.png differ diff --git a/assets/fullFeatureImages/row3first.png b/assets/fullFeatureImages/row3first.png new file mode 100644 index 0000000..fc9b189 Binary files /dev/null and b/assets/fullFeatureImages/row3first.png differ diff --git a/assets/fullFeatureImages/row4First.png b/assets/fullFeatureImages/row4First.png new file mode 100644 index 0000000..9f984d8 Binary files /dev/null and b/assets/fullFeatureImages/row4First.png differ diff --git a/assets/fullFeatureImages/row4Second.png b/assets/fullFeatureImages/row4Second.png new file mode 100644 index 0000000..e611871 Binary files /dev/null and b/assets/fullFeatureImages/row4Second.png differ diff --git a/assets/fullFeatureImages/row4third.png b/assets/fullFeatureImages/row4third.png new file mode 100644 index 0000000..6127871 Binary files /dev/null and b/assets/fullFeatureImages/row4third.png differ diff --git a/assets/fullFeatureImages/row5first.png b/assets/fullFeatureImages/row5first.png new file mode 100644 index 0000000..84d6565 Binary files /dev/null and b/assets/fullFeatureImages/row5first.png differ diff --git a/assets/fullFeatureImages/row5second.png b/assets/fullFeatureImages/row5second.png new file mode 100644 index 0000000..e1422bb Binary files /dev/null and b/assets/fullFeatureImages/row5second.png differ diff --git a/assets/fullFeatureImages/row5third.png b/assets/fullFeatureImages/row5third.png new file mode 100644 index 0000000..e1422bb Binary files /dev/null and b/assets/fullFeatureImages/row5third.png differ diff --git a/assets/fullFeatureImages/row6first.png b/assets/fullFeatureImages/row6first.png new file mode 100644 index 0000000..0bc7f70 Binary files /dev/null and b/assets/fullFeatureImages/row6first.png differ diff --git a/assets/fullFeatureImages/row6second.png b/assets/fullFeatureImages/row6second.png new file mode 100644 index 0000000..456b21f Binary files /dev/null and b/assets/fullFeatureImages/row6second.png differ diff --git a/assets/fullFeatureImages/row7first.png b/assets/fullFeatureImages/row7first.png new file mode 100644 index 0000000..e611871 Binary files /dev/null and b/assets/fullFeatureImages/row7first.png differ diff --git a/assets/home_images/45_line.png b/assets/home_images/45_line.png new file mode 100644 index 0000000..f82d450 Binary files /dev/null and b/assets/home_images/45_line.png differ diff --git a/assets/home_images/brown_container.png b/assets/home_images/brown_container.png new file mode 100644 index 0000000..74a4459 Binary files /dev/null and b/assets/home_images/brown_container.png differ diff --git a/assets/home_images/featureNav.png b/assets/home_images/featureNav.png new file mode 100644 index 0000000..86078ce Binary files /dev/null and b/assets/home_images/featureNav.png differ diff --git a/assets/home_images/featureUnselected.png b/assets/home_images/featureUnselected.png new file mode 100644 index 0000000..fd283ee Binary files /dev/null and b/assets/home_images/featureUnselected.png differ diff --git a/assets/home_images/fifthGridIcon.png b/assets/home_images/fifthGridIcon.png new file mode 100644 index 0000000..a8684fe Binary files /dev/null and b/assets/home_images/fifthGridIcon.png differ diff --git a/assets/home_images/firstGridIcon.png b/assets/home_images/firstGridIcon.png new file mode 100644 index 0000000..c2ffb2e Binary files /dev/null and b/assets/home_images/firstGridIcon.png differ diff --git a/assets/home_images/fourthGridIcon.png b/assets/home_images/fourthGridIcon.png new file mode 100644 index 0000000..475863c Binary files /dev/null and b/assets/home_images/fourthGridIcon.png differ diff --git a/assets/home_images/headSetIcon.png b/assets/home_images/headSetIcon.png new file mode 100644 index 0000000..7beb174 Binary files /dev/null and b/assets/home_images/headSetIcon.png differ diff --git a/assets/home_images/homeBottomNav.png b/assets/home_images/homeBottomNav.png new file mode 100644 index 0000000..269ca1d Binary files /dev/null and b/assets/home_images/homeBottomNav.png differ diff --git a/assets/home_images/homeUnselected.png b/assets/home_images/homeUnselected.png new file mode 100644 index 0000000..c82c235 Binary files /dev/null and b/assets/home_images/homeUnselected.png differ diff --git a/assets/home_images/messageIcon.png b/assets/home_images/messageIcon.png new file mode 100644 index 0000000..dbf324d Binary files /dev/null and b/assets/home_images/messageIcon.png differ diff --git a/assets/home_images/profileNav.png b/assets/home_images/profileNav.png new file mode 100644 index 0000000..132e167 Binary files /dev/null and b/assets/home_images/profileNav.png differ diff --git a/assets/home_images/profileSelected.png b/assets/home_images/profileSelected.png new file mode 100644 index 0000000..5268c2d Binary files /dev/null and b/assets/home_images/profileSelected.png differ diff --git a/assets/home_images/scannerIcon.png b/assets/home_images/scannerIcon.png new file mode 100644 index 0000000..0f3c4b2 Binary files /dev/null and b/assets/home_images/scannerIcon.png differ diff --git a/assets/home_images/searchIcon.png b/assets/home_images/searchIcon.png new file mode 100644 index 0000000..6018ba1 Binary files /dev/null and b/assets/home_images/searchIcon.png differ diff --git a/assets/home_images/secondGridIcon.png b/assets/home_images/secondGridIcon.png new file mode 100644 index 0000000..742c2b1 Binary files /dev/null and b/assets/home_images/secondGridIcon.png differ diff --git a/assets/home_images/teaBoilIcon.png b/assets/home_images/teaBoilIcon.png new file mode 100644 index 0000000..e42608e Binary files /dev/null and b/assets/home_images/teaBoilIcon.png differ diff --git a/assets/home_images/thirdGridIcon.png b/assets/home_images/thirdGridIcon.png new file mode 100644 index 0000000..82b5d78 Binary files /dev/null and b/assets/home_images/thirdGridIcon.png differ diff --git a/assets/profileImages/eyeIcon.png b/assets/profileImages/eyeIcon.png new file mode 100644 index 0000000..89edad5 Binary files /dev/null and b/assets/profileImages/eyeIcon.png differ diff --git a/assets/profileImages/fifthColumnIcon.png b/assets/profileImages/fifthColumnIcon.png new file mode 100644 index 0000000..79e9569 Binary files /dev/null and b/assets/profileImages/fifthColumnIcon.png differ diff --git a/assets/profileImages/firstColumnIcon.png b/assets/profileImages/firstColumnIcon.png new file mode 100644 index 0000000..0cdbbad Binary files /dev/null and b/assets/profileImages/firstColumnIcon.png differ diff --git a/assets/profileImages/firstRowIcon.png b/assets/profileImages/firstRowIcon.png new file mode 100644 index 0000000..95ec978 Binary files /dev/null and b/assets/profileImages/firstRowIcon.png differ diff --git a/assets/profileImages/fourthColumnIcon.png b/assets/profileImages/fourthColumnIcon.png new file mode 100644 index 0000000..a670bf3 Binary files /dev/null and b/assets/profileImages/fourthColumnIcon.png differ diff --git a/assets/profileImages/fourthRowIcon.png b/assets/profileImages/fourthRowIcon.png new file mode 100644 index 0000000..a6506a0 Binary files /dev/null and b/assets/profileImages/fourthRowIcon.png differ diff --git a/assets/profileImages/personIcon.png b/assets/profileImages/personIcon.png new file mode 100644 index 0000000..3e59c4c Binary files /dev/null and b/assets/profileImages/personIcon.png differ diff --git a/assets/profileImages/secondColumnIcon.png b/assets/profileImages/secondColumnIcon.png new file mode 100644 index 0000000..1925a00 Binary files /dev/null and b/assets/profileImages/secondColumnIcon.png differ diff --git a/assets/profileImages/secondRowIcon.png b/assets/profileImages/secondRowIcon.png new file mode 100644 index 0000000..e85b1b3 Binary files /dev/null and b/assets/profileImages/secondRowIcon.png differ diff --git a/assets/profileImages/thirdColumnIcon.png b/assets/profileImages/thirdColumnIcon.png new file mode 100644 index 0000000..b333d83 Binary files /dev/null and b/assets/profileImages/thirdColumnIcon.png differ diff --git a/assets/profileImages/thirdRowIcon.png b/assets/profileImages/thirdRowIcon.png new file mode 100644 index 0000000..d8f5645 Binary files /dev/null and b/assets/profileImages/thirdRowIcon.png differ diff --git a/assets/singleTransferImages/forwardIcon.png b/assets/singleTransferImages/forwardIcon.png new file mode 100644 index 0000000..98b8f13 Binary files /dev/null and b/assets/singleTransferImages/forwardIcon.png differ diff --git a/assets/singleTransferImages/personIcon.png b/assets/singleTransferImages/personIcon.png new file mode 100644 index 0000000..cabf08a Binary files /dev/null and b/assets/singleTransferImages/personIcon.png differ diff --git a/assets/singleTransferImages/scaneerIcon.png b/assets/singleTransferImages/scaneerIcon.png new file mode 100644 index 0000000..0393aa0 Binary files /dev/null and b/assets/singleTransferImages/scaneerIcon.png differ diff --git a/assets/splashImage/20250526-123428.jpg b/assets/splashImage/20250526-123428.jpg new file mode 100644 index 0000000..28ebf11 Binary files /dev/null and b/assets/splashImage/20250526-123428.jpg differ diff --git a/assets/splashImage/app_icon.jpg b/assets/splashImage/app_icon.jpg new file mode 100644 index 0000000..6aa2e84 Binary files /dev/null and b/assets/splashImage/app_icon.jpg differ diff --git a/assets/splashImage/applogo.jpg b/assets/splashImage/applogo.jpg new file mode 100644 index 0000000..3393d45 Binary files /dev/null and b/assets/splashImage/applogo.jpg differ diff --git a/assets/splashImage/splashScreen.jpg b/assets/splashImage/splashScreen.jpg new file mode 100644 index 0000000..28ebf11 Binary files /dev/null and b/assets/splashImage/splashScreen.jpg differ diff --git a/bankApp b/bankApp new file mode 160000 index 0000000..d2f96ab --- /dev/null +++ b/bankApp @@ -0,0 +1 @@ +Subproject commit d2f96ab32b085e5f4735e90c43541d152731b98c 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..592ceee --- /dev/null +++ b/ios/Flutter/Debug.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig new file mode 100644 index 0000000..592ceee --- /dev/null +++ b/ios/Flutter/Release.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000..c297efd --- /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.example.tempp; + 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.example.tempp.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.example.tempp.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.example.tempp.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.example.tempp; + 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.example.tempp; + 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..e3773d4 --- /dev/null +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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..f410c24 --- /dev/null +++ b/ios/Runner/Info.plist @@ -0,0 +1,49 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + Tempp + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + tempp + 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/constants/Responsive/responsive_utils.dart b/lib/constants/Responsive/responsive_utils.dart new file mode 100644 index 0000000..9ff6c83 --- /dev/null +++ b/lib/constants/Responsive/responsive_utils.dart @@ -0,0 +1,53 @@ +// import 'package:flutter/material.dart'; +// +// class Responsive { +// static double _screenWidth(BuildContext context) => MediaQuery.of(context).size.width; +// static double _screenHeight(BuildContext context) => MediaQuery.of(context).size.height; +// +// static bool isMobile(BuildContext context) => _screenWidth(context) < 600; +// static bool isTablet(BuildContext context) => _screenWidth(context) >= 600 && _screenWidth(context) < 1200; +// static bool isDesktop(BuildContext context) => _screenWidth(context) >= 1200; +// +// static double responsiveFontSize(BuildContext context) { +// final width = _screenWidth(context); +// if (isMobile(context)) return width * 0.04; +// if (isTablet(context)) return width * 0.03; +// return width * 0.025; +// } +// +// static double responsivePadding(BuildContext context) { +// if (isMobile(context)) return 16.0; +// if (isTablet(context)) return 24.0; +// return 32.0; +// } +// +// static double responsiveIconSize(BuildContext context) => responsiveFontSize(context) * 2.5; +// +// static Widget responsiveLayout({ +// required BuildContext context, +// required Widget mobile, +// required Widget tablet, +// required Widget desktop, +// }) { +// if (isDesktop(context)) return desktop; +// if (isTablet(context)) return tablet; +// return mobile; +// } +// } +// //responsive theme +// ThemeData getAppTheme(BuildContext context) { +// final baseTheme = ThemeData.light(); +// +// return baseTheme.copyWith( +// textTheme: TextTheme( +// displayLarge: TextStyle(fontSize: Responsive.responsiveFontSize(context) * 3), +// displayMedium: TextStyle(fontSize: Responsive.responsiveFontSize(context) * 2.5), +// // Add all other text styles... +// ), +// cardTheme: CardTheme( +// elevation: Responsive.isMobile(context) ? 2 : 4, +// margin: EdgeInsets.all(Responsive.responsivePadding(context) * 0.5), +// ), +// // Add other theme customizations... +// ); +// } \ No newline at end of file diff --git a/lib/constants/Responsive/responsive_widgets.dart b/lib/constants/Responsive/responsive_widgets.dart new file mode 100644 index 0000000..721d2e5 --- /dev/null +++ b/lib/constants/Responsive/responsive_widgets.dart @@ -0,0 +1,56 @@ +// import 'package:flutter/material.dart'; +// import 'responsive_utils.dart'; +// +// class ResponsiveText extends StatelessWidget { +// final String text; +// final TextStyle? style; +// final TextAlign? align; +// final double? scaleFactor; +// +// const ResponsiveText(this.text, {super.key, this.style, this.align, this.scaleFactor}); +// +// @override +// Widget build(BuildContext context) { +// final baseStyle = style ?? Theme.of(context).textTheme.bodyMedium; +// return Text( +// text, +// style: baseStyle?.copyWith( +// fontSize: (scaleFactor ?? 1) * Responsive.responsiveFontSize(context), +// ), +// textAlign: align, +// ); +// } +// } +// +// class ResponsivePadding extends StatelessWidget { +// final Widget child; +// final EdgeInsets? padding; +// +// const ResponsivePadding({super.key, required this.child, this.padding}); +// +// @override +// Widget build(BuildContext context) { +// final paddingValue = Responsive.responsivePadding(context); +// return Padding( +// padding: padding ?? EdgeInsets.all(paddingValue), +// child: child, +// ); +// } +// } +// +// class ResponsiveIcon extends StatelessWidget { +// final IconData icon; +// final Color? color; +// final double? sizeFactor; +// +// const ResponsiveIcon(this.icon, {super.key, this.color, this.sizeFactor}); +// +// @override +// Widget build(BuildContext context) { +// return Icon( +// icon, +// size: (sizeFactor ?? 1) * Responsive.responsiveIconSize(context), +// color: color, +// ); +// } +// } \ No newline at end of file diff --git a/lib/constants/constants.dart b/lib/constants/constants.dart new file mode 100644 index 0000000..987dccf --- /dev/null +++ b/lib/constants/constants.dart @@ -0,0 +1,167 @@ +import 'dart:io'; + +import 'package:flutter/material.dart'; +import 'package:cupertino_icons/cupertino_icons.dart'; + +class Constants { + static const String baseUrl = "http://190.92.230.205"; + + +} + +class AppTextStyles { + + + // Screen dimensions + static double getScreenWidth(BuildContext context) => MediaQuery.of(context).size.width; + static double getScreenHeight(BuildContext context) => MediaQuery.of(context).size.height; + static double getDiagonalInches(BuildContext context) { + final size = MediaQuery.of(context).size; + final inches = size.shortestSide / (Platform.isAndroid ? 160 : 163); + return inches; + } + + static bool isExtraSmallDevice(BuildContext context) { + final width = getScreenWidth(context); + final height = getScreenHeight(context); + return width < 380 || height < 700; // Very small phones + } + + static bool isSmallDevice(BuildContext context) { + final width = getScreenWidth(context); + final height = getScreenHeight(context); + return (width >= 390 && width < 400) || (height > 700 && height < 850); + } + + static bool isMediumDevice(BuildContext context) { + final width = getScreenWidth(context); + final height = getScreenHeight(context); + return (width >= 400 && width < 490) || (height >= 800 && height < 950); + } + + static bool isLargeDevice(BuildContext context) { + final width = getScreenWidth(context); + final height = getScreenHeight(context); + return width >= 500 || height >= 700; // Tablets and larger devices + } + + // Regular + static const TextStyle regular16 = TextStyle( + fontFamily: "SourceSans3", + fontSize: 16, + fontWeight: FontWeight.normal, // Regular (400) + color: Colors.black, + ); + + // Medium + static const TextStyle medium18 = TextStyle( + fontFamily: "SourceSans3", + fontSize: 18, + fontWeight: FontWeight.w500, // Medium (500) + color: Colors.white, + ); + + // Bold + static const TextStyle bold20 = TextStyle( + fontFamily: "SourceSans3", + fontSize: 32, + fontWeight: FontWeight.bold, // Bold (700) + color: Colors.white, + ); +} + + +double getScreenHeight(BuildContext context) { + return MediaQuery.of(context).size.height; +} +double getScreenWidth(BuildContext context) { + return MediaQuery.of(context).size.width; +} + + +final primaryColor = Colors.green; +final brownColor = Color(0xFFC6AB75); +final bottomNabBarIconColor = Color(0xFF059C5D); + +final secondaryColor = Colors.grey; +final Color lightGrey = Color(0xFF919191); +final Color lightGrey2 = Color(0xFFc3c3c3); +final backgroundColor = Colors.grey.shade100; +//textstyles + +final TextStyle boldStyle20=TextStyle( + fontFamily: "SourceSans3", + fontSize: 20, + color: lightGrey, + fontWeight: FontWeight.bold, // Bold + ); + +final TextStyle boldStyleblack=TextStyle( + fontFamily: "SourceSans3", + fontSize: 20, + color: Colors.black, + fontWeight: FontWeight.bold, // Bold + ); +final TextStyle boldStyleWhite=TextStyle( + fontFamily: "SourceSans3", + fontSize: 17, + color: Colors.white, + fontWeight: FontWeight.w500, // Bold + ); + + + final TextStyle greyStyleW500=TextStyle( + fontWeight: FontWeight.w500, + color: Colors.grey, + fontSize: 14 + ); + +final TextStyle normalStyle=TextStyle( + fontWeight: FontWeight.w500 +); + +final TextStyle cardStyleText=TextStyle( + fontFamily: "SourceSans3", + fontWeight: FontWeight.w600, + fontSize: 15 +); +final TextStyle rowStyleText=TextStyle( + fontFamily: "SourceSans3", + fontWeight: FontWeight.w600, + fontSize: 15, + color: Colors.black54 +); +final TextStyle trailingRowStyleText=TextStyle( + fontFamily: "SourceSans3", + fontWeight: FontWeight.w600, + fontSize: 15, + color: lightGrey2 +); +final TextStyle greenStyleText=TextStyle( + fontSize: 20, + fontWeight: FontWeight.bold, + color: bottomNabBarIconColor, // Color like the one in the image +); +final TextStyle profileSettingStyleText=TextStyle( + fontFamily: "SourceSans3", + fontSize: 20, fontWeight: FontWeight.w500, + color: Color(0xff333333 ) + ); +final TextStyle profileSettingStyleNumber=TextStyle( + fontFamily: "SourceSans3", + fontSize: 20, fontWeight: FontWeight.w500, +color: Color(0xff999999) +); + +final TextStyle featureStyle=TextStyle( + fontFamily: "SourceSans3", + fontSize: 20, fontWeight: FontWeight.normal, +color: Color(0xff666666) +); +final TextStyle accountDetailStyle=TextStyle(fontSize: 16, fontWeight: FontWeight.w500, +color: Colors.grey); +final TextStyle accountDetailStyleNumber=TextStyle(fontSize: 16, fontWeight: FontWeight.w500, +color: Colors.black); + + + diff --git a/lib/main.dart b/lib/main.dart new file mode 100644 index 0000000..968b5e6 --- /dev/null +++ b/lib/main.dart @@ -0,0 +1,42 @@ +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; +import 'package:tempp/pages/LoginPage/loginPage.dart'; +import 'package:tempp/pages/MainPages/splash_Page.dart'; +import 'package:tempp/viewsModel/BankCardViewModel/bankCardViewModel.dart'; +import 'package:tempp/viewsModel/TransactionViewModel/dateFilterViewModel.dart'; +import 'package:tempp/viewsModel/TransactionViewModel/transactionViewModel.dart'; +import 'package:tempp/viewsModel/TransactionViewModel/transactionfilterViewModel.dart'; +import 'package:tempp/viewsModel/userViewModels/LoginViewModel/loginViewModel.dart'; +import 'package:tempp/viewsModel/userViewModels/editUserViewModel.dart'; +import 'package:google_fonts/google_fonts.dart'; + +void main() { + runApp( + MultiProvider(providers: [ + ChangeNotifierProvider(create: (context) => FilterProvider()), + ChangeNotifierProvider(create: (context) => FilterProvider2()), + ChangeNotifierProvider(create: (context) => DateFilterProvider()), + ChangeNotifierProvider(create: (context) => LoginViewModel()), + ChangeNotifierProvider(create: (context) => UserEditViewModel()), + ChangeNotifierProvider(create: (context) => BankCardViewModel()), + ChangeNotifierProvider(create: (context) => TransactionViewModel()), + ], + child: MyApp())); +} + +class MyApp extends StatelessWidget { + const MyApp({super.key}); + + // This widget is the root of your application. + @override + Widget build(BuildContext context) { + return MaterialApp( + debugShowCheckedModeBanner: false, + title: 'Temp', + theme: ThemeData( + fontFamily: "SourceSans3", // Applies to all text + ), + home: SplashScreen(), + ); + } +} diff --git a/lib/models/bankCardModels/bankCardModel.dart b/lib/models/bankCardModels/bankCardModel.dart new file mode 100644 index 0000000..8be939a --- /dev/null +++ b/lib/models/bankCardModels/bankCardModel.dart @@ -0,0 +1,65 @@ +class BankCardModel { + final int id; + final String bankCardNumber; + final String openingBank; + final String accountName; + final String balance; + final String availableBalance; + final String accountType; + final String accountOpeningDate; + final String accountPermissions; + final String alias; + final String status; + final bool isDefault; + final String bankLogo; + + BankCardModel({ + required this.id, + required this.bankCardNumber, + required this.openingBank, + required this.accountName, + required this.balance, + required this.availableBalance, + required this.accountType, + required this.accountOpeningDate, + required this.accountPermissions, + required this.alias, + required this.status, + required this.isDefault, + required this.bankLogo, + }); + + // Factory constructor to parse the JSON data + factory BankCardModel.fromJson(Map json) { + return BankCardModel( + id: json['ID'], + bankCardNumber: json['BankCardNumber'], + openingBank: json['OpeningBank'], + accountName: json['AccountName'], + balance: json['Balance'], + availableBalance: json['AvailableBalance'], + accountType: json['AccountType'], + accountOpeningDate: json['AccountOpeningDate'], + accountPermissions: json['AccountPermissions'], + alias: json['Alias'], + status: json['Status'], + isDefault: json['IsDefault'], + bankLogo: json['BankLogo'] ?? '', + ); + } +} + +//bankListModel +class BankListModel { + final String bankName; + final String bankLogo; + + BankListModel({required this.bankName, required this.bankLogo}); + + factory BankListModel.fromJson(Map json) { + return BankListModel( + bankName: json['Name'], + bankLogo: json['Logo'], + ); + } +} diff --git a/lib/models/transactionModels/transactionModel.dart b/lib/models/transactionModels/transactionModel.dart new file mode 100644 index 0000000..6799b85 --- /dev/null +++ b/lib/models/transactionModels/transactionModel.dart @@ -0,0 +1,121 @@ +class TransactionModel { + final int id; + final String createdAt; + final String updatedAt; + final String deletedAt; // New field + final String recipientAccountName; + final String recipientAccount; + final String recipientBank; + final String transferAmount; + final String previousBalance; + final String purpose; + final String paymentFinancialAccountID; // New field + final String paymentBankCardID; + final int status; + final bool isIncome; + final String payBankLogo; + final String recipientBankLogo; // New field + final String payBank; // New field + + TransactionModel({ + required this.id, + required this.createdAt, + required this.updatedAt, + required this.deletedAt, + required this.recipientAccountName, + required this.recipientAccount, + required this.recipientBank, + required this.transferAmount, + required this.previousBalance, + required this.purpose, + required this.paymentFinancialAccountID, + required this.paymentBankCardID, + required this.status, + required this.isIncome, + required this.payBankLogo, + required this.recipientBankLogo, + required this.payBank, + }); + + factory TransactionModel.fromJson(Map json) { + return TransactionModel( + id: json['ID'], + createdAt: json['CreatedAt'], + updatedAt: json['UpdatedAt'], + deletedAt: json['DeletedAt'] ?? '', // Handle null case + recipientAccountName: json['RecipientAccountName'], + recipientAccount: json['RecipientAccount'], + recipientBank: json['RecipientBank'], + transferAmount: json['TransferAmount'], + previousBalance: json['PreviousBalance'], + purpose: json['Purpose'], + paymentFinancialAccountID: json['PaymentFinancialAccountID'], + paymentBankCardID: json['PaymentBankCardID'], + status: json['Status'], + isIncome: json['IsIncome'] as bool? ?? false, + payBankLogo: json['PayBankLogo'] ?? '', + recipientBankLogo: json['RecipientBankLogo'] ?? '', // Handle null case + payBank: json['PayBank'] ?? '', // Handle null case + ); + } +} + +class TransactionResponse { + final int code; + final int count; + final List data; + final String message; + + TransactionResponse({ + required this.code, + required this.count, + required this.data, + required this.message, + }); + + factory TransactionResponse.fromJson(Map json) { + var list = json['data'] as List; + List dataList = list.map((i) => TransactionModel.fromJson(i)).toList(); + + return TransactionResponse( + code: json['code'], + count: json['count'], + data: dataList, + message: json['message'], + ); + } +} + +// lib/models/transaction_response_model.dart + +class TransactionResponseModel { + final int code; + final dynamic data; + final String message; + final int successNum; + + TransactionResponseModel({ + required this.code, + this.data, + required this.message, + required this.successNum, + }); + + factory TransactionResponseModel.fromJson(Map json) { + return TransactionResponseModel( + code: json['code'], + data: json['data'], + message: json['message'], + successNum: json['successNum'], + ); + } + + Map toJson() { + return { + 'code': code, + 'data': data, + 'message': message, + 'successNum': successNum, + }; + } +} \ No newline at end of file diff --git a/lib/models/userModels/editUserModel.dart b/lib/models/userModels/editUserModel.dart new file mode 100644 index 0000000..96a0cd7 --- /dev/null +++ b/lib/models/userModels/editUserModel.dart @@ -0,0 +1,78 @@ +// models/userModels/editUserModel.dart +import 'loginModel.dart'; + +class UserEditRequest { + final int id; + final String userAlias; + final String profilePicture; + + UserEditRequest({ + required this.id, + required this.userAlias, + required this.profilePicture, + }); + + Map toJson() => { + 'id': id, + 'UserAlias': userAlias, + 'profilePicture': profilePicture, + }; +} + +class UserEditResponse { + final int code; + final String message; + final UserEditData? data; + + UserEditResponse({ + required this.code, + required this.message, + this.data, + }); + + factory UserEditResponse.fromJson(Map json) { + return UserEditResponse( + code: json['code'] ?? 0, + message: json['message'] ?? '', + data: json['data'] != null ? UserEditData.fromJson(json['data']) : null, + ); + } +} + +class UserEditData { + final TsUser tsUser; + + UserEditData({required this.tsUser}); + + factory UserEditData.fromJson(Map json) { + return UserEditData( + tsUser: TsUser.fromJson(json['TsUser']), + ); + } +} + +class ImageUploadResponse { + final int code; + final String message; + final String data; + + ImageUploadResponse({required this.code, required this.message, required this.data}); + + // Factory constructor to parse JSON data into the model + factory ImageUploadResponse.fromJson(Map json) { + return ImageUploadResponse( + code: json['code'], + message: json['message'], + data: json['data'], + ); + } + + // Method to convert the model to JSON format + Map toJson() { + return { + 'code': code, + 'message': message, + 'data': data, + }; + } +} diff --git a/lib/models/userModels/loginModel.dart b/lib/models/userModels/loginModel.dart new file mode 100644 index 0000000..d2aeb64 --- /dev/null +++ b/lib/models/userModels/loginModel.dart @@ -0,0 +1,132 @@ +// models/userModels/shared_user_model.dart +class TsUser { + final int id; + final String createdAt; + final String updatedAt; + final String? deletedAt; + final String userName; + final String userAlias; + final String phone; + final String password; + final String profilePicture; + final bool privateAccount; + final String enterpriseCustomerNumber; + final String operatorId; + final String? lastLoginTime; + final double depositAmount; + final double financialManagementAmount; + final double foreignCurrency; + + TsUser({ + required this.id, + required this.createdAt, + required this.updatedAt, + this.deletedAt, + required this.userName, + required this.userAlias, + required this.phone, + required this.password, + required this.profilePicture, + required this.privateAccount, + required this.enterpriseCustomerNumber, + required this.operatorId, + this.lastLoginTime, + required this.depositAmount, + required this.financialManagementAmount, + required this.foreignCurrency, + }); + + factory TsUser.fromJson(Map json) { + return TsUser( + id: json['ID'] ?? 0, + createdAt: json['CreatedAt'] ?? '', + updatedAt: json['UpdatedAt'] ?? '', + deletedAt: json['DeletedAt'], + userName: json['UserName'] ?? '', + userAlias: json['UserAlias'] ?? '', + phone: json['Phone'] ?? '', + password: json['Password'] ?? '', + profilePicture: json['ProfilePicture'] ?? '', + privateAccount: json['PrivateAccount'] ?? false, + enterpriseCustomerNumber: json['EnterpriseCustomerNumber'] ?? '', + operatorId: json['OperatorID'] ?? '', + lastLoginTime: json['LastLoginTime'], + depositAmount: double.tryParse(json['DepositAmount']?.toString() ?? '0') ?? 0.0, + financialManagementAmount: double.tryParse(json['FinancialManagementAmount']?.toString() ?? '0') ?? 0.0, + foreignCurrency: double.tryParse(json['ForeignCurrency']?.toString() ?? '0') ?? 0.0, + ); + } + + TsUser copyWith({ + int? id, + String? createdAt, + String? updatedAt, + String? deletedAt, + String? userName, + String ? userAlias, + String? phone, + String? password, + String? profilePicture, + bool? privateAccount, + String? enterpriseCustomerNumber, + String? operatorId, + String? lastLoginTime, + double? depositAmount, + double? financialManagementAmount, + double? foreignCurrency, + }) { + return TsUser( + id: id ?? this.id, + createdAt: createdAt ?? this.createdAt, + updatedAt: updatedAt ?? this.updatedAt, + deletedAt: deletedAt ?? this.deletedAt, + userName: userName ?? this.userName, + userAlias: userAlias ?? this.userAlias, + phone: phone ?? this.phone, + password: password ?? this.password, + profilePicture: profilePicture ?? this.profilePicture, + privateAccount: privateAccount ?? this.privateAccount, + enterpriseCustomerNumber: enterpriseCustomerNumber ?? this.enterpriseCustomerNumber, + operatorId: operatorId ?? this.operatorId, + lastLoginTime: lastLoginTime ?? this.lastLoginTime, + depositAmount: depositAmount ?? this.depositAmount, + financialManagementAmount: financialManagementAmount ?? this.financialManagementAmount, + foreignCurrency: foreignCurrency ?? this.foreignCurrency, + ); + } +} +//login model + +class LoginResponseModel { + final int code; + final String message; + final UserData? data; + + LoginResponseModel({ + required this.code, + required this.message, + this.data, + }); + + factory LoginResponseModel.fromJson(Map json) { + return LoginResponseModel( + code: json['code'] ?? 0, + message: json['message'] ?? '', + data: json['data'] != null ? UserData.fromJson(json['data']) : null, + ); + } +} + +class UserData { + final TsUser tsUser; + final String token; + + UserData({required this.tsUser, required this.token}); + + factory UserData.fromJson(Map json) { + return UserData( + tsUser: TsUser.fromJson(json['TsUser']), + token: json['token'] ?? '', + ); + } +} diff --git a/lib/pages/AccountPages/AccountInquiryPage.dart b/lib/pages/AccountPages/AccountInquiryPage.dart new file mode 100644 index 0000000..bcb5d35 --- /dev/null +++ b/lib/pages/AccountPages/AccountInquiryPage.dart @@ -0,0 +1,414 @@ +import 'package:flutter/material.dart'; +import 'package:tempp/constants/constants.dart'; +import 'package:provider/provider.dart'; +import 'package:tempp/models/transactionModels/transactionModel.dart'; +import 'package:tempp/pages/TransactionPages/bottomSheetDateFilter.dart'; +import 'package:tempp/pages/TransactionPages/bottomSheetAccount.dart'; +import 'package:tempp/viewsModel/TransactionViewModel/dateFilterViewModel.dart'; +import 'package:tempp/viewsModel/TransactionViewModel/transactionfilterViewModel.dart'; +import '../../models/userModels/loginModel.dart'; +import '../../viewsModel/TransactionViewModel/transactionViewModel.dart'; +import '../../viewsModel/userViewModels/LoginViewModel/loginViewModel.dart'; + +class AccountHistoryPage extends StatefulWidget { + final String bankCardNumber; + const AccountHistoryPage({super.key, required this.bankCardNumber}); + + @override + State createState() => _AccountHistoryPageState(); +} + +class _AccountHistoryPageState extends State { + int selectedTransactionTypeIndex = -1; // -1 means no selection + TextEditingController minAmountController = TextEditingController(); + TextEditingController amountController = TextEditingController(); + TextEditingController maxAmountController = TextEditingController(); + @override + void initState() { + super.initState(); + + // Using addPostFrameCallback to call after the build phase + WidgetsBinding.instance.addPostFrameCallback((_) { + // Fetch transactions after the widget is built + final loginViewModel = Provider.of( + context, + listen: false, + ); + final transactionViewModel = Provider.of( + context, + listen: false, + ); + final userId = loginViewModel + .loginResponse! + .data! + .tsUser + .id; // Get the actual userId from the login model + //get all transactions + // transactionViewModel.getTransactions( + // userId.toString(), + // ); + // Fetch transactions based on bankcard + transactionViewModel.getTransactionsByBankCard( + userId.toString(), + widget.bankCardNumber, + loginViewModel.loginResponse!.data!.token + ); + final dateProvider = Provider.of(context, listen: false); + if (dateProvider.startDate == null) { + dateProvider.setDateRange(0); // Default to "近7天" + } + + }); + } + String getLastFourDigits(String input) { + if (input.length < 4) return input; + return input.substring(input.length - 4); +} +String getFirstFourWithEllipsis(String input) { + if (input.length <= 4) return input; + return input.substring(0, 4) + '...'; +} + @override + Widget build(BuildContext context) { + + return Scaffold( + backgroundColor: Colors.white, + appBar: AppBar( + centerTitle: true, + leading: InkWell( + onTap: () => Navigator.pop(context), + child: Icon( + Icons.arrow_back_ios, + size: 18, + color: Colors.grey.shade600, + ), + ), + backgroundColor: Colors.white, + bottom: PreferredSize( + preferredSize: Size.fromHeight(40), + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + // Filter by Date - Updated with Consumer + Consumer( + builder: (context, dateProvider, child) { + return InkWell( + onTap: () => _showDateFilterBottomSheet(context), + child: Row( + children: [ + // Calendar text with dynamic dates + Text( + dateProvider.startDate != null && dateProvider.endDate != null + ? '${dateProvider.formattedStartDate}-${dateProvider.formattedEndDate}' + : '选择日期', // Default text when no dates selected + style: TextStyle( + color: Colors.grey.shade800, + ), + ), + SizedBox(width: 5), + RotatedBox( + quarterTurns: 1, + child: Icon( + Icons.arrow_forward_ios, + size: 18, + color: Colors.grey.shade600, + ), + ), + ], + ), + ); + }, + ), + + // Vertical Divider + Container( + width: 0.5, + height: 20, + color: Colors.grey.shade500, + margin: EdgeInsets.symmetric(horizontal: 8), + ), + + // Filter by Amount (unchanged) + InkWell( + onTap: () => _showFilterBottomSheet(context), + child: Row( + children: [ + Text('筛选'), + SizedBox(width: 5), + RotatedBox( + quarterTurns: 1, + child: Icon( + Icons.arrow_forward_ios, + size: 18, + color: Colors.grey.shade600, + ), + ), + ], + ), + ), + ], + ), + ), + ), + title: Text('账户明细', style: TextStyle(fontWeight: FontWeight.w500)), + // Title of the screen + actions: [ + IconButton( + icon: Icon(Icons.search), + onPressed: () {}, // Search button + ), + ], + ), + body: Consumer( + builder: (context, transactionViewModel, child) { + // Initialize sums for income and expenses + + // If the data is loading, show a progress indicator + if (transactionViewModel.isLoading) { + return const Center(child: CircularProgressIndicator()); + } + + + // If no transactions are available, display a message + if (transactionViewModel.transactions.isEmpty) { + return const Center(child: Text('没有转账记录，换个条件试试', + style: TextStyle( + fontFamily: 'SourceSans3', fontSize: 20, color:Color(0xFFC7C7C7), fontWeight: FontWeight.w500 + ), + )); + } + + return SingleChildScrollView( + scrollDirection: Axis.vertical, + child: Padding( + padding: const EdgeInsets.all(0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 80, + width: double.infinity, + decoration: BoxDecoration(color: Color(0xFFF6F9FE)), + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 18, + vertical: 10, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + "共${transactionViewModel.transactions.length}笔交易", + style: TextStyle(fontWeight: FontWeight.w600), + ), + SizedBox(height: 10), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + "收入: ¥${transactionViewModel.sumExpense.toStringAsFixed(2)}", // Modify this line as per your data model + style: TextStyle(fontWeight: FontWeight.w600), + ), + Text( + "支出: ¥${transactionViewModel.sumIncome.toStringAsFixed(2)}", // Modify this line as per your data model + style: TextStyle(fontWeight: FontWeight.w600), + ), + ], + ), + ], + ), + ), + ), + Padding( + padding: const EdgeInsets.symmetric( + horizontal: 20, + vertical: 10, + ), + child: Container( + padding: EdgeInsets.symmetric(horizontal: 5), + decoration: BoxDecoration(color: Colors.grey.shade200), + child: Text("04月"), + ), + ), + Container( + height: MediaQuery.of(context).size.height * 0.7, + child: ListView.builder( + shrinkWrap: false, + itemCount: transactionViewModel + .transactions + .length, // Update based on fetched transactions + itemBuilder: (context, index) { + // final loginViewModel = Provider.of( + // context, + // ); + final transaction = + transactionViewModel.transactions[index]; + String previousBalance = transaction + .previousBalance; // Use null-aware operator to handle null values + // TsUser user = + // loginViewModel.loginResponse!.data!.tsUser; + // double totalBalance = + // user.foreignCurrency + + // user.financialManagementAmount + + // user.depositAmount; + String lastFour = getLastFourDigits(transaction.recipientAccount); + return Padding( + padding: const EdgeInsets.symmetric(horizontal: 8), + child: Column( + children: [ + Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + transaction.recipientAccountName.length>8? '${transaction.recipientAccountName}(尾号\n${lastFour})': + '${transaction.recipientAccountName}(尾号${lastFour})', + style: TextStyle( + fontFamily: 'SourceSans3', + fontSize: 13, + fontWeight: FontWeight.w600, + ), + ), + Text( + transaction.isIncome + ? '+${transaction.transferAmount}元' + : '-${transaction.transferAmount}元', // Use the dynamic amount + style: TextStyle( + fontSize: 15, + color: transaction.isIncome + ? brownColor + : bottomNabBarIconColor, + fontWeight: FontWeight.bold, + ), + ), + + ],), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + + Text( + transaction.createdAt, // Use the dynamic date + style: TextStyle(color: Colors.grey.shade600), + ), + Text( + '余额:${previousBalance}', // Use the dynamic status + style: TextStyle( + fontSize: 14, + color: Colors.grey.shade500, + ), + ), + + ],), + + Divider( + color: Colors.grey.shade300, + thickness: 0.5, + ), + + ], + ), + ), + // ListTile( + // contentPadding: EdgeInsets.all(16), + // title: Row( + // children: [ + // Text( + // transaction.recipientAccountName.length>8? '${transaction.recipientAccountName}(尾号\n${lastFour})': + // '${transaction.recipientAccountName}(尾号${lastFour})', + // style: TextStyle( + // fontFamily: 'SourceSans3', + // fontSize: 13, + // fontWeight: FontWeight.w600, + // ), + // ), + // Spacer(), + // Column( + // crossAxisAlignment: + // CrossAxisAlignment.end, + // children: [ + // Text( + // transaction.isIncome + // ? '+${transaction.transferAmount}元' + // : '-${transaction.transferAmount}元', // Use the dynamic amount + // style: TextStyle( + // fontSize: 15, + // color: transaction.isIncome + // ? brownColor + // : bottomNabBarIconColor, + // fontWeight: FontWeight.bold, + // ), + // ), + // SizedBox(height: 4), + // Text( + // '余额:${previousBalance}', // Use the dynamic status + // style: TextStyle( + // fontSize: 14, + // color: Colors.grey.shade500, + // ), + // ), + // ], + // ), + // ], + // ), + // subtitle: Text( + // transaction.createdAt, // Use the dynamic date + // style: TextStyle(color: Colors.grey.shade600), + // ), + // ), + + ], + ), + ); + }, + ), + ), + ], + ), + ), + ); + }, + ), + ); + } + void _showFilterBottomSheet(BuildContext context) { + showModalBottomSheet( + backgroundColor: Colors.white, + isScrollControlled: true, + context: context, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.only(topLeft: Radius.circular(0), topRight: Radius.circular(0)), + ), + builder: (context) { + return ChangeNotifierProvider( + create: (context) => FilterProvider(), + child: FilterBottomSheet( + minAmountController: minAmountController, + maxAmountController: maxAmountController, + accountController: amountController, + primaryColor: bottomNabBarIconColor, + ), + ); + }, + ); + } + + void _showDateFilterBottomSheet(BuildContext context) { + showModalBottomSheet( + backgroundColor: Colors.white, + isScrollControlled: true, + context: context, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.only(topLeft: Radius.circular(0), topRight: Radius.circular(0)), + ), + builder: (context) => DateFilterBottomSheet( + primaryColor: bottomNabBarIconColor, + ), + ); + } +} diff --git a/lib/pages/AccountPages/account_detail_page.dart b/lib/pages/AccountPages/account_detail_page.dart new file mode 100644 index 0000000..af1840d --- /dev/null +++ b/lib/pages/AccountPages/account_detail_page.dart @@ -0,0 +1,328 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; +import 'package:tempp/constants/constants.dart'; +import '../../viewsModel/BankCardViewModel/bankCardViewModel.dart'; +import '../../viewsModel/userViewModels/LoginViewModel/loginViewModel.dart'; +import 'package:cached_network_image/cached_network_image.dart'; + +class AccountDetailsScreen extends StatefulWidget { + const AccountDetailsScreen({super.key}); + + @override + State createState() => _AccountDetailsScreenState(); +} + +class _AccountDetailsScreenState extends State { + @override + void initState() { + super.initState(); + + // Fetch transactions after the widget is built + WidgetsBinding.instance.addPostFrameCallback((_) { + final loginViewModel = Provider.of(context, listen: false); + final bankViewModel = Provider.of(context, listen: false); + final userId = loginViewModel.loginResponse!.data!.tsUser.id; // Get user ID from login model + bankViewModel.getUserBankCards(userId.toString(),loginViewModel.loginResponse!.data!.token); + }); + } + + @override + Widget build(BuildContext context) { + double height = MediaQuery.of(context).size.height; + double width = MediaQuery.of(context).size.width; + final loginViewModel = Provider.of(context, listen: false); + return Scaffold( + backgroundColor: Colors.grey[100], + appBar: AppBar( + leading: InkWell( + onTap: () { + Navigator.pop(context); + }, + child: Icon(CupertinoIcons.back, size: 24, color: Colors.black)), + centerTitle: true, + title: const Text( + "账户详情", // Account Details in Chinese + style: TextStyle(fontWeight: FontWeight.bold), + ), + backgroundColor: Colors.white, + ), + body: Consumer( + builder: (context, bankViewModel, child) { + if (bankViewModel.isLoading) { + return const Center(child: CircularProgressIndicator()); + } + + if (bankViewModel.errorMessage.isNotEmpty) { + return Center(child: Text(bankViewModel.errorMessage)); + } + + if (bankViewModel.bankCards.isEmpty) { + return const Center(child: Text('No bank cards available.')); + } + + final bankCard = bankViewModel.bankCards[0]; + return Column( + children: [ + // Top Card Container + Container( + decoration: BoxDecoration(color: Colors.white), + height: AppTextStyles.isExtraSmallDevice(context)?height * 0.48 : AppTextStyles.isSmallDevice(context)?height * 0.39: + AppTextStyles.isMediumDevice(context)?height * 0.37:height * 0.3, + width: width, + child: Padding( + padding: const EdgeInsets.only(top: 16, left: 16, right: 16), + child: Column( + children: [ + CardContainer( + cardNumber: bankCard.bankCardNumber, + bankName: bankCard.alias, + accountName: bankCard.openingBank, + statusText: "正常", + userAlias: loginViewModel.loginResponse!.data!.tsUser.userAlias, + image: CachedNetworkImage( + imageUrl: 'http://' + bankCard.bankLogo, + fit: BoxFit + .cover, + imageBuilder: (context, imageProvider) => CircleAvatar( + radius: 15, + backgroundImage: imageProvider, + ), + placeholder: (context, url) => CircleAvatar( + radius: 15, + backgroundColor: Colors.grey.shade200, + ), + errorWidget: (context, url, error) => CircleAvatar( + radius: 15, + backgroundColor: Colors.grey.shade200, + ), + ), + ), + Container( + width: width, + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 2), + decoration: BoxDecoration( + color: const Color(0xFFf9f6f1), + borderRadius: BorderRadius.circular(10), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + const Text( + '设为默认账号', // Set as default account + style: TextStyle(color: Colors.grey, fontSize: 16), + ), + const SizedBox(width: 20), + Switch( + + value: true, // Here, you can pass the dynamic value + onChanged: null, // Disable the switch + activeColor: Colors.white, + activeTrackColor: Colors.green.shade200, + ), + ], + ), + ), + Spacer(), + Text( + '基本信息', // Basic Information in Chinese + style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold, color: bottomNabBarIconColor), + ), + const SizedBox(height: 10), + Container( + height: 2, + width: 30, + color: bottomNabBarIconColor, + ), + ], + ), + ), + ), + SizedBox(height: 10), + // Basic Information Section + Container( + height: height * 0.4, + width: double.infinity, + decoration: BoxDecoration(color: Colors.white), + child: Padding( + padding: const EdgeInsets.all(16.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Text("人民币余额", style: accountDetailStyle), + const SizedBox(width: 15), + const Image( + image: AssetImage("assets/accountImages/eyeIcon.png"), + height: 25, + width: 25, + ), + const Spacer(), + Text( + "${bankCard.availableBalance}元", // Dynamic balance value + style: accountDetailStyleNumber, + ), + ], + ), + InfoRow( + title: "", + value: "可用余额: ¥${bankCard.availableBalance}元",titleStyle: accountDetailStyle,valueStyle: accountDetailStyle, + ), + InfoRow( + title: "账户类型", + value: bankCard.accountType, titleStyle: accountDetailStyle,valueStyle: accountDetailStyleNumber, + ), + InfoRow( + title: "开户日期", + value: bankCard.accountOpeningDate, titleStyle: accountDetailStyle,valueStyle: accountDetailStyleNumber, + ), + InfoRow( + title: "账户权限", + value: bankCard.accountPermissions, titleStyle: accountDetailStyle,valueStyle: accountDetailStyleNumber, + ), + ], + ), + ], + ), + ), + ), + ], + ); + }, + ), + ); + } +} + +class InfoRow extends StatelessWidget { + final String title; + final String value; + final TextStyle titleStyle; + final TextStyle valueStyle; + + const InfoRow({ + Key? key, + required this.title, + required this.value, + required this.titleStyle, + required this.valueStyle, + }) : super(key: key); + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 8.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + title, + style: titleStyle + ), + Text( + value, + style: valueStyle, + ) + ], + ), + ); + } +} + +class CardContainer extends StatelessWidget { + final String cardNumber; + final String bankName; + final String accountName; + final String statusText; + final String userAlias; + final Widget image; + + const CardContainer({ + Key? key, + required this.cardNumber, + required this.bankName, + required this.accountName, + required this.statusText, + required this.userAlias, + required this.image, + }) : super(key: key); + + @override + Widget build(BuildContext context) { + return Container( + width: double.infinity, + height: 200, + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage('assets/accountImages/accountDetailContainer.png'), + ), + ), + child: Stack( + children: [ + Positioned( + top: 20, + left: 20, + child: image, + ), + Positioned( + top: 20, + left: 70, + child: Text( + cardNumber, + style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold, color: Colors.white), + ), + ), + Positioned( + top: 60, + left: 70, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Text(bankName, style: TextStyle(fontSize: 14, fontWeight: FontWeight.w500, color: Colors.white)), + SizedBox(width: 10,), + Image.asset("assets/accountImages/edit.png",height: 14,width: 14,) + ], + ), + SizedBox(height: 10), + Text(accountName, style: TextStyle(fontSize: 14, fontWeight: FontWeight.w500, color: Colors.white)), + ], + ), + ), + Positioned( + top: 120, + left: 0, + child: Image.asset("assets/accountImages/dottedLine.png") + ), + Positioned( + bottom: 40, + left: 20, + child: Text( + userAlias, + style: TextStyle(fontSize: 14, fontWeight: FontWeight.w500, color: Colors.white), + ), + ), + Positioned( + top: 10, + right: 7, + child: Stack( + alignment: Alignment.center, + children: [ + Image.asset("assets/accountImages/greenBanner.png", height: 40, width: 40), + Text( + statusText, + style: TextStyle(fontSize: 11, color: Colors.white), + ), + ], + ), + ), + ], + ), + ); + } +} diff --git a/lib/pages/AccountPages/account_list_page.dart b/lib/pages/AccountPages/account_list_page.dart new file mode 100644 index 0000000..3343671 --- /dev/null +++ b/lib/pages/AccountPages/account_list_page.dart @@ -0,0 +1,392 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:tempp/pages/AccountPages/account_detail_page.dart'; +import 'package:tempp/viewsModel/BankCardViewModel/bankCardViewModel.dart'; + +import '../../constants/constants.dart'; +import '../../viewsModel/userViewModels/LoginViewModel/loginViewModel.dart'; +import 'AccountInquiryPage.dart'; +import 'package:provider/provider.dart'; +import 'package:cached_network_image/cached_network_image.dart'; + +class AccountListPage extends StatefulWidget { + const AccountListPage({super.key}); + + @override + State createState() => _AccountListPageState(); +} + + +class _AccountListPageState extends State { + @override + void initState() { + super.initState(); + + // Using addPostFrameCallback to call after the build phase + WidgetsBinding.instance.addPostFrameCallback((_) { + // Fetch transactions after the widget is built + final loginViewModel = Provider.of(context, listen: false); + final bankViewModel = Provider.of(context, listen: false); + final userId = loginViewModel.loginResponse!.data!.tsUser.id; // Get the actual userId from the login model + + // Fetch transactions + bankViewModel.getUserBankCards(userId.toString(),loginViewModel.loginResponse!.data!.token); + }); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + backgroundColor: Colors.grey.shade100, + appBar: AppBar( + centerTitle: true, + leading: InkWell( + onTap: () { + Navigator.pop(context); + }, + child: Icon(CupertinoIcons.back, size: 24, color: Colors.black)), + backgroundColor: Colors.white, + title: Text('账户查询', + style: TextStyle(fontSize: 23, fontWeight: FontWeight.bold)), + bottom: TabBar( + labelColor: bottomNabBarIconColor, // Color for the selected tab text + unselectedLabelColor: + Colors.grey, // Color for the unselected tab text + indicatorColor: + bottomNabBarIconColor, // Color for the bottom line indicator + tabs: [ + Tab( + text: '本行', // Tab 1 Text + ), + Tab( + text: '他行', // Tab 2 Text + ), + ], + ), + ), + body: Padding( + padding: const EdgeInsets.all(16.0), + child: TabBarView( + children: [ + // Content for the "本行" tab + _buildAccountDetails(context), + // Content for the "他行" tab (you can customize as needed) + Center(child: Text("暂无数据!",style: TextStyle( + fontFamily: 'SourceSans3', fontSize: 20, color:Color(0xFFC7C7C7), fontWeight: FontWeight.w500 + ),)), + ], + ), + ), + ); + } + + // Account Details Container + Widget _buildAccountDetails(BuildContext context) { + return Consumer( + builder: (context, viewModel, child) { + if (viewModel.isLoading) { + return Center(child: CircularProgressIndicator()); + } + + if (viewModel.errorMessage.isNotEmpty) { + return Center(child: Text(viewModel.errorMessage)); + } + + if (viewModel.bankCards.isEmpty) { + return Center(child: Text('No bank cards available.')); + } + + final bankCard = viewModel.bankCards[0]; + print(bankCard.bankLogo); + + return Stack( + children: [ + Container( + height: MediaQuery.of(context).size.height * 0.4, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(12), + color: Colors.white, + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.2), + spreadRadius: 2, + blurRadius: 5, + ), + ], + ), + padding: EdgeInsets.all(20), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + CachedNetworkImage( + imageUrl: 'http://' + bankCard.bankLogo, + fit: BoxFit + .cover, + imageBuilder: (context, imageProvider) => CircleAvatar( + radius: 15, + backgroundImage: imageProvider, + ), + placeholder: (context, url) => CircleAvatar( + radius: 15, + backgroundColor: Colors.grey.shade200, + ), + errorWidget: (context, url, error) => CircleAvatar( + radius: 15, + backgroundColor: Colors.grey.shade200, + ), + ), + // : CircleAvatar( + // radius: 20, + // backgroundColor: Colors.grey.shade200, + // ), + SizedBox(width: 10), + Text( + bankCard.bankCardNumber, + style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold), + ), + ], + ), + SizedBox(height: 8), + Row( + children: [ + Text( + bankCard.openingBank, + style: TextStyle(fontSize: 18, color: Colors.grey), + ), + SizedBox(width: 10), + Image.asset("assets/accountImages/eyeIcon.png", height: 25, width: 25), + ], + ), + SizedBox(height: 20), + Column( + children: [ + _buildBalance("余额", "¥${bankCard.availableBalance}"), + SizedBox(height: 10), + _buildBalance("可用余额", "¥${bankCard.availableBalance}"), + ], + ), + SizedBox(height: 20), + Spacer(), + Divider(thickness: 0.5), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 20), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + InkWell( + onTap: () { + Navigator.push(context, MaterialPageRoute(builder: (context) => AccountDetailsScreen())); + }, + child: Text( + '账户详情', + style: TextStyle( + color: bottomNabBarIconColor, + fontSize: 16, + ), + ), + ), + Container( + width: 0.5, + height: 20, + color: Colors.grey.shade300, + margin: EdgeInsets.symmetric(horizontal: 8), + ), + InkWell( + onTap: () { + + Navigator.push(context, MaterialPageRoute(builder: (context) => AccountHistoryPage(bankCardNumber: bankCard.bankCardNumber,))); + + }, + child: Text( + '交易明细', + style: TextStyle( + color: bottomNabBarIconColor, + fontSize: 16, + ), + ), + ), + ], + ), + ), + SizedBox(height: 10), + ], + ), + ), + Positioned( + top: 10, + right: -1, + child: Stack( + alignment: Alignment.center, + children: [ + Image.asset("assets/accountImages/brownBanner.png", height: 40, width: 40), + Text( + "默认", + style: TextStyle(fontSize: 11, color: Colors.white), + ) + ], + ), + ), + ], + ); + }, + ); + } +//allcard + // Widget _buildDetails(BuildContext context) { + // return Consumer( + // builder: (context, viewModel, child) { + // if (viewModel.isLoading) { + // return Center(child: CircularProgressIndicator()); + // } + + // if (viewModel.errorMessage.isNotEmpty) { + // return Center(child: Text(viewModel.errorMessage)); + // } + + // if (viewModel.bankCards.isEmpty) { + // return Center(child: Text('No bank cards available.')); + // } + + // return ListView.builder( + // itemCount: viewModel.bankCards.length, // Use the length of bankCards list + // itemBuilder: (context, index) { + // final bankCard = viewModel.bankCards[index]; // Get the bank card at index + + // return Stack( + // children: [ + // Container( + // margin: EdgeInsets.symmetric(vertical: 10, horizontal: 15), + // height: MediaQuery.of(context).size.height * 0.4, // Adjust this based on the design + // decoration: BoxDecoration( + // borderRadius: BorderRadius.circular(12), + // color: Colors.white, + // boxShadow: [ + // BoxShadow( + // color: Colors.grey.withOpacity(0.2), + // spreadRadius: 2, + // blurRadius: 5, + // ), + // ], + // ), + // padding: EdgeInsets.all(20), + // child: Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // // Bank card number and avatar + // Row( + // children: [ + // CircleAvatar( + // radius: 10, + // backgroundColor: Colors.grey.shade300, + // ), + // SizedBox(width: 10), + // Text( + // bankCard.bankCardNumber, + // style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold), + // ), + // ], + // ), + // SizedBox(height: 8), + // // Opening bank and eye icon + // Row( + // children: [ + // Text( + // bankCard.openingBank, + // style: TextStyle(fontSize: 18, color: Colors.grey), + // ), + // SizedBox(width: 10), + // Image.asset("assets/accountImages/eyeIcon.png", height: 25, width: 25), + // ], + // ), + // SizedBox(height: 20), + // // Balance and available balance + // Column( + // children: [ + // _buildBalance("余额", "¥${bankCard.balance}"), + // SizedBox(height: 10), + // _buildBalance("可用余额", "¥${bankCard.availableBalance}"), + // ], + // ), + // SizedBox(height: 20), + // Spacer(), + // Divider(thickness: 0.5), + // Padding( + // padding: const EdgeInsets.symmetric(horizontal: 20), + // child: Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // children: [ + // InkWell( + // onTap: () { + // Navigator.push(context, MaterialPageRoute(builder: (context) => AccountDetailsScreen())); + + // }, + // child: Text( + // '账户详情', + // style: TextStyle(color: bottomNabBarIconColor, fontSize: 16), + // ), + // ), + // Container( + // width: 0.5, + // height: 20, + // color: Colors.grey.shade300, + // margin: EdgeInsets.symmetric(horizontal: 8), + // ), + // InkWell( + // onTap: () { + // Navigator.push(context, MaterialPageRoute(builder: (context) => AccountHistoryPage(bankCardNumber: bankCard.bankCardNumber,))); + + // }, + // child: Text( + // '交易明细', + // style: TextStyle(color: bottomNabBarIconColor, fontSize: 16), + // ), + // ), + // ], + // ), + // ), + // SizedBox(height: 10), + // ], + // ), + // ), + // Positioned( + // top: 10, + // right: 12, + // child: Stack( + // alignment: Alignment.center, + // children: [ + // Image.asset("assets/accountImages/brownBanner.png", height: 40, width: 40), + // Text( + // "默认", + // style: TextStyle(fontSize: 11, color: Colors.white), + // ) + // ], + // ), + // ), + // ], + // ); + // }, + // ); + // }, + // ); + // } + + + + // Method to build balance information + Widget _buildBalance(String label, String value) { + return Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(label, style: TextStyle(color: Colors.grey, fontSize: 18)), + SizedBox(width: 20), + Text( + value, + style: TextStyle( + fontSize: 20, fontWeight: FontWeight.bold, color: brownColor), + ), + ], + ); + } +} diff --git a/lib/pages/FullFeaturePages/fullFeaturePage.dart b/lib/pages/FullFeaturePages/fullFeaturePage.dart new file mode 100644 index 0000000..d58f90a --- /dev/null +++ b/lib/pages/FullFeaturePages/fullFeaturePage.dart @@ -0,0 +1,293 @@ +import 'package:flutter/material.dart'; +import 'package:tempp/pages/AccountPages/account_detail_page.dart'; +import 'package:tempp/pages/SingleAccountPage/singleTransferPage.dart'; + +class FullFeaturePage extends StatelessWidget { + const FullFeaturePage({super.key}); + + @override + Widget build(BuildContext context) { + return Scaffold( + backgroundColor: Colors.white, + appBar: AppBar( + leading: InkWell( + onTap: () { + Navigator.pop(context); + }, + child: Icon( + Icons.arrow_back_ios, + size: 18, + color: Colors.grey.shade600, + ), + ), + centerTitle: true, + title: Text( + '全部功能', // The title of the screen + style: TextStyle(fontSize: 23, fontWeight: FontWeight.bold), + ), + backgroundColor: Colors.white, + actions: [ + Padding( + padding: const EdgeInsets.symmetric(horizontal: 16), + child: Text( + "编辑", + style: TextStyle( + fontWeight: FontWeight.w500, + color: Color(0xFF099B5D), + fontSize: 18, + ), + ), + ), + ], + ), + body: Padding( + padding: const EdgeInsets.all(16.0), + child: SingleChildScrollView( + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 20), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Text( + '我的常用', // The title of the screen + style: TextStyle( + fontFamily: 'SourceSans3', + fontSize: 16, + color: Color(0xFF000000), + fontWeight: FontWeight.w500, + ), + ), + SizedBox(width: 10), + Text( + '（最多可以添加5个）', // The title of the screen + style: TextStyle( + fontFamily: 'SourceSans3', + fontSize: 13, + fontWeight: FontWeight.w500, + color: Color(0xFF9a9a9a), + ), + ), + ], + ), + // First Row (3 items) + Padding( + padding: const EdgeInsets.symmetric(horizontal: 16,vertical: 4), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + InkWell( + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => SingleTransferPage(), + ), + ); + }, + child: _buildFeatureCard( + '单笔转账', + 'assets/fullFeatureImages/row1First.png', + ), + ), + InkWell( + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => AccountDetailsScreen(), + ), + ); + }, + child: _buildFeatureCard( + '账户查询', + 'assets/fullFeatureImages/row1Second.png', + ), + ), + _buildFeatureCard( + '转账交易查询', + 'assets/fullFeatureImages/row1Third.png', + ), + ], + ), + ), + SizedBox(height: 20), + // Second Row (1 item) + Padding( + padding: const EdgeInsets.symmetric(horizontal: 12,vertical: 4), + child: Row( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + _buildFeatureCard( + '电子回单', + 'assets/fullFeatureImages/row2first.png', + ), + ], + ), + ), + SizedBox(height: 20), + // Third Row (3 items) + Text( + '账户管理', // The title of the screen + style: TextStyle( + fontFamily: 'SourceSans3', + fontSize: 16, + fontWeight: FontWeight.w500, + ), + ), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 12,vertical: 4), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + _buildFeatureCard( + '账户查询', + 'assets/fullFeatureImages/row3first.png', + ), + _buildFeatureCard( + '财富总览', + 'assets/fullFeatureImages/row3Second.png', + ), + _buildFeatureCard( + '电子回单', + 'assets/fullFeatureImages/row3Third.png', + ), + ], + ), + ), + SizedBox(height: 20), + Text( + '转账汇款', // The title of the screen + style: TextStyle( + fontFamily: 'SourceSans3', + fontSize: 16, + fontWeight: FontWeight.w500, + ), + ), + // Fourth Row (3 items) + Padding( + padding: const EdgeInsets.symmetric(horizontal: 12,vertical: 4), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + _buildFeatureCard( + '汇率查询', + 'assets/fullFeatureImages/row4First.png', + ), + _buildFeatureCard( + '存款计算器', + 'assets/fullFeatureImages/row4Second.png', + ), + _buildFeatureCard( + '贷款计算器', + 'assets/fullFeatureImages/row4third.png', + ), + ], + ), + ), + SizedBox(height: 20), + Text( + '金融助手', // The title of the screen + style: TextStyle( + fontFamily: 'SourceSans3', + fontSize: 16, + fontWeight: FontWeight.w500, + ), + ), + // Fifth Row (3 items) + Padding( + padding: const EdgeInsets.symmetric(horizontal: 12,vertical: 4), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + _buildFeatureCard( + '网银查询', + 'assets/fullFeatureImages/row5first.png', + ), + _buildFeatureCard( + '存款计算器', + 'assets/fullFeatureImages/row5second.png', + ), + _buildFeatureCard( + '存款计算器', + 'assets/fullFeatureImages/row5third.png', + ), + ], + ), + ), + SizedBox(height: 20), + // Sixth Row (2 items) + Padding( + padding: const EdgeInsets.symmetric(horizontal: 12,vertical: 4), + child: Stack( + alignment: Alignment.center, + children: [ + Row( + children: [ + _buildFeatureCard( + '网点查询', + 'assets/fullFeatureImages/row6first.png', + ), + Expanded( + child: Container(), + ), // Takes up remaining space + ], + ), + _buildFeatureCard( + '贷款利率查询', + 'assets/fullFeatureImages/row6second.png', + ), + ], + ), + ), + SizedBox(height: 20), + Text( + '更多功能', // The title of the screen + style: TextStyle( + fontFamily: 'SourceSans3', + fontSize: 16, + fontWeight: FontWeight.w500, + ), + ), + // Seventh Row (1 item) + Padding( + padding: const EdgeInsets.symmetric(horizontal: 12,vertical: 4), + child: Row( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + _buildFeatureCard( + '交易查询', + 'assets/fullFeatureImages/row7first.png', + ), + ], + ), + ), + ], + ), + ), + ), + ), + ); + } + + // Method to create a feature card with image and text + Widget _buildFeatureCard(String label, String imageUrl) { + return Column( + children: [ + Image.asset(imageUrl, width: 35, height: 35), + SizedBox(height: 2), + Text( + label, + style: TextStyle( + fontFamily: 'SourceSans3', + fontSize: 13, + color: Colors.black, + fontWeight: FontWeight.w500, + ), + textAlign: TextAlign.center, + ), + ], + ); + } +} diff --git a/lib/pages/LoginPage/loginPage.dart b/lib/pages/LoginPage/loginPage.dart new file mode 100644 index 0000000..53390c0 --- /dev/null +++ b/lib/pages/LoginPage/loginPage.dart @@ -0,0 +1,224 @@ +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; +import 'package:tempp/constants/constants.dart'; +import '../../viewsModel/userViewModels/LoginViewModel/loginViewModel.dart'; +import '../MainPages/main_page.dart'; + +class LoginPage extends StatefulWidget { + const LoginPage({super.key}); + + @override + State createState() => _LoginPageState(); +} + +class _LoginPageState extends State { + + + final TextEditingController userNameController = TextEditingController(); + + final TextEditingController passwordController = TextEditingController(); + + final TextEditingController authController = TextEditingController(); + @override +void dispose() { + userNameController.dispose(); + passwordController.dispose(); + authController.dispose(); + super.dispose(); +} + + @override + Widget build(BuildContext context) { + + + final loginViewModel = Provider.of(context, listen: false); + return Scaffold( + resizeToAvoidBottomInset: false, // Prevents resizing when keyboard appears + backgroundColor: Colors.white.withOpacity(0.99), // Background color + body: Padding( + padding: const EdgeInsets.all(16.0), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + // Logo Section + // Container( + // width: 170, + // height: 80, + // decoration: BoxDecoration( + // color: Colors.grey.shade300, + // borderRadius: BorderRadius.circular(5)), + // // You can replace with an actual image + // child: Center( + // child: Image.asset("assets/splashImage/applogo.jpg",fit: BoxFit.fill,) + // ), + // ), + Center( + child: Image.asset("assets/splashImage/applogo.jpg",fit: BoxFit.fill,height: 100,width: 100,) + ), + SizedBox(height: 20), + Text("登录",style: boldStyleblack), // Login text + + // Space between logo and inputs + SizedBox(height: 40), // Space between logo and inputs + + // Input Fields for Username and Password + Center( + child: Container( + height: getScreenHeight(context)*0.58, + width: getScreenWidth(context)*0.8, + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(20), + + ), + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 16.0,vertical: 10.0), + child: Column( + children: [ + SizedBox(height: 40), + _buildTextField('请输入账号', false, userNameController, context), + + SizedBox(height: 20), + _buildTextField('请输入密码', true, passwordController,context), + SizedBox(height: 20), + _buildTextField('请输入授权码', false, authController,context), + SizedBox(height: 30), // Space between input fields + // Space between input fields and button + + // Login Button + Consumer( + builder: (context, viewModel, child) { + return ElevatedButton( + onPressed: () async { + // Validate empty fields first + if (userNameController.text.isEmpty || passwordController.text.isEmpty) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Center( + child: Text( + userNameController.text.isEmpty + ? "用户名不能为空！" + : "密码不能为空!", + style: TextStyle( + color: Colors.white, + fontSize: 16, + fontWeight: FontWeight.bold, + ), + ), + ), + backgroundColor: Colors.red, + ), + ); + return; // Exit if validation fails + } + + // Proceed with login if fields are filled + await loginViewModel.login( + userNameController.text, + passwordController.text, + authController.text + ); + // Check login result + if (loginViewModel.loginResponse?.message =="ok") { + //success toast + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Center(child: Text("登录成功!")), + backgroundColor: Colors.green, + duration: Duration(seconds: 1), // Short duration + ), + ); + + // Navigate after a slight delay to show the toast + Future.delayed(Duration(milliseconds: 1200), () { + Navigator.push( // Using pushReplacement to prevent going back to login + context, + MaterialPageRoute(builder: (context) => MainPage()), + ); + }); + } else { + // Show error message if login fails + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Center( + child: Text( + loginViewModel.errorMessage ?? "Login failed", + style: TextStyle( + color: Colors.white, + fontSize: 16, + fontWeight: FontWeight.bold, + ), + ), + ), + backgroundColor: Colors.red, + ), + ); + } + }, + style: ElevatedButton.styleFrom( + minimumSize: Size(MediaQuery.of(context).size.width, 60), + backgroundColor: bottomNabBarIconColor, + padding: EdgeInsets.symmetric(vertical: 15, horizontal: 50), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(30), + ), + ), + child: viewModel.isLoading + ? CircularProgressIndicator(color: Colors.white) + : Text( + '登录', + style: boldStyleWhite + ), + ); + }, + ), + + SizedBox(height: 20), // Space between button and bottom + ],), + ) + ), + ) + ], + ), + ), + ); + } + + // Method to build input fields + Widget _buildTextField(String hintText, bool isPassword, TextEditingController controller,BuildContext context) { + return TextField( + controller: controller, + enableInteractiveSelection: true, + enableSuggestions: false, + autocorrect: false, + onChanged: (value) {}, + obscureText: isPassword, // If password, obscure the text + decoration: InputDecoration( + hintText: hintText, + hintStyle: greyStyleW500, + filled: true, + fillColor: Colors.transparent, + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(30), + borderSide: BorderSide( + color: Colors.grey.shade300, // Outline border color set to gray + ), + ), + enabledBorder: OutlineInputBorder( + borderRadius: BorderRadius.circular(30), + borderSide: BorderSide( + color: Colors.grey.shade300, // Set the color of the border when not focused + ), + ), + focusedBorder: OutlineInputBorder( + borderRadius: BorderRadius.circular(30), + borderSide: BorderSide( + color: Colors.grey.shade300, // Outline border color for focused state + ), + ), + contentPadding: EdgeInsets.symmetric(vertical: 15, horizontal: 20), + ), + ); + } +} diff --git a/lib/pages/MainPages/feature_page.dart b/lib/pages/MainPages/feature_page.dart new file mode 100644 index 0000000..d100ba8 --- /dev/null +++ b/lib/pages/MainPages/feature_page.dart @@ -0,0 +1,175 @@ +import 'package:flutter/material.dart'; +import 'package:tempp/constants/constants.dart'; + +class FeaturePage extends StatelessWidget { + const FeaturePage({super.key}); + + @override + Widget build(BuildContext context) { + return Scaffold( + backgroundColor: backgroundColor, + body: Padding( + padding: const EdgeInsets.only(top: 10), + child: SizedBox( + width: double.infinity, + height: MediaQuery.of(context).size.height, + child: Stack( + alignment: Alignment.center, + children: [ + // Section title + Positioned( + bottom: 0, + child: Container( + color: Colors.white, + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.height * 0.8, + child: Padding( + padding: const EdgeInsets.all(16), + child: ListView( + scrollDirection: Axis.vertical, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + height: 60, + ), + Row( + children: [ + Text( + "定位", + style: AppTextStyles.regular16.copyWith( + fontSize: 20, + color: Colors.black, + fontWeight: FontWeight.w600 + ), + ), + SizedBox( + width: 10, + ), + RotatedBox( + quarterTurns: 1, + child: Icon( + Icons.arrow_forward_ios, + size: 14, + )) + ], + ), + SizedBox(height: 10), + + // Grid of feature cards + Text( + "预售房资金", + style: featureStyle, + ), + SizedBox( + height: 5, + ), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 8), + child: Row( + children: [ + _buildFeatureCard("assets/featureImages/firstGridIcon.png", + MediaQuery.of(context).size.height*0.2, + MediaQuery.of(context).size.width*0.42, + ), + SizedBox(width: 10), + _buildFeatureCard("assets/featureImages/secondGridIcon.png", + MediaQuery.of(context).size.height*0.2, + MediaQuery.of(context).size.width*0.42, + ), + ], + ), + ), + + Text( + "招投标保证金", + style: featureStyle, + ), + SizedBox( + height: 5, + ), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 8), + child: Row( + children: [ + _buildFeatureCard( + "assets/featureImages/thirdGridIcon.png", + MediaQuery.of(context).size.height*0.2, + MediaQuery.of(context).size.width*0.42, + + ), + SizedBox(width: 10), + _buildFeatureCard("assets/featureImages/fourthGridIcon.png", + MediaQuery.of(context).size.height*0.2, + MediaQuery.of(context).size.width*0.42, + ), + ], + ), + ), + ], + ), + ], + ), + ), + ), + ), + SizedBox(height: 20), + // Top row with icons + Positioned( + top: 70, + child: SizedBox( + height: MediaQuery.of(context).size.height * 0.15, + width: MediaQuery.of(context).size.width*0.95, + child: Card( + color: Colors.white, + // margin: EdgeInsets.symmetric(horizontal: 20), + elevation: 5, + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 16,vertical: 16), + child: Center( + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + _buildIconWithLabel("assets/featureImages/firstRowIcon.png", "电力缴费"), + _buildIconWithLabel( + "assets/featureImages/secondRowIcon.png", "财税银行卡"), + _buildIconWithLabel("assets/featureImages/thirdRowIcon.png", "非税缴费"), + _buildIconWithLabel("assets/featureImages/fourthRowIcon.png", "缴费记录"), + ], + ), + ), + ), + ), + ), + ), + ], + ), + ), + ), + ); + } + + // Method to create an icon with label + Widget _buildIconWithLabel(String imageUrl, String label) { + return Column( + children: [ + Image.asset(imageUrl, height: 32,width: 32,), + SizedBox(height: 5), + Text( + label, + style: AppTextStyles.regular16.copyWith( + fontSize: 14, + color: Colors.black, + ), + textAlign: TextAlign.center, + ), + ], + ); + } + + // Method to create a feature card + Widget _buildFeatureCard(String imageUrl,double height,double width) { + return Image.asset(imageUrl,height: height,width: width,); + } +} diff --git a/lib/pages/MainPages/home_page.dart b/lib/pages/MainPages/home_page.dart new file mode 100644 index 0000000..db0c251 --- /dev/null +++ b/lib/pages/MainPages/home_page.dart @@ -0,0 +1,288 @@ +import 'package:flutter/material.dart'; +import '../../viewsModel/BankCardViewModel/bankCardViewModel.dart'; +import '../../viewsModel/userViewModels/LoginViewModel/loginViewModel.dart'; +import '../AccountPages/account_list_page.dart'; +import '../FullFeaturePages/fullFeaturePage.dart'; +import '../SingleAccountPage/singleTransferPage.dart'; +import '../TransactionPages/transactionInquiryPage.dart'; +import 'package:provider/provider.dart'; +import 'package:google_fonts/google_fonts.dart'; +import '../../constants/constants.dart'; + +class HomePage extends StatefulWidget { + const HomePage({super.key}); + + @override + State createState() => _HomePageState(); +} + +class _HomePageState extends State { + void _handleGridItemTap(int index, BuildContext context) { + switch (index) { + case 0: + Navigator.push(context, MaterialPageRoute(builder: (_) => SingleTransferPage())); + break; + case 1: + Navigator.push( + context, + MaterialPageRoute( + builder: (context) { + return DefaultTabController( + length: 2, + child: AccountListPage(), + ); + }, + ), + ); + + break; + case 2: + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => TransactionHistoryPage(), + ), +); + break; + case 3: + // Navigator.push(context, MaterialPageRoute(builder: (_) => EReceiptScreen())); + break; + case 4: + Navigator.push(context, MaterialPageRoute(builder: (_) => FullFeaturePage())); + break; + default: + break; + } + } + + @override + Widget build(BuildContext context) { + // Get user information from LoginViewModel + final loginViewModel = Provider.of(context); + final userName = loginViewModel.loginResponse?.data?.tsUser.userAlias ?? "用户名称"; // Default name if not available + return Scaffold( + // backgroundColor: Colors.black, + body: Container( + width: double.infinity, + height: MediaQuery.of(context).size.height, + color: Colors.black, + child: LayoutBuilder( + builder: (context, constraints) { + final screenHeight = constraints.maxHeight; + final screenWidth = constraints.maxWidth; + final bottomContainerHeight = screenHeight * 0.45; + return Stack( + alignment: Alignment.topLeft, + children: [ + Positioned( + bottom: 0, + child: Container( + height: screenHeight * 0.7, + width: screenWidth, + decoration: BoxDecoration( + color: Colors.grey.shade100, + borderRadius: BorderRadius.vertical(top: Radius.circular(10)), + ), + ), + ), + // Stats card (positioned at 35% from top to achieve 50-50 overlap) + Positioned( + top: screenHeight * 0.3 -50, // -1 to ensure slight overlap + left: screenWidth * 0.1, + child: _buildStatsCard("0", "待他人审批", "0", "待我审批",context), + ), + // Top content (35% of screen height) + Container( + height: screenHeight * 0.45, + padding: EdgeInsets.symmetric(horizontal: 15, vertical: 20), + child: Column( + children: [ + // Search bar row + Row( + children: [ + Image.asset("assets/home_images/scannerIcon.png",height: 22,width: 22,), + SizedBox(width: 10), + Container( + width: 210, + decoration: BoxDecoration( + color: Color(0xFFFFFFFF).withOpacity(0.3), + borderRadius: BorderRadius.circular(30)), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + children: [ + Image.asset("assets/home_images/searchIcon.png",width: 20,height: 20,), + SizedBox(width: 10), + Text("请输入搜索内容", style:AppTextStyles.regular16), + ], + ), + ), + ), + Spacer(), + Image.asset("assets/home_images/headSetIcon.png",width: 22,height: 22,), + SizedBox(width: 10), + Image.asset("assets/home_images/messageIcon.png",width: 22,height: 22,), + + ], + ), + SizedBox(height: 15), + // Company name and button + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + userName, + style: AppTextStyles.medium18 + ), + SizedBox(height: 5), + Row( + children: [ + Image.asset("assets/home_images/teaBoilIcon.png",width: 22,height: 22,), + SizedBox(width: 5), + Text("下午好～", style: AppTextStyles.medium18), + ], + ), + ], + ), + + ], + ), + ], + ), + ), + // GridView content (positioned inside the white container) + Positioned( + bottom: bottomContainerHeight * 0.45, // Adjust this to position the grid + left: 20, + right: 20, + child: Container( + color: Colors.grey.shade100, + height: 240, + child: Card( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + ), + color: Colors.white, + child: GridView.builder( + padding: EdgeInsets.zero, + physics: NeverScrollableScrollPhysics(), + shrinkWrap: true, // Set shrinkWrap to true to ensure the grid occupies the entire space + gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( + crossAxisCount: 3, + crossAxisSpacing: 0, + mainAxisSpacing: 0, + ), + itemCount: 5, // Changed to 5 for proper number of items + itemBuilder: (context, index) { + final items = [ + {'imageUrl': "assets/home_images/firstGridIcon.png", 'text': '单笔交易'}, + {'imageUrl': "assets/home_images/secondGridIcon.png", 'text': '账户查询'}, + {'imageUrl': "assets/home_images/thirdGridIcon.png", 'text': '转帐交易查询'}, + {'imageUrl': "assets/home_images/thirdGridIcon.png", 'text': '电子回单'}, + {'imageUrl': "assets/home_images/fifthGridIcon.png", 'text': '全部'}, + ]; + return Container( + decoration: BoxDecoration( + border: Border.all(color: Colors.grey[300]!), + ), + child: _buildGridItem( + items[index]['imageUrl'] as String, + items[index]['text'] as String, + index, + context + ), + ); + }, + ), + ), + ) + ), + ], + ); + }, + ), + ), + ); + } + + // Method to build the stats card + Widget _buildStatsCard(String value, String label, String value2, String label2,BuildContext context) { + return SizedBox( + // width: size, + child: Stack( + alignment: Alignment.center, + children: [ + // Background image + Image.asset( + "assets/home_images/brown_container.png", // Replace with your background image asset + width: MediaQuery.of(context).size.width * 0.8, + fit: BoxFit.cover, + ), + // Foreground content + Padding( + padding: const EdgeInsets.symmetric(vertical: 16.0, horizontal: 20), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + value, + style: AppTextStyles.bold20, + ), + SizedBox(height: 5), + Text(label, style: AppTextStyles.medium18), + ], + ), + SizedBox(width: 10,), + Image.asset( + "assets/home_images/45_line.png", + height: 20, + width: 20, + ), + SizedBox(width: 10,), + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + value2, + style: AppTextStyles.bold20 + ), + SizedBox(height: 5), + Text(label2, style: AppTextStyles.medium18), + ], + ), + ], + ), + ), + ], + ), + ); + + } + + // Method to build grid items + Widget _buildGridItem(String imgUrl, String label,int index, BuildContext context) { + return InkWell( + onTap: () => _handleGridItemTap(index, context), + splashColor: Colors.blue.withOpacity(0.2), // Optional: Ripple effect + borderRadius: BorderRadius.circular(8), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Image.asset(imgUrl, height: 50,width: 50), + SizedBox(height: 5), + Text(label, style: AppTextStyles.regular16.copyWith( + fontSize: 14, + fontWeight: FontWeight.w500, + + )) + ], + ), + ); + } +} diff --git a/lib/pages/MainPages/main_page.dart b/lib/pages/MainPages/main_page.dart new file mode 100644 index 0000000..7ce0c78 --- /dev/null +++ b/lib/pages/MainPages/main_page.dart @@ -0,0 +1,186 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import '../../constants/constants.dart'; +import 'home_page.dart'; +import 'feature_page.dart'; +import 'profile_page.dart'; + +class MainPage extends StatefulWidget { + const MainPage({super.key}); + + @override + State createState() => _MainPageState(); +} + +class _MainPageState extends State { + int _selectedIndex = 0; + + // Pages for each tab + final List _pages = [ + HomePage(), + FeaturePage(), + ProfilePage(), + ]; + + void _onItemTapped(int index) { + setState(() { + _selectedIndex = index; + }); + } + + @override + Widget build(BuildContext context) { + Size size = MediaQuery.of(context).size; + double height = 56; + + final backgroundColor = Colors.white; + final shadowColor = Colors.grey; + double elevation = 12; // Increase elevation for a more pronounced effect + + return Scaffold( + extendBody: true, // To allow bottom bar to extend below the body + body: _pages[_selectedIndex], // Show corresponding page based on index + bottomNavigationBar: Container( + height: height , + decoration: BoxDecoration( + boxShadow: [ + BoxShadow( + color: shadowColor, + blurRadius: elevation, + offset: Offset(0, 4), + ), + ], + ), + child: Stack( + children: [ + CustomPaint( + size: Size(size.width, height), + painter: BottomNavCurvePainter( + backgroundColor: backgroundColor, + shadowColor: shadowColor, + elevation: elevation, + ), + ), + Center( + heightFactor: 1.5, // Raise the floating action button + child: NavBarIcon( + text: "特色", // Features + selected: _selectedIndex == 1, + onPressed: () => _onItemTapped(1), + defaultColor: secondaryColor, + selectedColor: bottomNabBarIconColor, + imageUrl: _selectedIndex==1?'assets/home_images/featureUnselected.png':'assets/home_images/featureNav.png', + ), + ), + SizedBox( + height: height, + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, // Use spaceEvenly to spread items + children: [ + NavBarIcon( + text: "首页", // Home + selected: _selectedIndex == 0, + onPressed: () => _onItemTapped(0), + defaultColor: secondaryColor, + selectedColor: bottomNabBarIconColor, + imageUrl: _selectedIndex==0?'assets/home_images/homeBottomNav.png':'assets/home_images/homeUnselected.png', + ), + // The center item (FloatingActionButton) already takes space + SizedBox(width: 56), + NavBarIcon( + text: "我的", // Profile + selected: _selectedIndex == 2, + onPressed: () => _onItemTapped(2), + defaultColor: secondaryColor, + selectedColor: bottomNabBarIconColor, + imageUrl: _selectedIndex==2?'assets/home_images/profileSelected.png':'assets/home_images/profileNav.png', + ), + ], + ), + ), + ], + ), + ), + ); + } +} + +class BottomNavCurvePainter extends CustomPainter { + BottomNavCurvePainter({ + required this.backgroundColor, + required this.shadowColor, + required this.elevation, + }); + + final Color backgroundColor; + final Color shadowColor; + final double elevation; + + @override + void paint(Canvas canvas, Size size) { + Paint paint = Paint() + ..color = backgroundColor + ..style = PaintingStyle.fill; + + Path path = Path(); + double insetRadius = 30; + double insetCurveBeginningX = size.width / 2 - insetRadius; + double insetCurveEndX = size.width / 2 + insetRadius; + + path.lineTo(insetCurveBeginningX, 0); + path.arcToPoint(Offset(insetCurveEndX, 0), + radius: Radius.circular(41), clockwise: true); + path.lineTo(size.width, 0); + path.lineTo(size.width, size.height + 56); + path.lineTo(0, size.height + 56); // This extends the navbar + canvas.drawShadow(path, shadowColor, elevation, true); + canvas.drawPath(path, paint); + } + + @override + bool shouldRepaint(CustomPainter oldDelegate) { + return false; + } +} + +class NavBarIcon extends StatelessWidget { + const NavBarIcon({ + super.key, + required this.text, + required this.imageUrl, + required this.selected, + required this.onPressed, + this.selectedColor = const Color(0xffFF8527), + this.defaultColor = Colors.black54, + }); + + final String text; + final String imageUrl; + final bool selected; + final Function() onPressed; + final Color defaultColor; + final Color selectedColor; + + @override + Widget build(BuildContext context) { + return SizedBox( + height: 50, + child: InkWell( + onTap: onPressed, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Image.asset(imageUrl,height: 22,width: 22,), + Text( + text, + style: TextStyle( + fontFamily:"SourceSans3", + fontWeight: FontWeight.bold, + fontSize: 15, color: selected ? selectedColor : defaultColor), + ), + ], + ), + ), + ); + } +} diff --git a/lib/pages/MainPages/profile_page.dart b/lib/pages/MainPages/profile_page.dart new file mode 100644 index 0000000..489b4f3 --- /dev/null +++ b/lib/pages/MainPages/profile_page.dart @@ -0,0 +1,829 @@ +// profile_page.dart +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; +import 'package:tempp/constants/constants.dart'; +import 'package:tempp/pages/LoginPage/loginPage.dart'; +import 'package:tempp/pages/MainPages/profile_setting_page.dart'; +import 'package:tempp/viewsModel/TransactionViewModel/transactionViewModel.dart'; + +import '../../models/userModels/loginModel.dart'; +import '../../viewsModel/userViewModels/LoginViewModel/loginViewModel.dart'; +import '../../viewsModel/userViewModels/editUserViewModel.dart'; +import 'package:cached_network_image/cached_network_image.dart'; + +class ProfilePage extends StatefulWidget { + const ProfilePage({super.key}); + + @override + State createState() => _ProfilePageState(); +} + +class _ProfilePageState extends State { + @override + void initState() { + super.initState(); + + // Using addPostFrameCallback to call after the build phase + WidgetsBinding.instance.addPostFrameCallback((_) { + // Fetch transactions after the widget is built + final loginViewModel = Provider.of( + context, + listen: false, + ); + final transactionViewModel = Provider.of( + context, + listen: false, + ); + final userId = loginViewModel + .loginResponse! + .data! + .tsUser + .id; // Get the actual userId from the login model + //get all transactions + transactionViewModel.getTransactions(userId.toString(),loginViewModel.loginResponse!.data!.token); + // Fetch transactions based on bankcard + // loginViewModel.fetchUserInfo(userId.toString()); + }); + } + + @override + Widget build(BuildContext context) { + final bool onTap = false; + String maskPhoneNumber(String phoneNumber) { + if (phoneNumber.isEmpty || phoneNumber.length < 8) { + return phoneNumber; // Return as-is if too short to mask + } + + // Extract first 3 and last 4 digits + final start = phoneNumber.substring(0, 3); + final end = phoneNumber.substring(phoneNumber.length - 4); + + return '$start****$end'; + } + + return Scaffold( + extendBody: true, + backgroundColor: Colors.black, + body: Consumer2( + builder: (context, loginViewModel, editViewModel, child) { + if (loginViewModel.loginResponse?.data == null) { + return Center(child: CircularProgressIndicator()); + } + + // Get the current user data + TsUser user = loginViewModel.loginResponse!.data!.tsUser; + + // If we have edited data, use that instead + final editedUser = editViewModel.response?.data?.tsUser; + final displayUser = editedUser != null ? editedUser : user; + + return Column( + children: [ + Container( + height: MediaQuery.of(context).size.height * 0.2, + color: Colors.black, + child: Padding( + padding: const EdgeInsets.all(20.0), + child: InkWell( + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => UserProfilePage(), + ), + ); + }, + child: Row( + children: [ + displayUser.profilePicture == null || + displayUser.profilePicture.isEmpty + ? CircleAvatar( + radius: 27.5, + backgroundColor: Colors.grey, + child: Image.asset( + "assets/profileImages/personIcon.png", + height: 55, + width: 55, + ), + ) + : // Use CachedNetworkImage to load the profile picture + CachedNetworkImage( + imageUrl: + 'http://' + displayUser.profilePicture, + height: 55, + width: 55, + fit: BoxFit + .cover, // Use cover to ensure the image covers the round shape + imageBuilder: (context, imageProvider) => + Container( + decoration: BoxDecoration( + shape: BoxShape + .circle, // This makes the image round + image: DecorationImage( + image: imageProvider, + fit: BoxFit.cover, + ), + ), + ), + placeholder: (context, url) => + CircularProgressIndicator(), // Placeholder while the image is loading + errorWidget: (context, url, error) => Icon( + Icons.person, + ), // Error widget in case the image fails to load + ), + SizedBox(width: 20), + Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + displayUser + .userAlias, // Displaying userName from API + style: AppTextStyles.medium18.copyWith( + fontSize: 20, + fontWeight: FontWeight.bold, + color: Colors.white, + ), + ), + Text( + maskPhoneNumber( + user.phone, + ), // Displaying user phone from API + style: AppTextStyles.medium18.copyWith( + fontSize: 18, + fontWeight: FontWeight.w400, + color: Colors.white, + ), + ), + RichText( + text: TextSpan( + children: [ + TextSpan( + text: '上次登录: \t', + style: AppTextStyles.medium18.copyWith( + fontSize: 14, + fontWeight: FontWeight.normal, + color: Colors.white, + ), + ), + + TextSpan( + text: '${user.lastLoginTime}', + style: AppTextStyles.regular16.copyWith( + fontSize: 14, + fontWeight: FontWeight.w500, + color: Color(0xFFC2C1C7), + ), + ), + ], + ), + ), + + ], + ), + Spacer(), + Icon( + Icons.arrow_forward_ios, + size: 20, + color: Colors.white, + ), + ], + ), + ), + ), + ), + Container( + height: MediaQuery.of(context).size.height * 0.8, + decoration: BoxDecoration( + color: Colors.grey.shade100, + borderRadius: BorderRadius.vertical(top: Radius.circular(10)), + ), + child: Padding( + padding: const EdgeInsets.symmetric(vertical: 16), + child: ListView( + scrollDirection: Axis.vertical, + children: [ + Column( + children: [ + //financial card + FinancialOverviewCard( + totalAmount: + user.depositAmount + + user.financialManagementAmount + + user.foreignCurrency, + depositAmount: user.depositAmount, + financialManagementAmount: + user.financialManagementAmount, + foreignCurrency: user.foreignCurrency, + ), + SizedBox(height: 30), + //2nd card + Card( + color: Colors.white, + margin: EdgeInsets.symmetric(horizontal: 20), + child: Padding( + padding: const EdgeInsets.all(15.0), + child: Column( + children: [ + Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Text( + "安全中心", + style: AppTextStyles.medium18 + .copyWith( + fontSize: 18, + fontWeight: FontWeight.bold, + color: Colors.black, + ), + ), + Icon( + Icons.arrow_forward_ios, + size: 15, + color: Colors.grey, + ), + ], + ), + ), + Row( + mainAxisAlignment: + MainAxisAlignment.spaceAround, + children: [ + _buildIconText( + "assets/profileImages/firstRowIcon.png", + '登录管理', + ), + _buildIconText( + "assets/profileImages/secondRowIcon.png", + '手机号管理', + ), + _buildIconText( + "assets/profileImages/thirdRowIcon.png", + '蓝牙Key管理', + ), + _buildIconText( + "assets/profileImages/fourthRowIcon.png", + '限制查询', + ), + ], + ), + ], + ), + ), + ), + SizedBox(height: 20), + // Second card containing ListTile widgets + Card( + color: Colors.white, + margin: EdgeInsets.symmetric(horizontal: 20), + child: Padding( + padding: const EdgeInsets.all(15.0), + child: Column( + children: [ + ListTile( + leading: Image.asset( + "assets/profileImages/firstColumnIcon.png", + height: 25, + width: 25, + ), + title: Text( + '分享', + style: AppTextStyles.regular16.copyWith( + fontSize: 18, + color: Colors.black, + ), + ), + trailing: Icon( + Icons.arrow_forward_ios, + color: Colors.grey, + size: 17, + ), + onTap: () {}, + ), + Row( + children: [ + SizedBox(width: 20), + SizedBox( + width: + MediaQuery.of(context).size.width * + 0.75, + child: Divider( + color: Colors.grey, + thickness: 0.3, + ), + ), + ], + ), + ListTile( + leading: Image.asset( + "assets/profileImages/secondColumnIcon.png", + height: 25, + width: 25, + ), + title: Text( + '智能客服', + style: AppTextStyles.regular16.copyWith( + fontSize: 18, + color: Colors.black, + ), + ), + trailing: Icon( + Icons.arrow_forward_ios, + color: Colors.grey, + size: 17, + ), + onTap: () {}, + ), + Row( + children: [ + SizedBox(width: 20), + SizedBox( + width: + MediaQuery.of(context).size.width * + 0.75, + child: Divider( + color: Colors.grey, + thickness: 0.3, + ), + ), + ], + ), + ListTile( + leading: Image.asset( + "assets/profileImages/thirdColumnIcon.png", + height: 25, + width: 25, + ), + title: Text( + '隐私政策', + style: AppTextStyles.regular16.copyWith( + fontSize: 18, + color: Colors.black, + ), + ), + trailing: Icon( + Icons.arrow_forward_ios, + color: Colors.grey, + size: 17, + ), + onTap: () {}, + ), + Row( + children: [ + SizedBox(width: 20), + SizedBox( + width: + MediaQuery.of(context).size.width * + 0.75, + child: Divider( + color: Colors.grey, + thickness: 0.3, + ), + ), + ], + ), + ListTile( + leading: Image.asset( + "assets/profileImages/fourthColumnIcon.png", + height: 25, + width: 25, + ), + title: Text( + '企业名片', + style: AppTextStyles.regular16.copyWith( + fontSize: 18, + color: Colors.black, + ), + ), + trailing: Icon( + Icons.arrow_forward_ios, + color: Colors.grey, + size: 17, + ), + onTap: () {}, + ), + Row( + children: [ + SizedBox(width: 20), + SizedBox( + width: + MediaQuery.of(context).size.width * + 0.75, + child: Divider( + color: Colors.grey, + thickness: 0.3, + ), + ), + ], + ), + ListTile( + leading: Image.asset( + "assets/profileImages/fifthColumnIcon.png", + height: 25, + width: 25, + ), + title: Text( + '关于', + style: AppTextStyles.regular16.copyWith( + fontSize: 18, + color: Colors.black, + ), + ), + trailing: Icon( + Icons.arrow_forward_ios, + color: Colors.grey, + size: 17, + ), + onTap: () {}, + ), + Row( + children: [ + SizedBox(width: 20), + SizedBox( + width: + MediaQuery.of(context).size.width * + 0.75, + child: Divider( + color: Colors.white, + thickness: 0, + ), + ), + ], + ), + ], + ), + ), + ), + ], + ), + SizedBox(height: 20), + SizedBox( + width: getScreenWidth(context) * 0.8, + height: 50, + child: GestureDetector( + onTap: () { + // Add your tap action here, like logging out + Navigator.pushReplacement(context, MaterialPageRoute( + builder: (context) => LoginPage(), + )); + }, + child: Card( + margin: EdgeInsets.symmetric(horizontal: 20), + color: Colors.white, + child: Center( + child: Text( + '退出登录', // Chinese text for "Log Out" + style: TextStyle( + fontFamily: 'SourceSans3', + fontSize: 16, + fontWeight: FontWeight.w500, + color: Colors.black, + ), + ), + ), + ), + ), + ), + SizedBox(height: 20), + ], + ), + ), + ), + ], + ); + }, + ), + ); + } +} + +// Method to build the icon-text pair in a row +Widget _buildIconText(String imageUrl, String label) { + return Column( + children: [ + Image.asset(imageUrl, height: 32, width: 32), + SizedBox(height: 5), + Text( + label, + style: AppTextStyles.regular16.copyWith( + fontSize: 14, + color: Colors.black, + ), + ), + ], + ); +} + +class FinancialOverviewCard extends StatefulWidget { + final double totalAmount; + final double depositAmount; + final double financialManagementAmount; + final double foreignCurrency; + + const FinancialOverviewCard({ + super.key, + required this.totalAmount, + required this.depositAmount, + required this.financialManagementAmount, + required this.foreignCurrency, + }); + + @override + State createState() => _FinancialOverviewCardState(); +} + +class _FinancialOverviewCardState extends State { + bool isHidden = true; // Tracks if the values are hidden or visible + + @override + Widget build(BuildContext context) { + return Card( + margin: EdgeInsets.symmetric(horizontal: 20), + color: Colors.white, + child: Padding( + padding: const EdgeInsets.all(15), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + // Title Section + Row( + children: [ + Text( + "财富总览", + style: AppTextStyles.medium18.copyWith( + fontSize: 20, + fontWeight: FontWeight.bold, + color: Colors.black, + ), + ), + SizedBox(width: 10), + InkWell( + splashColor: Colors.transparent, + onTap: () { + setState(() { + isHidden = !isHidden; // Toggle visibility on icon tap + }); + }, + child: Image.asset( + isHidden + ? "assets/accountImages/eye_close-removebg-preview.png" + : "assets/profileImages/eyeIcon.png", + height: 25, + width: 25, + ), + ), + ], + ), + SizedBox(height: 10), + // Total Asset Value + Text( + "资产总额(元)", + style: AppTextStyles.medium18.copyWith( + fontSize: 17, + fontWeight: FontWeight.bold, + color: Color(0xFF919191), + ), + ), + SizedBox(height: 5), + Text( + isHidden + ? "******" + : widget.totalAmount + .toString(), // Toggle between hidden and visible value + style: AppTextStyles.medium18.copyWith( + fontSize: 24, + fontWeight: FontWeight.bold, + color: Colors.black, + ), + ), + SizedBox(height: 20), + // Circular Chart + CustomPaint( + size: Size(120, 120), // Size of the circular chart + painter: CircularChartPainter( + redValue: widget.depositAmount, + yellowValue: widget.financialManagementAmount, + blueValue: widget.foreignCurrency, + totalValue: + widget.depositAmount + + widget.financialManagementAmount + + widget.foreignCurrency, + ), + ), + SizedBox(height: 20), + // Legend + Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + // Red Value (存款) + Row( + children: [ + CircleAvatar(radius: 6, backgroundColor: Color(0xFFE83E3E)), + SizedBox(width: 5), + RichText( + text: TextSpan( + children: [ + TextSpan( + text: '存款\t\t', + style: AppTextStyles.medium18.copyWith( + fontSize: 14, + fontWeight: FontWeight.bold, + color: Color(0xFF919191), + ), + ), + + TextSpan( + text: isHidden + ? "******" + : widget.depositAmount.toString(), + style: AppTextStyles.medium18.copyWith( + fontSize: 18, + fontWeight: FontWeight.bold, + color: Colors.black, + ), + ), + ], + ), + ), + ], + ), + SizedBox(height: 5), + // Yellow Value (理财) + Row( + children: [ + CircleAvatar(radius: 6, backgroundColor: Color(0xFFecb151)), + SizedBox(width: 5), + RichText( + text: TextSpan( + children: [ + TextSpan( + text: '理财\t\t', + style: AppTextStyles.medium18.copyWith( + fontSize: 14, + fontWeight: FontWeight.bold, + color: Color(0xFF919191), + ), + ), + + TextSpan( + text: isHidden + ? "******" + : widget.financialManagementAmount.toString(), + style: AppTextStyles.medium18.copyWith( + fontSize: 18, + fontWeight: FontWeight.bold, + color: Colors.black, + ), + ), + ], + ), + ), + ], + ), + SizedBox(height: 5), + // Blue Value (外币) + Row( + children: [ + CircleAvatar(radius: 6, backgroundColor: Color(0xFF143BAC)), + SizedBox(width: 5), + RichText( + text: TextSpan( + children: [ + TextSpan( + text: '外币\t\t', + style: AppTextStyles.medium18.copyWith( + fontSize: 14, + fontWeight: FontWeight.bold, + color: Color(0xFF919191), + ), + ), + + TextSpan( + text: isHidden + ? "******" + : '${widget.foreignCurrency.toString()}', + style: AppTextStyles.medium18.copyWith( + fontSize: 18, + fontWeight: FontWeight.bold, + color: Colors.black, + ), + ), + TextSpan( + text: '\t（折算人民币）', + style: AppTextStyles.medium18.copyWith( + fontSize: 14, + fontWeight: FontWeight.bold, + color: Color(0xFF919191), + ), + ), + ], + ), + ), + ], + ), + ], + ), + SizedBox(height: 10), + ], + ), + ), + ); + } +} + +//financial card painter +class CircularChartPainter extends CustomPainter { + final double redValue; + final double yellowValue; + final double blueValue; + final double totalValue; + + CircularChartPainter({ + required this.redValue, + required this.yellowValue, + required this.blueValue, + required this.totalValue, + }); + + @override + void paint(Canvas canvas, Size size) { + final Paint paintRed = Paint() + ..color = Color(0xFFE83E3E).withOpacity(1.0) + ..style = PaintingStyle.stroke + ..strokeWidth = 12; + + final Paint paintYellow = Paint() + ..color = Color(0xFFecb151).withOpacity(1.0) + ..style = PaintingStyle.stroke + ..strokeWidth = 12; + + final Paint paintBlue = Paint() + ..color = Color(0xFF143BAC).withOpacity(1.0) + ..style = PaintingStyle.stroke + ..strokeWidth = 12; + + // Draw background circle + final Paint backgroundPaint = Paint() + ..color = Colors.grey.shade200 + ..style = PaintingStyle.stroke + ..strokeWidth = 12; + + // Start drawing the circles + double startAngle = -90.0; + + // Draw the red section (存款) + double redAngle = (redValue / totalValue) * 360; + canvas.drawArc( + Rect.fromCircle( + center: Offset(size.width / 2, size.height / 2), + radius: size.width / 2, + ), + _degToRad(startAngle), + _degToRad(redAngle), + false, + paintRed, + ); + + // Draw the yellow section (理财) + startAngle += redAngle; + double yellowAngle = (yellowValue / totalValue) * 360; + canvas.drawArc( + Rect.fromCircle( + center: Offset(size.width / 2, size.height / 2), + radius: size.width / 2, + ), + _degToRad(startAngle), + _degToRad(yellowAngle), + false, + paintYellow, + ); + + // Draw the blue section (外币) + startAngle += yellowAngle; + double blueAngle = (blueValue / totalValue) * 360; + canvas.drawArc( + Rect.fromCircle( + center: Offset(size.width / 2, size.height / 2), + radius: size.width / 2, + ), + _degToRad(startAngle), + _degToRad(blueAngle), + false, + paintBlue, + ); + } + + @override + bool shouldRepaint(CustomPainter oldDelegate) { + return false; + } + + double _degToRad(double degree) { + return degree * 3.1415926535897932 / 180.0; + } +} diff --git a/lib/pages/MainPages/profile_setting_page.dart b/lib/pages/MainPages/profile_setting_page.dart new file mode 100644 index 0000000..ccbe70d --- /dev/null +++ b/lib/pages/MainPages/profile_setting_page.dart @@ -0,0 +1,335 @@ +import 'dart:io'; + +import 'package:flutter/material.dart'; +import 'package:image_picker/image_picker.dart'; +import 'package:provider/provider.dart'; +import 'package:tempp/pages/MainPages/main_page.dart'; +import 'package:tempp/viewsModel/TransactionViewModel/transactionViewModel.dart'; +import '../../constants/constants.dart'; +import '../../models/userModels/loginModel.dart'; +import '../../viewsModel/userViewModels/LoginViewModel/loginViewModel.dart'; +import '../../viewsModel/userViewModels/editUserViewModel.dart'; +import 'package:cached_network_image/cached_network_image.dart'; + +class UserProfilePage extends StatefulWidget { + const UserProfilePage({super.key}); + + @override + State createState() => _UserProfilePageState(); +} + +class _UserProfilePageState extends State { + File? _image; + final picker = ImagePicker(); + late TextEditingController _userNameController; + bool _isEditing = false; + bool _hasGeneratedTransaction = false; + @override + void initState() { + super.initState(); + _userNameController = TextEditingController(); + } + + @override + void dispose() { + _userNameController.dispose(); + super.dispose(); + } + // Pick image from gallery or camera + Future _pickImage(ImageSource source, TsUser user, UserEditViewModel editViewModel) async { + final pickedFile = await picker.pickImage(source: source); + if (pickedFile != null) { + setState(() { + _image = File(pickedFile.path); + }); + final LoginViewModel loginViewModel = Provider.of(context, listen: false); + + // Call the upload image function from view model + if (_image != null) { + await editViewModel.uploadImage(_image!, loginViewModel.loginResponse!.data!.token,); + if (editViewModel.errorMessage.isEmpty) { + // Successfully uploaded the image + print("Image uploaded successfully. URL: ${editViewModel.uploadedImageUrl}"); + + // Now call editUser and pass the correct image URL format + await editViewModel.editUser( + user.id, + user.userAlias, + editViewModel.uploadedImageUrl, // Pass the correctly formatted URL + loginViewModel.loginResponse!.data!.token, + context, + ); + if (editViewModel.response != null && editViewModel.response!.data != null) { + // Update LoginViewModel with new data + loginViewModel.updateUserData(editViewModel.response!.data!.tsUser); + } + } else { + print("Error uploading image: ${editViewModel.errorMessage}"); + } + } + } + } + // Edit user name + void _editUserName(String userName) { + setState(() { + _isEditing = true; + _userNameController.text = userName; + }); + } + + @override + Widget build(BuildContext context) { + final transactionViewModel=Provider.of(context); + + return Scaffold( + backgroundColor: backgroundColor, + appBar: AppBar( + centerTitle: true, + title: Text("个人资料"), + backgroundColor: Colors.white, + leading: IconButton( + icon: Icon(Icons.arrow_back_ios, color: Colors.black87), + onPressed: () => Navigator.pop(context), + ), + ), + body: Consumer2( + builder: (context, loginViewModel, editViewModel, child) { + if (loginViewModel.loginResponse?.data == null) { + return Center(child: CircularProgressIndicator()); + } + + // Get the current user data + TsUser user = loginViewModel.loginResponse!.data!.tsUser; + + // If we have edited data, use that instead + final editedUser = editViewModel.response?.data?.tsUser; + final displayUser = _isEditing && editedUser != null ? editedUser : user; + + return Padding( + padding: const EdgeInsets.only(top: 20), + child: Column( + children: [ + Container( + height: 300, + decoration: BoxDecoration( + color: Colors.white, + ), + child: ListView( + children: [ + // Profile Picture Section + Padding( + padding: const EdgeInsets.all(10.0), + child: Row( + children: [ + Text("头像", style: profileSettingStyleText), + Spacer(), + GestureDetector( + onTap: () { + showModalBottomSheet( + context: context, + builder: (BuildContext context) { + return Container( + height: 150, + child: Column( + children: [ + ListTile( + leading: Icon(Icons.camera), + title: Text("拍照"), + onTap: () { + _pickImage(ImageSource.camera,user, editViewModel); + Navigator.pop(context); + }, + ), + ListTile( + leading: Icon(Icons.image), + title: Text("从图库选择"), + onTap: () { + _pickImage(ImageSource.gallery,user,editViewModel); + Navigator.pop(context); + }, + ), + ], + ), + ); + }, + ); + }, + child: _image != null + ? CircleAvatar( + radius: 30, + backgroundImage: FileImage(_image!), + ) + : (displayUser.profilePicture == null || displayUser.profilePicture.isEmpty + ? Image.asset("assets/profileImages/personIcon.png", height: 55, width: 55) + : CachedNetworkImage( + imageUrl: 'http://${displayUser.profilePicture}?v=${DateTime.now().millisecondsSinceEpoch}', + height: 55, + width: 55, + fit: BoxFit + .cover, // Use cover to ensure the image covers the round shape + imageBuilder: (context, imageProvider) => Container( + decoration: BoxDecoration( + shape: + BoxShape.circle, // This makes the image round + image: DecorationImage( + image: imageProvider, + fit: BoxFit.cover, + ), + ), + ), + placeholder: (context, url) => + CircularProgressIndicator(), // Placeholder while the image is loading + errorWidget: (context, url, error) => Icon( + Icons.person, + ), // Error widget in case the image fails to load + ) + )), + SizedBox(width: 16), + Icon(Icons.arrow_forward_ios, size: 18), + ], + ), + ), + Divider(), + + // Username Section + Padding( + padding: const EdgeInsets.all(10.0), + child: Row( + children: [ + Text("用户名", style: profileSettingStyleText), + Spacer(), + _isEditing + ? Expanded( + child: TextField( + controller: _userNameController, + decoration: InputDecoration( + hintText: 'Enter new username', + border: InputBorder.none, + ), + onSubmitted: (newName) async { + await editViewModel.editUser( + user.id, + newName, + editViewModel.uploadedImageUrl, // Pass the File object if it exists + loginViewModel.loginResponse!.data!.token, + context + + ); + + if (editViewModel.response != null && editViewModel.response!.data != null) { + // Update LoginViewModel with new data + loginViewModel.updateUserData(editViewModel.response!.data!.tsUser); + } + + setState(() { + _isEditing = false; + }); + }, + ), + ) + : GestureDetector( + onTap: () => _editUserName(user.userAlias), + child: Text( + displayUser.userAlias, + style: profileSettingStyleNumber, + ), + ), + SizedBox(width: 16), + Icon(Icons.arrow_forward_ios, size: 18), + ], + ), + ), + Divider(), + + // Other info sections (unchanged) + Padding( + padding: const EdgeInsets.all(10.0), + child: Row( + children: [ + Text("企业客户号", style: profileSettingStyleText), + Spacer(), + Text(user.enterpriseCustomerNumber, + style: profileSettingStyleNumber), + ], + ), + ), + Divider(), + Padding( + padding: const EdgeInsets.all(10.0), + child: Row( + children: [ + InkWell( + onTap: () { + print(editViewModel.response?.data?.tsUser.userName); + }, + child: Text("操作员编号", style: profileSettingStyleText), + ), + Spacer(), + Text(user.operatorId, style: profileSettingStyleNumber), + ], + ), + ), + + ], + ), + ), + SizedBox(height: 40,), + ElevatedButton( + style: ElevatedButton.styleFrom( + minimumSize: Size(MediaQuery.of(context).size.width * 0.8, 60), + backgroundColor: bottomNabBarIconColor, + padding: EdgeInsets.symmetric(vertical: 15, horizontal: 50), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(30), + ), + ), + onPressed: () async { + if (_hasGeneratedTransaction) { + // Already generated, do nothing or show info message + ScaffoldMessenger.of(context).showSnackBar( + SnackBar(content: Center(child: Text("已生成过交易记录"))), + ); + return; + } + + setState(() { + _hasGeneratedTransaction = true; + }); + + try { + await transactionViewModel.addUserTransactionRecordTest(user.id.toString()); + + // Show success message + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + backgroundColor: bottomNabBarIconColor, + content: Center(child: Text("正在生成交易，请稍后查看交易记录！")), + duration: Duration(seconds: 3), + ), + ); + } catch (e) { + // Optional: Handle error with SnackBar + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Center(child: Text("生成交易失败: $e")), + backgroundColor: Colors.red, + ), + ); + + setState(() { + _hasGeneratedTransaction = false; // Allow retry on failure + }); + } + }, + child: Text( + "生成随机交易", + style: boldStyleWhite, + ), +) + ], + ), + ); + }), + ); + } +} \ No newline at end of file diff --git a/lib/pages/MainPages/splash_Page.dart b/lib/pages/MainPages/splash_Page.dart new file mode 100644 index 0000000..5eceba0 --- /dev/null +++ b/lib/pages/MainPages/splash_Page.dart @@ -0,0 +1,36 @@ +// ignore: file_names +import 'dart:async'; + +import 'package:flutter/material.dart'; +import 'package:tempp/constants/constants.dart'; +import 'package:tempp/pages/LoginPage/loginPage.dart'; +class SplashScreen extends StatefulWidget { + const SplashScreen({super.key}); + + @override + _SplashScreenState createState() => _SplashScreenState(); +} + +class _SplashScreenState extends State { + @override + void initState() { + super.initState(); + // Set a timer for 3 seconds and then navigate to the next screen + Timer(Duration(seconds: 2), () { + Navigator.pushReplacement( + context, + MaterialPageRoute(builder: (context) => LoginPage()), + ); + }); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + body: Image.asset('assets/splashImage/splashScreen.jpg', height: getScreenHeight(context), + width: getScreenWidth(context), + fit: BoxFit.fill, + ), + ); + } +} diff --git a/lib/pages/SingleAccountPage/singleTransferPage.dart b/lib/pages/SingleAccountPage/singleTransferPage.dart new file mode 100644 index 0000000..45e9f1a --- /dev/null +++ b/lib/pages/SingleAccountPage/singleTransferPage.dart @@ -0,0 +1,585 @@ +import 'package:flutter/material.dart'; +import 'package:tempp/models/bankCardModels/bankCardModel.dart'; + +import '../../constants/constants.dart'; +import '../../models/userModels/loginModel.dart'; +import '../../viewsModel/BankCardViewModel/bankCardViewModel.dart'; +import '../../viewsModel/TransactionViewModel/transactionViewModel.dart'; +import 'package:provider/provider.dart'; +import '../../viewsModel/userViewModels/LoginViewModel/loginViewModel.dart'; + +class SingleTransferPage extends StatefulWidget { + const SingleTransferPage({super.key}); + + @override + _SingleTransferPageState createState() => _SingleTransferPageState(); +} + +class _SingleTransferPageState extends State { + TextEditingController recipientNameController = TextEditingController(); + TextEditingController recipientAccountController = TextEditingController(); + TextEditingController recipientBankController = TextEditingController(); + TextEditingController transferAmountController = TextEditingController(); + TextEditingController purposeController = TextEditingController(); + String? selectedBank; + + @override + void initState() { + super.initState(); + + // Using addPostFrameCallback to call after the build phase + WidgetsBinding.instance.addPostFrameCallback((_) { + // Fetch transactions after the widget is built + final loginViewModel = Provider.of( + context, + listen: false, + ); + final bankCardViewModel = Provider.of( + context, + listen: false, + ); + final userId = loginViewModel + .loginResponse! + .data! + .tsUser + .id; // Get the actual userId from the login model + bankCardViewModel.getUserBankCards(userId.toString(),loginViewModel.loginResponse!.data!.token); + bankCardViewModel.getBankList(loginViewModel.loginResponse!.data!.token); + + // Add listener for transaction result + final transactionViewModel = Provider.of( + context, + listen: false, + ); + transactionViewModel.addListener(() { + final msg = transactionViewModel.errorMessage; + if (msg.isNotEmpty) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Center(child: Text(msg == "ok" ? "转账成功" : msg)), + backgroundColor: msg.contains("ok") ? Colors.green : Colors.red, + duration: Duration(seconds: 2), + ), + ); + if (msg == "ok") { + // Clear the text fields if transfer is successful + recipientNameController.clear(); + recipientAccountController.clear(); + recipientBankController.clear(); + transferAmountController.clear(); + purposeController.clear(); + bankCardViewModel.getUserBankCards(userId.toString(),loginViewModel.loginResponse!.data!.token); + } + } + }); + }); + } + + @override + Widget build(BuildContext context) { + final viewModel = Provider.of(context); + if (viewModel.bankCards.isEmpty) { + print("No bank cards found."); + // Show a loading indicator or fallback UI + return Center(child: CircularProgressIndicator()); + } + if (viewModel.bankList.isEmpty) { + print("No bank list found."); + // Show a loading indicator or fallback UI for bank list + return Center(child: CircularProgressIndicator()); + } + + final bankCard = viewModel.bankCards[0]; + + return Scaffold( + resizeToAvoidBottomInset: true, + backgroundColor: Colors.grey.shade100, // Half white background + appBar: AppBar( + backgroundColor: Colors.white, + centerTitle: true, + title: Text("单笔转账", style: boldStyleblack), + leading: IconButton( + icon: Icon(Icons.arrow_back_ios), + onPressed: () { + Navigator.pop(context); // Go back to previous screen + }, + ), + ), + body: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + // First container - Payment Account Info + Padding( + padding: const EdgeInsets.all(8.0), + child: Text( + "付款人信息", + style: boldStyle20.copyWith( + color: lightGrey, + fontSize: 17, + fontWeight: FontWeight.w500, + ), + ), + ), + SizedBox(height: 5), + // Payment Account UI (unchanged) + Container( + decoration: BoxDecoration( + color: Colors.white, + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.2), + spreadRadius: 2, + blurRadius: 5, + ), + ], + ), + child: Padding( + padding: const EdgeInsets.symmetric(vertical: 10), + child: Column( + mainAxisAlignment: MainAxisAlignment.end, + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Padding( + padding: const EdgeInsets.symmetric(horizontal: 16), + child: Column( + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Text("付款账户", style: cardStyleText), + Spacer(), + + InkWell( + onTap: () { + // You can still keep the onTap logic if needed, but it won't be necessary for showing the alias in the text. + }, + child: Consumer( + builder: (context, viewModel, child) { + if (viewModel.bankCards.isEmpty) { + return Text( + 'No bank card available', // Show a fallback text if no cards are available + style: cardStyleText, + ); + } + + // Access Alias, fallback to OpeningBank if Alias is empty + String aliasToShow = + viewModel.bankCards[0].alias.isNotEmpty + ? viewModel.bankCards[0].alias + : viewModel.bankCards[0].openingBank; + + return Text( + aliasToShow, // Display the Alias or OpeningBank + style: cardStyleText, + ); + }, + ), + ), + + SizedBox(width: 10), + Icon(Icons.arrow_forward_ios, size: 18), + ], + ), + + Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Column( + mainAxisAlignment: MainAxisAlignment.end, + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + // Text( + // "", + // style: cardStyleText, + // ), + Text( + "司(尾号2993)", //companynumb + style: cardStyleText, + ), + Text( + "宜宾芥峙汽车销售有限公司", //companynumb + style: cardStyleText, + ), + ], + ), + SizedBox(width: 30), + ], + ), + SizedBox(height: 10), + ], + ), + ), + Divider(thickness: 0.5, color: Colors.grey.shade300), + Padding( + padding: const EdgeInsets.symmetric( + horizontal: 50, + vertical: 5, + ), + child: Consumer( + builder: (context, viewModel, child) { + return Text( + "可用余额${bankCard.availableBalance}元", + style: TextStyle( + fontSize: 14, + fontWeight: FontWeight.w600, + color: Colors.grey.shade400, + ), + ); + }, + ), + ), + ], + ), + ), + ), + SizedBox(height: 5), + // Recipient Info Section (unchanged) + Padding( + padding: const EdgeInsets.all(8.0), + child: Text( + "收款人信息", + style: boldStyle20.copyWith( + color: lightGrey, + fontSize: 17, + fontWeight: FontWeight.w500, + ), + ), + ), + // Recipient Info UI (unchanged) + Container( + decoration: BoxDecoration( + color: Colors.white, + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.2), + spreadRadius: 2, + blurRadius: 5, + ), + ], + ), + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 10, + horizontal: 20, + ), + child: SingleChildScrollView( + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + RowWithDivider( + leadingText: "收款户名", + trailingText: "请输入收款户名", + iconPath: "assets/singleTransferImages/personIcon.png", + leadingStyle: cardStyleText, + hintStyle: trailingRowStyleText, + trailingStyle: rowStyleText, + // Optional parameters with defaults: + iconSize: 18, + dividerThickness: 0.5, + dividerColor: Colors.grey.shade300, + spacing: 7, + trailingController: recipientNameController, + ), + RowWithDivider( + leadingText: "收款账号", + trailingText: "收款账号", + iconPath: "assets/singleTransferImages/scaneerIcon.png", + leadingStyle: cardStyleText, + trailingStyle: rowStyleText, + hintStyle: trailingRowStyleText, + // Optional parameters with defaults: + iconSize: 18, + dividerThickness: 0.5, + dividerColor: Colors.grey.shade300, + spacing: 7, + trailingController: recipientAccountController, + ), + Column( + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text("收款银行", style: cardStyleText), + DropdownButton( + dropdownColor: Colors.white, + underline: Container(), + hint: Text( + "请选择收款银行", + style: trailingRowStyleText, + ), + style: rowStyleText, + value: selectedBank, + onChanged: (newValue) { + setState(() { + selectedBank = newValue; + recipientBankController.text = + newValue ?? ''; + }); + }, + items: viewModel.bankList + .map>((bank) { + return DropdownMenuItem( + value: bank.bankName, + child: Text(bank.bankName), + ); + }) + .toList(), + // Customizing the icon and adding padding for space between text and icon + icon: Padding( + padding: const EdgeInsets.only( + left: 24.0, + ), // Add space between text and icon + child: Image.asset( + "assets/singleTransferImages/forwardIcon.png", + height: 18, + width: 18, + ), + ), + ), + ], + ), + Divider(thickness: 0.5, color: Colors.grey.shade300), + ], + ), + + SizedBox(height: 10), + Text("转帐金额", style: cardStyleText), + SizedBox(height: 15), + Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + children: [ + Text( + "¥", + style: TextStyle( + fontSize: 26, + fontWeight: FontWeight.bold, + ), + ), + SizedBox(width: 5), + SizedBox( + width: 120, + child: TextField( + controller: transferAmountController, + decoration: InputDecoration( + hintText: "请输入金额", + helperStyle: rowStyleText, + border: InputBorder.none, + ), + ), + ), + ], + ), + ), + Text("大写金额", style: rowStyleText), + ], + ), + ), + ), + ), + + SizedBox(height: 10), + // Third container - Amount and Purpose (unchanged) + Container( + decoration: BoxDecoration( + color: Colors.white, + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.2), + spreadRadius: 2, + blurRadius: 5, + ), + ], + ), + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 10, + horizontal: 20, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.end, + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Column( + children: [ + Row( + children: [ + Text("用途", style: cardStyleText), + const Spacer(), + SizedBox( + width: 120, + child: TextField( + controller: purposeController, + maxLength: + 60, // Limit the length to 60 characters + maxLines: null, + decoration: InputDecoration( + counterText: '', + hintText: "请输入用途", + helperStyle: boldStyle20.copyWith( + fontSize: 24, + ), + border: + InputBorder.none, // Removes the underline + enabledBorder: InputBorder + .none, // Removes underline when enabled + focusedBorder: InputBorder + .none, // Removes underline when focused + disabledBorder: InputBorder + .none, // Removes underline when disabled + ), + onChanged: (text) { + setState( + () {}, + ); // Trigger UI update when text changes + }, + ), + ), + SizedBox(width: 7), + Image.asset( + "assets/singleTransferImages/forwardIcon.png", + height: 18, + width: 18, + ), + ], + ), + ], + ), + Align( + alignment: Alignment.centerRight, + child: Text( + "${purposeController.text.length}/60", // Display current character count + style: TextStyle( + fontSize: 14, + color: Colors.grey.shade600, + ), + ), + ), + ], + ), + ), + ), + SizedBox(height: 20), + Consumer( + builder: (context, transactionViewModel, child) { + return Container( + width: double.infinity, + height: 50, + margin: EdgeInsets.symmetric(horizontal: 16), + child: ElevatedButton( + style: ElevatedButton.styleFrom( + backgroundColor: bottomNabBarIconColor.withOpacity(0.4), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(4), + ), + ), + onPressed: () { + final loginViewModel = Provider.of( + context, + listen: false, + ); + // Get the userId + final userId = + loginViewModel.loginResponse!.data!.tsUser.id; + final bankCardViewModel = Provider.of( + context, + listen: false, + ); + // Call addTransaction method + transactionViewModel.addTransaction( + recipientAccountName: recipientNameController.text, + recipientBank: recipientBankController.text, + recipientAccount: recipientAccountController.text, + transferAmount: transferAmountController.text, + status: "2", + userId: userId.toString(), + purpose: purposeController.text, + + bankCardNumber: bankCard.bankCardNumber, token: loginViewModel.loginResponse!.data!.token, + ); + // loginViewModel.fetchUserInfo(userId.toString()); + + // Removed SnackBar from here + }, + child: Text( + '下一步', + style: TextStyle(color: Colors.white, fontSize: 16), + ), + ), + ); + }, + ), + + SizedBox(height: 10), + ], + ), + ), + ); + } +} + +class RowWithDivider extends StatelessWidget { + final String leadingText; + final String trailingText; + final TextEditingController trailingController; + final String? iconPath; + final double iconSize; + final TextStyle leadingStyle; + final TextStyle trailingStyle; + final TextStyle hintStyle; + final double dividerThickness; + final Color dividerColor; + final double spacing; + + const RowWithDivider({ + super.key, + required this.leadingText, + required this.trailingController, + this.iconPath, + this.iconSize = 18, + required this.leadingStyle, + required this.trailingStyle, + required this.hintStyle, + this.dividerThickness = 0.5, + this.dividerColor = Colors.grey, + this.spacing = 0, + required this.trailingText, + }); + + @override + Widget build(BuildContext context) { + return Column( + children: [ + Row( + children: [ + Text(leadingText, style: leadingStyle), + const Spacer(), + // Replace trailing text with TextField for input + SizedBox( + width: 120, // Set width of the TextField as needed + child: TextField( + keyboardType: TextInputType.number, + maxLength: 19, + controller: trailingController, + decoration: InputDecoration( + counterText: '', // Hides the max length counter + hintText: trailingText, // Placeholder text based on leading text + hintStyle: hintStyle, + border: InputBorder.none, + ), + style: trailingStyle, + ), + ), + if (iconPath != null) ...[ + SizedBox(width: spacing), + Image.asset(iconPath!, height: iconSize, width: iconSize), + ], + ], + ), + Divider(thickness: dividerThickness, color: dividerColor), + ], + ); + } +} diff --git a/lib/pages/TransactionPages/bottomSheetAccount.dart b/lib/pages/TransactionPages/bottomSheetAccount.dart new file mode 100644 index 0000000..a3643e7 --- /dev/null +++ b/lib/pages/TransactionPages/bottomSheetAccount.dart @@ -0,0 +1,267 @@ +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; +import 'package:tempp/viewsModel/userViewModels/LoginViewModel/loginViewModel.dart'; + +import '../../viewsModel/TransactionViewModel/transactionViewModel.dart'; +import '../../viewsModel/TransactionViewModel/transactionfilterViewModel.dart'; +class TransactionTypeFilter extends StatelessWidget { + final Color selectedColor; + + const TransactionTypeFilter({super.key, required this.selectedColor}); + + @override + Widget build(BuildContext context) { + final filterProvider = Provider.of(context); + + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text('收支方向', + style: TextStyle( + fontFamily: 'SourceSans3', + fontSize: 15, + fontWeight: FontWeight.w400, + color: Colors.black, + ), + ), + SizedBox(height: 10), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: List.generate(filterProvider.transactionTypes.length, (index) { + return _buildFilterChip( + filterProvider.transactionTypes[index], + isSelected: filterProvider.selectedTransactionTypeIndex == index, + selectedColor: selectedColor, + onTap: () { + filterProvider.setTransactionType( + filterProvider.selectedTransactionTypeIndex == index ? null : index + ); + }, + ); + }), + ), + ], + ); + } + + Widget _buildFilterChip(String label, { + required bool isSelected, + required Color selectedColor, + required VoidCallback onTap, + }) { + return SizedBox( + width: 100 , + height: 40, + child: OutlinedButton( + style: OutlinedButton.styleFrom( + // backgroundColor: isSelected ? selectedColor.withOpacity(0.1) : Colors.transparent, + side: BorderSide(color: isSelected ? selectedColor : Colors.grey.shade300), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(5), + ), + ), + onPressed: onTap, + child: Text( + label, + style: TextStyle( + fontSize: 12, + fontWeight: FontWeight.bold, + color: isSelected ? selectedColor : Colors.black, + ), + ), + ), + ); + } +} + +//Resuablebottomsheet +class FilterBottomSheet extends StatelessWidget { + final TextEditingController minAmountController; + final TextEditingController maxAmountController; + final TextEditingController accountController; + final Color primaryColor; + + const FilterBottomSheet({ + super.key, + required this.minAmountController, + required this.maxAmountController, + required this.accountController, + required this.primaryColor, + }); + + @override + Widget build(BuildContext context) { + return SizedBox( + height: MediaQuery.of(context).size.height * 0.5, + child: Column( + children: [ + Padding( + padding: const EdgeInsets.symmetric(horizontal: 16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Align( + alignment: Alignment.topRight, + child: IconButton( + icon: Icon(Icons.close), + onPressed: () => Navigator.pop(context), + ), + ), + Center(child: Text('筛选', style: TextStyle( + fontFamily: 'SourceSans3', + fontSize: 18, fontWeight: FontWeight.w600))), + SizedBox(height: 20), + // _buildTextField(accountController, '付款账户', '全部'), + // SizedBox(height: 20), + TransactionTypeFilter(selectedColor: primaryColor), + SizedBox(height: 10), + _buildAmountRangeFilter(), + SizedBox(height: 20), + ], + ), + ), + Spacer(), + _buildActionButtons(context), + ], + ), + ); + } + + Widget _buildTextField(TextEditingController controller, String label, String hint) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(label), + SizedBox(height: 5), + TextField( + controller: controller, + decoration: InputDecoration( + hintText: hint, + contentPadding: EdgeInsets.all(12), + enabledBorder: OutlineInputBorder( + borderSide: BorderSide(color: Colors.grey.shade300), + borderRadius: BorderRadius.circular(4), + ), + focusedBorder: OutlineInputBorder( + borderSide: BorderSide(color: Colors.grey.shade300), + borderRadius: BorderRadius.circular(4), + ), + border: OutlineInputBorder( + borderSide: BorderSide(color: Colors.grey.shade300), + borderRadius: BorderRadius.circular(4), + ), + ), + keyboardType: TextInputType.number, + ), + ], + ); + } + + Widget _buildAmountRangeFilter() { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text('金额区间', + style: TextStyle( + fontFamily: 'SourceSans3', + fontSize: 15, + fontWeight: FontWeight.w400, + color: Colors.black, + ),), + SizedBox(height: 10), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + _buildAmountField(minAmountController, '最低金额'), + Text('~', style: TextStyle(fontSize: 26, fontWeight: FontWeight.w500)), + _buildAmountField(maxAmountController, '最高金额'), + ], + ), + ], + ); + } + + Widget _buildAmountField(TextEditingController controller, String hint) { + return SizedBox( + width: 140, + child: TextField( + controller: controller, + decoration: InputDecoration( + prefixIcon: Padding( + padding: EdgeInsets.only(left: 12, right: 8, top: 10), + child: Text('¥', style: TextStyle(color: Colors.black, fontSize: 16)), + ), + hintText: hint, + hintStyle: TextStyle(color: Color(0xFFC2C2C2), fontSize: 16), + contentPadding: EdgeInsets.all(12), + enabledBorder: OutlineInputBorder( + borderSide: BorderSide(color: Colors.grey.shade300), + borderRadius: BorderRadius.circular(3), + ), + focusedBorder: OutlineInputBorder( + borderSide: BorderSide(color: Colors.grey.shade300), + borderRadius: BorderRadius.circular(3), + ), + border: OutlineInputBorder( + borderSide: BorderSide(color: Colors.grey.shade300), + borderRadius: BorderRadius.circular(3), + ), + ), + keyboardType: TextInputType.number, + ), + ); + } + + Widget _buildActionButtons(BuildContext context) { + final filterProvider = Provider.of(context, listen: false); + final transactionViewModel = Provider.of(context, listen: false); + final loginViewModel = Provider.of(context, listen: false); + + return Row( + children: [ + Expanded( + child: GestureDetector( + onTap: () { + minAmountController.clear(); + maxAmountController.clear(); + accountController.clear(); + filterProvider.resetFilters(); + }, + child: Container( + height: 50, + color: Colors.grey.shade300, + alignment: Alignment.center, + child: Text('重置', style: TextStyle(color: Colors.black, fontWeight: FontWeight.w500, fontSize: 12)), + ), + ), + ), + Expanded( + child: GestureDetector( + onTap: () { + // Apply filters with filterProvider.selectedTransactionTypeIndex + final startMoney = double.tryParse(minAmountController.text) ?? 0; + final endMoney = double.tryParse(maxAmountController.text) ?? double.infinity; + + transactionViewModel.getTransactionsByAmount( + loginViewModel.loginResponse!.data!.tsUser.id.toString(), // Pass the actual user ID here + startMoney, + endMoney, + loginViewModel.loginResponse!.data!.token + + + ); + + Navigator.pop(context); + }, + child: Container( + height: 50, + color: primaryColor, + alignment: Alignment.center, + child: Text('查询', style: TextStyle(color: Colors.white, fontWeight: FontWeight.w500, fontSize: 12)), + ), + ), + ), + ], + ); + } +} diff --git a/lib/pages/TransactionPages/bottomSheetDateFilter.dart b/lib/pages/TransactionPages/bottomSheetDateFilter.dart new file mode 100644 index 0000000..f9ea19f --- /dev/null +++ b/lib/pages/TransactionPages/bottomSheetDateFilter.dart @@ -0,0 +1,206 @@ +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; +import 'package:tempp/viewsModel/userViewModels/LoginViewModel/loginViewModel.dart'; +import '../../viewsModel/TransactionViewModel/dateFilterViewModel.dart'; +import '../../viewsModel/TransactionViewModel/transactionViewModel.dart'; + +class DateFilterBottomSheet extends StatelessWidget { + final Color primaryColor; + + const DateFilterBottomSheet({Key? key, required this.primaryColor}) + : super(key: key); + + @override + Widget build(BuildContext context) { + // Initialize with default range when bottom sheet opens + WidgetsBinding.instance.addPostFrameCallback((_) { + final dateProvider = Provider.of(context, listen: false); + dateProvider.setDateRange(0); // Set default range (近7天) + }); + + return SizedBox( + height: MediaQuery.of(context).size.height * 0.6, + child: Column( + children: [ + Padding( + padding: const EdgeInsets.symmetric(horizontal: 16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Align( + alignment: Alignment.topRight, + child: IconButton( + icon: Icon(Icons.close), + onPressed: () => Navigator.pop(context), + ), + ), + Center(child: Text('选择日期', style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold))), + Divider(thickness: 0.5, color: Colors.grey.shade300), + SizedBox(height: 20), + Text('交易时间', style: TextStyle(fontSize: 16)), + SizedBox(height: 10), + _buildDateRangeButtons(), + SizedBox(height: 20), + _buildDateRangeDisplay(), + SizedBox(height: 20), + ], + ), + ), + Spacer(), + _buildQueryButton(context), + SizedBox(height: 10), + ], + ), + ); + } + + Widget _buildDateRangeButtons() { + return Consumer( + builder: (context, dateProvider, child) { + return Wrap( + spacing: 8, + runSpacing: 8, + children: List.generate(dateProvider.dateRanges.length, (index) { + return _buildDateRangeButton( + dateProvider.dateRanges[index], + isSelected: dateProvider.selectedDateRangeIndex == index, + onTap: () => dateProvider.setDateRange(index), + ); + }), + ); + }, + ); + } + + Widget _buildDateRangeButton(String label, { + required bool isSelected, + required VoidCallback onTap, + }) { + return SizedBox( + width: 80, + height: 36, + child: OutlinedButton( + style: OutlinedButton.styleFrom( + side: BorderSide(color: isSelected ? primaryColor : Colors.grey.shade300), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(4), + ), + padding: EdgeInsets.zero, + ), + onPressed: onTap, + child: Text( + label, + style: TextStyle(fontSize: 12, color: isSelected ? primaryColor : Colors.black), + ), + ), + ); + } + + Widget _buildDateRangeDisplay() { + return Consumer( + builder: (context, dateProvider, child) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text("自定义"), + SizedBox(height: 10), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 20), + child: Row( + children: [ + _buildDatePickerField( + context, + dateProvider.startDate, + '开始日期', + (date) => dateProvider.updateStartDate(date), + ), + Text(' - ', style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500)), + _buildDatePickerField( + context, + dateProvider.endDate, + '结束日期', + (date) => dateProvider.updateEndDate(date), + ), + ], + ), + ), + ], + ); + }, + ); + } + + Widget _buildDatePickerField( + BuildContext context, + DateTime? date, + String hint, + ValueChanged onDateSelected, + ) { + return GestureDetector( + onTap: () async { + final selected = await showDatePicker( + context: context, + initialDate: date ?? DateTime.now(), + firstDate: DateTime(2000), + lastDate: DateTime(2100), + ); + if (selected != null) { + onDateSelected(selected); + } + }, + child: Container( + width: 140, + padding: EdgeInsets.symmetric(horizontal: 12, vertical: 12), + decoration: BoxDecoration( + border: Border.all(color: Colors.grey.shade300), + borderRadius: BorderRadius.circular(4), + ), + child: Text( + date != null + ? '${date.year}/${date.month.toString().padLeft(2, '0')}/${date.day.toString().padLeft(2, '0')}' + : hint, + style: TextStyle(fontSize: 14), + ), + ), + ); + } + + Widget _buildQueryButton(BuildContext context) { + final loginViewModel = Provider.of(context); + return Container( + width: double.infinity, + height: 50, + margin: EdgeInsets.symmetric(horizontal: 16), + child: ElevatedButton( + style: ElevatedButton.styleFrom( + backgroundColor: primaryColor, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(4), + ), + ), + onPressed: () { + final dateProvider = Provider.of(context, listen: false); + final transactionViewModel = Provider.of(context, listen: false); + final userId = loginViewModel.loginResponse!.data!.tsUser.id; // Get actual userId from login model + print("Start Date: ${dateProvider.formattedStartDate}"); + print("End Date: ${dateProvider.formattedEndDate}"); + // Ensure startDate and endDate are not null before calling the API + if (dateProvider.startDate != null && dateProvider.endDate != null) { + + + // Fetch transactions based on the selected date range or custom dates + transactionViewModel.getTransactionsByTime( + userId.toString(), + dateProvider.startDate!, + dateProvider.endDate!, + loginViewModel.loginResponse!.data!.token, + ); + } + + Navigator.pop(context); + }, + child: Text('查询', style: TextStyle(color: Colors.white, fontSize: 16)), + ), + ); + } +} diff --git a/lib/pages/TransactionPages/bottomSheetTransactionFilter.dart b/lib/pages/TransactionPages/bottomSheetTransactionFilter.dart new file mode 100644 index 0000000..cc62051 --- /dev/null +++ b/lib/pages/TransactionPages/bottomSheetTransactionFilter.dart @@ -0,0 +1,266 @@ +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; +import 'package:tempp/viewsModel/userViewModels/LoginViewModel/loginViewModel.dart'; + +import '../../viewsModel/TransactionViewModel/transactionViewModel.dart'; +import '../../viewsModel/TransactionViewModel/transactionfilterViewModel.dart'; +class TransactionTypeFilter2 extends StatelessWidget { + final Color selectedColor; + + const TransactionTypeFilter2({super.key, required this.selectedColor}); + + @override + Widget build(BuildContext context) { + final filterProvider = Provider.of(context); + + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text('收支方向', + style: TextStyle( + fontFamily: 'SourceSans3', + fontSize: 15, + fontWeight: FontWeight.w400, + color: Colors.black, + ), + ), + SizedBox(height: 10), + Wrap( + spacing: 6, + runSpacing: 8, + children: List.generate(filterProvider.transactionTypes.length, (index) { + return _buildFilterChip( + filterProvider.transactionTypes[index], + isSelected: filterProvider.selectedTransactionTypeIndex == index, + selectedColor: selectedColor, + onTap: () { + filterProvider.setTransactionType( + filterProvider.selectedTransactionTypeIndex == index ? null : index + ); + }, + ); + }), + ), + ], + ); + } + + Widget _buildFilterChip(String label, { + required bool isSelected, + required Color selectedColor, + required VoidCallback onTap, + }) { + return SizedBox( + width: 110, + height: 40, + child: OutlinedButton( + style: OutlinedButton.styleFrom( + // backgroundColor: isSelected ? selectedColor.withOpacity(0.1) : Colors.transparent, + side: BorderSide(color: isSelected ? selectedColor : Colors.grey.shade300), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(5), + ), + ), + onPressed: onTap, + child: Text( + label, + style: TextStyle( + fontSize: 12, + fontWeight: FontWeight.bold, + color: isSelected ? selectedColor : Colors.black, + ), + ), + ), + ); + } +} + +//Resuablebottomsheet +class FilterBottomSheet2 extends StatelessWidget { + final TextEditingController minAmountController; + final TextEditingController maxAmountController; + final TextEditingController accountController; + final Color primaryColor; + + const FilterBottomSheet2({ + super.key, + required this.minAmountController, + required this.maxAmountController, + required this.accountController, + required this.primaryColor, + }); + + @override + Widget build(BuildContext context) { + return SizedBox( + height: MediaQuery.of(context).size.height * 0.8, + child: Column( + children: [ + Padding( + padding: const EdgeInsets.symmetric(horizontal: 16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Align( + alignment: Alignment.topRight, + child: IconButton( + icon: Icon(Icons.close), + onPressed: () => Navigator.pop(context), + ), + ), + Center(child: Text('筛选', style: TextStyle( + fontFamily: 'SourceSans3', + fontSize: 18, fontWeight: FontWeight.w600))), + SizedBox(height: 20), + _buildTextField(accountController, '付款账户', '全部'), + SizedBox(height: 20), + TransactionTypeFilter2(selectedColor: primaryColor), + SizedBox(height: 10), + _buildAmountRangeFilter(), + SizedBox(height: 20), + ], + ), + ), + Spacer(), + _buildActionButtons(context), + ], + ), + ); + } + + Widget _buildTextField(TextEditingController controller, String label, String hint) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(label), + SizedBox(height: 5), + TextField( + controller: controller, + decoration: InputDecoration( + hintText: hint, + contentPadding: EdgeInsets.all(12), + enabledBorder: OutlineInputBorder( + borderSide: BorderSide(color: Colors.grey.shade300), + borderRadius: BorderRadius.circular(4), + ), + focusedBorder: OutlineInputBorder( + borderSide: BorderSide(color: Colors.grey.shade300), + borderRadius: BorderRadius.circular(4), + ), + border: OutlineInputBorder( + borderSide: BorderSide(color: Colors.grey.shade300), + borderRadius: BorderRadius.circular(4), + ), + ), + keyboardType: TextInputType.number, + ), + ], + ); + } + + Widget _buildAmountRangeFilter() { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text('金额区间', + style: TextStyle( + fontFamily: 'SourceSans3', + fontSize: 15, + fontWeight: FontWeight.w400, + color: Colors.black, + ),), + SizedBox(height: 10), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + _buildAmountField(minAmountController, '最低金额'), + Text('~', style: TextStyle(fontSize: 26, fontWeight: FontWeight.w500)), + _buildAmountField(maxAmountController, '最高金额'), + ], + ), + ], + ); + } + + Widget _buildAmountField(TextEditingController controller, String hint) { + return SizedBox( + width: 140, + child: TextField( + controller: controller, + decoration: InputDecoration( + prefixIcon: Padding( + padding: EdgeInsets.only(left: 12, right: 8, top: 10), + child: Text('¥', style: TextStyle(color: Colors.black, fontSize: 16)), + ), + hintText: hint, + hintStyle: TextStyle(color: Color(0xFFC2C2C2), fontSize: 16), + contentPadding: EdgeInsets.all(12), + enabledBorder: OutlineInputBorder( + borderSide: BorderSide(color: Colors.grey.shade300), + borderRadius: BorderRadius.circular(3), + ), + focusedBorder: OutlineInputBorder( + borderSide: BorderSide(color: Colors.grey.shade300), + borderRadius: BorderRadius.circular(3), + ), + border: OutlineInputBorder( + borderSide: BorderSide(color: Colors.grey.shade300), + borderRadius: BorderRadius.circular(3), + ), + ), + keyboardType: TextInputType.number, + ), + ); + } + + Widget _buildActionButtons(BuildContext context) { + final filterProvider = Provider.of(context, listen: false); + final transactionViewModel = Provider.of(context, listen: false); + final loginViewModel = Provider.of(context, listen: false); + + return Row( + children: [ + Expanded( + child: GestureDetector( + onTap: () { + minAmountController.clear(); + maxAmountController.clear(); + accountController.clear(); + filterProvider.resetFilters(); + }, + child: Container( + height: 50, + color: Colors.grey.shade300, + alignment: Alignment.center, + child: Text('重置', style: TextStyle(color: Colors.black, fontWeight: FontWeight.w500, fontSize: 12)), + ), + ), + ), + Expanded( + child: GestureDetector( + onTap: () { + // Apply filters with filterProvider.selectedTransactionTypeIndex + final startMoney = double.tryParse(minAmountController.text) ?? 0; + final endMoney = double.tryParse(maxAmountController.text) ?? double.infinity; + + transactionViewModel.getTransactionsByAmount( + loginViewModel.loginResponse!.data!.tsUser.id.toString(), // Pass the actual user ID here + startMoney, + endMoney, + loginViewModel.loginResponse!.data!.token + ); + + Navigator.pop(context); + }, + child: Container( + height: 50, + color: primaryColor, + alignment: Alignment.center, + child: Text('查询', style: TextStyle(color: Colors.white, fontWeight: FontWeight.w500, fontSize: 12)), + ), + ), + ), + ], + ); + } +} diff --git a/lib/pages/TransactionPages/transactionInquiryPage.dart b/lib/pages/TransactionPages/transactionInquiryPage.dart new file mode 100644 index 0000000..0000a19 --- /dev/null +++ b/lib/pages/TransactionPages/transactionInquiryPage.dart @@ -0,0 +1,369 @@ +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; +import 'package:tempp/pages/TransactionPages/bottomSheetTransactionFilter.dart'; +import 'package:tempp/viewsModel/TransactionViewModel/dateFilterViewModel.dart'; +import 'package:tempp/viewsModel/bankCardViewModel/bankCardViewModel.dart'; +import 'package:tempp/viewsModel/userViewModels/LoginViewModel/loginViewModel.dart'; +import '../../constants/constants.dart'; +import '../../viewsModel/TransactionViewModel/transactionViewModel.dart'; +import '../../viewsModel/TransactionViewModel/transactionfilterViewModel.dart'; +import 'bottomSheetDateFilter.dart'; +import 'bottomSheetAccount.dart'; +import 'package:cached_network_image/cached_network_image.dart'; + + + + +class TransactionHistoryPage extends StatefulWidget { + const TransactionHistoryPage({super.key}); + + @override + State createState() => _TransactionHistoryPageState(); + +} + +class _TransactionHistoryPageState extends State { + int selectedTransactionTypeIndex = -1; // -1 means no selection + TextEditingController minAmountController = TextEditingController(); + TextEditingController amountController = TextEditingController(); + TextEditingController maxAmountController = TextEditingController(); + +String selectedDateLabel = '近3月'; // default value +double selectedDateFontSize = 14.0; + + @override + void initState() { + super.initState(); + + // Using addPostFrameCallback to call after the build phase + WidgetsBinding.instance.addPostFrameCallback((_) { + // Fetch transactions after the widget is built + final loginViewModel = Provider.of( + context, + listen: false, + ); + final transactionViewModel = Provider.of( + context, + listen: false, + ); + final userId = loginViewModel + .loginResponse! + .data! + .tsUser + .id; + + // Fetch transactions of last three months + DateTime now = DateTime.now(); + DateTime threeMonthsAgo = now.subtract(Duration(days: 90)); + // // transactionViewModel.getTransactions(userId.toString(),loginViewModel.loginResponse!.data!.token); + // final bankViewModel = Provider.of( + // context, + // listen: false, + // ); + + transactionViewModel.getTransactionsByTime(userId.toString(), threeMonthsAgo, now, loginViewModel.loginResponse!.data!.token); + + // bankViewModel.getUserBankCards(userId.toString(),loginViewModel.loginResponse!.data!.token); + }); + } +String getLastFourDigits(String input) { + if (input.length < 4) return input; + return input.substring(input.length - 4); +} +String getFirstFourWithEllipsis(String input) { + if (input.length <= 4) return input; + return input.substring(0, 4) + '...'; +} + + @override + Widget build(BuildContext context) { + final dateProvider = Provider.of(context, listen: false); + return Scaffold( + backgroundColor: Colors.white, + appBar: AppBar( + centerTitle: true, + leading: InkWell( + onTap: () { + Navigator.pop(context); + }, + child: Icon( + Icons.arrow_back_ios, + size: 18, + color: Colors.grey.shade600, + ), + ), + backgroundColor: Colors.white, + bottom: PreferredSize( + preferredSize: Size.fromHeight(40), + child: Padding( + padding: EdgeInsets.symmetric(horizontal: dateProvider.isCustomSelected?20:80, vertical: 10), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + InkWell( + onTap: () { + _showDateFilterBottomSheet(context); + }, + child: Row( + children: [ + Text(selectedDateLabel, + + ), + SizedBox(width: 5), + RotatedBox( + quarterTurns: 1, + child: Icon( + Icons.arrow_forward_ios, + size: 18, + color: Colors.grey.shade600, + ), + ), + ], + ), + ), + Container( + width: 0.5, + height: 20, + color: Colors.grey.shade500, + margin: EdgeInsets.symmetric(horizontal: 8), + ), + InkWell( + onTap: () { + _showFilterBottomSheet(context); + }, + child: Row( + children: [ + Text('筛选'), + SizedBox(width: 5), + RotatedBox( + quarterTurns: 1, + child: Icon( + Icons.arrow_forward_ios, + size: 18, + color: Colors.grey.shade600, + ), + ), + ], + ), + ), + ], + ), + ), + ), + title: Text('转账交易查询', style: TextStyle(fontWeight: FontWeight.w500)), + actions: [IconButton(icon: Icon(Icons.search), onPressed: () {})], + ), + body: Consumer( + builder: (context, viewModel, child) { + // Check if data is loading + if (viewModel.isLoading) { + return Center(child: CircularProgressIndicator()); + } + + // If no transactions are available, display a message + if (viewModel.transactions.isEmpty) { + return Center( + child: Text( + '没有转账记录，换个条件试试', + style: TextStyle( + fontFamily: 'SourceSans3', + fontSize: 20, + color: Color(0xFFC7C7C7), + fontWeight: FontWeight.w500, + ), + ), + ); + } + + // Show transaction data + return SingleChildScrollView( + scrollDirection: Axis.vertical, + child: Padding( + padding: const EdgeInsets.all(0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 50, + width: double.infinity, + decoration: BoxDecoration(color: Color(0xFFF6F9FE)), + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 18, + vertical: 14, + ), + child: Text("查询日期内合集金额${(viewModel.sumIncome+viewModel.sumExpense).toStringAsFixed(2)}元，合计笔数${viewModel.transactions.length}笔"), + ), + ), + Container( + height: MediaQuery.of(context).size.height * 0.7, + child: ListView.builder( + shrinkWrap: false, + itemCount: viewModel + .transactions + .length, // Use data from ViewModel + itemBuilder: (context, index) { + final transaction = viewModel.transactions[index]; + String lastFour = getLastFourDigits(transaction.recipientAccount); + String firstFourWithEllipsis = getFirstFourWithEllipsis(transaction.recipientBank); + + return Padding( + padding: const EdgeInsets.symmetric(horizontal: 6), + child: Column( + children: [ + ListTile( + contentPadding: EdgeInsets.all(16), + title: Row( + children: [ + CachedNetworkImage( + imageUrl: + 'http://' + transaction.recipientBankLogo, + imageBuilder: (context, imageProvider) => + CircleAvatar( + radius: 20, + backgroundImage: imageProvider, + ), + placeholder: (context, url) => + CircleAvatar( + radius: 20, + backgroundColor: + Colors.grey.shade200, + ), + errorWidget: (context, url, error) => + CircleAvatar( + radius: 20, + backgroundColor: + Colors.grey.shade200, + ), + ), + + SizedBox(width: 10), + Text( + '${firstFourWithEllipsis}(尾号${lastFour}) \n${transaction.recipientAccountName}', + style: TextStyle( + fontFamily: 'SourceSans3', + fontSize: 13, + fontWeight: FontWeight.bold, + ), + ), + Spacer(), + Column( + crossAxisAlignment: + CrossAxisAlignment.end, + children: [ + Text( + '${transaction.transferAmount}元', + style: TextStyle( + fontFamily: 'SourceSans3', + fontSize: + 14, + color: Colors.black, + fontWeight: FontWeight.bold, + ), + ), + SizedBox(height: 4), + Text("完成", + style: TextStyle( + fontFamily: 'SourceSans3', + fontSize: 13, + color: Colors.grey.shade500, + ), + ), + ], + ), + ], + ), + subtitle: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 50, + ), + child: Text( + transaction.createdAt, + style: TextStyle( + color: Colors.grey.shade600, + ), + ), + ), + ), + Divider( + color: Colors.grey.shade200, + thickness: 0.5, + ), + ], + ), + ); + }, + ), + ), + ], + ), + ), + ); + }, + ), + ); + } + + + void _showFilterBottomSheet(BuildContext context) { + showModalBottomSheet( + backgroundColor: Colors.white, + isScrollControlled: true, + context: context, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(0), + topRight: Radius.circular(0), + ), + ), + builder: (context) { + return ChangeNotifierProvider( + create: (context) => FilterProvider(), + child: FilterBottomSheet2( + minAmountController: minAmountController, + maxAmountController: maxAmountController, + accountController: amountController, + primaryColor: bottomNabBarIconColor, + ), + ); + }, + ); + } + + void _showDateFilterBottomSheet(BuildContext context) { + showModalBottomSheet( + backgroundColor: Colors.white, + isScrollControlled: true, + context: context, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(0), + topRight: Radius.circular(0), + ), + ), + builder: (context) => DateFilterBottomSheet( + primaryColor: bottomNabBarIconColor, + ), + ).then((_) { + // After bottom sheet is closed, get selected date range + final dateProvider = Provider.of(context, listen: false); + setState(() { + String displayText = ''; + double fontSize = 14.0; // default + + if (dateProvider.isCustomSelected) { + displayText = + '${dateProvider.formattedStartDate} - ${dateProvider.formattedEndDate}'; + fontSize = 12.0; // smaller font for custom range + } else { + final int selectedIndex = dateProvider.selectedDateRangeIndex ?? 0; + displayText = dateProvider.dateRanges[selectedIndex]; + fontSize = selectedIndex == 3 ? 12.0 : 14.0; + } + + selectedDateLabel = displayText; + selectedDateFontSize = fontSize; // Store in state if needed + }); + }); +} +} diff --git a/lib/services/apiServices/bankCardApiService/bankCardApiService.dart b/lib/services/apiServices/bankCardApiService/bankCardApiService.dart new file mode 100644 index 0000000..605d950 --- /dev/null +++ b/lib/services/apiServices/bankCardApiService/bankCardApiService.dart @@ -0,0 +1,62 @@ +import 'dart:convert'; +import 'package:http/http.dart' as http; +import '../../../constants/constants.dart'; +import '../../../models/bankCardModels/bankCardModel.dart'; + +class BankCardApiService { + final String baseUrl = Constants.baseUrl; + + // Fetch user bank cards + Future> fetchUserBankCards(String userId,String token) async { + final headers = { + 'Content-Type': 'application/json', + 'Authorization': 'Bearer $token', + }; + final response = await http.get( + Uri.parse('$baseUrl/api/v1/bankCard/tsBankCard/listUserBankCard?userId=$userId'), + headers: headers, + ); + print(response.body); + if (response.statusCode == 200) { + final data = json.decode(response.body); + final bankCards = List.from( + data['data'].map((item) => BankCardModel.fromJson(item)), + ); + return bankCards; + } else { + throw Exception('Failed to load bank cards'); + } + } + Future> fetchBankList(String token) async { + final headers = { + 'Content-Type': 'application/json', + 'Authorization': 'Bearer $token', + }; + + try { + + final response = await http.get(Uri.parse('$baseUrl/api/v1/bankCard/tsBankCard/bankList'), + headers: headers + ); + print(response.body); + + if (response.statusCode == 200) { + final data = json.decode(response.body); + if (data['code'] == 0) { + // Parse and return the list of bank cards + List bankCards = List.from( + data['data'].map((item) => BankListModel.fromJson(item))); + return bankCards; + } else { + throw Exception('Failed to load bank cards'); + } + } else { + throw Exception('Failed to load bank cards'); + } + } catch (e) { + throw Exception('Failed to load bank cards: $e'); + } + } + + +} diff --git a/lib/services/apiServices/transactionApiService/transactionApiService.dart b/lib/services/apiServices/transactionApiService/transactionApiService.dart new file mode 100644 index 0000000..0cfdbc9 --- /dev/null +++ b/lib/services/apiServices/transactionApiService/transactionApiService.dart @@ -0,0 +1,209 @@ +import 'dart:convert'; +import 'package:http/http.dart' as http; + +import '../../../constants/constants.dart'; +import '../../../models/transactionModels/transactionModel.dart'; + +class TransactionApiService { + final String baseUrl = Constants.baseUrl; + + Future> fetchTransactions(String userId,String token) async { + final headers = { + 'Content-Type': 'application/json', + 'Authorization': 'Bearer $token', + }; + final response = await http.get( + Uri.parse( + '$baseUrl/api/v1/transaction/tsTransactionRecord/listUserTransactionRecord?userId=$userId'), + headers: headers, + ); + print(response.body); + if (response.statusCode == 200) { + final data = json.decode(response.body); + final transactions = List.from( + data['data'].map((item) => TransactionModel.fromJson(item)), + ); + return transactions; + } else { + throw Exception('Failed to load transactions'); + } + } + // Fetch transactions for a specific bank card (based on userId and bankCardId) + + Future> fetchTransactionsByBankCard(String userId, String bankCardId,String token) async { + + final headers = { + 'Content-Type': 'application/json', + 'Authorization': 'Bearer $token', + }; + // Call the API to fetch transactions for the specific bank card + final response = await http.get( + Uri.parse('$baseUrl/api/v1/transaction/tsTransactionRecord/listUserTransactionRecord?userId=$userId&bankCardId=$bankCardId'), + + headers: headers, + ); + + if (response.statusCode == 200) { + try { + final Map jsonResponse = json.decode(response.body); + + // Check if the 'data' field exists and is not null + if (jsonResponse.containsKey('data') && jsonResponse['data'] != null) { + final List data = jsonResponse['data']; + + // If 'data' is a list, map it to TransactionModel objects + return data.map((transaction) => TransactionModel.fromJson(transaction)).toList(); + } else { + // If there is no 'data' or it's null, return an empty list + return []; + } + } catch (e) { + print('Error decoding JSON: $e'); + throw Exception('Failed to load transactions'); + } + } else { + throw Exception('Failed to load transactions for the specified bank card'); + } + } + +//by time + Future> fetchTransactionsByTime( + String userId, String startTime, String endTime,String token) async { + final headers = { + 'Content-Type': 'application/json', + 'Authorization': 'Bearer $token', + }; + final response = await http.get( + Uri.parse( + '$baseUrl/api/v1/transaction/tsTransactionRecord/listUserTransactionRecord?userId=$userId&startTime=$startTime&endTime=$endTime'), + headers: headers + ); + + print(response.body); + + if (response.statusCode == 200) { + final data = json.decode(response.body); + + // Check if 'data' key exists and it's not null + if (data['data'] == null || (data['data'] as List).isEmpty) { + return []; // Return an empty list if no transactions + } + + final transactions = List.from( + data['data'].map((item) => TransactionModel.fromJson(item)), + ); + return transactions; + } else { + throw Exception('Failed to load transactions by date'); + } + } + //by amount + Future> fetchTransactionsByAmount( + String userId, double startMoney, double endMoney,String token) async { + final headers = { + 'Content-Type': 'application/json', + 'Authorization': 'Bearer $token', + }; + final response = await http.get( + Uri.parse( + '$baseUrl/api/v1/transaction/tsTransactionRecord/listUserTransactionRecord?userId=$userId&startMoney=$startMoney&endMoney=$endMoney', + ), + headers: headers, + + ); + + print(response.body); + + if (response.statusCode == 200) { + final data = json.decode(response.body); + + // Check if 'data' key exists and it's not null + if (data['data'] == null || (data['data'] as List).isEmpty) { + return []; // Return an empty list if no transactions + } + + final transactions = List.from( + data['data'].map((item) => TransactionModel.fromJson(item)), + ); + return transactions; + } else { + throw Exception('Failed to load transactions by amount'); + } + } + + + + Future addUserTransactionRecord({ + required String recipientAccountName, + required String recipientBank, + required String recipientAccount, + required String transferAmount, + required String status, + required String userId, + required String purpose, + required String bankCardNumber, + required String token + }) async { + final headers = { + 'Content-Type': 'application/json', + 'Authorization': 'Bearer $token', + }; + var request = http.MultipartRequest( + 'POST', + Uri.parse('$baseUrl/api/v1/transaction/tsTransactionRecord/addUserTransactionRecord'), + ); + request.headers.addAll(headers); + request.fields['recipientAccountName'] = recipientAccountName; + request.fields['recipientBank'] = recipientBank; + request.fields['recipientAccount'] = recipientAccount; + request.fields['transferAmount'] = transferAmount; + request.fields['status'] = status; + request.fields['userId'] = userId; + request.fields['purpose'] = purpose; + request.fields['paymentBankCardID'] = bankCardNumber; + + + try { + var response = await request.send(); + var responseBody = await response.stream.bytesToString(); + print(responseBody); + + if (response.statusCode == 200) { + final data = json.decode(responseBody); + if (data['code'] == 0) { + // Success + } else { + // Throw an exception with the error message from the API response + throw Exception(data['message'] ?? 'Transaction failed'); + } + } else { + throw Exception('Failed to add transaction'); + } + } catch (e) { + throw Exception('Error: $e'); + } + } + // lib/services/transaction_api_service.dart + + + + Future addUserTransactionRecordTest({ + required String userId, + }) async { + try { + final url = Uri.parse('$baseUrl/api/v1/transaction/tsTransactionRecord/addUserTransactionRecordTest') + .replace(queryParameters: {'id': userId}); + + final response = await http.get(url); +print(response.body); + if (response.statusCode == 200) { + final jsonResponse = json.decode(response.body); + return TransactionResponseModel.fromJson(jsonResponse); + } else { + throw Exception('Failed to add transaction record: ${response.statusCode}'); + } + } catch (e) { + throw Exception('Failed to add transaction record: $e'); + } + } +} \ No newline at end of file diff --git a/lib/services/apiServices/userApiServices/editUserApi.dart b/lib/services/apiServices/userApiServices/editUserApi.dart new file mode 100644 index 0000000..f622fd3 --- /dev/null +++ b/lib/services/apiServices/userApiServices/editUserApi.dart @@ -0,0 +1,75 @@ +// services/api_service.dart +import 'dart:convert'; +import 'package:http/http.dart' as http; +import 'dart:io'; +import 'package:http/http.dart' as http; +import 'package:path/path.dart' as path; +import '../../../constants/constants.dart'; +import '../../../models/userModels/editUserModel.dart'; + +class UserEditApiService { + Future editUser(UserEditRequest request,String token) async { + final url = Uri.parse('${Constants.baseUrl}/api/v1/user/tsUser/editUser'); + final headers = { + 'Content-Type': 'application/json', + 'Authorization': 'Bearer $token', + }; + + final body = json.encode({ + 'id': request.id, + 'UserAlias': request.userAlias, + 'profilePicture': request.profilePicture, + }); + + final response = await http.put( + url, + headers: headers, + body: body, + ); + + if (response.statusCode == 200) { + print(request.profilePicture); + print(response.body); + return UserEditResponse.fromJson(json.decode(response.body)); + } else { + throw Exception('Failed to update user: ${response.statusCode}'); + } + } +} +//upload image +class ImageApiService { + final String baseUrl = Constants.baseUrl; + + // Function to upload image and return the response as a model + Future uploadImage(File imageFile,String token) async { + final uri = Uri.parse('$baseUrl/api/v1/upload'); + final headers = { + 'Content-Type': 'application/json', + 'Authorization': 'Bearer $token', + }; + var request = http.MultipartRequest('POST', uri); + request.headers.addAll(headers); + + // Add the image file to the request + request.files.add(await http.MultipartFile.fromPath('file', imageFile.path)); + + // Send the request + var response = await request.send(); + + // Check if the response is successful + if (response.statusCode == 200) { + final responseData = await response.stream.bytesToString(); + final jsonResponse = json.decode(responseData); + + if (jsonResponse['code'] == 0) { + // Return the response as a model + return ImageUploadResponse.fromJson(jsonResponse); + } else { + throw Exception('Failed to upload image: ${jsonResponse['message']}'); + } + } else { + throw Exception('Failed to upload image'); + } + } +} + diff --git a/lib/services/apiServices/userApiServices/loginApi.dart b/lib/services/apiServices/userApiServices/loginApi.dart new file mode 100644 index 0000000..5ebd7ae --- /dev/null +++ b/lib/services/apiServices/userApiServices/loginApi.dart @@ -0,0 +1,47 @@ +// services/api_service.dart +import 'dart:convert'; +import 'package:http/http.dart' as http; + +import '../../../constants/constants.dart'; +import '../../../models/userModels/loginModel.dart'; + +class LoginApi { + Future login(String userName, String password,String authCode) async { + final url = Uri.parse('${Constants.baseUrl}/api/v1/user/tsUser/login'); + final headers = {'Content-Type': 'application/json'}; + final response = await http.post( + url, + headers: headers, + body: json.encode({ + 'userName': userName, + 'password': password, + 'authCode':authCode + }), + ); + if (response.statusCode == 200) { + return LoginResponseModel.fromJson(json.decode(response.body)); + } else { + throw Exception('Failed to login'); + } + } + Future getUserInfo(String userId,String token) async { + final headers = { + 'Content-Type': 'application/json', + 'Authorization': 'Bearer $token', + }; + final url = Uri.parse('${Constants.baseUrl}/api/v1/user/tsUser/userInfo/$userId'); + + + final response = await http.get( + url, + headers: headers, + ); + print(response.body); + + if (response.statusCode == 200) { + return LoginResponseModel.fromJson(json.decode(response.body)); + } else { + throw Exception('Failed to fetch user info'); + } + } +} diff --git a/lib/viewsModel/TransactionViewModel/dateFilterViewModel.dart b/lib/viewsModel/TransactionViewModel/dateFilterViewModel.dart new file mode 100644 index 0000000..26fe130 --- /dev/null +++ b/lib/viewsModel/TransactionViewModel/dateFilterViewModel.dart @@ -0,0 +1,90 @@ +import 'package:flutter/material.dart'; + +class DateFilterProvider with ChangeNotifier { + int? _selectedDateRangeIndex; + DateTime? _startDate; + DateTime? _endDate; + + final List _dateRanges = [ + '近7天', + '近1月', + '近1年', + '自定义' + ]; + + int? get selectedDateRangeIndex => _selectedDateRangeIndex; + List get dateRanges => _dateRanges; + DateTime? get startDate => _startDate; + DateTime? get endDate => _endDate; + bool get isCustomSelected => + _selectedDateRangeIndex == 3; // index of '自定义' + + String? get formattedStartDate => _startDate != null + ? '${_startDate!.year}-${_startDate!.month.toString().padLeft(2, '0')}-${_startDate!.day.toString().padLeft(2, '0')}' + : null; + + String? get formattedEndDate => _endDate != null + ? '${_endDate!.year}-${_endDate!.month.toString().padLeft(2, '0')}-${_endDate!.day.toString().padLeft(2, '0')}' + : null; + + // Set default dates based on selected range + void setDateRange(int index) { + _selectedDateRangeIndex = index; + + final now = DateTime.now(); + if (index == 0) { + _startDate = now.subtract(const Duration(days: 7)); + _endDate = now; + } else if (index == 1) { + _startDate = DateTime(now.year, now.month - 1, now.day); + _endDate = now; + } else if (index == 2) { + _startDate = DateTime(now.year - 1, now.month, now.day); + _endDate = now; + } else { + // Custom - dates will be set separately + _startDate = null; + _endDate = null; + } + + notifyListeners(); + } + + // Set custom dates from the UI (start and end dates) + void setCustomDates(DateTime? start, DateTime? end) { + // When setting custom dates, also set the selected range to custom + _selectedDateRangeIndex = 3; + + // Ensure both start and end dates are set properly + if (start != null && end != null) { + _startDate = start; + _endDate = end; + print("Custom Start Date: $_startDate"); + print("Custom End Date: $_endDate"); + } else { + print("Invalid dates, resetting..."); + } + notifyListeners(); + } +void updateStartDate(DateTime? date) { + if (date != null) { + _startDate = date; + _selectedDateRangeIndex = 3; // custom range + notifyListeners(); + } +} + +void updateEndDate(DateTime? date) { + if (date != null) { + _endDate = date; + _selectedDateRangeIndex = 3; // custom range + notifyListeners(); + } +} + void reset() { + _selectedDateRangeIndex = null; + _startDate = null; + _endDate = null; + notifyListeners(); + } +} \ No newline at end of file diff --git a/lib/viewsModel/TransactionViewModel/transactionViewModel.dart b/lib/viewsModel/TransactionViewModel/transactionViewModel.dart new file mode 100644 index 0000000..401500b --- /dev/null +++ b/lib/viewsModel/TransactionViewModel/transactionViewModel.dart @@ -0,0 +1,160 @@ +import 'package:flutter/material.dart'; + +import '../../models/transactionModels/transactionModel.dart'; +import '../../services/apiServices/transactionApiService/transactionApiService.dart'; + +class TransactionViewModel extends ChangeNotifier { + final TransactionApiService _apiService = TransactionApiService(); + List transactions = []; + bool isLoading = false; + String errorMessage = ''; + double sumIncome = 0; + double sumExpense = 0; + + + + Future getTransactions(String userId,String token) async { + isLoading = true; + notifyListeners(); + + try { + transactions = await _apiService.fetchTransactions(userId,token); + calculateSums(); + } catch (e) { + errorMessage = e.toString(); + } finally { + isLoading = false; + notifyListeners(); + } + } + + // Calculate the total income and expense + void calculateSums() { + double income = 0; + double expense = 0; + + for (final transaction in transactions) { + final amount = double.tryParse(transaction.transferAmount) ?? 0; + if (transaction.isIncome) { + expense += amount; + } else { + income += amount; + } + } + + // Update the sums and notify listeners + sumIncome = income; + sumExpense = expense; + + notifyListeners(); // Notify listeners to update UI + print('CALCULATED: Income=$income, Expense=$expense'); + } + + double calculateTotal() { + double total = 0; + + for (final transaction in transactions) { + final amount = double.tryParse(transaction.transferAmount) ?? 0; + if (transaction.isIncome) { + total += amount; + } else { + total += amount; + } + } + + print('CALCULATED: Total=$total'); + return total; +} + // Fetch transactions based on userId and bankCardId + Future getTransactionsByBankCard(String userId, String bankCardId,String token) async { + isLoading = true; + notifyListeners(); + + try { + transactions = await _apiService.fetchTransactionsByBankCard(userId, bankCardId,token); + calculateSums(); + } catch (e) { + errorMessage = e.toString(); + } finally { + isLoading = false; + notifyListeners(); + } + } + Future getTransactionsByTime(String userId, DateTime startTime, DateTime endTime,String token) async { + isLoading = true; + notifyListeners(); + + try { + print("ok"); + // Format dates in 'yyyy-MM-dd' format + String startTimeStr = '${startTime.year}-${startTime.month.toString().padLeft(2, '0')}-${startTime.day.toString().padLeft(2, '0')}'; + String endTimeStr = '${endTime.year}-${endTime.month.toString().padLeft(2, '0')}-${endTime.day.toString().padLeft(2, '0')}'; + + transactions = await _apiService.fetchTransactionsByTime(userId, startTimeStr, endTimeStr,token); + print(transactions.first.recipientAccount); + calculateSums(); + } catch (e) { + errorMessage = e.toString(); + } finally { + isLoading = false; + notifyListeners(); + } + } + Future getTransactionsByAmount(String userId, double startMoney, double endMoney,String token) async { + isLoading = true; + notifyListeners(); + + try { + transactions = await _apiService.fetchTransactionsByAmount(userId, startMoney, endMoney,token); + calculateSums(); + } catch (e) { + errorMessage = e.toString(); + } finally { + isLoading = false; + notifyListeners(); + } + } + //add transaction + Future addTransaction({ + required String recipientAccountName, + required String recipientBank, + required String recipientAccount, + required String transferAmount, + required String status, + required String userId, + required String purpose, + required String bankCardNumber, + required String token + }) async { + isLoading = true; + errorMessage = ''; // Clear previous error message + notifyListeners(); + + try { + await _apiService.addUserTransactionRecord( + recipientAccountName: recipientAccountName, + recipientBank: recipientBank, + recipientAccount: recipientAccount, + transferAmount: transferAmount, + status: status, + userId: userId, + purpose: purpose, + bankCardNumber: bankCardNumber, + token: token + + ); + // After successful transaction addition, fetch the transactions again + await getTransactions(userId,token); + calculateSums(); + errorMessage = 'ok'; + } catch (e) { + errorMessage = e.toString(); + } finally { + isLoading = false; + notifyListeners(); + } + } + Future addUserTransactionRecordTest(String userId) async { + return await _apiService.addUserTransactionRecordTest(userId: userId); + } +} \ No newline at end of file diff --git a/lib/viewsModel/TransactionViewModel/transactionfilterViewModel.dart b/lib/viewsModel/TransactionViewModel/transactionfilterViewModel.dart new file mode 100644 index 0000000..ecba9fc --- /dev/null +++ b/lib/viewsModel/TransactionViewModel/transactionfilterViewModel.dart @@ -0,0 +1,54 @@ +import 'package:flutter/material.dart'; + +class FilterProvider with ChangeNotifier { + int? _selectedTransactionTypeIndex; + final List _transactionTypes = [ + '全部', + '收入', + '支出', + // '银行处理中', + // '待审批', + // '待银行审批', + // '预约待处理', + // '撤销待审批', + ]; + + int? get selectedTransactionTypeIndex => _selectedTransactionTypeIndex; + List get transactionTypes => _transactionTypes; + + void setTransactionType(int? index) { + _selectedTransactionTypeIndex = index; + notifyListeners(); + } + + void resetFilters() { + _selectedTransactionTypeIndex = null; + notifyListeners(); + } +} +class FilterProvider2 with ChangeNotifier { + int? _selectedTransactionTypeIndex; + final List _transactionTypes = [ + '全部', + '完成', + '交易失败', + '银行处理中', + '待审批', + '待银行审批', + '预约待处理', + '撤销待审批', + ]; + + int? get selectedTransactionTypeIndex => _selectedTransactionTypeIndex; + List get transactionTypes => _transactionTypes; + + void setTransactionType(int? index) { + _selectedTransactionTypeIndex = index; + notifyListeners(); + } + + void resetFilters() { + _selectedTransactionTypeIndex = null; + notifyListeners(); + } +} \ No newline at end of file diff --git a/lib/viewsModel/bankCardViewModel/bankCardViewModel.dart b/lib/viewsModel/bankCardViewModel/bankCardViewModel.dart new file mode 100644 index 0000000..0c5e7f4 --- /dev/null +++ b/lib/viewsModel/bankCardViewModel/bankCardViewModel.dart @@ -0,0 +1,40 @@ +import 'package:flutter/material.dart'; +import 'package:tempp/models/transactionModels/transactionModel.dart'; + +import '../../models/bankCardModels/bankCardModel.dart'; +import '../../services/apiServices/bankCardApiService/bankCardApiService.dart'; + +class BankCardViewModel extends ChangeNotifier { + final BankCardApiService _apiService = BankCardApiService(); + + List bankCards = []; + bool isLoading = false; + String errorMessage = ''; +List bankList = []; + BankCardModel? selectedCard; + Future getUserBankCards(String userId,String token) async { + isLoading = true; + notifyListeners(); + + try { + bankCards = await _apiService.fetchUserBankCards(userId,token); + selectedCard = bankCards.first; + } catch (e) { + errorMessage = e.toString(); + } finally { + isLoading = false; + notifyListeners(); + } + } + + // Function to fetch the bank list + Future getBankList(String token) async { + try { + bankList = await _apiService.fetchBankList(token); + errorMessage = ''; // Clear any previous errors + } catch (e) { + errorMessage = 'Failed to load bank list: $e'; + } + notifyListeners(); // Notify the UI to update + } +} diff --git a/lib/viewsModel/userViewModels/LoginViewModel/loginViewModel.dart b/lib/viewsModel/userViewModels/LoginViewModel/loginViewModel.dart new file mode 100644 index 0000000..f472815 --- /dev/null +++ b/lib/viewsModel/userViewModels/LoginViewModel/loginViewModel.dart @@ -0,0 +1,86 @@ +// viewmodels/login_viewmodel.dart +import 'package:flutter/material.dart'; +import 'package:tempp/models/userModels/loginModel.dart'; +import 'package:tempp/services/apiServices/userApiServices/loginApi.dart'; + +class LoginViewModel extends ChangeNotifier { + final LoginApi _apiService = LoginApi(); + bool _isLoading = false; + LoginResponseModel? _loginResponse; + String _errorMessage = ''; + + bool get isLoading => _isLoading; + LoginResponseModel? get loginResponse => _loginResponse; + String get errorMessage => _errorMessage; + + Future login(String userName, String password,String authCode) async { + _isLoading = true; + notifyListeners(); + + try { + final response = await _apiService.login(userName, password,authCode); + _loginResponse = response; + _errorMessage = _loginResponse!.message; + } catch (e) { + _errorMessage = 'Error occurred while logging in'; + } + + _isLoading = false; + notifyListeners(); + } + Future fetchUserInfo(String userId,String token) async { + _isLoading = true; + notifyListeners(); + + try { + final response = await _apiService.getUserInfo(userId,token); + _loginResponse = response; + _errorMessage = ''; + // clear any previous errors + } catch (error) { + _errorMessage = 'Failed to load user info: $error'; + _loginResponse = null; + } finally { + _isLoading = false; + notifyListeners(); + } + } + + // Add this method to update user data +void updateUserData(TsUser updatedUser) { + if (_loginResponse != null && _loginResponse!.data != null) { + // Preserve all existing data, only update the userAlias + final currentUser = _loginResponse!.data!.tsUser; + final updatedUserWithOldData = TsUser( + id: currentUser.id, + userName: currentUser.userName, + userAlias: updatedUser.userAlias, // Only this changes + // Preserve all other fields from the original user + phone: currentUser.phone, + createdAt: currentUser.createdAt, + updatedAt: currentUser.updatedAt, + deletedAt: currentUser.deletedAt, + password: currentUser.password, + profilePicture: updatedUser.profilePicture, + privateAccount: currentUser.privateAccount, + enterpriseCustomerNumber: currentUser.enterpriseCustomerNumber, + operatorId: currentUser.operatorId, + lastLoginTime: currentUser.lastLoginTime, + depositAmount: currentUser.depositAmount, + financialManagementAmount: currentUser.financialManagementAmount, + foreignCurrency: currentUser.foreignCurrency, + // Add all other TsUser properties here... + ); + + _loginResponse = LoginResponseModel( + code: _loginResponse!.code, + message: _loginResponse!.message, + data: UserData( + tsUser: updatedUserWithOldData, // Updated user with preserved data + token: _loginResponse!.data!.token, + ), + ); + notifyListeners(); + } +} +} \ No newline at end of file diff --git a/lib/viewsModel/userViewModels/editUserViewModel.dart b/lib/viewsModel/userViewModels/editUserViewModel.dart new file mode 100644 index 0000000..e185651 --- /dev/null +++ b/lib/viewsModel/userViewModels/editUserViewModel.dart @@ -0,0 +1,97 @@ +// viewmodels/user_edit_viewmodel.dart +import 'dart:io'; +import 'package:flutter/material.dart'; +import '../../models/userModels/editUserModel.dart'; +import '../../services/apiServices/userApiServices/editUserApi.dart'; +import 'package:provider/provider.dart'; +import 'LoginViewModel/loginViewModel.dart'; + +class UserEditViewModel extends ChangeNotifier { + final UserEditApiService _apiService = UserEditApiService(); + final ImageApiService _imageApiService = ImageApiService(); + bool _isLoading = false; + String _errorMessage = ''; + UserEditResponse? _response; + + bool get isLoading => _isLoading; + + String get errorMessage => _errorMessage; + + UserEditResponse? get response => _response; + String? _uploadedImageUrl; + String get uploadedImageUrl => _uploadedImageUrl ?? ''; + + Future editUser(int id, + String userALias, + String? imageFile, + // Accept File instead of String + String token, + BuildContext context,) async { + _isLoading = true; + notifyListeners(); + + try { + // String? imageUrl; + // + // // If a new image was selected, upload it first + // if (imageFile != null) { + // imageUrl = await _imageUploadService.uploadImage(imageFile); + // if (imageUrl == null) { + // _errorMessage = 'Failed to upload image'; + // _isLoading = false; + // notifyListeners(); + // return; + // } + // } + + UserEditRequest request = UserEditRequest( + id: id, + userAlias: userALias, + profilePicture: imageFile!, // Use new URL or keep existing + ); + + _response = await _apiService.editUser(request,token); + + if (_response?.code != 200) { + _errorMessage = _response?.message ?? 'Failed to update user.'; + } else { + _errorMessage = ''; + final loginViewModel = Provider.of( + context, listen: false); + loginViewModel.updateUserData(_response!.data!.tsUser); + } + } catch (e) { + _errorMessage = 'An error occurred. Please try again!'; + } + + _isLoading = false; + notifyListeners(); + } + + // Method to upload image + // Method to upload image + Future uploadImage(File imageFile,String token) async { + _isLoading = true; + notifyListeners(); + + try { + // Get the response model from the upload API + ImageUploadResponse response = await _imageApiService.uploadImage(imageFile,token); + + // Check if the image URL is available + if (response.code == 0) { + _uploadedImageUrl = '${response.data}'; // Prepend 'url:' to the image URL + _errorMessage = ''; // Clear any previous error + } else { + _errorMessage = 'Failed to upload image: ${response.message}'; + _uploadedImageUrl = null; + } + } catch (e) { + _errorMessage = e.toString(); + _uploadedImageUrl = null; + } finally { + _isLoading = false; + notifyListeners(); + } + } +} \ No newline at end of file diff --git a/linux/.gitignore b/linux/.gitignore new file mode 100644 index 0000000..d3896c9 --- /dev/null +++ b/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt new file mode 100644 index 0000000..d793334 --- /dev/null +++ b/linux/CMakeLists.txt @@ -0,0 +1,128 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.13) +project(runner 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 "tempp") +# The unique GTK application identifier for this application. See: +# https://wiki.gnome.org/HowDoI/ChooseApplicationID +set(APPLICATION_ID "com.example.tempp") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(SET CMP0063 NEW) + +# Load bundled libraries from the lib/ directory relative to the binary. +set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") + +# Root filesystem for cross-building. +if(FLUTTER_TARGET_PLATFORM_SYSROOT) + set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() + +# Define build configuration options. +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() + +# 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_14) + target_compile_options(${TARGET} PRIVATE -Wall -Werror) + target_compile_options(${TARGET} PRIVATE "$<$>:-O3>") + target_compile_definitions(${TARGET} PRIVATE "$<$>:NDEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) + +# Only the install-generated bundle's copy of the executable will launch +# correctly, since the resources must in the right relative locations. To avoid +# people trying to run the unbundled copy, put it in a subdirectory instead of +# the default top-level location. +set_target_properties(${BINARY_NAME} + PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run" +) + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# By default, "installing" just makes a relocatable bundle in the build +# directory. +set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle") +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +# Start with a clean build bundle directory every time. +install(CODE " + file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\") + " COMPONENT Runtime) + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") + +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) + +foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES}) + install(FILES "${bundled_library}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endforeach(bundled_library) + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/linux/") +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. +if(NOT CMAKE_BUILD_TYPE MATCHES "Debug") + install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() diff --git a/linux/flutter/CMakeLists.txt b/linux/flutter/CMakeLists.txt new file mode 100644 index 0000000..d5bd016 --- /dev/null +++ b/linux/flutter/CMakeLists.txt @@ -0,0 +1,88 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.10) + +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. + +# Serves the same purpose as list(TRANSFORM ... PREPEND ...), +# which isn't available in 3.10. +function(list_prepend LIST_NAME PREFIX) + set(NEW_LIST "") + foreach(element ${${LIST_NAME}}) + list(APPEND NEW_LIST "${PREFIX}${element}") + endforeach(element) + set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) +endfunction() + +# === Flutter Library === +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) +pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) +pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) + +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") + +# 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/lib/libapp.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "fl_basic_message_channel.h" + "fl_binary_codec.h" + "fl_binary_messenger.h" + "fl_dart_project.h" + "fl_engine.h" + "fl_json_message_codec.h" + "fl_json_method_codec.h" + "fl_message_codec.h" + "fl_method_call.h" + "fl_method_channel.h" + "fl_method_codec.h" + "fl_method_response.h" + "fl_plugin_registrar.h" + "fl_plugin_registry.h" + "fl_standard_message_codec.h" + "fl_standard_method_codec.h" + "fl_string_codec.h" + "fl_value.h" + "fl_view.h" + "flutter_linux.h" +) +list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") +target_link_libraries(flutter INTERFACE + PkgConfig::GTK + PkgConfig::GLIB + PkgConfig::GIO +) +add_dependencies(flutter 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. +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/_phony_ + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" + ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE} + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} +) diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..64a0ece --- /dev/null +++ b/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include + +void fl_register_plugins(FlPluginRegistry* registry) { + g_autoptr(FlPluginRegistrar) file_selector_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin"); + file_selector_plugin_register_with_registrar(file_selector_linux_registrar); +} diff --git a/linux/flutter/generated_plugin_registrant.h b/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..e0f0a47 --- /dev/null +++ b/linux/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 fl_register_plugins(FlPluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake new file mode 100644 index 0000000..2db3c22 --- /dev/null +++ b/linux/flutter/generated_plugins.cmake @@ -0,0 +1,24 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + file_selector_linux +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux 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}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/linux/runner/CMakeLists.txt b/linux/runner/CMakeLists.txt new file mode 100644 index 0000000..e97dabc --- /dev/null +++ b/linux/runner/CMakeLists.txt @@ -0,0 +1,26 @@ +cmake_minimum_required(VERSION 3.13) +project(runner LANGUAGES CXX) + +# Define the application target. To change its name, change BINARY_NAME in the +# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer +# work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} + "main.cc" + "my_application.cc" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add preprocessor definitions for the application ID. +add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") + +# Add dependency libraries. Add any application-specific dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter) +target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) + +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") diff --git a/linux/runner/main.cc b/linux/runner/main.cc new file mode 100644 index 0000000..e7c5c54 --- /dev/null +++ b/linux/runner/main.cc @@ -0,0 +1,6 @@ +#include "my_application.h" + +int main(int argc, char** argv) { + g_autoptr(MyApplication) app = my_application_new(); + return g_application_run(G_APPLICATION(app), argc, argv); +} diff --git a/linux/runner/my_application.cc b/linux/runner/my_application.cc new file mode 100644 index 0000000..0a3c7b3 --- /dev/null +++ b/linux/runner/my_application.cc @@ -0,0 +1,130 @@ +#include "my_application.h" + +#include +#ifdef GDK_WINDOWING_X11 +#include +#endif + +#include "flutter/generated_plugin_registrant.h" + +struct _MyApplication { + GtkApplication parent_instance; + char** dart_entrypoint_arguments; +}; + +G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) + +// Implements GApplication::activate. +static void my_application_activate(GApplication* application) { + MyApplication* self = MY_APPLICATION(application); + GtkWindow* window = + GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); + + // Use a header bar when running in GNOME as this is the common style used + // by applications and is the setup most users will be using (e.g. Ubuntu + // desktop). + // If running on X and not using GNOME then just use a traditional title bar + // in case the window manager does more exotic layout, e.g. tiling. + // If running on Wayland assume the header bar will work (may need changing + // if future cases occur). + gboolean use_header_bar = TRUE; +#ifdef GDK_WINDOWING_X11 + GdkScreen* screen = gtk_window_get_screen(window); + if (GDK_IS_X11_SCREEN(screen)) { + const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen); + if (g_strcmp0(wm_name, "GNOME Shell") != 0) { + use_header_bar = FALSE; + } + } +#endif + if (use_header_bar) { + GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); + gtk_widget_show(GTK_WIDGET(header_bar)); + gtk_header_bar_set_title(header_bar, "tempp"); + gtk_header_bar_set_show_close_button(header_bar, TRUE); + gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); + } else { + gtk_window_set_title(window, "tempp"); + } + + gtk_window_set_default_size(window, 1280, 720); + gtk_widget_show(GTK_WIDGET(window)); + + g_autoptr(FlDartProject) project = fl_dart_project_new(); + fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments); + + FlView* view = fl_view_new(project); + gtk_widget_show(GTK_WIDGET(view)); + gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); + + fl_register_plugins(FL_PLUGIN_REGISTRY(view)); + + gtk_widget_grab_focus(GTK_WIDGET(view)); +} + +// Implements GApplication::local_command_line. +static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) { + MyApplication* self = MY_APPLICATION(application); + // Strip out the first argument as it is the binary name. + self->dart_entrypoint_arguments = g_strdupv(*arguments + 1); + + g_autoptr(GError) error = nullptr; + if (!g_application_register(application, nullptr, &error)) { + g_warning("Failed to register: %s", error->message); + *exit_status = 1; + return TRUE; + } + + g_application_activate(application); + *exit_status = 0; + + return TRUE; +} + +// Implements GApplication::startup. +static void my_application_startup(GApplication* application) { + //MyApplication* self = MY_APPLICATION(object); + + // Perform any actions required at application startup. + + G_APPLICATION_CLASS(my_application_parent_class)->startup(application); +} + +// Implements GApplication::shutdown. +static void my_application_shutdown(GApplication* application) { + //MyApplication* self = MY_APPLICATION(object); + + // Perform any actions required at application shutdown. + + G_APPLICATION_CLASS(my_application_parent_class)->shutdown(application); +} + +// Implements GObject::dispose. +static void my_application_dispose(GObject* object) { + MyApplication* self = MY_APPLICATION(object); + g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev); + G_OBJECT_CLASS(my_application_parent_class)->dispose(object); +} + +static void my_application_class_init(MyApplicationClass* klass) { + G_APPLICATION_CLASS(klass)->activate = my_application_activate; + G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line; + G_APPLICATION_CLASS(klass)->startup = my_application_startup; + G_APPLICATION_CLASS(klass)->shutdown = my_application_shutdown; + G_OBJECT_CLASS(klass)->dispose = my_application_dispose; +} + +static void my_application_init(MyApplication* self) {} + +MyApplication* my_application_new() { + // Set the program name to the application ID, which helps various systems + // like GTK and desktop environments map this running application to its + // corresponding .desktop file. This ensures better integration by allowing + // the application to be recognized beyond its binary name. + g_set_prgname(APPLICATION_ID); + + return MY_APPLICATION(g_object_new(my_application_get_type(), + "application-id", APPLICATION_ID, + "flags", G_APPLICATION_NON_UNIQUE, + nullptr)); +} diff --git a/linux/runner/my_application.h b/linux/runner/my_application.h new file mode 100644 index 0000000..72271d5 --- /dev/null +++ b/linux/runner/my_application.h @@ -0,0 +1,18 @@ +#ifndef FLUTTER_MY_APPLICATION_H_ +#define FLUTTER_MY_APPLICATION_H_ + +#include + +G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION, + GtkApplication) + +/** + * my_application_new: + * + * Creates a new Flutter-based application. + * + * Returns: a new #MyApplication. + */ +MyApplication* my_application_new(); + +#endif // FLUTTER_MY_APPLICATION_H_ 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..c2efd0b --- /dev/null +++ b/macos/Flutter/Flutter-Debug.xcconfig @@ -0,0 +1 @@ +#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..c2efd0b --- /dev/null +++ b/macos/Flutter/Flutter-Release.xcconfig @@ -0,0 +1 @@ +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift new file mode 100644 index 0000000..0c9779f --- /dev/null +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -0,0 +1,16 @@ +// +// Generated file. Do not edit. +// + +import FlutterMacOS +import Foundation + +import file_selector_macos +import path_provider_foundation +import sqflite_darwin + +func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) + PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) + SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin")) +} diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000..2bf6327 --- /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 /* tempp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "tempp.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 /* tempp.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 /* tempp.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.example.tempp.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/tempp.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/tempp"; + }; + 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.example.tempp.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/tempp.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/tempp"; + }; + 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.example.tempp.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/tempp.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/tempp"; + }; + 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..cb0e35a --- /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..8d4ff27 --- /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 = tempp + +// The application's bundle identifier +PRODUCT_BUNDLE_IDENTIFIER = com.example.tempp + +// The copyright displayed in application information +PRODUCT_COPYRIGHT = Copyright © 2025 com.example. 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..919e10a --- /dev/null +++ b/pubspec.lock @@ -0,0 +1,682 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + archive: + dependency: transitive + description: + name: archive + sha256: "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd" + url: "https://pub.dev" + source: hosted + version: "4.0.7" + args: + dependency: transitive + description: + name: args + sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04 + url: "https://pub.dev" + source: hosted + version: "2.7.0" + async: + dependency: transitive + description: + name: async + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" + url: "https://pub.dev" + source: hosted + version: "2.13.0" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + cached_network_image: + dependency: "direct main" + description: + name: cached_network_image + sha256: "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916" + url: "https://pub.dev" + source: hosted + version: "3.4.1" + cached_network_image_platform_interface: + dependency: transitive + description: + name: cached_network_image_platform_interface + sha256: "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829" + url: "https://pub.dev" + source: hosted + version: "4.1.1" + cached_network_image_web: + dependency: transitive + description: + name: cached_network_image_web + sha256: "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062" + url: "https://pub.dev" + source: hosted + version: "1.3.1" + characters: + dependency: transitive + description: + name: characters + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 + url: "https://pub.dev" + source: hosted + version: "1.4.0" + checked_yaml: + dependency: transitive + description: + name: checked_yaml + sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff + url: "https://pub.dev" + source: hosted + version: "2.0.3" + cli_util: + dependency: transitive + description: + name: cli_util + sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c + url: "https://pub.dev" + source: hosted + version: "0.4.2" + 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" + crypto: + dependency: transitive + description: + name: crypto + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" + url: "https://pub.dev" + source: hosted + version: "3.0.6" + 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: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" + url: "https://pub.dev" + source: hosted + version: "1.3.3" + ffi: + dependency: transitive + description: + name: ffi + sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + file: + dependency: transitive + description: + name: file + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 + url: "https://pub.dev" + source: hosted + version: "7.0.1" + file_selector_linux: + dependency: transitive + description: + name: file_selector_linux + sha256: "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33" + url: "https://pub.dev" + source: hosted + version: "0.9.3+2" + file_selector_macos: + dependency: transitive + description: + name: file_selector_macos + sha256: "8c9250b2bd2d8d4268e39c82543bacbaca0fda7d29e0728c3c4bbb7c820fd711" + url: "https://pub.dev" + source: hosted + version: "0.9.4+3" + file_selector_platform_interface: + dependency: transitive + description: + name: file_selector_platform_interface + sha256: a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b + url: "https://pub.dev" + source: hosted + version: "2.6.2" + file_selector_windows: + dependency: transitive + description: + name: file_selector_windows + sha256: "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b" + url: "https://pub.dev" + source: hosted + version: "0.9.3+4" + fixnum: + dependency: transitive + description: + name: fixnum + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be + url: "https://pub.dev" + source: hosted + version: "1.1.1" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_cache_manager: + dependency: transitive + description: + name: flutter_cache_manager + sha256: "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386" + url: "https://pub.dev" + source: hosted + version: "3.4.1" + flutter_launcher_icons: + dependency: "direct main" + description: + name: flutter_launcher_icons + sha256: bfa04787c85d80ecb3f8777bde5fc10c3de809240c48fa061a2c2bf15ea5211c + url: "https://pub.dev" + source: hosted + version: "0.14.3" + flutter_plugin_android_lifecycle: + dependency: transitive + description: + name: flutter_plugin_android_lifecycle + sha256: f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e + url: "https://pub.dev" + source: hosted + version: "2.0.28" + 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" + google_fonts: + dependency: "direct main" + description: + name: google_fonts + sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82 + url: "https://pub.dev" + source: hosted + version: "6.2.1" + http: + dependency: "direct main" + description: + name: http + sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b" + url: "https://pub.dev" + source: hosted + version: "1.4.0" + http_parser: + dependency: transitive + description: + name: http_parser + sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" + url: "https://pub.dev" + source: hosted + version: "4.1.2" + image: + dependency: transitive + description: + name: image + sha256: "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928" + url: "https://pub.dev" + source: hosted + version: "4.5.4" + image_picker: + dependency: "direct main" + description: + name: image_picker + sha256: "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a" + url: "https://pub.dev" + source: hosted + version: "1.1.2" + image_picker_android: + dependency: transitive + description: + name: image_picker_android + sha256: "317a5d961cec5b34e777b9252393f2afbd23084aa6e60fcf601dcf6341b9ebeb" + url: "https://pub.dev" + source: hosted + version: "0.8.12+23" + image_picker_for_web: + dependency: transitive + description: + name: image_picker_for_web + sha256: "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83" + url: "https://pub.dev" + source: hosted + version: "3.0.6" + image_picker_ios: + dependency: transitive + description: + name: image_picker_ios + sha256: "05da758e67bc7839e886b3959848aa6b44ff123ab4b28f67891008afe8ef9100" + url: "https://pub.dev" + source: hosted + version: "0.8.12+2" + image_picker_linux: + dependency: transitive + description: + name: image_picker_linux + sha256: "34a65f6740df08bbbeb0a1abd8e6d32107941fd4868f67a507b25601651022c9" + url: "https://pub.dev" + source: hosted + version: "0.2.1+2" + image_picker_macos: + dependency: transitive + description: + name: image_picker_macos + sha256: "1b90ebbd9dcf98fb6c1d01427e49a55bd96b5d67b8c67cf955d60a5de74207c1" + url: "https://pub.dev" + source: hosted + version: "0.2.1+2" + image_picker_platform_interface: + dependency: transitive + description: + name: image_picker_platform_interface + sha256: "886d57f0be73c4b140004e78b9f28a8914a09e50c2d816bdd0520051a71236a0" + url: "https://pub.dev" + source: hosted + version: "2.10.1" + image_picker_windows: + dependency: transitive + description: + name: image_picker_windows + sha256: "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb" + url: "https://pub.dev" + source: hosted + version: "0.2.1+1" + json_annotation: + dependency: transitive + description: + name: json_annotation + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" + url: "https://pub.dev" + source: hosted + version: "4.9.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0" + url: "https://pub.dev" + source: hosted + version: "10.0.9" + 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" + 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" + mime: + dependency: transitive + description: + name: mime + sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" + url: "https://pub.dev" + source: hosted + version: "2.0.0" + nested: + dependency: transitive + description: + name: nested + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" + source: hosted + version: "1.0.0" + octo_image: + dependency: transitive + description: + name: octo_image + sha256: "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + path: + dependency: transitive + description: + name: path + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + url: "https://pub.dev" + source: hosted + version: "1.9.1" + path_provider: + dependency: transitive + description: + name: path_provider + sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" + url: "https://pub.dev" + source: hosted + version: "2.1.5" + path_provider_android: + dependency: transitive + description: + name: path_provider_android + sha256: d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9 + url: "https://pub.dev" + source: hosted + version: "2.2.17" + path_provider_foundation: + dependency: transitive + description: + name: path_provider_foundation + sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + path_provider_linux: + dependency: transitive + description: + name: path_provider_linux + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 + url: "https://pub.dev" + source: hosted + version: "2.2.1" + path_provider_platform_interface: + dependency: transitive + description: + name: path_provider_platform_interface + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + path_provider_windows: + dependency: transitive + description: + name: path_provider_windows + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 + url: "https://pub.dev" + source: hosted + version: "2.3.0" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646" + url: "https://pub.dev" + source: hosted + version: "6.1.0" + platform: + dependency: transitive + description: + name: platform + sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" + url: "https://pub.dev" + source: hosted + version: "3.1.6" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" + source: hosted + version: "2.1.8" + posix: + dependency: transitive + description: + name: posix + sha256: f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62 + url: "https://pub.dev" + source: hosted + version: "6.0.2" + provider: + dependency: "direct main" + description: + name: provider + sha256: "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84" + url: "https://pub.dev" + source: hosted + version: "6.1.5" + rxdart: + dependency: transitive + description: + name: rxdart + sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962" + url: "https://pub.dev" + source: hosted + version: "0.28.0" + 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" + sprintf: + dependency: transitive + description: + name: sprintf + sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" + url: "https://pub.dev" + source: hosted + version: "7.0.0" + sqflite: + dependency: transitive + description: + name: sqflite + sha256: e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03 + url: "https://pub.dev" + source: hosted + version: "2.4.2" + sqflite_android: + dependency: transitive + description: + name: sqflite_android + sha256: "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + sqflite_common: + dependency: transitive + description: + name: sqflite_common + sha256: "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b" + url: "https://pub.dev" + source: hosted + version: "2.5.5" + sqflite_darwin: + dependency: transitive + description: + name: sqflite_darwin + sha256: "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3" + url: "https://pub.dev" + source: hosted + version: "2.4.2" + sqflite_platform_interface: + dependency: transitive + description: + name: sqflite_platform_interface + sha256: "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920" + url: "https://pub.dev" + source: hosted + version: "2.4.0" + 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" + synchronized: + dependency: transitive + description: + name: synchronized + sha256: "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6" + url: "https://pub.dev" + source: hosted + version: "3.3.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" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 + url: "https://pub.dev" + source: hosted + version: "1.4.0" + uuid: + dependency: transitive + description: + name: uuid + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff + url: "https://pub.dev" + source: hosted + version: "4.5.1" + 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: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 + url: "https://pub.dev" + source: hosted + version: "15.0.0" + web: + dependency: transitive + description: + name: web + sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" + url: "https://pub.dev" + source: hosted + version: "1.1.1" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + xml: + dependency: transitive + description: + name: xml + sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 + url: "https://pub.dev" + source: hosted + version: "6.5.0" + yaml: + dependency: transitive + description: + name: yaml + sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce + url: "https://pub.dev" + source: hosted + version: "3.1.3" +sdks: + dart: ">=3.7.0 <4.0.0" + flutter: ">=3.27.0" diff --git a/pubspec.yaml b/pubspec.yaml new file mode 100644 index 0000000..418a9bc --- /dev/null +++ b/pubspec.yaml @@ -0,0 +1,121 @@ +name: tempp +description: "A new Flutter project." +# The following line prevents the package from being accidentally published to +# pub.dev using `flutter pub publish`. This is preferred for private packages. +publish_to: 'none' # Remove this line if you wish to publish to pub.dev + +# The following defines the version and build number for your application. +# A version number is three numbers separated by dots, like 1.2.43 +# followed by an optional build number separated by a +. +# Both the version and the builder number may be overridden in flutter +# build by specifying --build-name and --build-number, respectively. + + +# In Android, build-name is used as versionName while build-number used as versionCode. +# Read more about Android versioning at https://developer.android.com/studio/publish/versioning +# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion. +# Read more about iOS versioning at +# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html +# In Windows, build-name is used as the major, minor, and patch parts +# of the product and file versions while build-number is used as the build suffix. +version: 1.0.0+1 + +environment: + sdk: '>=3.7.0 <4.0.0' + +# Dependencies specify other packages that your package needs in order to work. +# To automatically upgrade your package dependencies to the latest versions +# consider running `flutter pub upgrade --major-versions`. Alternatively, +# dependencies can be manually updated by changing the version numbers below to +# the latest version available on pub.dev. To see which dependencies have newer +# versions available, run `flutter pub outdated`. +dependencies: + flutter: + sdk: flutter + + # The following adds the Cupertino Icons font to your application. + # Use with the CupertinoIcons class for iOS style icons. + cupertino_icons: ^1.0.8 + http: ^1.4.0 + provider: ^6.1.5 + image_picker: ^1.1.2 + cached_network_image: ^3.4.1 + google_fonts: ^6.2.1 + flutter_launcher_icons: ^0.14.3 + + + +dev_dependencies: + flutter_test: + sdk: flutter +flutter_icons: + android: "launcher_icon" + ios: true + image_path: "assets/splashImage/app_icon.jpg" + + + + + + # The "flutter_lints" package below contains a set of recommended lints to + # encourage good coding practices. The lint set provided by the package is + # activated in the `analysis_options.yaml` file located at the root of your + # package. See that file for information about deactivating specific lint + # rules and activating additional ones. + flutter_lints: ^5.0.0 + + + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + +# The following section is specific to Flutter packages. +flutter: + + # The following line ensures that the Material Icons font is + # included with your application, so that you can use the icons in + # the material Icons class. + uses-material-design: true + + + # To add assets to your application, add an assets section, like this: + assets: + - assets/ + - assets/home_images/ + - assets/featureImages/ + - assets/profileImages/ + - assets/accountImages/ + - assets/fullFeatureImages/ + - assets/singleTransferImages/ + - assets/splashImage/ + + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.dev/to/resolution-aware-images + + # For details regarding adding assets from package dependencies, see + # https://flutter.dev/to/asset-from-package + + # To add custom fonts to your application, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + fonts: + - family: SourceSans3 + fonts: + - asset: assets/fonts/SourceHanSansCN-Regular.otf + weight: 500 + - asset: assets/fonts/SourceHanSansCN-Bold.otf + weight: 700 + - asset: assets/fonts/SourceHanSansCN-Medium.otf + weight: 600 + + + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts from package dependencies, + # see https://flutter.dev/to/font-from-package diff --git a/test/widget_test.dart b/test/widget_test.dart new file mode 100644 index 0000000..fd54a04 --- /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:tempp/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..6cf2ef7 --- /dev/null +++ b/web/index.html @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + tempp + + + + + + diff --git a/web/manifest.json b/web/manifest.json new file mode 100644 index 0000000..4e01abf --- /dev/null +++ b/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "tempp", + "short_name": "tempp", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "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..db01685 --- /dev/null +++ b/windows/CMakeLists.txt @@ -0,0 +1,108 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(tempp 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 "tempp") + +# 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..77ab7a0 --- /dev/null +++ b/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,14 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include + +void RegisterPlugins(flutter::PluginRegistry* registry) { + FileSelectorWindowsRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FileSelectorWindows")); +} 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..a423a02 --- /dev/null +++ b/windows/flutter/generated_plugins.cmake @@ -0,0 +1,24 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + file_selector_windows +) + +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..c79dd64 --- /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.example" "\0" + VALUE "FileDescription", "tempp" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "tempp" "\0" + VALUE "LegalCopyright", "Copyright (C) 2025 com.example. All rights reserved." "\0" + VALUE "OriginalFilename", "tempp.exe" "\0" + VALUE "ProductName", "tempp" "\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..f66f4ab --- /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"tempp", 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_