Skip to content

Commit

Permalink
update 5 files
Browse files Browse the repository at this point in the history
  • Loading branch information
@Aquarius-blake
Aquarius-blake committed Dec 29, 2023
1 parent 0b88cd2 commit 6c268f3
Show file tree
Hide file tree
Showing 6 changed files with 79 additions and 31 deletions.
7 changes: 7 additions & 0 deletions lib/Screens/Authenticate/Register.dart
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import 'package:firebase_analytics/firebase_analytics.dart';
import 'package:flutter/material.dart';
import 'package:forum3/shared/Widgets/Alert.dart';
import 'package:forum3/shared/loading.dart';
import 'package:image_picker/image_picker.dart';
import '../../Services/Upload.dart';
import '../../Services/auth.dart';



class Register extends StatefulWidget {
Register({Key? key}) : super(key: key);

Expand All @@ -21,6 +24,7 @@ class _RegisterState extends State<Register> {
String error="";
dynamic image;
DateTime date=DateTime(2022,01,01);
var analytics = FirebaseAnalytics.instance;


bool loading=false;
Expand Down Expand Up @@ -319,6 +323,9 @@ class _RegisterState extends State<Register> {
}
else{
// print("success");
await analytics.logSignUp(
signUpMethod: "Email"
);
Navigator.pop(context);
}
}
Expand Down
2 changes: 2 additions & 0 deletions lib/Screens/Authenticate/reset.dart
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:forum3/Services/auth.dart';
import 'package:forum3/Services/Analytics.dart' as globals;


class Resetpass extends StatefulWidget {
Expand Down Expand Up @@ -120,6 +121,7 @@ padd=150;
onPressed: () async{
if(_formKey.currentState?.validate()!=null){
await _auth.Reset(email);
globals.analytics.logEvent(name: "Reset_password");
Navigator.pop(context);
}
},
Expand Down
11 changes: 10 additions & 1 deletion lib/Screens/Authenticate/signin.dart
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'package:firebase_analytics/firebase_analytics.dart';
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:forum3/shared/loading.dart';
Expand All @@ -22,6 +23,8 @@ class _SinginState extends State<Singin> {
String password="";
String error="";

var analytics = FirebaseAnalytics.instance;

@override
Widget build(BuildContext context) {
return loading ? Loading(): Scaffold(
Expand Down Expand Up @@ -166,6 +169,9 @@ class _SinginState extends State<Singin> {
);
}else{
print("success");
await analytics.logLogin(
loginMethod: "Email"
);
}
}else{
error="Signin Failed";}
Expand Down Expand Up @@ -202,12 +208,15 @@ class _SinginState extends State<Singin> {
),
onPressed: () async {
dynamic result= await _auth.Signguest();
if(result== null){
if(result == null){
print("Error Signing into App");
}else
{
print("Success");
print(result.UID);
await analytics.logLogin(
loginMethod: "login_guest"
);
}
},
child: Padding(
Expand Down
5 changes: 5 additions & 0 deletions lib/Services/Analytics.dart
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
library Social_Media.globals;

import 'package:firebase_analytics/firebase_analytics.dart';

var analytics = FirebaseAnalytics.instance;
84 changes: 54 additions & 30 deletions pubspec.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ packages:
dependency: transitive
description:
name: _flutterfire_internals
sha256: "5dce45a06d386358334eb1689108db6455d90ceb0d75848d5f4819283d4ee2b8"
sha256: f5628cd9c92ed11083f425fd1f8f1bc60ecdda458c81d73b143aeda036c35fe7
url: "https://pub.dev"
source: hosted
version: "1.3.4"
version: "1.3.16"
analyzer:
dependency: transitive
description:
Expand Down Expand Up @@ -141,26 +141,26 @@ packages:
dependency: "direct main"
description:
name: cloud_firestore
sha256: "035b91f66b60dab5eefcc217accc734020234f79d963b075699920b95334a755"
sha256: cb978c7512624144f24f3d06e4312b2f4ac00b016f2fed62dc8f6d56b8585d78
url: "https://pub.dev"
source: hosted
version: "4.8.3"
version: "4.13.6"
cloud_firestore_platform_interface:
dependency: transitive
description:
name: cloud_firestore_platform_interface
sha256: "86bd1865abbeb09a7d09da3e70364a09f894937270651fc611a1c6d6a9f7b02c"
sha256: fa177fa85f7665c76e1ebec252a5b280b4b47612b4d70fe286944814fff1d4f2
url: "https://pub.dev"
source: hosted
version: "5.15.3"
version: "6.0.10"
cloud_firestore_web:
dependency: transitive
description:
name: cloud_firestore_web
sha256: ac2eeb2a7ab1928c3aacc30eed750fa839d6f620e112a5459e321df217be2f47
sha256: d0ebbf0927e627c0d7d2f3177d3b6f0050e5d811c08c2b646b0c746a2b502cb7
url: "https://pub.dev"
source: hosted
version: "3.6.3"
version: "3.8.10"
code_builder:
dependency: transitive
description:
Expand Down Expand Up @@ -281,94 +281,118 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.9.3"
firebase_analytics:
dependency: "direct main"
description:
name: firebase_analytics
sha256: "5e92d510eacd66c354718fd9cc8f66ffdfa025640b645c4742297fb973770508"
url: "https://pub.dev"
source: hosted
version: "10.7.4"
firebase_analytics_platform_interface:
dependency: transitive
description:
name: firebase_analytics_platform_interface
sha256: "72977325a72af5ebb8e53b5c5533cb2e33eec481cd46210cfe5427f5efba55d8"
url: "https://pub.dev"
source: hosted
version: "3.8.4"
firebase_analytics_web:
dependency: transitive
description:
name: firebase_analytics_web
sha256: "8b9710be7e292e2a5ad34fff449d4b668c5808fb339649e69181727a4534f579"
url: "https://pub.dev"
source: hosted
version: "0.5.5+11"
firebase_auth:
dependency: "direct main"
description:
name: firebase_auth
sha256: acfbe55bc23e94ccc7228b7fc7b9abc0005597c1de226f6e3a0103ac29728fbe
sha256: "88f88d541a2c1903c023355e13d077835573a200bbf57e12a6a2c24bf99665a1"
url: "https://pub.dev"
source: hosted
version: "4.7.1"
version: "4.15.3"
firebase_auth_platform_interface:
dependency: transitive
description:
name: firebase_auth_platform_interface
sha256: "4ab0a8997994db2b76bf0652689d7908ca935a99314857c683251bc23d31c287"
sha256: "3c9cfaccb7549492edf5b0c67c6dd1c6727c7830891aa6727f2fb225f0226626"
url: "https://pub.dev"
source: hosted
version: "6.16.0"
version: "7.0.9"
firebase_auth_web:
dependency: transitive
description:
name: firebase_auth_web
sha256: "2e694a612a0739c0cf5f426d515dda37ee5827bab211d16e76bcad6a082925eb"
sha256: c09515414c07c11bb133aec4baae9a74c6ff1f62bf05ace54564db82b8c87852
url: "https://pub.dev"
source: hosted
version: "5.6.1"
version: "5.8.12"
firebase_core:
dependency: "direct main"
description:
name: firebase_core
sha256: "2e9324f719e90200dc7d3c4f5d2abc26052f9f2b995d3b6626c47a0dfe1c8192"
sha256: "96607c0e829a581c2a483c658f04e8b159964c3bae2730f73297070bc85d40bb"
url: "https://pub.dev"
source: hosted
version: "2.15.0"
version: "2.24.2"
firebase_core_platform_interface:
dependency: transitive
description:
name: firebase_core_platform_interface
sha256: b63e3be6c96ef5c33bdec1aab23c91eb00696f6452f0519401d640938c94cba2
sha256: c437ae5d17e6b5cc7981cf6fd458a5db4d12979905f9aafd1fea930428a9fe63
url: "https://pub.dev"
source: hosted
version: "4.8.0"
version: "5.0.0"
firebase_core_web:
dependency: transitive
description:
name: firebase_core_web
sha256: "0fd5c4b228de29b55fac38aed0d9e42514b3d3bd47675de52bf7f8fccaf922fa"
sha256: d585bdf3c656c3f7821ba1bd44da5f13365d22fcecaf5eb75c4295246aaa83c0
url: "https://pub.dev"
source: hosted
version: "2.6.0"
version: "2.10.0"
firebase_dynamic_links:
dependency: "direct main"
description:
name: firebase_dynamic_links
sha256: "4872f4d7e94736041398bc3490c2ddd87ee159d6b051ba01ca2708e5260a7ebe"
sha256: b0522806658428803aeb5e7be0b22a29acb8f8697a8909c36965feaeb1f655bd
url: "https://pub.dev"
source: hosted
version: "5.3.4"
version: "5.4.8"
firebase_dynamic_links_platform_interface:
dependency: transitive
description:
name: firebase_dynamic_links_platform_interface
sha256: "946fccfefb67e26bf63e392f1b3917d79ea031d3071488f0c5e8ab72de8219ab"
sha256: "8b90384d8f85c7211f2b5e2d9d5ae98bd08091f116ef2bd1a74b33574efacc61"
url: "https://pub.dev"
source: hosted
version: "0.2.6+4"
version: "0.2.6+16"
firebase_storage:
dependency: "direct main"
description:
name: firebase_storage
sha256: "4b747005aee0c611242cdd553f58795f51e1567d2dfd4f75692fac3f67c8c336"
sha256: "8126e80210c0841a5b8204590b40d6b9e87cded3d342a92833f484a564dcddb3"
url: "https://pub.dev"
source: hosted
version: "11.2.5"
version: "11.5.6"
firebase_storage_platform_interface:
dependency: transitive
description:
name: firebase_storage_platform_interface
sha256: c77c7b6b7d283280993c81ea8ac95552b2ae521a7bb46a95181c1482e62d1633
sha256: "545a3a8edf337850403bb0fa03c8074a53deb87c0107d19755c77a82ce07919e"
url: "https://pub.dev"
source: hosted
version: "4.4.4"
version: "5.1.3"
firebase_storage_web:
dependency: transitive
description:
name: firebase_storage_web
sha256: "6906245579f1af225e43df0395c9d9631cb3135cbfa3521a839196d3383bb89a"
sha256: ee6870ff79aa304b8996ba18a4aefe1e8b3fc31fd385eab6574180267aa8d393
url: "https://pub.dev"
source: hosted
version: "3.6.5"
version: "3.6.17"
fixnum:
dependency: transitive
description:
Expand Down
1 change: 1 addition & 0 deletions pubspec.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ dependencies:
badges: ^3.1.2
flutter_chat_bubble: ^2.0.2
page_transition: ^2.1.0
firebase_analytics: ^10.7.4

dev_dependencies:
flutter_test:
Expand Down

0 comments on commit 6c268f3

Please sign in to comment.