diff --git a/.gitignore b/.gitignore index 27d27e85..dac1abed 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,12 @@ .buildlog/ .history .svn/ +*.info +*.info.backup +index.html +*.lock +google-services*.json +key.properties # IntelliJ related *.iml diff --git a/.gradle/6.9.3/fileChanges/last-build.bin b/.gradle/6.9.3/fileChanges/last-build.bin new file mode 100644 index 00000000..f76dd238 Binary files /dev/null and b/.gradle/6.9.3/fileChanges/last-build.bin differ diff --git a/.gradle/6.9.3/gc.properties b/.gradle/6.9.3/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 00000000..8ae8039c --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Wed Oct 26 18:08:25 CEST 2022 +gradle.version=6.9.3 diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 00000000..321cf184 --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,7 @@ +{ + "ExpandedNodes": [ + "" + ], + "SelectedNode": "\\D:\\Prog\\StudioProjects\\create_flutter_provider2022", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/create_flutter_provider2022/v17/.suo b/.vs/create_flutter_provider2022/v17/.suo new file mode 100644 index 00000000..839148df Binary files /dev/null and b/.vs/create_flutter_provider2022/v17/.suo differ diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..ef5bf7e6 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,63 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + + + { + "name": "create_flutter_provider (android debug dev)", + "request": "launch", + "type": "dart", + "flutterMode": "debug", + "program": "lib/main.dart", + "args": [ + "--flavor", + "dev" + ] + }, + { + "name": "create_flutter_provider (android release prod)", + "request": "launch", + "type": "dart", + "flutterMode": "release", + "program": "lib/main_prod.dart", + + "args": [ + "--flavor", + "prod" + ] + }, + { + "name": "create_flutter_provider (web debug dev)", + "request": "launch", + "type": "dart", + "flutterMode": "debug", + "preLaunchTask": "copywebdev", + "program": "lib/main.dart", + "args": [ + "--flavor", + "dev", + "localhost", + "--web-port", + "5000" + ] + }, + { + "name": "create_flutter_provider (web debug prod)", + "request": "launch", + "type": "dart", + "flutterMode": "debug", + "preLaunchTask": "copywebprod", + "program": "lib/main_prod.dart", + "args": [ + "--flavor", + "prod", + "localhost", + "--web-port", + "5000" + ] + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..c5f3f6b9 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "interactive" +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 00000000..f7075585 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,26 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "copywebdev", + "type": "shell", + "windows": { + "command": "${workspaceFolder}${pathSeparator}copy_webenv.cmd" + }, + "args": [ + "dev" + ], + "problemMatcher": [] + }, + { + "label": "copywebprod", + "type": "shell", + "command": "${workspaceFolder}${pathSeparator}copy_webenv.cmd", + "args": [ + "prod" + ] + } + ] +} \ No newline at end of file diff --git a/README.md b/README.md index 3ee244cc..1f170896 100644 --- a/README.md +++ b/README.md @@ -326,13 +326,13 @@ For the sub folder called ‘res’, ignore it for now. We will go through that 4. Having different app name and app icon for Dev and Prod We want to have a different app name for our project. This is helpful as with Flavor setup, we can install both app in the same devices for testing. -Having app name such as NoteApp-Dev or Note-Dev or Note-Prod helps us to identify which app is for which environment – development or production. +Having app name such as NoteApp-Dev or create_flutter_provider_app or Note-Prod helps us to identify which app is for which environment – development or production. The same concept and benefits if we have different app icon for each apps that are connecting to different environment. For app name, create file called strings.xml and with the following content: ``` - Note-Dev + create_flutter_provider_app ``` diff --git a/analysis_options.yaml b/analysis_options.yaml new file mode 100644 index 00000000..61b6c4de --- /dev/null +++ b/analysis_options.yaml @@ -0,0 +1,29 @@ +# 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-lang.github.io/linter/lints/index.html. + # + # 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/app/build.gradle b/android/app/build.gradle index a4401b3a..a2cbda7a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -8,7 +8,7 @@ if (localPropertiesFile.exists()) { def flutterRoot = localProperties.getProperty('flutter.sdk') if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") + throw GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") } def flutterVersionCode = localProperties.getProperty('flutter.versionCode') @@ -25,8 +25,14 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" +def keystorePropertiesFile = rootProject.file("key.properties") + +def keystoreProperties = new Properties() + +keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) + android { - compileSdkVersion 28 + compileSdkVersion 33 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -34,13 +40,14 @@ android { lintOptions { disable 'InvalidPackage' + checkReleaseBuilds false } defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.example.create_flutter_provider_app"//com.example.create_flutter_provider_app - minSdkVersion 16 - targetSdkVersion 28 + minSdkVersion 19 + targetSdkVersion 30 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -60,7 +67,7 @@ android { productFlavors { dev { dimension "flavor-type" - applicationId "com.example.create_flutter_provider_app.dev" + applicationId "com.example.create_flutter_provider_app" versionCode 1 versionName "1.0" } @@ -71,6 +78,22 @@ android { versionName "1.0" } } + signingConfigs{ + + release{ + + keyAlias keystoreProperties['keyAlias'] + + keyPassword keystoreProperties['keyPassword'] + + storeFile file(keystoreProperties['storeFile']) + + storePassword keystoreProperties['storePassword'] + + } + + } + } flutter { @@ -83,6 +106,10 @@ dependencies { testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test:runner:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + implementation platform('com.google.firebase:firebase-bom:31.1.0') + implementation 'com.google.firebase:firebase-analytics' + implementation 'com.google.firebase:firebase-auth' + implementation 'com.google.android.gms:play-services-auth:20.3.0' } diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index fa328a93..18fe0bbc 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.example.create_flutter_provider_app"> diff --git a/android/app/src/dev/google-services.json b/android/app/src/dev/google-services.json deleted file mode 100644 index 1e6a37b1..00000000 --- a/android/app/src/dev/google-services.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "project_info": { - "project_number": "747799024060", - "firebase_url": "https://note-app-dev.firebaseio.com", - "project_id": "note-app-dev", - "storage_bucket": "note-app-dev.appspot.com" - }, - "client": [ - { - "client_info": { - "mobilesdk_app_id": "1:747799024060:android:12a44c09b32bf75c3d5bb9", - "android_client_info": { - "package_name": "com.example.create_flutter_provider_app.dev" - } - }, - "oauth_client": [ - { - "client_id": "747799024060-0i7261mp5tipeb817cpcr7s0cn29ck0a.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyA_mDikkCUSSDXiwFKly7GlC25LJEJHsFA" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "747799024060-0i7261mp5tipeb817cpcr7s0cn29ck0a.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } - } - ], - "configuration_version": "1" -} \ No newline at end of file diff --git a/android/app/src/dev/res/values/strings.xml b/android/app/src/dev/res/values/strings.xml index 8248c9ba..8fa644e6 100644 --- a/android/app/src/dev/res/values/strings.xml +++ b/android/app/src/dev/res/values/strings.xml @@ -1,4 +1,4 @@ -Note-Dev +create_flutter_provider_app \ No newline at end of file diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index a91402e7..ea6ba482 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,12 +1,13 @@ + package="com.example.create_flutter_provider_app"> + + + + + + + + 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 00000000..06952be7 --- /dev/null +++ b/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml index fa328a93..18fe0bbc 100644 --- a/android/app/src/profile/AndroidManifest.xml +++ b/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.example.create_flutter_provider_app"> diff --git a/android/build.gradle b/android/build.gradle index 4273368a..3a63d464 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,14 +1,15 @@ buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.5.31' repositories { google() jcenter() + mavenCentral() // Maven Central repository } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:4.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.google.gms:google-services:4.3.3' + classpath 'com.google.gms:google-services:4.3.13' } } @@ -16,6 +17,7 @@ allprojects { repositories { google() jcenter() + mavenCentral() // Maven Central repository } } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 296b146b..595fb867 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip diff --git a/assets/images/facebooklogin.png b/assets/images/facebooklogin.png new file mode 100644 index 00000000..5fe2ec73 Binary files /dev/null and b/assets/images/facebooklogin.png differ diff --git a/assets/images/google.jpg b/assets/images/google.jpg new file mode 100644 index 00000000..49deeaa0 Binary files /dev/null and b/assets/images/google.jpg differ diff --git a/assets/images/googlelogin.png b/assets/images/googlelogin.png new file mode 100644 index 00000000..656ae179 Binary files /dev/null and b/assets/images/googlelogin.png differ diff --git a/assets/lang/en.json b/assets/lang/en.json index 91e3bc24..402b73e2 100644 --- a/assets/lang/en.json +++ b/assets/lang/en.json @@ -1,9 +1,9 @@ { - "splashTitle": "Welcome to ", "alertDialogTitle": "Alert", "alertDialogMessage": "This will logout. Are you sure?", "alertDialogCancelBtn": "Cancel", "alertDialogYesBtn": "Yes", + "homeAppBarTitle": "Todos", "loginTxtEmail": "Email", "loginTxtPassword": "Password", "loginBtnSignIn": "Sign In", @@ -15,7 +15,7 @@ "loginTxtErrorEmail": "Please enter an email", "loginTxtErrorPassword": "Please enter a password with 6+ chars long", "loginTxtErrorSignIn": "Invalid email and/or password", - "homeAppBarTitle": "Todos", + "loginTxtErrorGoogleSignIn": "Try again", "settingAppTitle": "Setting", "settingThemeListTitle": "Dark theme", "settingThemeListSubTitle": "Turn On the Dark Side", @@ -26,6 +26,8 @@ "settingLanguageListSubTitle": "Set Your Prefer Language", "settingPopUpToggleEnglish": "Change to English", "settingPopUpToggleChinese": "Change to Chinese", + "settingPopUpToggleSpanish": "Change to Spanish", + "splashsubtitle1":"Welcome to ", "todosSnackBarContent": "Deleted ", "todosSnackBarActionLbl": "Undo", "todosErrorTopMsgTxt": "Something went wrong", diff --git a/assets/lang/es.json b/assets/lang/es.json new file mode 100644 index 00000000..1f451c41 --- /dev/null +++ b/assets/lang/es.json @@ -0,0 +1,46 @@ +{ + "alertDialogTitle": "Alerta", + "alertDialogMessage": "Esto desconectará la sesión. ¿Estás seguro?", + "alertDialogCancelBtn": "Cancela", + "alertDialogYesBtn": "Si", + "homeAppBarTitle": "Todos", + "loginTxtEmail": "Correo electrónico", + "loginTxtPassword": "Clave", + "loginBtnSignIn": "Acceso", + "loginBtnSignUp": "Registrarse", + "loginTxtDontHaveAccount": "¿No tienes una cuenta?", + "loginTxtHaveAccount": "¿Tienes ya una cuenta?", + "loginBtnLinkCreateAccount": "Crear cuenta", + "loginBtnLinkSignIn": "Acceder", + "loginTxtErrorEmail": "Por favor, introduce un correo electrónico", + "loginTxtErrorPassword": "Por favor, introduce una clave al menos con 6 caracteres de longitud", + "loginTxtErrorSignIn": "Correo y/o clave inválidos", + "loginTxtErrorGoogleSignIn": "Prueba otra vez", + "settingAppTitle": "Ajustes", + "settingThemeListTitle": "Tema oscuro", + "settingThemeListSubTitle": "Visualiza en tema oscuro", + "settingLogoutListTitle": "Cerrar sesión", + "settingLogoutListSubTitle": "Desconectar", + "settingLogoutButton": "Cerrar", + "settingLanguageListTitle": "Lenguaje", + "settingLanguageListSubTitle": "Establece lenguaje preferido", + "settingPopUpToggleEnglish": "Cambia a Inglés", + "settingPopUpToggleChinese": "Cambia a Chino", + "settingPopUpToggleSpanish": "Cambia a Español", + "splashsubtitle1":"Bienvenido a ", + "todosSnackBarContent": "Borrado ", + "todosSnackBarActionLbl": "Deshacer", + "todosErrorTopMsgTxt": "Algo fue mal", + "todosErrorBottomMsgTxt": "No se pueden cargar datos ahora", + "todosDismissibleMsgTxt": "Borrar", + "todosPopUpToggleAllComplete": "Marcar todas las tareas completas", + "todosPopUpToggleClearCompleted": "Limpiar todas las tareas", + "todosCreateEditAppBarTitleNewTxt": "Nueva tarea", + "todosCreateEditAppBarTitleEditTxt": "Editar tarea", + "todosCreateEditTaskNameTxt": "Nombre tarea", + "todosCreateEditNotesTxt": "Notas", + "todosCreateEditTaskNameValidatorMsg": "El nombre no puede ser vacío", + "todosCreateEditCompletedTxt": "¿Completada?", + "todosEmptyTopMsgDefaultTxt": "Nada aquí", + "todosEmptyBottomDefaultMsgTxt": "Añada un nuevo elemento para empezar" +} \ No newline at end of file diff --git a/assets/lang/zh.json b/assets/lang/zh.json index ce6fcfd4..12822354 100644 --- a/assets/lang/zh.json +++ b/assets/lang/zh.json @@ -1,9 +1,9 @@ { - "splashTitle": "欢迎来到 ", - "alertDialogTitle": "警报", + "alertDialogsubtitle1": "警报", "alertDialogMessage": "这将注销。 你确定吗？", "alertDialogCancelBtn": "取消", "alertDialogYesBtn": "是", + "homeAppBarsubtitle1": "全部", "loginTxtEmail": "电子邮件", "loginTxtPassword": "密码", "loginBtnSignIn": "登入", @@ -15,17 +15,17 @@ "loginTxtErrorEmail": "请输入电子邮件", "loginTxtErrorPassword": "请输入超过6个字符的密码", "loginTxtErrorSignIn": "无效的电子邮件和/或密码", - "homeAppBarTitle": "全部", - "settingAppTitle": "设置", - "settingThemeListTitle": "黑暗主题", - "settingThemeListSubTitle": "打开黑暗的一面", - "settingLogoutListTitle": "登出", - "settingLogoutListSubTitle": "从这里注销我", + "settingAppsubtitle1": "设置", + "settingThemeListsubtitle1": "黑暗主题", + "settingThemeListSubsubtitle1": "打开黑暗的一面", + "settingLogoutListsubtitle1": "登出", + "settingLogoutListSubsubtitle1": "从这里注销我", "settingLogoutButton": "登出", - "settingLanguageListTitle": "语言", - "settingLanguageListSubTitle": "设定您的偏好语言", + "settingLanguageListsubtitle1": "语言", + "settingLanguageListSubsubtitle1": "设定您的偏好语言", "settingPopUpToggleEnglish": "改成英文", "settingPopUpToggleChinese": "改成中文", + "splashsubtitle1": "欢迎来到 ", "todosSnackBarContent": "已删除 ", "todosSnackBarActionLbl": "撤消", "todosErrorTopMsgTxt": "出问题了", @@ -33,8 +33,8 @@ "todosDismissibleMsgTxt": "删除", "todosPopUpToggleAllComplete": "标记所有完成", "todosPopUpToggleClearCompleted": "清除所有已完成", - "todosCreateEditAppBarTitleNewTxt": "新渡渡鸟", - "todosCreateEditAppBarTitleEditTxt": "编辑一切", + "todosCreateEditAppBarsubtitle1NewTxt": "新渡渡鸟", + "todosCreateEditAppBarsubtitle1EditTxt": "编辑一切", "todosCreateEditTaskNameTxt": "待办事项名称", "todosCreateEditNotesTxt": "笔记", "todosCreateEditTaskNameValidatorMsg": "名称不能为空", diff --git a/copy_webenv.cmd b/copy_webenv.cmd new file mode 100644 index 00000000..3217aa47 --- /dev/null +++ b/copy_webenv.cmd @@ -0,0 +1 @@ +xcopy webenv\%1 web\ /E/Y \ No newline at end of file diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 25409292..06fabe90 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -320,7 +320,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.venturearkstudio.noteapp; + PRODUCT_BUNDLE_IDENTIFIER = com.example.create_flutter_provider_app; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -454,7 +454,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.venturearkstudio.noteapp; + PRODUCT_BUNDLE_IDENTIFIER = com.example.create_flutter_provider_app; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -481,7 +481,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.venturearkstudio.noteapp; + PRODUCT_BUNDLE_IDENTIFIER = com.example.create_flutter_provider_app; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; 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 00000000..18d98100 --- /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 00000000..f9b0d7c5 --- /dev/null +++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /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 00000000..f9b0d7c5 --- /dev/null +++ b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/lib/app_localizations.dart b/lib/app_localizations.dart index 6a75c09d..f83bb7b9 100755 --- a/lib/app_localizations.dart +++ b/lib/app_localizations.dart @@ -24,7 +24,7 @@ class AppLocalizations { Future load() async { // Load the language JSON file from the "lang" folder String jsonString = - await rootBundle.loadString('lang/${locale.languageCode}.json'); + await rootBundle.loadString('assets/lang/${locale.languageCode}.json'); Map jsonMap = json.decode(jsonString); _localizedStrings = jsonMap.map((key, value) { @@ -49,7 +49,7 @@ class _AppLocalizationsDelegate @override bool isSupported(Locale locale) { // Include all of your supported language codes here - return ['en', 'zh'].contains(locale.languageCode); + return ['en', 'zh', 'es'].contains(locale.languageCode); } @override diff --git a/lib/auth_widget_builder.dart b/lib/auth_widget_builder.dart index e1bd064a..6a6d3a4d 100755 --- a/lib/auth_widget_builder.dart +++ b/lib/auth_widget_builder.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:noteapp/models/user_model.dart'; -import 'package:noteapp/providers/auth_provider.dart'; -import 'package:noteapp/services/firestore_database.dart'; +import 'package:create_flutter_provider_app/models/user_model.dart'; +import 'package:create_flutter_provider_app/providers/auth_provider.dart'; +import 'package:create_flutter_provider_app/services/firestore_database.dart'; import 'package:provider/provider.dart'; /* diff --git a/lib/caches/sharedpref/shared_preference_helper.dart b/lib/caches/sharedpref/shared_preference_helper.dart index 75c54353..c4477451 100755 --- a/lib/caches/sharedpref/shared_preference_helper.dart +++ b/lib/caches/sharedpref/shared_preference_helper.dart @@ -1,6 +1,10 @@ import 'package:shared_preferences/shared_preferences.dart'; class SharedPreferenceHelper { + + static Future initSharedPrefs() async { + await SharedPreferences.getInstance(); + } Future? _sharedPreference; static const String is_dark_mode = "is_dark_mode"; static const String language_code = "language_code"; diff --git a/lib/constants/app_themes.dart b/lib/constants/app_themes.dart index afc94d45..639b4102 100755 --- a/lib/constants/app_themes.dart +++ b/lib/constants/app_themes.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:noteapp/constants/app_font_family.dart'; +import 'package:create_flutter_provider_app/constants/app_font_family.dart'; class AppThemes { AppThemes._(); @@ -27,13 +27,13 @@ class AppThemes { fontSize: 12.0, color: _lightAppBarColor, fontWeight: FontWeight.w100); static final TextTheme _lightTextTheme = TextTheme( - headline: _lightScreenHeadingTextStyle, - body1: _lightScreenTaskNameTextStyle, - body2: _lightScreenTaskDurationTextStyle, - button: _lightScreenButtonTextStyle, - title: _lightScreenTaskNameTextStyle, - subhead: _lightScreenTaskNameTextStyle, - caption: _lightScreenCaptionTextStyle, + displayMedium: _lightScreenHeadingTextStyle, + bodyMedium: _lightScreenTaskNameTextStyle, + bodySmall: _lightScreenTaskDurationTextStyle, + labelSmall: _lightScreenButtonTextStyle, + titleSmall: _lightScreenTaskNameTextStyle, + bodyLarge: _lightScreenTaskNameTextStyle, + labelLarge: _lightScreenCaptionTextStyle, ); //constants color range for dark theme @@ -59,13 +59,13 @@ class AppThemes { fontSize: 12.0, color: _darkAppBarColor, fontWeight: FontWeight.w100); static final TextTheme _darkTextTheme = TextTheme( - headline: _darkScreenHeadingTextStyle, - body1: _darkScreenTaskNameTextStyle, - body2: _darkScreenTaskDurationTextStyle, - button: _darkScreenButtonTextStyle, - title: _darkScreenTaskNameTextStyle, - subhead: _darkScreenTaskNameTextStyle, - caption: _darkScreenCaptionTextStyle, + displayMedium: _darkScreenHeadingTextStyle, + bodyMedium: _darkScreenTaskNameTextStyle, + bodySmall: _darkScreenTaskDurationTextStyle, + labelSmall: _darkScreenButtonTextStyle, + titleSmall: _darkScreenTaskNameTextStyle, + bodyLarge: _darkScreenTaskNameTextStyle, + labelLarge: _darkScreenCaptionTextStyle, ); //the light theme @@ -78,11 +78,11 @@ class AppThemes { appBarTheme: AppBarTheme( color: _lightAppBarColor, iconTheme: IconThemeData(color: _lightOnPrimaryColor), - textTheme: _lightTextTheme, + //textTheme: _lightTextTheme, ), colorScheme: ColorScheme.light( primary: _lightPrimaryColor, - primaryVariant: _lightPrimaryVariantColor, + //primaryVariant: _lightPrimaryVariantColor, secondary: _lightSecondaryColor, onPrimary: _lightOnPrimaryColor, ), @@ -96,6 +96,11 @@ class AppThemes { buttonTheme: ButtonThemeData( buttonColor: _lightButtonPrimaryColor, textTheme: ButtonTextTheme.primary), + elevatedButtonTheme: ElevatedButtonThemeData( + style: ElevatedButton.styleFrom( + backgroundColor: _lightButtonPrimaryColor, + foregroundColor: _lightPrimaryColor, + )), unselectedWidgetColor: _lightPrimaryColor, inputDecorationTheme: InputDecorationTheme( fillColor: _lightPrimaryColor, @@ -114,11 +119,11 @@ class AppThemes { appBarTheme: AppBarTheme( color: _darkAppBarColor, iconTheme: IconThemeData(color: _darkOnPrimaryColor), - textTheme: _darkTextTheme, + //textTheme: _darkTextTheme, ), colorScheme: ColorScheme.light( primary: _darkPrimaryColor, - primaryVariant: _darkPrimaryVariantColor, + //primaryVariant: _darkPrimaryVariantColor, secondary: _darkSecondaryColor, onPrimary: _darkOnPrimaryColor, ), @@ -132,6 +137,11 @@ class AppThemes { buttonTheme: ButtonThemeData( buttonColor: _darkButtonPrimaryColor, textTheme: ButtonTextTheme.primary), + elevatedButtonTheme: ElevatedButtonThemeData( + style: ElevatedButton.styleFrom( + backgroundColor: _darkButtonPrimaryColor, + foregroundColor: _lightPrimaryColor, + )), unselectedWidgetColor: _darkPrimaryColor, inputDecorationTheme: InputDecorationTheme( fillColor: _darkPrimaryColor, diff --git a/lib/firebase_options.dart b/lib/firebase_options.dart new file mode 100644 index 00000000..c953c500 --- /dev/null +++ b/lib/firebase_options.dart @@ -0,0 +1,69 @@ +// File generated by FlutterFire CLI. +// ignore_for_file: lines_longer_than_80_chars, avoid_classes_with_only_static_members +import 'package:firebase_core/firebase_core.dart' show FirebaseOptions; +import 'package:flutter/foundation.dart' + show defaultTargetPlatform, kIsWeb, TargetPlatform; + +/// Default [FirebaseOptions] for use with your Firebase apps. +/// +/// Example: +/// ```dart +/// import 'firebase_options.dart'; +/// // ... +/// await Firebase.initializeApp( +/// options: DefaultFirebaseOptions.currentPlatform, +/// ); +/// ``` +class DefaultFirebaseOptions { + static FirebaseOptions get currentPlatform { + if (kIsWeb) { + return web; + } + switch (defaultTargetPlatform) { + case TargetPlatform.android: + return android; + case TargetPlatform.iOS: + throw UnsupportedError( + 'DefaultFirebaseOptions have not been configured for ios - ' + 'you can reconfigure this by running the FlutterFire CLI again.', + ); + case TargetPlatform.macOS: + throw UnsupportedError( + 'DefaultFirebaseOptions have not been configured for macos - ' + 'you can reconfigure this by running the FlutterFire CLI again.', + ); + case TargetPlatform.windows: + throw UnsupportedError( + 'DefaultFirebaseOptions have not been configured for windows - ' + 'you can reconfigure this by running the FlutterFire CLI again.', + ); + case TargetPlatform.linux: + throw UnsupportedError( + 'DefaultFirebaseOptions have not been configured for linux - ' + 'you can reconfigure this by running the FlutterFire CLI again.', + ); + default: + throw UnsupportedError( + 'DefaultFirebaseOptions are not supported for this platform.', + ); + } + } + + static const FirebaseOptions web = FirebaseOptions( + apiKey: 'AIzaSyDZzjbyy_AnyqtffENSy8k5Az5Jj46T5eU', + appId: '1:395840317251:web:4cc107d1d6b59033f571f6', + messagingSenderId: '395840317251', + projectId: 'create-flutter-provider-b6213', + authDomain: 'create-flutter-provider-b6213.firebaseapp.com', + storageBucket: 'create-flutter-provider-b6213.appspot.com', + measurementId: 'G-NKX952QRCM', + ); + + static const FirebaseOptions android = FirebaseOptions( + apiKey: 'AIzaSyC36HyNn7EnFhNGNQW3pTpB4_-7Pb-aSkY', + appId: '1:395840317251:android:74c37af1177ecbf3f571f6', + messagingSenderId: '395840317251', + projectId: 'create-flutter-provider-b6213', + storageBucket: 'create-flutter-provider-b6213.appspot.com', + ); +} diff --git a/lib/main.dart b/lib/main.dart index bea39b23..46d95209 100755 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,15 +1,21 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:noteapp/flavor.dart'; -import 'package:noteapp/my_app.dart'; -import 'package:noteapp/providers/auth_provider.dart'; -import 'package:noteapp/providers/language_provider.dart'; -import 'package:noteapp/providers/theme_provider.dart'; -import 'package:noteapp/services/firestore_database.dart'; +import 'package:create_flutter_provider_app/flavor.dart'; +import 'package:create_flutter_provider_app/my_app.dart'; +import 'package:create_flutter_provider_app/providers/auth_provider.dart'; +import 'package:create_flutter_provider_app/providers/language_provider.dart'; +import 'package:create_flutter_provider_app/providers/theme_provider.dart'; +import 'package:create_flutter_provider_app/services/firestore_database.dart'; import 'package:provider/provider.dart'; +import 'firebase_options.dart'; +import 'package:firebase_core/firebase_core.dart'; +import 'restart_app.dart'; -void main() { +void main() async { WidgetsFlutterBinding.ensureInitialized(); + await Firebase.initializeApp( + options: DefaultFirebaseOptions.currentPlatform, + ); SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]) .then((_) async { runApp( @@ -30,9 +36,11 @@ void main() { create: (context) => LanguageProvider(), ), ], - child: MyApp( - databaseBuilder: (_, uid) => FirestoreDatabase(uid: uid), - key: Key('MyApp'), + child: RestartWidget( + child: MyApp( + databaseBuilder: (_, uid) => FirestoreDatabase(uid: uid), + key: const Key('MyApp'), + ), ), ), ); diff --git a/lib/main_prod.dart b/lib/main_prod.dart index 45612829..89d70709 100755 --- a/lib/main_prod.dart +++ b/lib/main_prod.dart @@ -1,15 +1,21 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:noteapp/flavor.dart'; -import 'package:noteapp/my_app.dart'; -import 'package:noteapp/providers/auth_provider.dart'; -import 'package:noteapp/providers/language_provider.dart'; -import 'package:noteapp/providers/theme_provider.dart'; -import 'package:noteapp/services/firestore_database.dart'; +import 'package:create_flutter_provider_app/flavor.dart'; +import 'package:create_flutter_provider_app/my_app.dart'; +import 'package:create_flutter_provider_app/providers/auth_provider.dart'; +import 'package:create_flutter_provider_app/providers/language_provider.dart'; +import 'package:create_flutter_provider_app/providers/theme_provider.dart'; +import 'package:create_flutter_provider_app/services/firestore_database.dart'; import 'package:provider/provider.dart'; +import 'firebase_options.dart'; +import 'package:firebase_core/firebase_core.dart'; +import 'restart_app.dart'; -void main() { +void main() async { WidgetsFlutterBinding.ensureInitialized(); + await Firebase.initializeApp( + options: DefaultFirebaseOptions.currentPlatform, + ); SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]) .then((_) async { runApp( @@ -30,9 +36,11 @@ void main() { create: (context) => LanguageProvider(), ), ], - child: MyApp( - databaseBuilder: (_, uid) => FirestoreDatabase(uid: uid), - key: Key('SimpleFinance'), + child: RestartWidget( + child: MyApp( + databaseBuilder: (_, uid) => FirestoreDatabase(uid: uid), + key: const Key('SimpleFinance'), + ), ), ), ); diff --git a/lib/my_app.dart b/lib/my_app.dart index 1b45a29a..9b587bd5 100755 --- a/lib/my_app.dart +++ b/lib/my_app.dart @@ -1,19 +1,21 @@ import 'package:flutter/material.dart'; -import 'package:noteapp/app_localizations.dart'; -import 'package:noteapp/auth_widget_builder.dart'; -import 'package:noteapp/constants/app_themes.dart'; -import 'package:noteapp/flavor.dart'; -import 'package:noteapp/models/user_model.dart'; -import 'package:noteapp/providers/auth_provider.dart'; -import 'package:noteapp/providers/language_provider.dart'; -import 'package:noteapp/providers/theme_provider.dart'; -import 'package:noteapp/routes.dart'; -import 'package:noteapp/services/firestore_database.dart'; -import 'package:noteapp/ui/auth/sign_in_screen.dart'; -import 'package:noteapp/ui/home/home.dart'; +import 'package:create_flutter_provider_app/app_localizations.dart'; +import 'package:create_flutter_provider_app/auth_widget_builder.dart'; +import 'package:create_flutter_provider_app/constants/app_themes.dart'; +import 'package:create_flutter_provider_app/flavor.dart'; +import 'package:create_flutter_provider_app/models/user_model.dart'; +import 'package:create_flutter_provider_app/providers/auth_provider.dart'; +import 'package:create_flutter_provider_app/providers/language_provider.dart'; +import 'package:create_flutter_provider_app/providers/theme_provider.dart'; +import 'package:create_flutter_provider_app/routes.dart'; +import 'package:create_flutter_provider_app/services/firestore_database.dart'; +import 'package:create_flutter_provider_app/ui/auth/sign_in_screen.dart'; +import 'package:create_flutter_provider_app/ui/home/home.dart'; import 'package:provider/provider.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; +import 'caches/sharedpref/shared_preference_helper.dart'; + class MyApp extends StatelessWidget { const MyApp({required Key key, required this.databaseBuilder}) : super(key: key); @@ -31,7 +33,10 @@ class MyApp extends StatelessWidget { //{context, data, child} return Consumer( builder: (_, languageProviderRef, __) { - return AuthWidgetBuilder( + return + FutureBuilder( + future: SharedPreferenceHelper.initSharedPrefs(), + builder: (_, __) => AuthWidgetBuilder( databaseBuilder: databaseBuilder, builder: (BuildContext context, AsyncSnapshot userSnapshot) { @@ -39,19 +44,23 @@ class MyApp extends StatelessWidget { debugShowCheckedModeBanner: false, locale: languageProviderRef.appLocale, //List of all supported locales - supportedLocales: [ + supportedLocales: const [ Locale('en', 'US'), Locale('zh', 'CN'), + Locale('es', 'ES'), ], //These delegates make sure that the localization data for the proper language is loaded - localizationsDelegates: [ + + localizationsDelegates: const [ //A class which loads the translations from JSON files AppLocalizations.delegate, + GlobalCupertinoLocalizations.delegate, //Built-in localization of basic text for Material widgets (means those default Material widget such as alert dialog icon text) GlobalMaterialLocalizations.delegate, //Built-in localization for text direction LTR/RTL GlobalWidgetsLocalizations.delegate, ], + //return a locale which will be used by the app localeResolutionCallback: (locale, supportedLocales) { //check if the current device locale is supported or not @@ -77,19 +86,20 @@ class MyApp extends StatelessWidget { builder: (_, authProviderRef, __) { if (userSnapshot.connectionState == ConnectionState.active) { - return userSnapshot.hasData + return userSnapshot.data?.uid != 'null' ? HomeScreen() - : SignInScreen(); + : const SignInScreen(); } - return Material( + return const Material( child: CircularProgressIndicator(), ); }, ), ); }, - key: Key('AuthWidget'), + key: const Key('AuthWidget'), + ) ); }, ); diff --git a/lib/providers/auth_provider.dart b/lib/providers/auth_provider.dart index 1c6e1326..32f2b97b 100755 --- a/lib/providers/auth_provider.dart +++ b/lib/providers/auth_provider.dart @@ -1,6 +1,11 @@ import 'package:flutter/material.dart'; import 'package:firebase_auth/firebase_auth.dart'; -import 'package:noteapp/models/user_model.dart'; +import 'package:flutter/foundation.dart'; +import 'package:google_sign_in/google_sign_in.dart'; +import 'package:create_flutter_provider_app/models/user_model.dart'; +import 'package:create_flutter_provider_app/utils/showOTPDialog.dart'; +import 'package:create_flutter_provider_app/utils/showSnackbar.dart'; +import 'package:flutter_facebook_auth/flutter_facebook_auth.dart'; enum Status { Uninitialized, @@ -25,6 +30,7 @@ status for your UI or widgets to listen. class AuthProvider extends ChangeNotifier { //Firebase Auth object late FirebaseAuth _auth; + late GoogleSignIn _googleSignIn; //Default status Status _status = Status.Uninitialized; @@ -36,6 +42,9 @@ class AuthProvider extends ChangeNotifier { AuthProvider() { //initialise object _auth = FirebaseAuth.instance; + _googleSignIn = GoogleSignIn( + clientId: + "395840317251-da8ngtj9kc42d8r1muh5t2j8cbqrl943.apps.googleusercontent.com"); //listener for authentication changes such as user sign in and sign out _auth.authStateChanges().listen(onAuthStateChanged); @@ -56,6 +65,7 @@ class AuthProvider extends ChangeNotifier { } //Method to detect live auth changes such as user sign in and sign out + //Authenticated is only set here Future onAuthStateChanged(User? firebaseUser) async { if (firebaseUser == null) { _status = Status.Unauthenticated; @@ -99,6 +109,160 @@ class AuthProvider extends ChangeNotifier { } } + // GOOGLE SIGN IN. From flutter-firebase-auth + Future signInWithGoogle(BuildContext context) async { + try { + _status = Status.Authenticating; + notifyListeners(); + if (kIsWeb) { + GoogleAuthProvider googleProvider = GoogleAuthProvider(); + + googleProvider + .addScope('https://www.googleapis.com/auth/contacts.readonly'); + + await _auth.signInWithPopup(googleProvider); + } else { + final GoogleSignInAccount? googleUser = await GoogleSignIn().signIn(); + + final GoogleSignInAuthentication? googleAuth = + await googleUser?.authentication; + + if (googleAuth?.accessToken != null && googleAuth?.idToken != null) { + // Create a new credential + final credential = GoogleAuthProvider.credential( + accessToken: googleAuth?.accessToken, + idToken: googleAuth?.idToken, + ); + UserCredential userCredential = + await _auth.signInWithCredential(credential); + + // if you want to do specific task like storing information in firestore + // only for new users using google sign in (since there are no two options + // for google sign in and google sign up, only one as of now), + // do the following: + + // if (userCredential.user != null) { + // if (userCredential.additionalUserInfo!.isNewUser) {} + // } + } + } + } on FirebaseAuthException catch (e) { + print("Error on the sign in = " + e.toString()); + _status = Status.Unauthenticated; + notifyListeners(); + showSnackBar(context, e.message!); // Displaying the error message + return false; + } + return true; + } + + // ANONYMOUS SIGN IN. From flutter-firebase-auth + Future signInAnonymously(BuildContext context) async { + try { + _status = Status.Authenticating; + notifyListeners(); + + await _auth.signInAnonymously(); + } on FirebaseAuthException catch (e) { + _status = Status.Unauthenticated; + notifyListeners(); + showSnackBar(context, e.message!); // Displaying the error message + return false; + } + return true; + } + + // FACEBOOK SIGN IN. From flutter-firebase-auth + Future signInWithFacebook(BuildContext context) async { + try { + _status = Status.Authenticating; + notifyListeners(); + + final LoginResult loginResult = await FacebookAuth.instance.login(); + + final OAuthCredential facebookAuthCredential = + FacebookAuthProvider.credential(loginResult.accessToken!.token); + + await _auth.signInWithCredential(facebookAuthCredential); + } on FirebaseAuthException catch (e) { + _status = Status.Unauthenticated; + notifyListeners(); + + showSnackBar(context, e.message!); // Displaying the error message + return false; + } + return true; + } + + // PHONE SIGN IN + Future phoneSignIn( + BuildContext context, + String phoneNumber, + ) async { + _status = Status.Authenticating; + notifyListeners(); + + TextEditingController codeController = TextEditingController(); + if (kIsWeb) { + // !!! Works only on web !!! + ConfirmationResult result = + await _auth.signInWithPhoneNumber(phoneNumber); + + // Diplay Dialog Box To accept OTP + showOTPDialog( + codeController: codeController, + context: context, + onPressed: () async { + PhoneAuthCredential credential = PhoneAuthProvider.credential( + verificationId: result.verificationId, + smsCode: codeController.text.trim(), + ); + + await _auth.signInWithCredential(credential); + Navigator.of(context).pop(); // Remove the dialog box + }, + ); + } else { + // FOR ANDROID, IOS + await _auth.verifyPhoneNumber( + phoneNumber: phoneNumber, + // Automatic handling of the SMS code + verificationCompleted: (PhoneAuthCredential credential) async { + // !!! works only on android !!! + await _auth.signInWithCredential(credential); + }, + // Displays a message when verification fails + verificationFailed: (e) { + _status = Status.Unauthenticated; + notifyListeners(); + + showSnackBar(context, e.message!); + }, + // Displays a dialog box when OTP is sent + codeSent: ((String verificationId, int? resendToken) async { + showOTPDialog( + codeController: codeController, + context: context, + onPressed: () async { + PhoneAuthCredential credential = PhoneAuthProvider.credential( + verificationId: verificationId, + smsCode: codeController.text.trim(), + ); + + // !!! Works only on Android, iOS !!! + await _auth.signInWithCredential(credential); + Navigator.of(context).pop(); // Remove the dialog box + }, + ); + }), + codeAutoRetrievalTimeout: (String verificationId) { + // Auto-resolution timed out... + }, + ); + } + return true; + } + //Method to handle password reset email Future sendPasswordResetEmail(String email) async { await _auth.sendPasswordResetEmail(email: email); @@ -106,9 +270,30 @@ class AuthProvider extends ChangeNotifier { //Method to handle user signing out Future signOut() async { - _auth.signOut(); - _status = Status.Unauthenticated; - notifyListeners(); - return Future.delayed(Duration.zero); + try { + await _auth.signOut(); + if (await _googleSignIn.isSignedIn()) { + await _googleSignIn.signOut(); + //await _googleSignIn.disconnect(); + } + _status = Status.Unauthenticated; + notifyListeners(); + return Future.delayed(Duration.zero); + } catch (e) { + if (kDebugMode) { + print(e.toString()); + } // Displaying the error message + } + } + + // DELETE ACCOUNT + Future deleteAccount(BuildContext context) async { + try { + await _auth.currentUser!.delete(); + } on FirebaseAuthException catch (e) { + showSnackBar(context, e.message!); // Displaying the error message + // if an error of requires-recent-login is thrown, make sure to log + // in user again and then delete account. + } } } diff --git a/lib/providers/language_provider.dart b/lib/providers/language_provider.dart index a44e3b7f..0025fc95 100755 --- a/lib/providers/language_provider.dart +++ b/lib/providers/language_provider.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:noteapp/caches/sharedpref/shared_preference_helper.dart'; +import 'package:create_flutter_provider_app/caches/sharedpref/shared_preference_helper.dart'; class LanguageProvider extends ChangeNotifier { // shared pref object @@ -20,10 +20,15 @@ class LanguageProvider extends ChangeNotifier { } void updateLanguage(String languageCode) { - if (languageCode == "zh") { - _appLocale = Locale("zh"); - } else { - _appLocale = Locale("en"); + switch (languageCode) { + case 'zh': + _appLocale = Locale("zh"); + break; + case 'es': + _appLocale = Locale("es"); + break; + default: + _appLocale = Locale("en"); } _sharedPrefsHelper.changeLanguage(languageCode); diff --git a/lib/providers/theme_provider.dart b/lib/providers/theme_provider.dart index 2d523f2c..92139db7 100755 --- a/lib/providers/theme_provider.dart +++ b/lib/providers/theme_provider.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:noteapp/caches/sharedpref/shared_preference_helper.dart'; +import 'package:create_flutter_provider_app/caches/sharedpref/shared_preference_helper.dart'; class ThemeProvider extends ChangeNotifier { // shared pref object diff --git a/lib/restart_app.dart b/lib/restart_app.dart new file mode 100644 index 00000000..5b1c18e5 --- /dev/null +++ b/lib/restart_app.dart @@ -0,0 +1,32 @@ +import 'package:flutter/material.dart'; + +class RestartWidget extends StatefulWidget { + RestartWidget({required this.child}); + + final Widget child; + + static void restartApp(BuildContext context) { + context.findAncestorStateOfType<_RestartWidgetState>()!.restartApp(); + } + + @override + _RestartWidgetState createState() => _RestartWidgetState(); +} + +class _RestartWidgetState extends State { + Key key = UniqueKey(); + + void restartApp() { + setState(() { + key = UniqueKey(); + }); + } + + @override + Widget build(BuildContext context) { + return KeyedSubtree( + key: key, + child: widget.child, + ); + } +} \ No newline at end of file diff --git a/lib/routes.dart b/lib/routes.dart index 0d584250..b6261676 100755 --- a/lib/routes.dart +++ b/lib/routes.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -import 'package:noteapp/ui/auth/register_screen.dart'; -import 'package:noteapp/ui/auth/sign_in_screen.dart'; -import 'package:noteapp/ui/setting/setting_screen.dart'; -import 'package:noteapp/ui/splash/splash_screen.dart'; -import 'package:noteapp/ui/todo/create_edit_todo_screen.dart'; -import 'package:noteapp/ui/todo/todos_screen.dart'; +import 'package:create_flutter_provider_app/ui/auth/register_screen.dart'; +import 'package:create_flutter_provider_app/ui/auth/sign_in_screen.dart'; +import 'package:create_flutter_provider_app/ui/setting/setting_screen.dart'; +import 'package:create_flutter_provider_app/ui/splash/splash_screen.dart'; +import 'package:create_flutter_provider_app/ui/todo/create_edit_todo_screen.dart'; +import 'package:create_flutter_provider_app/ui/todo/todos_screen.dart'; class Routes { Routes._(); //this is to prevent anyone from instantiate this object @@ -18,6 +18,7 @@ class Routes { static final routes = { splash: (BuildContext context) => SplashScreen(), + //splash: (BuildContext context) => TodosScreen(), login: (BuildContext context) => SignInScreen(), register: (BuildContext context) => RegisterScreen(), home: (BuildContext context) => TodosScreen(), diff --git a/lib/services/firestore_database.dart b/lib/services/firestore_database.dart index 642de8a4..f0aa94f0 100755 --- a/lib/services/firestore_database.dart +++ b/lib/services/firestore_database.dart @@ -1,10 +1,10 @@ import 'dart:async'; -import 'package:noteapp/models/todo_model.dart'; -import 'package:noteapp/services/firestore_path.dart'; +import 'package:create_flutter_provider_app/models/todo_model.dart'; +import 'package:create_flutter_provider_app/services/firestore_path.dart'; import 'package:cloud_firestore/cloud_firestore.dart'; -import 'package:noteapp/services/firestore_service.dart'; +import 'package:create_flutter_provider_app/services/firestore_service.dart'; String documentIdFromCurrentDate() => DateTime.now().toIso8601String(); @@ -19,6 +19,10 @@ on a field, then is ok to use custom code and write it here. For example, setAllTodoComplete is require to change all todos item to have the complete status changed to true. +2022: If in future, lets say we added a new section and a new document for user +to store images, I can create a separate collection and new methods in +FirestoreDatabase without touching the FirestoreService. + */ class FirestoreDatabase { FirestoreDatabase({required this.uid}) : assert(uid != null); diff --git a/lib/ui/auth/register_screen.dart b/lib/ui/auth/register_screen.dart index c0e33873..52ed82e3 100755 --- a/lib/ui/auth/register_screen.dart +++ b/lib/ui/auth/register_screen.dart @@ -1,10 +1,13 @@ import 'package:flutter/material.dart'; -import 'package:noteapp/app_localizations.dart'; -import 'package:noteapp/models/user_model.dart'; -import 'package:noteapp/providers/auth_provider.dart'; -import 'package:noteapp/routes.dart'; +import 'package:create_flutter_provider_app/app_localizations.dart'; +import 'package:create_flutter_provider_app/models/user_model.dart'; +import 'package:create_flutter_provider_app/providers/auth_provider.dart'; +import 'package:create_flutter_provider_app/routes.dart'; import 'package:provider/provider.dart'; +// register_screen +// TODO: show error when email is badly formatted + class RegisterScreen extends StatefulWidget { @override _RegisterScreenState createState() => _RegisterScreenState(); @@ -67,7 +70,7 @@ class _RegisterScreenState extends State { ), TextFormField( controller: _emailController, - style: Theme.of(context).textTheme.body1, + //style: Theme.of(context).textTheme.bodyText1, validator: (value) => value!.isEmpty ? AppLocalizations.of(context) .translate("loginTxtErrorEmail") @@ -87,7 +90,7 @@ class _RegisterScreenState extends State { obscureText: true, maxLength: 12, controller: _passwordController, - style: Theme.of(context).textTheme.body1, + //style: Theme.of(context).textTheme.bodyText1, validator: (value) => value!.length < 6 ? AppLocalizations.of(context) .translate("loginTxtErrorPassword") @@ -106,11 +109,11 @@ class _RegisterScreenState extends State { ? Center( child: CircularProgressIndicator(), ) - : RaisedButton( + : ElevatedButton( child: Text( AppLocalizations.of(context) .translate("loginBtnSignUp"), - style: Theme.of(context).textTheme.button, + //style: Theme.of(context).textTheme.button, ), onPressed: () async { if (_formKey.currentState!.validate()) { @@ -122,11 +125,11 @@ class _RegisterScreenState extends State { _emailController.text, _passwordController.text); - if (userModel == null) { - _scaffoldKey.currentState!.showSnackBar(SnackBar( + if (userModel.displayName == null) { + ScaffoldMessenger.of(context).showSnackBar((SnackBar( content: Text(AppLocalizations.of(context) .translate("loginTxtErrorSignIn")), - )); + ))); } } }), @@ -140,17 +143,17 @@ class _RegisterScreenState extends State { child: Text( AppLocalizations.of(context) .translate("loginTxtHaveAccount"), - style: Theme.of(context).textTheme.button, + //style: Theme.of(context).textTheme.button, )), ), authProvider.status == Status.Registering ? Center( child: null, ) - : FlatButton( + : ElevatedButton( child: Text(AppLocalizations.of(context) .translate("loginBtnLinkSignIn")), - textColor: Theme.of(context).iconTheme.color, + //textColor: Theme.of(context).iconTheme.color, onPressed: () { Navigator.of(context) .pushReplacementNamed(Routes.login); diff --git a/lib/ui/auth/sign_in_screen.dart b/lib/ui/auth/sign_in_screen.dart index 03050194..22f313f6 100755 --- a/lib/ui/auth/sign_in_screen.dart +++ b/lib/ui/auth/sign_in_screen.dart @@ -1,11 +1,13 @@ import 'package:flutter/material.dart'; -import 'package:noteapp/app_localizations.dart'; -import 'package:noteapp/flavor.dart'; -import 'package:noteapp/providers/auth_provider.dart'; -import 'package:noteapp/routes.dart'; +import 'package:create_flutter_provider_app/app_localizations.dart'; +import 'package:create_flutter_provider_app/flavor.dart'; +import 'package:create_flutter_provider_app/providers/auth_provider.dart'; +import 'package:create_flutter_provider_app/routes.dart'; import 'package:provider/provider.dart'; class SignInScreen extends StatefulWidget { + const SignInScreen({Key? key}) : super(key: key); + @override _SignInScreenState createState() => _SignInScreenState(); } @@ -59,35 +61,36 @@ class _SignInScreenState extends State { crossAxisAlignment: CrossAxisAlignment.stretch, mainAxisAlignment: MainAxisAlignment.center, children: [ - Padding( - padding: const EdgeInsets.all(8.0), + const Padding( + padding: EdgeInsets.all(8.0), child: FlutterLogo( size: 128, - ), + ), // Centered FlutterLogo ), + // email ----------------------------------- TextFormField( controller: _emailController, - style: Theme.of(context).textTheme.body1, + //style: Theme.of(context).textTheme.bodyText1, validator: (value) => value!.isEmpty ? AppLocalizations.of(context) .translate("loginTxtErrorEmail") : null, decoration: InputDecoration( - prefixIcon: Icon( - Icons.email, - color: Theme.of(context).iconTheme.color, - ), + prefixIcon: Icon(Icons.email + //color: Theme.of(context).iconTheme.color, + ), labelText: AppLocalizations.of(context) .translate("loginTxtEmail"), - border: OutlineInputBorder()), + border: const OutlineInputBorder()), ), Padding( padding: const EdgeInsets.symmetric(vertical: 16), +//password ------------------------------ child: TextFormField( obscureText: true, maxLength: 12, controller: _passwordController, - style: Theme.of(context).textTheme.body1, + //style: Theme.of(context).textTheme.bodyText1, validator: (value) => value!.length < 6 ? AppLocalizations.of(context) .translate("loginTxtErrorPassword") @@ -99,18 +102,18 @@ class _SignInScreenState extends State { ), labelText: AppLocalizations.of(context) .translate("loginTxtPassword"), - border: OutlineInputBorder()), + border: const OutlineInputBorder()), ), ), authProvider.status == Status.Authenticating - ? Center( + ? const Center( child: CircularProgressIndicator(), ) - : RaisedButton( + : ElevatedButton( child: Text( AppLocalizations.of(context) .translate("loginBtnSignIn"), - style: Theme.of(context).textTheme.button, + //style: Theme.of(context).textTheme.button, ), onPressed: () async { if (_formKey.currentState!.validate()) { @@ -123,7 +126,9 @@ class _SignInScreenState extends State { _passwordController.text); if (!status) { - _scaffoldKey.currentState!.showSnackBar(SnackBar( + ScaffoldMessenger.of(context) + .showSnackBar(SnackBar( + //_scaffoldKey.currentState!.showSnackBar(SnackBar( content: Text(AppLocalizations.of(context) .translate("loginTxtErrorSignIn")), )); @@ -133,27 +138,70 @@ class _SignInScreenState extends State { } } }), + Row(mainAxisAlignment: MainAxisAlignment.center, children: [ +//--- Google button------------------------- + authProvider.status == Status.Authenticating + ? const Center( + child: null, + ) + // : SizedBox( + // height:70, + // child: + : ElevatedButton( + style: ElevatedButton.styleFrom( + maximumSize: const Size(220, 100), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(18.0)), + padding: EdgeInsets.zero, + ), + clipBehavior: Clip.none, + child: Image.asset('assets/images/googlelogin.png', + fit: BoxFit.fill), + onPressed: () async { + bool status = + await authProvider.signInWithGoogle(context); + if (!status) { + ScaffoldMessenger.of(context) + .showSnackBar(SnackBar( + //_scaffoldKey.currentState!.showSnackBar(SnackBar( + content: Text(AppLocalizations.of(context) + .translate("loginTxtErrorGoogleSignIn")), + )); + } else { + if (mounted) { + Navigator.of(context) + .pushReplacementNamed(Routes.home); + } else { + Navigator.pop; + } + } + }), + ]), + const SizedBox( + height: 40, + ), authProvider.status == Status.Authenticating - ? Center( + ? const Center( child: null, ) : Padding( - padding: const EdgeInsets.only(top: 48), + padding: const EdgeInsets.only(top: 8), child: Center( child: Text( AppLocalizations.of(context) .translate("loginTxtDontHaveAccount"), - style: Theme.of(context).textTheme.button, + //style: Theme.of(context).textTheme.button, )), ), authProvider.status == Status.Authenticating - ? Center( + ? const Center( child: null, ) - : FlatButton( + : TextButton( child: Text(AppLocalizations.of(context) .translate("loginBtnLinkCreateAccount")), - textColor: Theme.of(context).iconTheme.color, + style: TextButton.styleFrom( + foregroundColor: Theme.of(context).iconTheme.color), onPressed: () { Navigator.of(context) .pushReplacementNamed(Routes.register); @@ -163,12 +211,16 @@ class _SignInScreenState extends State { child: Column( mainAxisAlignment: MainAxisAlignment.end, children: [ - SizedBox( - height: 70, - ), + authProvider.status == Status.Authenticating + ? const Center( + child: null, + ) + : const SizedBox( + height: 70, + ), Text( Provider.of(context).toString(), - style: Theme.of(context).textTheme.body2, + //style: Theme.of(context).textTheme.bodyText2, ), ], )), diff --git a/lib/ui/home/home.dart b/lib/ui/home/home.dart index 9da50ebc..28f0e3ad 100755 --- a/lib/ui/home/home.dart +++ b/lib/ui/home/home.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:noteapp/ui/splash/splash_screen.dart'; +import 'package:create_flutter_provider_app/ui/splash/splash_screen.dart'; class HomeScreen extends StatefulWidget { @override diff --git a/lib/ui/setting/setting_language_actions.dart b/lib/ui/setting/setting_language_actions.dart index 2cc82dfb..711cca76 100755 --- a/lib/ui/setting/setting_language_actions.dart +++ b/lib/ui/setting/setting_language_actions.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:noteapp/app_localizations.dart'; -import 'package:noteapp/providers/language_provider.dart'; +import 'package:create_flutter_provider_app/app_localizations.dart'; +import 'package:create_flutter_provider_app/providers/language_provider.dart'; import 'package:provider/provider.dart'; -enum LanguagesActions { english, chinese } +enum LanguagesActions { english, chinese, spanish } class SettingLanguageActions extends StatelessWidget { @override @@ -20,6 +20,9 @@ class SettingLanguageActions extends StatelessWidget { break; case LanguagesActions.chinese: languageProvider.updateLanguage("zh"); + break; + case LanguagesActions.spanish: + languageProvider.updateLanguage("es"); } }, itemBuilder: (BuildContext context) => >[ @@ -35,6 +38,12 @@ class SettingLanguageActions extends StatelessWidget { child: Text(AppLocalizations.of(context) .translate("settingPopUpToggleChinese")), ), + PopupMenuItem( + value: LanguagesActions.spanish, + enabled: _appCurrentLocale == Locale("es") ? false : true, + child: Text(AppLocalizations.of(context) + .translate("settingPopUpToggleSpanish")), + ), ], ); } diff --git a/lib/ui/setting/setting_screen.dart b/lib/ui/setting/setting_screen.dart index 393f016f..52fee6dc 100755 --- a/lib/ui/setting/setting_screen.dart +++ b/lib/ui/setting/setting_screen.dart @@ -1,11 +1,12 @@ import 'package:flutter/material.dart'; import 'package:flutter_platform_widgets/flutter_platform_widgets.dart'; -import 'package:noteapp/app_localizations.dart'; -import 'package:noteapp/providers/auth_provider.dart'; -import 'package:noteapp/providers/theme_provider.dart'; -import 'package:noteapp/routes.dart'; -import 'package:noteapp/ui/setting/setting_language_actions.dart'; +import 'package:create_flutter_provider_app/app_localizations.dart'; +import 'package:create_flutter_provider_app/providers/auth_provider.dart'; +import 'package:create_flutter_provider_app/providers/theme_provider.dart'; +import 'package:create_flutter_provider_app/ui/setting/setting_language_actions.dart'; import 'package:provider/provider.dart'; +import 'package:create_flutter_provider_app/restart_app.dart'; +//import 'package:create_flutter_provider_app/constants/app_themes.dart'; class SettingScreen extends StatelessWidget { @override @@ -27,8 +28,8 @@ class SettingScreen extends StatelessWidget { subtitle: Text(AppLocalizations.of(context) .translate("settingThemeListSubTitle")), trailing: Switch( - activeColor: Theme.of(context).appBarTheme.color, - activeTrackColor: Theme.of(context).textTheme.title!.color, + activeColor: Theme.of(context).appBarTheme.backgroundColor, + activeTrackColor: Theme.of(context).textTheme.bodySmall!.color, value: Provider.of(context).isDarkModeOn, onChanged: (booleanValue) { Provider.of(context, listen: false) @@ -48,7 +49,7 @@ class SettingScreen extends StatelessWidget { AppLocalizations.of(context).translate("settingLogoutListTitle")), subtitle: Text(AppLocalizations.of(context) .translate("settingLogoutListSubTitle")), - trailing: RaisedButton( + trailing: ElevatedButton( onPressed: () { _confirmSignOut(context); }, @@ -84,9 +85,7 @@ class SettingScreen extends StatelessWidget { authProvider.signOut(); - Navigator.pop(context); - Navigator.of(context).pushNamedAndRemoveUntil( - Routes.login, ModalRoute.withName(Routes.login)); + RestartWidget.restartApp(context); }, ) ], diff --git a/lib/ui/splash/splash_screen.dart b/lib/ui/splash/splash_screen.dart index d1bf4d7c..1c7b3edd 100755 --- a/lib/ui/splash/splash_screen.dart +++ b/lib/ui/splash/splash_screen.dart @@ -1,9 +1,11 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:noteapp/app_localizations.dart'; -import 'package:noteapp/routes.dart'; +import 'package:create_flutter_provider_app/app_localizations.dart'; +import 'package:create_flutter_provider_app/routes.dart'; class SplashScreen extends StatefulWidget { + const SplashScreen({Key? key}) : super(key: key); + @override _SplashScreenState createState() => _SplashScreenState(); } @@ -25,12 +27,12 @@ class _SplashScreenState extends State { children: [ Center( child: Text( - AppLocalizations.of(context).translate("splashTitle"), - style: TextStyle( - fontSize: Theme.of(context).textTheme.headline!.fontSize, - ), + AppLocalizations.of(context).translate("splashsubtitle1"), + //style: TextStyle( + // fontSize: Theme.of(context).textTheme.headline1!.fontSize, + //), )), - FlutterLogo( + const FlutterLogo( size: 128, ), ], @@ -38,11 +40,15 @@ class _SplashScreenState extends State { } startTimer() { - var duration = Duration(milliseconds: 3000); + var duration = const Duration(milliseconds: 3000); return Timer(duration, redirect); } redirect() async { - Navigator.of(context).pushReplacementNamed(Routes.home); + if (mounted) { + Navigator.of(context).pushReplacementNamed(Routes.home); + } else { + Navigator.pop; + } } } diff --git a/lib/ui/todo/create_edit_todo_screen.dart b/lib/ui/todo/create_edit_todo_screen.dart index 9ac00d36..1d8f1df9 100755 --- a/lib/ui/todo/create_edit_todo_screen.dart +++ b/lib/ui/todo/create_edit_todo_screen.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:noteapp/app_localizations.dart'; -import 'package:noteapp/models/todo_model.dart'; -import 'package:noteapp/services/firestore_database.dart'; +import 'package:create_flutter_provider_app/app_localizations.dart'; +import 'package:create_flutter_provider_app/models/todo_model.dart'; +import 'package:create_flutter_provider_app/services/firestore_database.dart'; import 'package:provider/provider.dart'; class CreateEditTodoScreen extends StatefulWidget { @@ -55,7 +55,7 @@ class _CreateEditTodoScreenState extends State { : AppLocalizations.of(context) .translate("todosCreateEditAppBarTitleNewTxt")), actions: [ - FlatButton( + TextButton( onPressed: () { if (_formKey.currentState!.validate()) { FocusScope.of(context).unfocus(); @@ -102,7 +102,7 @@ class _CreateEditTodoScreenState extends State { children: [ TextFormField( controller: _taskController, - style: Theme.of(context).textTheme.body1, + style: Theme.of(context).textTheme.bodyText1, validator: (value) => value!.isEmpty ? AppLocalizations.of(context) .translate("todosCreateEditTaskNameValidatorMsg") @@ -119,7 +119,7 @@ class _CreateEditTodoScreenState extends State { padding: const EdgeInsets.symmetric(vertical: 16), child: TextFormField( controller: _extraNoteController, - style: Theme.of(context).textTheme.body1, + style: Theme.of(context).textTheme.bodyText1, maxLines: 15, decoration: InputDecoration( enabledBorder: OutlineInputBorder( diff --git a/lib/ui/todo/empty_content.dart b/lib/ui/todo/empty_content.dart index c15e66ea..8e0b9259 100755 --- a/lib/ui/todo/empty_content.dart +++ b/lib/ui/todo/empty_content.dart @@ -1,13 +1,11 @@ import 'package:flutter/material.dart'; class EmptyContentWidget extends StatelessWidget { - final String title; + final String subtitle1; final String message; EmptyContentWidget( - {required Key key, - required this.title, - required this.message}) + {required Key key, required this.subtitle1, required this.message}) : super(key: key); @override @@ -16,7 +14,7 @@ class EmptyContentWidget extends StatelessWidget { child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - Text(title), + Text(subtitle1), Text(message), ], ), diff --git a/lib/ui/todo/todos_extra_actions.dart b/lib/ui/todo/todos_extra_actions.dart index e859ce63..674f255d 100755 --- a/lib/ui/todo/todos_extra_actions.dart +++ b/lib/ui/todo/todos_extra_actions.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:noteapp/app_localizations.dart'; -import 'package:noteapp/services/firestore_database.dart'; +import 'package:create_flutter_provider_app/app_localizations.dart'; +import 'package:create_flutter_provider_app/services/firestore_database.dart'; import 'package:provider/provider.dart'; enum TodosActions { toggleAllComplete, clearCompleted } diff --git a/lib/ui/todo/todos_screen.dart b/lib/ui/todo/todos_screen.dart index 939488d9..27f56c3e 100755 --- a/lib/ui/todo/todos_screen.dart +++ b/lib/ui/todo/todos_screen.dart @@ -1,17 +1,19 @@ import 'package:flutter/material.dart'; -import 'package:noteapp/app_localizations.dart'; -import 'package:noteapp/models/todo_model.dart'; -import 'package:noteapp/models/user_model.dart'; -import 'package:noteapp/providers/auth_provider.dart'; -import 'package:noteapp/routes.dart'; -import 'package:noteapp/services/firestore_database.dart'; -import 'package:noteapp/ui/todo/empty_content.dart'; -import 'package:noteapp/ui/todo/todos_extra_actions.dart'; +import 'package:create_flutter_provider_app/app_localizations.dart'; +import 'package:create_flutter_provider_app/models/todo_model.dart'; +import 'package:create_flutter_provider_app/models/user_model.dart'; +import 'package:create_flutter_provider_app/providers/auth_provider.dart'; +import 'package:create_flutter_provider_app/routes.dart'; +import 'package:create_flutter_provider_app/services/firestore_database.dart'; +import 'package:create_flutter_provider_app/ui/todo/empty_content.dart'; +import 'package:create_flutter_provider_app/ui/todo/todos_extra_actions.dart'; import 'package:provider/provider.dart'; class TodosScreen extends StatelessWidget { final _scaffoldKey = GlobalKey(); + TodosScreen({Key? key}) : super(key: key); + @override Widget build(BuildContext context) { final authProvider = Provider.of(context); @@ -93,8 +95,9 @@ class TodosScreen extends StatelessWidget { key: Key(todos[index].id), onDismissed: (direction) { firestoreDatabase.deleteTodo(todos[index]); + ScaffoldMessenger.of(context).showSnackBar(SnackBar( + //_scaffoldKey.currentState!.showSnackBar(SnackBar( - _scaffoldKey.currentState!.showSnackBar(SnackBar( backgroundColor: Theme.of(context).appBarTheme.color, content: Text( AppLocalizations.of(context) @@ -139,7 +142,7 @@ class TodosScreen extends StatelessWidget { ); } else { return EmptyContentWidget( - title: AppLocalizations.of(context) + subtitle1: AppLocalizations.of(context) .translate("todosEmptyTopMsgDefaultTxt"), message: AppLocalizations.of(context) .translate("todosEmptyBottomDefaultMsgTxt"), @@ -148,7 +151,7 @@ class TodosScreen extends StatelessWidget { } } else if (snapshot.hasError) { return EmptyContentWidget( - title: + subtitle1: AppLocalizations.of(context).translate("todosErrorTopMsgTxt"), message: AppLocalizations.of(context) .translate("todosErrorBottomMsgTxt"), diff --git a/lib/utils/showOtpDialog.dart b/lib/utils/showOtpDialog.dart new file mode 100644 index 00000000..d2294105 --- /dev/null +++ b/lib/utils/showOtpDialog.dart @@ -0,0 +1,29 @@ +import 'package:flutter/material.dart'; + +void showOTPDialog({ + required BuildContext context, + required TextEditingController codeController, + required VoidCallback onPressed, +}) { + showDialog( + context: context, + barrierDismissible: false, + builder: (context) => AlertDialog( + title: const Text("Enter OTP"), + content: Column( + mainAxisSize: MainAxisSize.min, + children: [ + TextField( + controller: codeController, + ), + ], + ), + actions: [ + TextButton( + child: const Text("Done"), + onPressed: onPressed, + ) + ], + ), + ); +} diff --git a/lib/utils/showSnackbar.dart b/lib/utils/showSnackbar.dart new file mode 100644 index 00000000..80b937e5 --- /dev/null +++ b/lib/utils/showSnackbar.dart @@ -0,0 +1,9 @@ +import 'package:flutter/material.dart'; + +void showSnackBar(BuildContext context, String text) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text(text), + ), + ); +} diff --git a/linux/.gitignore b/linux/.gitignore new file mode 100644 index 00000000..d3896c98 --- /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 00000000..b4004c64 --- /dev/null +++ b/linux/CMakeLists.txt @@ -0,0 +1,138 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.10) +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 "create_flutter_provider2022") +# The unique GTK application identifier for this application. See: +# https://wiki.gnome.org/HowDoI/ChooseApplicationID +set(APPLICATION_ID "com.example.create_flutter_provider2022") + +# 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) + +add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") + +# Define the application target. To change its name, change BINARY_NAME above, +# not the value here, or `flutter run` will no longer work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} + "main.cc" + "my_application.cc" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add dependency libraries. Add any application-specific dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter) +target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) + +# 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) + +# 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 00000000..d5bd0164 --- /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 00000000..1c65bab7 --- /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) desktop_webview_auth_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "DesktopWebviewAuthPlugin"); + desktop_webview_auth_plugin_register_with_registrar(desktop_webview_auth_registrar); +} diff --git a/linux/flutter/generated_plugin_registrant.h b/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 00000000..e0f0a47b --- /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 00000000..e5bf8b2e --- /dev/null +++ b/linux/flutter/generated_plugins.cmake @@ -0,0 +1,24 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + desktop_webview_auth +) + +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/main.cc b/linux/main.cc new file mode 100644 index 00000000..e7c5c543 --- /dev/null +++ b/linux/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/my_application.cc b/linux/my_application.cc new file mode 100644 index 00000000..ce2469d3 --- /dev/null +++ b/linux/my_application.cc @@ -0,0 +1,104 @@ +#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, "create_flutter_provider2022"); + 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, "create_flutter_provider2022"); + } + + 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 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_OBJECT_CLASS(klass)->dispose = my_application_dispose; +} + +static void my_application_init(MyApplication* self) {} + +MyApplication* my_application_new() { + return MY_APPLICATION(g_object_new(my_application_get_type(), + "application-id", APPLICATION_ID, + "flags", G_APPLICATION_NON_UNIQUE, + nullptr)); +} diff --git a/linux/my_application.h b/linux/my_application.h new file mode 100644 index 00000000..72271d5e --- /dev/null +++ b/linux/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 00000000..746adbb6 --- /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 00000000..c2efd0b6 --- /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 00000000..c2efd0b6 --- /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 00000000..c6338bcd --- /dev/null +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -0,0 +1,24 @@ +// +// Generated file. Do not edit. +// + +import FlutterMacOS +import Foundation + +import cloud_firestore +import desktop_webview_auth +import firebase_auth +import firebase_core +import firebase_database +import firebase_messaging +import shared_preferences_macos + +func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + FLTFirebaseFirestorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseFirestorePlugin")) + DesktopWebviewAuthPlugin.register(with: registry.registrar(forPlugin: "DesktopWebviewAuthPlugin")) + FLTFirebaseAuthPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseAuthPlugin")) + FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin")) + FLTFirebaseDatabasePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseDatabasePlugin")) + FLTFirebaseMessagingPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseMessagingPlugin")) + SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) +} diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj new file mode 100644 index 00000000..eed8729a --- /dev/null +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,573 @@ +// !$*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 */ + 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 */ + 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 */ + 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 /* create_flutter_provider2022.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "create_flutter_provider2022.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 */ + 33CC10EA2044A3C60003C045 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 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 */, + 33CC10EE2044A3C60003C045 /* Products */, + D73912EC22F37F3D000D13A0 /* Frameworks */, + ); + sourceTree = ""; + }; + 33CC10EE2044A3C60003C045 /* Products */ = { + isa = PBXGroup; + children = ( + 33CC10ED2044A3C60003C045 /* create_flutter_provider2022.app */, + ); + 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 */ + 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 /* create_flutter_provider2022.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 33CC10E52044A3C60003C045 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 0920; + LastUpgradeCheck = 1300; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 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 */, + 33CC111A2044C6BA0003C045 /* Flutter Assemble */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 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 */ + 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 */ + 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 */ + 338D0CE9231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + 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; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + 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; + 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; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + 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; + 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; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + 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 */ + 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 00000000..18d98100 --- /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 00000000..84adcfca --- /dev/null +++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/macos/Runner.xcworkspace/contents.xcworkspacedata b/macos/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..1d526a16 --- /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 00000000..18d98100 --- /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 00000000..d53ef643 --- /dev/null +++ b/macos/Runner/AppDelegate.swift @@ -0,0 +1,9 @@ +import Cocoa +import FlutterMacOS + +@NSApplicationMain +class AppDelegate: FlutterAppDelegate { + override func applicationShouldTerminateAfterLastWindowClosed(_ sender: 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 00000000..a2ec33f1 --- /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 00000000..82b6f9d9 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 00000000..13b35eba 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 00000000..0a3f5fa4 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 00000000..bdb57226 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 00000000..f083318e 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 00000000..326c0e72 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 00000000..2f1632cf 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 00000000..80e867a4 --- /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 00000000..50820d0c --- /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 = create_flutter_provider2022 + +// The application's bundle identifier +PRODUCT_BUNDLE_IDENTIFIER = com.example.createFlutterProvider2022 + +// The copyright displayed in application information +PRODUCT_COPYRIGHT = Copyright © 2022 com.example. All rights reserved. diff --git a/macos/Runner/Configs/Debug.xcconfig b/macos/Runner/Configs/Debug.xcconfig new file mode 100644 index 00000000..36b0fd94 --- /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 00000000..dff4f495 --- /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 00000000..42bcbf47 --- /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 00000000..dddb8a30 --- /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 00000000..4789daa6 --- /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 00000000..2722837e --- /dev/null +++ b/macos/Runner/MainFlutterWindow.swift @@ -0,0 +1,15 @@ +import Cocoa +import FlutterMacOS + +class MainFlutterWindow: NSWindow { + override func awakeFromNib() { + let flutterViewController = FlutterViewController.init() + 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 00000000..852fa1a4 --- /dev/null +++ b/macos/Runner/Release.entitlements @@ -0,0 +1,8 @@ + + + + + com.apple.security.app-sandbox + + + diff --git a/pubspec.lock b/pubspec.lock index e5e3c871..9412b244 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,144 +1,307 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + _flutterfire_internals: + dependency: transitive + description: + name: _flutterfire_internals + sha256: "2f428053492f92303e42c9afa8e3a78ad1886760e7b594e2b5a6b6ee47376360" + url: "https://pub.dev" + source: hosted + version: "1.0.2" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + url: "https://pub.dev" source: hosted - version: "2.6.1" + version: "2.10.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + url: "https://pub.dev" source: hosted - version: "1.1.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" + version: "1.2.1" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" cloud_firestore: dependency: "direct main" description: name: cloud_firestore - url: "https://pub.dartlang.org" + sha256: "9194bf1845ee073bea64ec94e72c9dcf5d15f755e96496d8ccfee9def38b666f" + url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "3.5.1" cloud_firestore_platform_interface: dependency: transitive description: name: cloud_firestore_platform_interface - url: "https://pub.dartlang.org" + sha256: d023142c18c28b2610c23c196e829c96976569cc2aa2f8e45328ae8a64c428d1 + url: "https://pub.dev" source: hosted - version: "5.4.0" + version: "5.7.7" cloud_firestore_web: dependency: transitive description: name: cloud_firestore_web - url: "https://pub.dartlang.org" + sha256: "3d7d4fa8c1dc5a1f7cb33985ae0ab9924d33d76d4959fe26aed84b7d282887e3" + url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.8.10" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.17.0" + crypto: + dependency: transitive + description: + name: crypto + sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + url: "https://pub.dev" + source: hosted + version: "3.0.2" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be + url: "https://pub.dev" + source: hosted + version: "1.0.5" + desktop_webview_auth: + dependency: transitive + description: + name: desktop_webview_auth + sha256: "9de17601e1521b7cc2de1c5538e92f64833da668cba101bf11b2f61ce652becc" + url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "0.0.11" + email_validator: + dependency: transitive + description: + name: email_validator + sha256: e9a90f27ab2b915a27d7f9c2a7ddda5dd752d6942616ee83529b686fc086221b + url: "https://pub.dev" + source: hosted + version: "2.1.17" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.1" ffi: dependency: transitive description: name: ffi - url: "https://pub.dartlang.org" + sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978 + url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "2.0.1" file: dependency: transitive description: name: file - url: "https://pub.dartlang.org" + sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + url: "https://pub.dev" source: hosted - version: "6.1.2" + version: "6.1.4" firebase_auth: dependency: "direct main" description: name: firebase_auth - url: "https://pub.dartlang.org" + sha256: ca3034d35d6ca894487ec80aa1162a135fef7c5d0abef8154789cbeea3a6deaf + url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.11.2" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface - url: "https://pub.dartlang.org" + sha256: ab20ecbc411726e139250a49fa03fe1ae0105fd990c5330b2a148ec08dfb140b + url: "https://pub.dev" source: hosted - version: "6.0.1" + version: "6.10.1" firebase_auth_web: dependency: transitive description: name: firebase_auth_web - url: "https://pub.dartlang.org" + sha256: bbe4f4fffcc378ca05c3d8ff33853be86dd27d0fafc85a953acaf5190531b6f9 + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "4.6.1" firebase_core: - dependency: transitive + dependency: "direct main" description: name: firebase_core - url: "https://pub.dartlang.org" + sha256: "4f1d7c13a909e82ff026679c9b8493cdeb35a9c76bc46c42bf9e2240c9e57e80" + url: "https://pub.dev" source: hosted - version: "1.5.0" + version: "1.24.0" firebase_core_platform_interface: - dependency: transitive + dependency: "direct main" description: name: firebase_core_platform_interface - url: "https://pub.dartlang.org" + sha256: b51257a8b4388565cd66062d727d3e60067b5f5cc3390eb0ecd20b8f97741bdb + url: "https://pub.dev" source: hosted - version: "4.0.1" + version: "4.5.1" firebase_core_web: dependency: transitive description: name: firebase_core_web - url: "https://pub.dartlang.org" + sha256: "839f1b48032a61962792cea1225fae030d4f27163867f181d6d2072dd40acbee" + url: "https://pub.dev" + source: hosted + version: "1.7.3" + firebase_database: + dependency: transitive + description: + name: firebase_database + sha256: "9eda5a12479b7f7b29ba4c7459941cee6741efad74ebad6e9c203c19228d347f" + url: "https://pub.dev" + source: hosted + version: "9.1.7" + firebase_database_platform_interface: + dependency: transitive + description: + name: firebase_database_platform_interface + sha256: "1e29d16eb6550e4c82a708a27e1e12a98b927767bf7182fcbbf37d98c48af9b5" + url: "https://pub.dev" + source: hosted + version: "0.2.2+7" + firebase_database_web: + dependency: transitive + description: + name: firebase_database_web + sha256: "10922a042dd87559c97d25ce0677a47a7318b09ed1a3d14755daa5d2c3559d7a" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "0.2.1+9" + firebase_dynamic_links: + dependency: transitive + description: + name: firebase_dynamic_links + sha256: "3c6aea4bf9dafcdd33f5103d7ab06980939249335cc95455a3777118b9ab1c24" + url: "https://pub.dev" + source: hosted + version: "4.3.11" + firebase_dynamic_links_platform_interface: + dependency: transitive + description: + name: firebase_dynamic_links_platform_interface + sha256: b534940d3ce4fb7d0fe1598ed652865affa3ec69e471f78409a571a625f77da1 + url: "https://pub.dev" + source: hosted + version: "0.2.3+15" + firebase_messaging: + dependency: "direct main" + description: + name: firebase_messaging + sha256: "6126f8f6f3bba6e3ffff05300711615c388eb31e0a7431cebe5514f6572cbdff" + url: "https://pub.dev" + source: hosted + version: "13.1.0" + firebase_messaging_platform_interface: + dependency: transitive + description: + name: firebase_messaging_platform_interface + sha256: "71f120e8b405a172cb0088a2cd62fd8b77be0f0c942a5bda411b80268c1702f8" + url: "https://pub.dev" + source: hosted + version: "4.2.0" + firebase_messaging_web: + dependency: transitive + description: + name: firebase_messaging_web + sha256: b7c5e019c4ecf3a512c4a0f00a4a9c1f260eb11872380a91f35983387488ce94 + url: "https://pub.dev" + source: hosted + version: "3.2.0" + firebase_ui_auth: + dependency: "direct main" + description: + name: firebase_ui_auth + sha256: e13a653f69e13874d9c9f1ab409f0e67b061287b7ff667ae843d85b74f271a4e + url: "https://pub.dev" + source: hosted + version: "1.0.0-dev.0" + firebase_ui_localizations: + dependency: transitive + description: + name: firebase_ui_localizations + sha256: "8cfc6ec77f1d0d1867002202e7dea20bb4d118b5c413e1bedf50cc0118d21047" + url: "https://pub.dev" + source: hosted + version: "1.0.1" + firebase_ui_oauth: + dependency: transitive + description: + name: firebase_ui_oauth + sha256: b92a9a11d66ec98a3f990e0089bb5543fec042d19926be4cbdac9d6a0eb2d9bd + url: "https://pub.dev" + source: hosted + version: "1.0.0-dev.0" flutter: dependency: "direct main" description: flutter source: sdk version: "0.0.0" + flutter_facebook_auth: + dependency: "direct main" + description: + name: flutter_facebook_auth + sha256: "50dc3eef562acbe1e4cfad478053c9c16f9eaac49ad14ec48f00ed9dae1ba0cd" + url: "https://pub.dev" + source: hosted + version: "4.4.1+1" + flutter_facebook_auth_platform_interface: + dependency: transitive + description: + name: flutter_facebook_auth_platform_interface + sha256: "7950f5f8a6f2270c5d29af2a514733987db1191f70838fa777b282e47365f8c8" + url: "https://pub.dev" + source: hosted + version: "3.2.0" + flutter_facebook_auth_web: + dependency: transitive + description: + name: flutter_facebook_auth_web + sha256: "0f732e968c929a3c11a215ded802557576230ff0a0794c88941a8e92ff07b2eb" + url: "https://pub.dev" + source: hosted + version: "3.2.0" + flutter_lints: + dependency: "direct dev" + description: + name: flutter_lints + sha256: b543301ad291598523947dc534aaddc5aaad597b709d2426d3a0e0d44c5cb493 + url: "https://pub.dev" + source: hosted + version: "1.0.4" flutter_localizations: dependency: "direct main" description: flutter @@ -148,9 +311,18 @@ packages: dependency: "direct main" description: name: flutter_platform_widgets - url: "https://pub.dartlang.org" + sha256: e09e041d2f4db7a3743f55f64642df706e6319409aeae60ef19dccfa7148919f + url: "https://pub.dev" source: hosted - version: "1.9.5" + version: "2.0.0" + flutter_svg: + dependency: transitive + description: + name: flutter_svg + sha256: "6ff9fa12892ae074092de2fa6a9938fb21dbabfdaa2ff57dc697ff912fc8d4b2" + url: "https://pub.dev" + source: hosted + version: "1.1.6" flutter_test: dependency: "direct dev" description: flutter @@ -161,146 +333,278 @@ packages: description: flutter source: sdk version: "0.0.0" + google_sign_in: + dependency: "direct main" + description: + name: google_sign_in + sha256: d3e31052ce068d0fe2eb9975ee4409266a044592cf67737ec230be07343c6bdf + url: "https://pub.dev" + source: hosted + version: "5.4.2" + google_sign_in_android: + dependency: transitive + description: + name: google_sign_in_android + sha256: "41187ee48f8f3f7588cb932a5ab3cc8c83f354d1d50c750f61b240efac1b33d2" + url: "https://pub.dev" + source: hosted + version: "6.1.4" + google_sign_in_ios: + dependency: transitive + description: + name: google_sign_in_ios + sha256: "1116aff5e87f89837b052a81abe6259be7c4dd418275786864d27b74cb2a4e70" + url: "https://pub.dev" + source: hosted + version: "5.5.1" + google_sign_in_platform_interface: + dependency: transitive + description: + name: google_sign_in_platform_interface + sha256: "61306213c76bb8170c3aa20017df296c0131c24d7f6c0cc7e2eeaeac34c9f457" + url: "https://pub.dev" + source: hosted + version: "2.3.0" + google_sign_in_web: + dependency: transitive + description: + name: google_sign_in_web + sha256: "5b35c221169a7b3e0fc15043ac09102ef542300ef92f2e1f05d5d8efde263af5" + url: "https://pub.dev" + source: hosted + version: "0.10.2" + http: + dependency: transitive + description: + name: http + sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482" + url: "https://pub.dev" + source: hosted + version: "0.13.5" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.0.2" intl: dependency: transitive description: name: intl - url: "https://pub.dartlang.org" + sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" + url: "https://pub.dev" source: hosted version: "0.17.0" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + url: "https://pub.dev" + source: hosted + version: "0.6.5" + lints: + dependency: transitive + description: + name: lints + sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c + url: "https://pub.dev" source: hosted - version: "0.6.3" + version: "1.0.1" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + url: "https://pub.dev" source: hosted - version: "0.12.10" + version: "0.12.13" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + url: "https://pub.dev" + source: hosted + version: "0.2.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.8.0" nested: dependency: transitive description: name: nested - url: "https://pub.dartlang.org" + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" source: hosted version: "1.0.0" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.8.3" + path_drawing: + dependency: transitive + description: + name: path_drawing + sha256: bbb1934c0cbb03091af082a6389ca2080345291ef07a5fa6d6e078ba8682f977 + url: "https://pub.dev" + source: hosted + version: "1.0.1" + path_parsing: + dependency: transitive + description: + name: path_parsing + sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf + url: "https://pub.dev" + source: hosted + version: "1.0.1" path_provider_linux: dependency: transitive description: name: path_provider_linux - url: "https://pub.dartlang.org" + sha256: ab0987bf95bc591da42dffb38c77398fc43309f0b9b894dcc5d6f40c4b26c379 + url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.1.7" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - url: "https://pub.dartlang.org" + sha256: f0abc8ebd7253741f05488b4813d936b4d07c6bae3e86148a09e342ee4b08e76 + url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.5" path_provider_windows: dependency: transitive description: name: path_provider_windows - url: "https://pub.dartlang.org" + sha256: bcabbe399d4042b8ee687e17548d5d3f527255253b4a639f5f8d2094a9c2b45c + url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "2.1.3" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4" + url: "https://pub.dev" + source: hosted + version: "5.1.0" platform: dependency: transitive description: name: platform - url: "https://pub.dartlang.org" + sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" + url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.1.0" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.dartlang.org" + sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a + url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.1.3" process: dependency: transitive description: name: process - url: "https://pub.dartlang.org" + sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" + url: "https://pub.dev" source: hosted - version: "4.2.3" + version: "4.2.4" provider: dependency: "direct main" description: name: provider - url: "https://pub.dartlang.org" + sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f + url: "https://pub.dev" + source: hosted + version: "6.0.5" + quiver: + dependency: transitive + description: + name: quiver + sha256: "93982981971e812c94d4a6fa3a57b89f9ec12b38b6380cd3c1370c3b01e4580e" + url: "https://pub.dev" source: hosted - version: "6.0.0" + version: "3.1.0" shared_preferences: dependency: "direct main" description: name: shared_preferences - url: "https://pub.dartlang.org" + sha256: "76917b7d4b9526b2ba416808a7eb9fb2863c1a09cf63ec85f1453da240fa818a" + url: "https://pub.dev" source: hosted - version: "2.0.6" + version: "2.0.15" + shared_preferences_android: + dependency: transitive + description: + name: shared_preferences_android + sha256: "8e251f3c986002b65fed6396bce81f379fb63c27317d49743cf289fd0fd1ab97" + url: "https://pub.dev" + source: hosted + version: "2.0.14" + shared_preferences_ios: + dependency: transitive + description: + name: shared_preferences_ios + sha256: "585a14cefec7da8c9c2fb8cd283a3bb726b4155c0952afe6a0caaa7b2272de34" + url: "https://pub.dev" + source: hosted + version: "2.1.1" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - url: "https://pub.dartlang.org" + sha256: fbc3cd6826896b66a5f576b025e4f344f780c84ea7f8203097a353370607a2c8 + url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.1.2" shared_preferences_macos: dependency: transitive description: name: shared_preferences_macos - url: "https://pub.dartlang.org" + sha256: fbb94bf296576f49be37a1496d5951796211a8db0aa22cc0d68c46440dad808c + url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.0.4" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - url: "https://pub.dartlang.org" + sha256: da9431745ede5ece47bc26d5d73a9d3c6936ef6945c101a5aca46f62e52c1cf3 + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.0" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - url: "https://pub.dartlang.org" + sha256: a4b5bc37fe1b368bbc81f953197d55e12f49d0296e7e412dfe2d2d77d6929958 + url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.0.4" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - url: "https://pub.dartlang.org" + sha256: "07c274c2115d4d5e4280622abb09f0980e2c5b1fcdc98ae9f59a3bad5bfc1f26" + url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.1.2" sky_engine: dependency: transitive description: flutter @@ -310,72 +614,90 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "1.9.1" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.4.16" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.3.1" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.4" win32: dependency: transitive description: name: win32 - url: "https://pub.dartlang.org" + sha256: ca121dbbadb3e43b449053feab0cdf3f2bff93b107cacf0290e3d29f717374b6 + url: "https://pub.dev" source: hosted - version: "2.2.5" + version: "3.1.2" xdg_directories: dependency: transitive description: name: xdg_directories - url: "https://pub.dartlang.org" + sha256: "11541eedefbcaec9de35aa82650b695297ce668662bbd6e3911a7fabdbde589f" + url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.2.0+2" + xml: + dependency: transitive + description: + name: xml + sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5" + url: "https://pub.dev" + source: hosted + version: "6.2.2" sdks: - dart: ">=2.13.0 <3.0.0" - flutter: ">=2.0.0" + dart: ">=2.18.0 <4.0.0" + flutter: ">=3.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 62742e11..e9568a23 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,4 +1,4 @@ -name: noteapp +name: create_flutter_provider_app description: A new Flutter application. # The following line prevents the package from being accidentally published to @@ -32,11 +32,19 @@ dependencies: cupertino_icons: ^1.0.2 provider: ^6.0.0 shared_preferences: ^2.0.6 - firebase_auth: ^3.0.2 - cloud_firestore: ^2.5.0 - flutter_platform_widgets: ^1.9.5 + firebase_auth: ^3.11.2 + google_sign_in: ^5.4.2 + flutter_facebook_auth: ^4.1.2 + cloud_firestore: ^3.5.1 + flutter_platform_widgets: ^2.0.0 + firebase_core: ^1.24.0 + firebase_ui_auth: ^1.0.0-dev.0 + #solution for Error: Member not found: 'FirebaseAppPlatform.verifyExtends' + firebase_core_platform_interface: 4.5.1 + firebase_messaging: ^13.0.4 # will satisfy your firebase core things that depend on ^4.5.1 dev_dependencies: + flutter_lints: ^1.0.0 flutter_test: sdk: flutter @@ -55,6 +63,15 @@ flutter: # assets: # - images/a_dot_burr.jpeg # - images/a_dot_ham.jpeg + # + assets: + - assets/lang/en.json + - assets/lang/zh.json + - assets/lang/es.json + - assets/images/google.jpg + - assets/images/googlelogin.png + - assets/images/facebooklogin.png + # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. @@ -81,3 +98,16 @@ flutter: # # For details regarding fonts from package dependencies, # see https://flutter.dev/custom-fonts/#from-packages + + fonts: + - family: ProductSans + fonts: + - asset: assets/fonts/Product-Sans-Regular.ttf + - asset: assets/fonts/Product-Sans-Italic.ttf + style: italic + - asset: assets/fonts/Product-Sans-Bold.ttf + weight: 700 + - asset: assets/fonts/Product-Sans-Bold-Italic.ttf + style: italic + weight: 700 + \ No newline at end of file diff --git a/test/widget_test.dart b/test/widget_test.dart new file mode 100644 index 00000000..3b9ea20c --- /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:create_flutter_provider2022/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 00000000..8aaa46ac 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 00000000..b749bfef 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 00000000..88cfd48d 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 00000000..eb9b4d76 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 00000000..d69c5669 Binary files /dev/null and b/web/icons/Icon-maskable-512.png differ diff --git a/web/manifest.json b/web/manifest.json new file mode 100644 index 00000000..101827d5 --- /dev/null +++ b/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "create_flutter_provider2022", + "short_name": "create_flutter_provider2022", + "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/webenv/dev/favicon.png b/webenv/dev/favicon.png new file mode 100644 index 00000000..8aaa46ac Binary files /dev/null and b/webenv/dev/favicon.png differ diff --git a/webenv/dev/icons/Icon-192.png b/webenv/dev/icons/Icon-192.png new file mode 100644 index 00000000..b749bfef Binary files /dev/null and b/webenv/dev/icons/Icon-192.png differ diff --git a/webenv/dev/icons/Icon-512.png b/webenv/dev/icons/Icon-512.png new file mode 100644 index 00000000..88cfd48d Binary files /dev/null and b/webenv/dev/icons/Icon-512.png differ diff --git a/webenv/dev/icons/Icon-maskable-192.png b/webenv/dev/icons/Icon-maskable-192.png new file mode 100644 index 00000000..eb9b4d76 Binary files /dev/null and b/webenv/dev/icons/Icon-maskable-192.png differ diff --git a/webenv/dev/icons/Icon-maskable-512.png b/webenv/dev/icons/Icon-maskable-512.png new file mode 100644 index 00000000..d69c5669 Binary files /dev/null and b/webenv/dev/icons/Icon-maskable-512.png differ diff --git a/webenv/dev/manifest.json b/webenv/dev/manifest.json new file mode 100644 index 00000000..101827d5 --- /dev/null +++ b/webenv/dev/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "create_flutter_provider2022", + "short_name": "create_flutter_provider2022", + "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/webenv/prod/favicon.png b/webenv/prod/favicon.png new file mode 100644 index 00000000..8aaa46ac Binary files /dev/null and b/webenv/prod/favicon.png differ diff --git a/webenv/prod/icons/Icon-192.png b/webenv/prod/icons/Icon-192.png new file mode 100644 index 00000000..b749bfef Binary files /dev/null and b/webenv/prod/icons/Icon-192.png differ diff --git a/webenv/prod/icons/Icon-512.png b/webenv/prod/icons/Icon-512.png new file mode 100644 index 00000000..88cfd48d Binary files /dev/null and b/webenv/prod/icons/Icon-512.png differ diff --git a/webenv/prod/icons/Icon-maskable-192.png b/webenv/prod/icons/Icon-maskable-192.png new file mode 100644 index 00000000..eb9b4d76 Binary files /dev/null and b/webenv/prod/icons/Icon-maskable-192.png differ diff --git a/webenv/prod/icons/Icon-maskable-512.png b/webenv/prod/icons/Icon-maskable-512.png new file mode 100644 index 00000000..d69c5669 Binary files /dev/null and b/webenv/prod/icons/Icon-maskable-512.png differ diff --git a/webenv/prod/manifest.json b/webenv/prod/manifest.json new file mode 100644 index 00000000..101827d5 --- /dev/null +++ b/webenv/prod/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "create_flutter_provider2022", + "short_name": "create_flutter_provider2022", + "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 00000000..d492d0d9 --- /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 00000000..d916ccf7 --- /dev/null +++ b/windows/CMakeLists.txt @@ -0,0 +1,101 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(create_flutter_provider2022 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 "create_flutter_provider2022") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(SET CMP0063 NEW) + +# 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() + +# 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 00000000..930d2071 --- /dev/null +++ b/windows/flutter/CMakeLists.txt @@ -0,0 +1,104 @@ +# 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") + +# === 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" + windows-x64 $ + 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 00000000..45e2647e --- /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) { + DesktopWebviewAuthPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("DesktopWebviewAuthPlugin")); +} diff --git a/windows/flutter/generated_plugin_registrant.h b/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 00000000..dc139d85 --- /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 00000000..67972319 --- /dev/null +++ b/windows/flutter/generated_plugins.cmake @@ -0,0 +1,24 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + desktop_webview_auth +) + +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 00000000..394917c0 --- /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 00000000..743bdc2d --- /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", "create_flutter_provider2022" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "create_flutter_provider2022" "\0" + VALUE "LegalCopyright", "Copyright (C) 2022 com.example. All rights reserved." "\0" + VALUE "OriginalFilename", "create_flutter_provider2022.exe" "\0" + VALUE "ProductName", "create_flutter_provider2022" "\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 00000000..b25e363e --- /dev/null +++ b/windows/runner/flutter_window.cpp @@ -0,0 +1,66 @@ +#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(); + }); + + 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 00000000..6da0652f --- /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 00000000..adc8402e --- /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"create_flutter_provider2022", 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 00000000..66a65d1e --- /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 00000000..c04e20ca 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 00000000..a42ea768 --- /dev/null +++ b/windows/runner/runner.exe.manifest @@ -0,0 +1,20 @@ + + + + + PerMonitorV2 + + + + + + + + + + + + + + + diff --git a/windows/runner/utils.cpp b/windows/runner/utils.cpp new file mode 100644 index 00000000..f5bf9fa0 --- /dev/null +++ b/windows/runner/utils.cpp @@ -0,0 +1,64 @@ +#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(); + } + int target_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + -1, nullptr, 0, nullptr, nullptr); + 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, + -1, 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 00000000..3879d547 --- /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 00000000..041a3855 --- /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 registar 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 00000000..c86632d8 --- /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 + // responsponds 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_