From 4b42a7bd42e109dac9ded2a6a23ee30d53e2cd54 Mon Sep 17 00:00:00 2001 From: Priyanshu078 Date: Thu, 28 Oct 2021 18:34:56 +0530 Subject: [PATCH] kotlin version error solved --- android/app/build.gradle | 1 + android/build.gradle | 4 ++-- android/gradle/wrapper/gradle-wrapper.properties | 2 +- lib/Services/auth_wrapper.dart | 2 +- lib/UI/create_goal_page_2.dart | 2 -- lib/UI/login_screen.dart | 6 ++---- lib/UI/profile_screen.dart | 6 +++--- lib/main.dart | 9 ++++----- lib/utils/constants.dart | 16 ++++++++++++++++ pubspec.yaml | 2 +- 10 files changed, 31 insertions(+), 19 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 2c9e755..40f7c10 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -26,6 +26,7 @@ apply plugin: 'com.google.gms.google-services' apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" + android { compileSdkVersion 29 diff --git a/android/build.gradle b/android/build.gradle index e62a641..a873cae 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.5.10' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:4.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.3.5' } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 296b146..493072b 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-6.1.1-all.zip diff --git a/lib/Services/auth_wrapper.dart b/lib/Services/auth_wrapper.dart index c4d350b..da17789 100644 --- a/lib/Services/auth_wrapper.dart +++ b/lib/Services/auth_wrapper.dart @@ -9,7 +9,7 @@ import 'package:firebase_auth/firebase_auth.dart'; class AuthWrapper extends StatelessWidget { @override Widget build(BuildContext context) { - final user = Provider.of(context); + final user = Provider.of(context,listen:false).metadata; // return either the Home or Login screen if (user == null) { diff --git a/lib/UI/create_goal_page_2.dart b/lib/UI/create_goal_page_2.dart index 49ca5ee..9e2ed78 100644 --- a/lib/UI/create_goal_page_2.dart +++ b/lib/UI/create_goal_page_2.dart @@ -1,5 +1,3 @@ - - import 'package:awesome_slider/awesome_slider.dart'; import 'package:batua/utils/constants.dart'; import 'package:flutter/material.dart'; diff --git a/lib/UI/login_screen.dart b/lib/UI/login_screen.dart index 11b8625..d237bb7 100644 --- a/lib/UI/login_screen.dart +++ b/lib/UI/login_screen.dart @@ -1,11 +1,9 @@ - - import 'package:batua/Services/authentication_service.dart'; import 'package:batua/Services/facebook_auth.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:modal_progress_hud/modal_progress_hud.dart'; +import 'package:modal_progress_hud_nsn/modal_progress_hud_nsn.dart'; import '../Services/google_signin.dart'; import '../utils/constants.dart'; @@ -149,7 +147,7 @@ class _LoginScreenState extends State { showDialog( context: context, builder: (context) { - return AlertDialog( + return const AlertDialog( backgroundColor: Colors.black54, title: Text( "Log-In Complete", diff --git a/lib/UI/profile_screen.dart b/lib/UI/profile_screen.dart index 6f53d08..a6728ae 100644 --- a/lib/UI/profile_screen.dart +++ b/lib/UI/profile_screen.dart @@ -1,5 +1,3 @@ - - import 'package:batua/Services/authentication_service.dart'; import 'package:batua/utils/constants.dart'; import 'package:cloud_firestore/cloud_firestore.dart'; @@ -132,7 +130,9 @@ class ProfileScreen extends StatelessWidget { ), sizedBoxBuilder(_height), singleTextBox( - text: snapshot.data!.data()!['Mobile Number'].toString() == + text: snapshot.data! + .data()!['Mobile Number'] + .toString() == '' ? 'No data provided' : snapshot.data!.data()!['Mobile Number'].toString(), diff --git a/lib/main.dart b/lib/main.dart index aa4792a..9532b76 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -29,11 +29,10 @@ class MyApp extends StatelessWidget { child: MaterialApp( title: 'Batua', theme: ThemeData( - fontFamily: 'Poppins', - primarySwatch: primary_color, - visualDensity: VisualDensity.adaptivePlatformDensity, - accentColor: secondary_color - ), + fontFamily: 'Poppins', + primarySwatch: primarySwatch, + visualDensity: VisualDensity.adaptivePlatformDensity, + accentColor: secondary_color), initialRoute: RouteConstants.AUTH_WRAPPER, onGenerateRoute: RoutePage.generateRoute, ), diff --git a/lib/utils/constants.dart b/lib/utils/constants.dart index 9b54494..d9062ee 100644 --- a/lib/utils/constants.dart +++ b/lib/utils/constants.dart @@ -15,6 +15,22 @@ Color textField_color2 = const Color(0x42000000).withOpacity(0.05); // ignore: non_constant_identifier_names Color textField_color = Colors.grey.withOpacity(0.10); +MaterialColor primarySwatch = MaterialColor( + primary_color.value, + const { + 50: const Color(0xffdddde2), //10% + 100: const Color(0xffc4c5c9), //20% + 200: const Color(0xffacacb0), //30% + 300: const Color(0xff939497), //40% + 400: const Color(0xff7b7b7e), //50% + 500: const Color(0xff626264), //60% + 600: const Color(0xff494a4b), //70% + 700: const Color(0xff313132), //80% + 800: const Color(0xff181919), //90% + 900: const Color(0xff000000), //100% + }, +); + InputDecoration inputDecoration = InputDecoration( hintStyle: const TextStyle( color: Color(0x42000000), diff --git a/pubspec.yaml b/pubspec.yaml index 0d42cea..0b90d08 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -36,7 +36,7 @@ dependencies: google_sign_in: ^5.1.1 jiffy: ^4.1.0 lint: ^1.7.2 - modal_progress_hud: ^0.1.3 + modal_progress_hud_nsn: ^0.1.0-nullsafety-1 provider: ^6.0.1