Skip to content

Commit

Permalink
Sign in problems fix
Browse files Browse the repository at this point in the history
  • Loading branch information
ashuvssut committed Aug 21, 2021
1 parent 87bda7f commit 7c10194
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 54 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,4 @@ pubspec.lock
dump
lib/pages/notification_details_page.dart
lib/pages/notification_examples_page.dart

android/app/google-services.json
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ flutter {

dependencies {
implementation 'com.android.support:multidex:1.0.3'
implementation platform('com.google.firebase:firebase-bom:26.1.1')
implementation platform('com.google.firebase:firebase-bom:28.4.0')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.google.android.material:material:1.5.0-alpha02'
}
47 changes: 0 additions & 47 deletions android/app/google-services.json

This file was deleted.

2 changes: 2 additions & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
In most cases you can leave this as-is, but you if you want to provide
additional functionality it is fine to subclass or reimplement
FlutterApplication and put your custom class here. -->

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}

dependencies {
classpath 'com.google.gms:google-services:4.3.4'
classpath 'com.google.gms:google-services:4.3.10'
classpath 'com.android.tools.build:gradle:3.5.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
Expand Down
3 changes: 2 additions & 1 deletion lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'package:awesome_notifications/awesome_notifications.dart';
import 'package:flutter/material.dart';
import 'package:firebase_core/firebase_core.dart';
import 'package:women_safety_app/views/home.dart';
import 'package:women_safety_app/views/signin.dart';
// import 'package:women_safety_app/views/signin.dart';

void main() async {
Expand Down Expand Up @@ -44,7 +45,7 @@ class _MyAppState extends State<MyApp> {
theme: ThemeData(
primarySwatch: Colors.blue,
),
home: Home(),
home: SignIn(),
);
}
}
6 changes: 3 additions & 3 deletions lib/views/signin.dart
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class _SignInState extends State<SignIn> {
margin: const EdgeInsets.only(top: 50.0),
width: 300,
child: ButtonTheme(
buttonColor: Colors.white60,
buttonColor: Colors.white,
child: RaisedButton(
onPressed: () {
AuthMethods().signInWithGoogle(context);
Expand All @@ -45,7 +45,7 @@ class _SignInState extends State<SignIn> {
),
child: Row(children: [
Padding(
padding: const EdgeInsets.only(top:7, right:17,bottom:7,left:7),
padding: const EdgeInsets.only(top: 13, right: 17, bottom: 13, left: 7),
child: SvgPicture.asset(
"assets/icons/google.svg",
height: size.height * 0.05,
Expand All @@ -54,7 +54,7 @@ class _SignInState extends State<SignIn> {
Text(
"Sign In with Google",
style: TextStyle(
color: Colors.white,
color: Colors.blue,
fontWeight: FontWeight.w700,
fontSize: 21,
),
Expand Down

0 comments on commit 7c10194

Please sign in to comment.