diff --git a/.gitignore b/.gitignore index 8cd6f99e7b..e3d42d5719 100644 --- a/.gitignore +++ b/.gitignore @@ -8,9 +8,6 @@ .buildlog/ .history .svn/ -.firebase/ -.flutter-plugins-dependencies - # IntelliJ related *.iml @@ -41,8 +38,6 @@ app.*.map.json .packages .pub-cache/ .pub/ -/build/ -test_goldens/failures/ build/ # Android related @@ -72,7 +67,6 @@ build/ **/ios/**/profile **/ios/**/xcuserdata **/ios/.generated/ -**/ios/Flutter/.last_build_id **/ios/Flutter/App.framework **/ios/Flutter/Flutter.framework **/ios/Flutter/Flutter.podspec @@ -91,9 +85,6 @@ build/ !**/ios/**/default.perspectivev3 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages -**/google-services.json -**/GoogleService-Info.plist - # End of https://www.toptal.com/developers/gitignore/api/flutter android/google-play-service-account.json @@ -107,4 +98,4 @@ android/google-play-service-account.json .env.temp .secrets.* .cicd/ -keystore.jks +keystore.jks \ No newline at end of file diff --git a/.metadata b/.metadata index 00c95def60..6898768c73 100644 --- a/.metadata +++ b/.metadata @@ -1,45 +1,10 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled. +# This file should be version controlled and should not be manually edited. version: - revision: f6b9c4da23f88394ae33a1915da47274a2d705d7 - channel: main + revision: 5f21edf8b66e31a39133177319414395cc5b5f48 + channel: unknown project_type: app - -# Tracks metadata for the flutter migrate command -migration: - platforms: - - platform: root - create_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7 - base_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7 - - platform: android - create_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7 - base_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7 - - platform: ios - create_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7 - base_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7 - - platform: linux - create_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7 - base_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7 - - platform: macos - create_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7 - base_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7 - - platform: web - create_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7 - base_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7 - - platform: windows - create_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7 - base_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7 - - # User provided section - - # List of Local paths (relative to this file) that should be - # ignored by the migrate tool. - # - # Files that are not part of the templates will be ignored by default. - unmanaged_files: - - 'lib/main.dart' - - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/_ops/.env b/_ops/.env index 329b68d5c4..b6ef4c336e 100644 --- a/_ops/.env +++ b/_ops/.env @@ -16,8 +16,8 @@ EXTRA_PATHS=$HOME/Library/Android/sdk/cmdline-tools/latest/bin:$HOME/Library/And # Flutter env vars for dart app # Below command is for Macos. Use base64 -w0 in Linux # echo '--dart-define APP_NAME=[DEV]GalleryApp --dart-define APP_SUFFIX=gallery.dev' | base64 -DART_DEFINES_B64_dev=LS1kYXJ0LWRlZmluZSBBUFBfTkFNRT1bREVWXUdhbGxlcnlBcHAgLS1kYXJ0LWRlZmluZSBBUFBfU1VGRklYPWdhbGxlcnkuZGV2Cg== +DART_DEFINES_B64_dev=LS1kYXJ0LWRlZmluZSBBUFBfTkFNRT1bREVWXUZsdW1vIC0tZGFydC1kZWZpbmUgQVBQX1NVRkZJWD1mbHVtby5kZXYK # echo '--dart-define APP_NAME=GalleryApp --dart-define APP_SUFFIX=gallery' | base64 -DART_DEFINES_B64_prod=LS1kYXJ0LWRlZmluZSBBUFBfTkFNRT1HYWxsZXJ5QXBwIC0tZGFydC1kZWZpbmUgQVBQX1NVRkZJWD1nYWxsZXJ5Cg== +DART_DEFINES_B64_prod=LS1kYXJ0LWRlZmluZSBBUFBfTkFNRT1GbHVtbyAtLWRhcnQtZGVmaW5lIEFQUF9TVUZGSVg9Zmx1bW8K # echo '--dart-define APP_NAME=[beta]GalleryApp --dart-define APP_SUFFIX=gallery.beta' | base64 -DART_DEFINES_B64_beta=LS1kYXJ0LWRlZmluZSBBUFBfTkFNRT1bYmV0YV1HYWxsZXJ5QXBwIC0tZGFydC1kZWZpbmUgQVBQX1NVRkZJWD1nYWxsZXJ5LmJldGEK +DART_DEFINES_B64_beta=LS1kYXJ0LWRlZmluZSBBUFBfTkFNRT1bYmV0YV1GbHVtbyAtLWRhcnQtZGVmaW5lIEFQUF9TVUZGSVg9Zmx1bW8uYmV0YQo= diff --git a/_ops/utils/bump.sh b/_ops/utils/bump.sh index 95849691ef..ae7e288f2f 100755 --- a/_ops/utils/bump.sh +++ b/_ops/utils/bump.sh @@ -23,7 +23,7 @@ elif [[ "${SUFFIX:-}" != "" ]]; then fi # Count commits -COMMITS=$(git rev-list HEAD --count) +COMMITS=$(git rev-list --count --all) INCREMENT=1 # For Flutter aps diff --git a/analysis_options.yaml b/analysis_options.yaml index ad82b9b987..8d53f9bf4f 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,20 +1,23 @@ -include: package:flutter_lints/flutter.yaml +analyzer: + exclude: [build/**] + errors: + uri_has_not_been_generated: ignore + plugins: + - angular +# Lint rules and documentation, see http://dart-lang.github.io/linter/lints linter: - # In addition to the flutter_lints rules: - - always_declare_return_types - - avoid_types_on_closure_parameters - - avoid_void_async - cancel_subscriptions - - close_sinks - - directives_ordering - - flutter_style_todos - - package_api_docs - - prefer_single_quotes + - hash_and_equals + - iterable_contains_unrelated_type + - list_remove_unrelated_type - test_types_in_equals - - throw_in_finally - - unawaited_futures - - unnecessary_statements - - unsafe_html - - use_super_parameters + - unrelated_type_equality_checks + - valid_regexps + +global_options: + angular|angular: + options: + no-emit-component-factories: True + no-emit-injectable-factories: True diff --git a/android/.gitignore b/android/.gitignore index e2fc429007..bc2100d8f7 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -5,12 +5,3 @@ gradle-wrapper.jar /gradlew.bat /local.properties GeneratedPluginRegistrant.java - -# CD -fastlane/report.xml - -# Remember to never publicly share your keystore. -# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app -key.properties -**/*.keystore -**/*.jks \ No newline at end of file diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml index 3110d52908..304732f884 100644 --- a/android/app/src/main/res/drawable/launch_background.xml +++ b/android/app/src/main/res/drawable/launch_background.xml @@ -1,7 +1,7 @@ - + - #E6EBEB - diff --git a/android/build.gradle b/android/build.gradle index 28c4d9ff87..0df46f5fcc 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,44 +1,34 @@ buildscript { - ext.kotlin_version = '1.7.10' + ext.gradle_version = '7.4.2' + ext.kotlin_version = '1.8.20' repositories { google() - mavenCentral() + jcenter { url "https://jcenter.bintray.com/" } + maven { url 'https://repo1.maven.org/maven2' } + maven { url 'https://maven.google.com' } } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' - // START: FlutterFire Configuration - classpath 'com.google.gms:google-services:4.3.10' - classpath 'com.google.firebase:perf-plugin:1.4.1' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1' - // END: FlutterFire Configuration + classpath "com.android.tools.build:gradle:$gradle_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } - - configurations.classpath { - resolutionStrategy.activateDependencyLocking() - } } allprojects { repositories { google() - mavenCentral() + jcenter { url "https://jcenter.bintray.com/" } + maven { url 'https://repo1.maven.org/maven2' } + maven { url 'https://maven.google.com' } } } rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { project.evaluationDependsOn(':app') - - dependencyLocking { - ignoredDependencies.add('io.flutter:*') - lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - if (!project.hasProperty('local-engine-repo')) { - lockAllConfigurations() - } - } } tasks.register("clean", Delete) { diff --git a/android/gradle.properties b/android/gradle.properties index 13113c9bf9..02799004e7 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,5 +1,4 @@ -org.gradle.jvmargs=-Xmx1536M -android.enableR8=true +org.gradle.jvmargs=-Xmx1024M android.useAndroidX=true android.enableJetifier=true org.gradle.caching=true diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 3c472b99c6..6b665338b3 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,3 +1,4 @@ +#Fri Jun 23 08:50:38 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/android/settings.gradle b/android/settings.gradle index 343ea45599..d3b6a4013d 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,20 +1,15 @@ -pluginManagement { - def flutterSdkPath = { - def properties = new Properties() - file("local.properties").withInputStream { properties.load(it) } - def flutterSdkPath = properties.getProperty("flutter.sdk") - assert flutterSdkPath != null, "flutter.sdk not set in local.properties" - return flutterSdkPath - } - settings.ext.flutterSdkPath = flutterSdkPath() +// Copyright 2014 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. - includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") +include ':app' - plugins { - id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false - } -} +def localPropertiesFile = new File(rootProject.projectDir, "local.properties") +def properties = new Properties() -include ":app", ":crane" +assert localPropertiesFile.exists() +localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } -apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle" +def flutterSdkPath = properties.getProperty("flutter.sdk") +assert flutterSdkPath != null, "flutter.sdk not set in local.properties" +apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/ios/.gitignore b/ios/.gitignore index 42de8175da..30ae329fff 100644 --- a/ios/.gitignore +++ b/ios/.gitignore @@ -1,4 +1,3 @@ -**/dgph *.mode1v3 *.mode2v3 *.moved-aside @@ -19,7 +18,6 @@ Flutter/App.framework Flutter/Flutter.framework Flutter/Flutter.podspec Flutter/Generated.xcconfig -Flutter/ephemeral/ Flutter/app.flx Flutter/app.zip Flutter/flutter_assets/ diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist index 4f8d4d2456..8c6e56146e 100644 --- a/ios/Flutter/AppFrameworkInfo.plist +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 11.0 + 12.0 diff --git a/ios/Podfile b/ios/Podfile index d6e747ca86..c6f2cc3270 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '11.0' +# platform :ios, '12.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' @@ -32,9 +32,7 @@ target 'Runner' do use_modular_headers! flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) - target 'RunnerTests' do - inherit! :search_paths - end + end post_install do |installer| @@ -42,5 +40,13 @@ post_install do |installer| flutter_additional_ios_build_settings(target) end - + installer.generated_projects.each do |project| + project.targets.each do |target| + target.build_configurations.each do |config| + if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].split('.').first.to_i < 9 + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0' + end + end + end + end end diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index ce8153d5a1..9316cbee07 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,7 +1,7 @@ + LastUpgradeVersion = "1300" + version = "1.7"> @@ -55,17 +55,6 @@ - - - - - - - + + + - + diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index 2426008042..dc9ada4725 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png index fb1973f23c..28c6bf0301 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png index 66946f8336..2ccbfd967d 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png index c5d6fde94a..f091b6b0bc 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png index bb26a902a7..4cde12118d 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png index 7af5e05dd0..d0ef06e7ed 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png index b9d0e340a0..dcdc2306c2 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png index 66946f8336..2ccbfd967d 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png index c26f0a0eef..c8f9ed8f5c 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png index 9fbce2838c..a6d6b8609d 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png index 9fbce2838c..a6d6b8609d 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png index 995c67d465..75b2d164a5 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png index 0814ac51d4..c4df70d39d 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png index c97bcdf230..6a84f41e14 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png index 1b5647e26e..d0e1f58536 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard index 566f7d4d82..f2e259c7c9 100644 --- a/ios/Runner/Base.lproj/LaunchScreen.storyboard +++ b/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -14,14 +14,12 @@ - - - + @@ -30,10 +28,10 @@ - + - + diff --git a/ios/Runner/Base.lproj/Main.storyboard b/ios/Runner/Base.lproj/Main.storyboard index 5383a21a80..e37b3e0f24 100644 --- a/ios/Runner/Base.lproj/Main.storyboard +++ b/ios/Runner/Base.lproj/Main.storyboard @@ -1,26 +1,29 @@ - - + + + - + + - + - + - + + diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png index 0647f1905e..b749bfef07 100644 Binary files a/web/icons/Icon-192.png and b/web/icons/Icon-192.png differ diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png index 57a74558bb..88cfd48dff 100644 Binary files a/web/icons/Icon-512.png and b/web/icons/Icon-512.png differ