From bfb50ee422eb25d2552ffab65d9b8268236602e6 Mon Sep 17 00:00:00 2001 From: Bhargav Raviya Date: Sat, 7 Oct 2023 10:04:40 +0530 Subject: [PATCH] upgrade flutter version 3.13.4 --- .gitignore | 13 ++ .metadata | 23 ++- analysis_options.yaml | 28 --- android/.gitignore | 10 +- android/app/build.gradle | 47 ++--- android/app/src/debug/AndroidManifest.xml | 6 +- android/app/src/main/AndroidManifest.xml | 22 +-- .../com/example/flutter_auth/MainActivity.kt | 6 - .../res/drawable-v21/launch_background.xml | 12 ++ .../app/src/main/res/values-night/styles.xml | 18 ++ android/app/src/main/res/values/styles.xml | 12 +- android/app/src/profile/AndroidManifest.xml | 6 +- android/build.gradle | 16 +- .../gradle/wrapper/gradle-wrapper.properties | 4 +- android/settings.gradle | 27 +-- ios/.gitignore | 2 + ios/Flutter/AppFrameworkInfo.plist | 2 +- ios/Runner.xcodeproj/project.pbxproj | 185 ++++++++++++++---- .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/WorkspaceSettings.xcsettings | 8 + .../xcshareddata/xcschemes/Runner.xcscheme | 21 +- .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/WorkspaceSettings.xcsettings | 8 + ios/Runner/Info.plist | 6 +- ios/RunnerTests/RunnerTests.swift | 12 ++ lib/Screens/Login/components/login_form.dart | 12 +- .../components/login_screen_top_image.dart | 8 +- lib/Screens/Login/login_screen.dart | 14 +- lib/Screens/Signup/components/or_divider.dart | 2 +- .../Signup/components/sign_up_top_image.dart | 7 +- .../Signup/components/signup_form.dart | 12 +- .../Signup/components/socal_sign_up.dart | 6 +- .../Signup/components/social_icon.dart | 4 +- lib/Screens/Signup/signup_screen.dart | 19 +- .../Welcome/components/login_signup_btn.dart | 16 +- .../Welcome/components/welcome_image.dart | 13 +- lib/Screens/Welcome/welcome_screen.dart | 48 ++--- .../already_have_an_account_acheck.dart | 2 +- lib/components/background.dart | 2 +- lib/main.dart | 15 +- pubspec.lock | 178 +++++++++++------ pubspec.yaml | 58 +----- test/widget_test.dart | 2 +- 43 files changed, 555 insertions(+), 373 deletions(-) create mode 100644 android/app/src/main/res/drawable-v21/launch_background.xml create mode 100644 android/app/src/main/res/values-night/styles.xml create mode 100644 ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 ios/RunnerTests/RunnerTests.swift diff --git a/.gitignore b/.gitignore index 9f7c9c7..6a5d561 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ .buildlog/ .history .svn/ +migrate_working_dir/ # IntelliJ related *.iml @@ -22,6 +23,7 @@ # Flutter/Dart/Pub related **/doc/api/ +**/ios/Flutter/.last_build_id .dart_tool/ .flutter-plugins .flutter-plugins-dependencies @@ -30,6 +32,17 @@ .pub/ /build/ +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release + # Web related lib/generated_plugin_registrant.dart diff --git a/.metadata b/.metadata index a7388d5..cf3e71e 100644 --- a/.metadata +++ b/.metadata @@ -1,11 +1,11 @@ # 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: fb57da5f945d02ef4f98dfd9409a72b7cce74268 - channel: stable + revision: "367f9ea16bfae1ca451b9cc27c1366870b187ae2" + channel: "stable" project_type: app @@ -13,15 +13,14 @@ project_type: app migration: platforms: - platform: root - create_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 - base_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 -<<<<<<< HEAD - - platform: windows -======= - - platform: web ->>>>>>> responsive - create_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 - base_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 + create_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2 + base_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2 + - platform: android + create_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2 + base_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2 + - platform: ios + create_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2 + base_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2 # User provided section diff --git a/analysis_options.yaml b/analysis_options.yaml index 61b6c4d..f9b3034 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,29 +1 @@ -# 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/.gitignore b/android/.gitignore index 7241745..6f56801 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -1,5 +1,13 @@ - +gradle-wrapper.jar /.gradle /captures/ +/gradlew +/gradlew.bat /local.properties GeneratedPluginRegistrant.java + +# Remember to never publicly share your keystore. +# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +key.properties +**/*.keystore +**/*.jks diff --git a/android/app/build.gradle b/android/app/build.gradle index 8309b16..ebee947 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ 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.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,29 +22,34 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { - compileSdkVersion 31 + namespace "com.example.flutter_auth" + // compileSdkVersion flutter.compileSdkVersion + compileSdkVersion 33 + ndkVersion flutter.ndkVersion - sourceSets { - main.java.srcDirs += 'src/main/kotlin' + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = '1.8' } - lintOptions { - disable 'InvalidPackage' + sourceSets { + main.java.srcDirs += 'src/main/kotlin' } defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.example.flutter_auth" - minSdkVersion 16 - targetSdkVersion 28 + // You can update the following values to match your application needs. + // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. + minSdkVersion flutter.minSdkVersion + targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -59,9 +65,4 @@ flutter { source '../..' } -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' -} +dependencies {} diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index ee4e519..399f698 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,6 +1,6 @@ - - diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index a9be33e..f541e9d 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,29 +1,29 @@ - - + + + - + + + + + + + diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..06952be --- /dev/null +++ b/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index 00fa441..3afa56f 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -1,8 +1,18 @@ + + + diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml index ee4e519..399f698 100644 --- a/android/app/src/profile/AndroidManifest.xml +++ b/android/app/src/profile/AndroidManifest.xml @@ -1,6 +1,6 @@ - - diff --git a/android/build.gradle b/android/build.gradle index 1d919e8..f7eb7f6 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,15 +1,12 @@ buildscript { - ext.kotlin_version = '1.5.21' + ext.kotlin_version = '1.7.10' repositories { google() - jcenter() - maven { - url "https://maven.google.com" - } + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.0' + classpath 'com.android.tools.build:gradle:7.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -17,10 +14,7 @@ buildscript { allprojects { repositories { google() - jcenter() - maven { - url "https://maven.google.com" - } + mavenCentral() } } @@ -32,6 +26,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 07a6de5..898da0e 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Aug 19 2021 +#Sat Oct 10 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip diff --git a/android/settings.gradle b/android/settings.gradle index 5a2f14f..55c4ca8 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,15 +1,20 @@ -include ':app' +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() -def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() + includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") -def plugins = new Properties() -def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins') -if (pluginsFile.exists()) { - pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) } + plugins { + id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false + } } -plugins.each { name, path -> - def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile() - include ":$name" - project(":$name").projectDir = pluginDirectory -} +include ":app" + +apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/ios/.gitignore b/ios/.gitignore index e96ef60..7a7f987 100644 --- a/ios/.gitignore +++ b/ios/.gitignore @@ -1,3 +1,4 @@ +**/dgph *.mode1v3 *.mode2v3 *.moved-aside @@ -18,6 +19,7 @@ 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 f2872cf..4f8d4d2 100644 --- a/ios/Flutter/AppFrameworkInfo.plist +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 3de7ccd..aa4ea36 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -13,8 +13,19 @@ 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 97C146E61CF9000F007C117D /* Project object */; + proxyType = 1; + remoteGlobalIDString = 97C146ED1CF9000F007C117D; + remoteInfo = Runner; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXCopyFilesBuildPhase section */ 9705A1C41CF9048500538489 /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; @@ -42,6 +53,8 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; + 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -66,12 +79,21 @@ name = Flutter; sourceTree = ""; }; + 331C8082294A63A400263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C807B294A618700263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; 97C146E51CF9000F007C117D = { isa = PBXGroup; children = ( 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, + 331C8082294A63A400263BE5 /* RunnerTests */, ); sourceTree = ""; }; @@ -79,6 +101,7 @@ isa = PBXGroup; children = ( 97C146EE1CF9000F007C117D /* Runner.app */, + 331C8081294A63A400263BE5 /* RunnerTests.xctest */, ); name = Products; sourceTree = ""; @@ -90,7 +113,6 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */, 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, 97C147021CF9000F007C117D /* Info.plist */, - 97C146F11CF9000F007C117D /* Supporting Files */, 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, @@ -99,16 +121,27 @@ path = Runner; sourceTree = ""; }; - 97C146F11CF9000F007C117D /* Supporting Files */ = { - isa = PBXGroup; - children = ( - ); - name = "Supporting Files"; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ + 331C8080294A63A400263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + 331C807D294A63A400263BE5 /* Sources */, + 331C807E294A63A400263BE5 /* Frameworks */, + 331C807F294A63A400263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C8086294A63A400263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; 97C146ED1CF9000F007C117D /* Runner */ = { isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; @@ -135,9 +168,14 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; - ORGANIZATIONNAME = "The Chromium Authors"; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1430; + ORGANIZATIONNAME = ""; TargetAttributes = { + 331C8080294A63A400263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 97C146ED1CF9000F007C117D; + }; 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; LastSwiftMigration = 1100; @@ -145,7 +183,7 @@ }; }; buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -158,11 +196,19 @@ projectRoot = ""; targets = ( 97C146ED1CF9000F007C117D /* Runner */, + 331C8080294A63A400263BE5 /* RunnerTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + 331C807F294A63A400263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 97C146EC1CF9000F007C117D /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -179,10 +225,12 @@ /* Begin PBXShellScriptBuildPhase section */ 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); name = "Thin Binary"; outputPaths = ( @@ -193,6 +241,7 @@ }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -208,6 +257,14 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 331C807D294A63A400263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 97C146EA1CF9000F007C117D /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -219,6 +276,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 331C8086294A63A400263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 97C146ED1CF9000F007C117D /* Runner */; + targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin PBXVariantGroup section */ 97C146FA1CF9000F007C117D /* Main.storyboard */ = { isa = PBXVariantGroup; @@ -280,7 +345,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -297,15 +362,10 @@ CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( + LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Flutter", + "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterAuth; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -315,6 +375,56 @@ }; name = Profile; }; + 331C8088294A63A400263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = AE0B7B92F70575B8D7E0D07E /* Pods-RunnerTests.debug.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterAuth.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Debug; + }; + 331C8089294A63A400263BE5 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 89B67EB44CE7B6631473024E /* Pods-RunnerTests.release.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterAuth.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Release; + }; + 331C808A294A63A400263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 640959BDD8F10B91D80A66BE /* Pods-RunnerTests.profile.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterAuth.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Profile; + }; 97C147031CF9000F007C117D /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -362,7 +472,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -411,11 +521,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -429,15 +540,10 @@ CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( + LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Flutter", + "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterAuth; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -456,15 +562,10 @@ CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( + LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Flutter", + "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterAuth; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -477,6 +578,16 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C8088294A63A400263BE5 /* Debug */, + 331C8089294A63A400263BE5 /* Release */, + 331C808A294A63A400263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 3db53b6..87131a0 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ - - - - + + + + + + - - + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index f68aab4..f1c3a2f 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -4,6 +4,8 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + Flutter Auth CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -39,9 +41,9 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - UIViewControllerBasedStatusBarAppearance - CADisableMinimumFrameDurationOnPhone + UIApplicationSupportsIndirectInputEvents + diff --git a/ios/RunnerTests/RunnerTests.swift b/ios/RunnerTests/RunnerTests.swift new file mode 100644 index 0000000..86a7c3b --- /dev/null +++ b/ios/RunnerTests/RunnerTests.swift @@ -0,0 +1,12 @@ +import Flutter +import UIKit +import XCTest + +class RunnerTests: XCTestCase { + + func testExample() { + // If you add code to the Runner application, consider adding tests here. + // See https://developer.apple.com/documentation/xctest for more information about using XCTest. + } + +} diff --git a/lib/Screens/Login/components/login_form.dart b/lib/Screens/Login/components/login_form.dart index 5e338dc..f63d493 100644 --- a/lib/Screens/Login/components/login_form.dart +++ b/lib/Screens/Login/components/login_form.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import '../../../components/already_have_an_account_acheck.dart'; import '../../../constants.dart'; -import '../../Signup/signup_screen.dart'; +import '../../signup/signup_screen.dart'; class LoginForm extends StatelessWidget { const LoginForm({ @@ -19,10 +19,10 @@ class LoginForm extends StatelessWidget { textInputAction: TextInputAction.next, cursorColor: kPrimaryColor, onSaved: (email) {}, - decoration: InputDecoration( + decoration: const InputDecoration( hintText: "Your email", prefixIcon: Padding( - padding: const EdgeInsets.all(defaultPadding), + padding: EdgeInsets.all(defaultPadding), child: Icon(Icons.person), ), ), @@ -33,10 +33,10 @@ class LoginForm extends StatelessWidget { textInputAction: TextInputAction.done, obscureText: true, cursorColor: kPrimaryColor, - decoration: InputDecoration( + decoration: const InputDecoration( hintText: "Your password", prefixIcon: Padding( - padding: const EdgeInsets.all(defaultPadding), + padding: EdgeInsets.all(defaultPadding), child: Icon(Icons.lock), ), ), @@ -59,7 +59,7 @@ class LoginForm extends StatelessWidget { context, MaterialPageRoute( builder: (context) { - return SignUpScreen(); + return const SignUpScreen(); }, ), ); diff --git a/lib/Screens/Login/components/login_screen_top_image.dart b/lib/Screens/Login/components/login_screen_top_image.dart index a2eec36..f5571aa 100644 --- a/lib/Screens/Login/components/login_screen_top_image.dart +++ b/lib/Screens/Login/components/login_screen_top_image.dart @@ -12,11 +12,11 @@ class LoginScreenTopImage extends StatelessWidget { Widget build(BuildContext context) { return Column( children: [ - Text( + const Text( "LOGIN", style: TextStyle(fontWeight: FontWeight.bold), ), - SizedBox(height: defaultPadding * 2), + const SizedBox(height: defaultPadding * 2), Row( children: [ const Spacer(), @@ -27,8 +27,8 @@ class LoginScreenTopImage extends StatelessWidget { const Spacer(), ], ), - SizedBox(height: defaultPadding * 2), + const SizedBox(height: defaultPadding * 2), ], ); } -} \ No newline at end of file +} diff --git a/lib/Screens/Login/login_screen.dart b/lib/Screens/Login/login_screen.dart index 38cf718..6da4002 100644 --- a/lib/Screens/Login/login_screen.dart +++ b/lib/Screens/Login/login_screen.dart @@ -10,19 +10,19 @@ class LoginScreen extends StatelessWidget { @override Widget build(BuildContext context) { - return Background( + return const Background( child: SingleChildScrollView( child: Responsive( - mobile: const MobileLoginScreen(), + mobile: MobileLoginScreen(), desktop: Row( children: [ - const Expanded( + Expanded( child: LoginScreenTopImage(), ), Expanded( child: Row( mainAxisAlignment: MainAxisAlignment.center, - children: const [ + children: [ SizedBox( width: 450, child: LoginForm(), @@ -45,12 +45,12 @@ class MobileLoginScreen extends StatelessWidget { @override Widget build(BuildContext context) { - return Column( + return const Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - const LoginScreenTopImage(), + LoginScreenTopImage(), Row( - children: const [ + children: [ Spacer(), Expanded( flex: 8, diff --git a/lib/Screens/Signup/components/or_divider.dart b/lib/Screens/Signup/components/or_divider.dart index 82508db..443787d 100644 --- a/lib/Screens/Signup/components/or_divider.dart +++ b/lib/Screens/Signup/components/or_divider.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_auth/constants.dart'; +import '../../../constants.dart'; class OrDivider extends StatelessWidget { const OrDivider({Key? key}) : super(key: key); diff --git a/lib/Screens/Signup/components/sign_up_top_image.dart b/lib/Screens/Signup/components/sign_up_top_image.dart index 220ab0b..a53ac3e 100644 --- a/lib/Screens/Signup/components/sign_up_top_image.dart +++ b/lib/Screens/Signup/components/sign_up_top_image.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; - import '../../../constants.dart'; class SignUpScreenTopImage extends StatelessWidget { @@ -14,9 +13,9 @@ class SignUpScreenTopImage extends StatelessWidget { children: [ Text( "Sign Up".toUpperCase(), - style: TextStyle(fontWeight: FontWeight.bold), + style: const TextStyle(fontWeight: FontWeight.bold), ), - SizedBox(height: defaultPadding), + const SizedBox(height: defaultPadding), Row( children: [ const Spacer(), @@ -27,7 +26,7 @@ class SignUpScreenTopImage extends StatelessWidget { const Spacer(), ], ), - SizedBox(height: defaultPadding), + const SizedBox(height: defaultPadding), ], ); } diff --git a/lib/Screens/Signup/components/signup_form.dart b/lib/Screens/Signup/components/signup_form.dart index 70607a7..5817ec3 100644 --- a/lib/Screens/Signup/components/signup_form.dart +++ b/lib/Screens/Signup/components/signup_form.dart @@ -19,10 +19,10 @@ class SignUpForm extends StatelessWidget { textInputAction: TextInputAction.next, cursorColor: kPrimaryColor, onSaved: (email) {}, - decoration: InputDecoration( + decoration: const InputDecoration( hintText: "Your email", prefixIcon: Padding( - padding: const EdgeInsets.all(defaultPadding), + padding: EdgeInsets.all(defaultPadding), child: Icon(Icons.person), ), ), @@ -33,10 +33,10 @@ class SignUpForm extends StatelessWidget { textInputAction: TextInputAction.done, obscureText: true, cursorColor: kPrimaryColor, - decoration: InputDecoration( + decoration: const InputDecoration( hintText: "Your password", prefixIcon: Padding( - padding: const EdgeInsets.all(defaultPadding), + padding: EdgeInsets.all(defaultPadding), child: Icon(Icons.lock), ), ), @@ -55,7 +55,7 @@ class SignUpForm extends StatelessWidget { context, MaterialPageRoute( builder: (context) { - return LoginScreen(); + return const LoginScreen(); }, ), ); @@ -65,4 +65,4 @@ class SignUpForm extends StatelessWidget { ), ); } -} \ No newline at end of file +} diff --git a/lib/Screens/Signup/components/socal_sign_up.dart b/lib/Screens/Signup/components/socal_sign_up.dart index a9c8baf..bc79ffa 100644 --- a/lib/Screens/Signup/components/socal_sign_up.dart +++ b/lib/Screens/Signup/components/socal_sign_up.dart @@ -16,15 +16,15 @@ // Row( // mainAxisAlignment: MainAxisAlignment.center, // children: [ -// SocalIcon( +// SocialIcon( // iconSrc: "assets/icons/facebook.svg", // press: () {}, // ), -// SocalIcon( +// SocialIcon( // iconSrc: "assets/icons/twitter.svg", // press: () {}, // ), -// SocalIcon( +// SocialIcon( // iconSrc: "assets/icons/google-plus.svg", // press: () {}, // ), diff --git a/lib/Screens/Signup/components/social_icon.dart b/lib/Screens/Signup/components/social_icon.dart index 183f9f2..915dbbb 100644 --- a/lib/Screens/Signup/components/social_icon.dart +++ b/lib/Screens/Signup/components/social_icon.dart @@ -2,10 +2,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_auth/constants.dart'; import 'package:flutter_svg/flutter_svg.dart'; -class SocalIcon extends StatelessWidget { +class SocialIcon extends StatelessWidget { final String? iconSrc; final Function? press; - const SocalIcon({ + const SocialIcon({ Key? key, this.iconSrc, this.press, diff --git a/lib/Screens/Signup/signup_screen.dart b/lib/Screens/Signup/signup_screen.dart index b4d0dd7..b9d0f05 100644 --- a/lib/Screens/Signup/signup_screen.dart +++ b/lib/Screens/Signup/signup_screen.dart @@ -4,26 +4,25 @@ import 'package:flutter_auth/responsive.dart'; import '../../components/background.dart'; import 'components/sign_up_top_image.dart'; import 'components/signup_form.dart'; -import 'components/socal_sign_up.dart'; class SignUpScreen extends StatelessWidget { const SignUpScreen({Key? key}) : super(key: key); @override Widget build(BuildContext context) { - return Background( + return const Background( child: SingleChildScrollView( child: Responsive( - mobile: const MobileSignupScreen(), + mobile: MobileSignUpScreen(), desktop: Row( children: [ - const Expanded( + Expanded( child: SignUpScreenTopImage(), ), Expanded( child: Column( mainAxisAlignment: MainAxisAlignment.center, - children: const [ + children: [ SizedBox( width: 450, child: SignUpForm(), @@ -41,19 +40,19 @@ class SignUpScreen extends StatelessWidget { } } -class MobileSignupScreen extends StatelessWidget { - const MobileSignupScreen({ +class MobileSignUpScreen extends StatelessWidget { + const MobileSignUpScreen({ Key? key, }) : super(key: key); @override Widget build(BuildContext context) { - return Column( + return const Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - const SignUpScreenTopImage(), + SignUpScreenTopImage(), Row( - children: const [ + children: [ Spacer(), Expanded( flex: 8, diff --git a/lib/Screens/Welcome/components/login_signup_btn.dart b/lib/Screens/Welcome/components/login_signup_btn.dart index 80ea85a..ff5ce3a 100644 --- a/lib/Screens/Welcome/components/login_signup_btn.dart +++ b/lib/Screens/Welcome/components/login_signup_btn.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import '../../../constants.dart'; -import '../../Login/login_screen.dart'; -import '../../Signup/signup_screen.dart'; +import '../../login/login_screen.dart'; +import '../../signup/signup_screen.dart'; -class LoginAndSignupBtn extends StatelessWidget { - const LoginAndSignupBtn({ +class LoginAndSignUpBtn extends StatelessWidget { + const LoginAndSignUpBtn({ Key? key, }) : super(key: key); @@ -21,7 +21,7 @@ class LoginAndSignupBtn extends StatelessWidget { context, MaterialPageRoute( builder: (context) { - return LoginScreen(); + return const LoginScreen(); }, ), ); @@ -38,16 +38,16 @@ class LoginAndSignupBtn extends StatelessWidget { context, MaterialPageRoute( builder: (context) { - return SignUpScreen(); + return const SignUpScreen(); }, ), ); }, style: ElevatedButton.styleFrom( - primary: kPrimaryLightColor, elevation: 0), + backgroundColor: kPrimaryLightColor, elevation: 0), child: Text( "Sign Up".toUpperCase(), - style: TextStyle(color: Colors.black), + style: const TextStyle(color: Colors.black), ), ), ], diff --git a/lib/Screens/Welcome/components/welcome_image.dart b/lib/Screens/Welcome/components/welcome_image.dart index ce4f4cc..e0336da 100644 --- a/lib/Screens/Welcome/components/welcome_image.dart +++ b/lib/Screens/Welcome/components/welcome_image.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; - import '../../../constants.dart'; class WelcomeImage extends StatelessWidget { @@ -12,25 +11,25 @@ class WelcomeImage extends StatelessWidget { Widget build(BuildContext context) { return Column( children: [ - Text( + const Text( "WELCOME TO EDU", style: TextStyle(fontWeight: FontWeight.bold), ), - SizedBox(height: defaultPadding * 2), + const SizedBox(height: defaultPadding * 2), Row( children: [ - Spacer(), + const Spacer(), Expanded( flex: 8, child: SvgPicture.asset( "assets/icons/chat.svg", ), ), - Spacer(), + const Spacer(), ], ), - SizedBox(height: defaultPadding * 2), + const SizedBox(height: defaultPadding * 2), ], ); } -} \ No newline at end of file +} diff --git a/lib/Screens/Welcome/welcome_screen.dart b/lib/Screens/Welcome/welcome_screen.dart index 49cc531..34fae20 100644 --- a/lib/Screens/Welcome/welcome_screen.dart +++ b/lib/Screens/Welcome/welcome_screen.dart @@ -4,6 +4,7 @@ import '../../components/background.dart'; import '../../responsive.dart'; import 'components/login_signup_btn.dart'; import 'components/welcome_image.dart'; +import 'components/welcome_image.dart'; class WelcomeScreen extends StatelessWidget { const WelcomeScreen({Key? key}) : super(key: key); @@ -17,7 +18,7 @@ class WelcomeScreen extends StatelessWidget { desktop: Row( mainAxisAlignment: MainAxisAlignment.end, children: [ - const Expanded( + Expanded( child: WelcomeImage(), ), Expanded( @@ -26,43 +27,32 @@ class WelcomeScreen extends StatelessWidget { children: const [ SizedBox( width: 450, - child: LoginAndSignupBtn(), + child: LoginAndSignUpBtn(), ), ], ), ), ], ), - mobile: const MobileWelcomeScreen(), + mobile: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + WelcomeImage(), + Row( + children: [ + Spacer(), + Expanded( + flex: 8, + child: LoginAndSignUpBtn(), + ), + const Spacer(), + ], + ), + ], + ), ), ), ), ); } } - -class MobileWelcomeScreen extends StatelessWidget { - const MobileWelcomeScreen({ - Key? key, - }) : super(key: key); - - @override - Widget build(BuildContext context) { - return Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const WelcomeImage(), - Row( - children: const [ - Spacer(), - Expanded( - flex: 8, - child: LoginAndSignupBtn(), - ), - Spacer(), - ], - ), - ], - ); - } -} diff --git a/lib/components/already_have_an_account_acheck.dart b/lib/components/already_have_an_account_acheck.dart index e3aff36..2649197 100644 --- a/lib/components/already_have_an_account_acheck.dart +++ b/lib/components/already_have_an_account_acheck.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_auth/constants.dart'; +import '../constants.dart'; class AlreadyHaveAnAccountCheck extends StatelessWidget { final bool login; diff --git a/lib/components/background.dart b/lib/components/background.dart index a785755..ed3f37d 100644 --- a/lib/components/background.dart +++ b/lib/components/background.dart @@ -15,7 +15,7 @@ class Background extends StatelessWidget { Widget build(BuildContext context) { return Scaffold( resizeToAvoidBottomInset: false, - body: Container( + body: SizedBox( width: double.infinity, height: MediaQuery.of(context).size.height, child: Stack( diff --git a/lib/main.dart b/lib/main.dart index 2139b70..97c12ca 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,13 +1,14 @@ import 'package:flutter/material.dart'; -import 'package:flutter_auth/Screens/Welcome/welcome_screen.dart'; -import 'package:flutter_auth/constants.dart'; +import 'constants.dart'; +import 'screens/welcome/welcome_screen.dart'; -void main() => runApp(const MyApp()); +void main() { + runApp(const MainApp()); +} -class MyApp extends StatelessWidget { - const MyApp({Key? key}) : super(key: key); +class MainApp extends StatelessWidget { + const MainApp({super.key}); - // This widget is the root of your application. @override Widget build(BuildContext context) { return MaterialApp( @@ -19,7 +20,7 @@ class MyApp extends StatelessWidget { elevatedButtonTheme: ElevatedButtonThemeData( style: ElevatedButton.styleFrom( elevation: 0, - primary: kPrimaryColor, + backgroundColor: kPrimaryColor, shape: const StadiumBorder(), maximumSize: const Size(double.infinity, 56), minimumSize: const Size(double.infinity, 56), diff --git a/pubspec.lock b/pubspec.lock index e3630af..d728f23 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,62 +1,70 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + args: + dependency: transitive + description: + name: args + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + url: "https://pub.dev" + source: hosted + version: "2.4.2" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" source: hosted - version: "2.8.2" + version: "2.11.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" - source: hosted - version: "1.2.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.0" 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" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.2" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d + url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.0.6" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -66,16 +74,18 @@ packages: dependency: "direct dev" description: name: flutter_lints - url: "https://pub.dartlang.org" + sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.3" flutter_svg: dependency: "direct main" description: name: flutter_svg - url: "https://pub.dartlang.org" + sha256: "8c5d68a82add3ca76d792f058b186a0599414f279f00ece4830b9b231b570338" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "2.0.7" flutter_test: dependency: "direct dev" description: flutter @@ -85,58 +95,58 @@ packages: dependency: transitive description: name: lints - url: "https://pub.dartlang.org" + sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.1" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + url: "https://pub.dev" source: hosted - version: "0.12.11" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + url: "https://pub.dev" source: hosted - version: "0.1.4" + version: "0.5.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.9.1" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + url: "https://pub.dev" source: hosted - version: "1.8.1" - path_drawing: - dependency: transitive - description: - name: path_drawing - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.0" + version: "1.8.3" path_parsing: dependency: transitive description: name: path_parsing - url: "https://pub.dartlang.org" + sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf + url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.0.1" petitparser: dependency: transitive description: name: petitparser - url: "https://pub.dartlang.org" + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 + url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "5.4.0" sky_engine: dependency: transitive description: flutter @@ -146,58 +156,98 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.10.0" 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: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + url: "https://pub.dev" + source: hosted + version: "0.6.0" + vector_graphics: + dependency: transitive + description: + name: vector_graphics + sha256: "670f6e07aca990b4a2bcdc08a784193c4ccdd1932620244c3a86bb72a0eac67f" + url: "https://pub.dev" source: hosted - version: "0.4.9" + version: "1.1.7" + vector_graphics_codec: + dependency: transitive + description: + name: vector_graphics_codec + sha256: "7451721781d967db9933b63f5733b1c4533022c0ba373a01bdd79d1a5457f69f" + url: "https://pub.dev" + source: hosted + version: "1.1.7" + vector_graphics_compiler: + dependency: transitive + description: + name: vector_graphics_compiler + sha256: "80a13c613c8bde758b1464a1755a7b3a8f2b6cec61fbf0f5a53c94c30f03ba2e" + url: "https://pub.dev" + source: hosted + version: "1.1.7" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "0.1.4-beta" xml: dependency: transitive description: name: xml - url: "https://pub.dartlang.org" + sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" + url: "https://pub.dev" source: hosted - version: "6.1.0" + version: "6.3.0" sdks: - dart: ">=2.17.0 <3.0.0" - flutter: ">=2.11.0-0.1.pre" + dart: ">=3.1.2 <4.0.0" + flutter: ">=3.7.0-0" diff --git a/pubspec.yaml b/pubspec.yaml index 05425d7..9fd2ad7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,71 +1,23 @@ name: flutter_auth description: A new Flutter project. - -# The following defines the version and build number for your application. -# A version number is three numbers separated by dots, like 1.2.43 -# followed by an optional build number separated by a +. -# Both the version and the builder number may be overridden in flutter -# build by specifying --build-name and --build-number, respectively. -# In Android, build-name is used as versionName while build-number used as versionCode. -# Read more about Android versioning at https://developer.android.com/studio/publish/versioning -# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. -# Read more about iOS versioning at -# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html +publish_to: "none" version: 1.0.0+1 - environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=3.1.2 <4.0.0" dependencies: flutter: sdk: flutter - - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.5 - flutter_svg: ^1.1.0 + cupertino_icons: + flutter_svg: ^2.0.7 dev_dependencies: flutter_test: sdk: flutter + flutter_lints: ^2.0.0 - flutter_lints: ^2.0.1 - -# For information on the generic Dart part of this file, see the -# following page: https://dart.dev/tools/pub/pubspec - -# The following section is specific to Flutter. flutter: - # The following line ensures that the Material Icons font is - # included with your application, so that you can use the icons in - # the material Icons class. uses-material-design: true - - # To add assets to your application, add an assets section, like this: assets: - assets/images/ - assets/icons/ - # - images/a_dot_ham.jpeg - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/assets-and-images/#resolution-aware. - # For details regarding adding assets from package dependencies, see - # https://flutter.dev/assets-and-images/#from-packages - # To add custom fonts to your application, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: - # fonts: - # - family: Schyler - # fonts: - # - asset: fonts/Schyler-Regular.ttf - # - asset: fonts/Schyler-Italic.ttf - # style: italic - # - family: Trajan Pro - # fonts: - # - asset: fonts/TrajanPro.ttf - # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 - # - # For details regarding fonts from package dependencies, - # see https://flutter.dev/custom-fonts/#from-packages diff --git a/test/widget_test.dart b/test/widget_test.dart index 8165743..6cab4fb 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -13,7 +13,7 @@ import 'package:flutter_auth/main.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async { // Build our app and trigger a frame. - await tester.pumpWidget(const MyApp()); + await tester.pumpWidget(const MainApp()); // Verify that our counter starts at 0. expect(find.text('0'), findsOneWidget);