Skip to content
Snippets Groups Projects
Commit 272bd28d authored by Himali Aryal's avatar Himali Aryal
Browse files

Merge branch 'authetication' into 'master' 

Added authentication

See merge request !9
parents 7841ba9a ecbf3b74
No related branches found
No related tags found
1 merge request!9Added authentication
Show whitespace changes
Inline Side-by-side
lib/main.dart
+ 72
− 5
View file @ 272bd28d
import 'dart:async';
import 'package:firebase_auth/firebase_auth.dart';
import 'package:firebase_core/firebase_core.dart';
import 'package:flutter/material.dart';
import 'package:flutter_app/ui/auth/log_in.dart';
import 'package:flutter_app/ui/common/notification_provider.dart';
import 'package:flutter_app/ui/entries/list_entries.dart';
import 'package:flutter_app/ui/entries/select_page.dart';
......@@ -13,9 +16,67 @@ import 'package:workmanager/workmanager.dart';
// });
// }
void main() => runApp(MaterialApp(
home: Home(),
void main() {
runApp(MaterialApp(
home: MyApp(),
));
}
class MyApp extends StatelessWidget {
@override
Widget build(BuildContext context) {
return MaterialApp(
home: LandingPage(),
);
}
}
class LandingPage extends StatelessWidget {
final Future<FirebaseApp> _initialization = Firebase.initializeApp();
@override
Widget build(BuildContext context) {
return FutureBuilder(
future: _initialization,
builder: (context, snapshot){
if(snapshot.hasError){
return Scaffold(
body: Center(
child: Text("Error: ${snapshot.error}"),
),
);
}
if(snapshot.connectionState == ConnectionState.done){
return StreamBuilder(
stream: FirebaseAuth.
instance
.authStateChanges(),
builder: (context, snapshot){
if(snapshot.connectionState == ConnectionState.active){
User user = snapshot.data;
if(user == null){
return LoginPage();
}else{
return Home();
}
}
return Scaffold(
body: Center(
child: Text('Connecting authentication...'),
),
);
},
);
}
return Scaffold(
body: Center(
child: Text('Connecting to the app...'),
),
);
}
);
}
}
class Home extends StatefulWidget {
static const routeName = 'home';
......@@ -35,11 +96,17 @@ class _HomeState extends State<Home> {
backgroundColor: Color(0xFF3C4858),
actions: <Widget>[
IconButton(
icon: Icon(Icons.settings),
icon: Icon(Icons.notifications),
onPressed: () {
Navigator.of(context).push(SlideUpRoute(widget: NotificationProvider()));
},
)
),
IconButton(
icon: Icon(Icons.settings),
onPressed: () async{
await FirebaseAuth.instance.signOut();
},
),
],
),
body: IndexedStack(
......
lib/ui/auth/log_in.dart 0 → 100644
+ 98
− 0
View file @ 272bd28d
import 'package:flutter/material.dart';
import 'package:firebase_auth/firebase_auth.dart';
class LoginPage extends StatefulWidget {
@override
_LoginPageState createState() => _LoginPageState();
}
class _LoginPageState extends State<LoginPage> {
String _email;
String _password;
Future<void> _createUser() async{
try{
UserCredential userCredential = await FirebaseAuth
.instance
.createUserWithEmailAndPassword(email: _email, password: _password);
} on FirebaseAuthException catch(e){
showAlert();
}catch(e){
showAlert();
}
}
void showAlert() {
showDialog(context: context, builder: (context) {
return AlertDialog(
title: Text('Incorrect user name or password...'),
);
});
}
Future<void> _login() async{
try{
UserCredential userCredential = await FirebaseAuth
.instance
.signInWithEmailAndPassword(email: _email, password: _password);
} on FirebaseAuthException catch(e){
showAlert();
}catch(e){
showAlert();
}
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text('Login'),
backgroundColor: Color(0xFF3C4858),
centerTitle: true,
),
body: Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
children: [
TextField(
onChanged: (value){
_email = value;
},
decoration: InputDecoration(
hintText: 'Enter Email...'
),
),
TextField(
onChanged: (value){
_password = value;
},
obscureText: true,
decoration: InputDecoration(
hintText: 'Enter Password...'
),
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
MaterialButton(
onPressed: (){
_login();
},
child: Text('Login'),
),
MaterialButton(
onPressed: (){
_createUser();
},
child: Text('Register'),
),
],
),
],
),
),
);
}
}
lib/ui/common/notification_provider.dart
+ 14
− 11
View file @ 272bd28d
import 'dart:async';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/scheduler.dart';
import 'package:flutter_app/ui/common/slide_up_route.dart';
......@@ -31,19 +32,14 @@ class _NotificationProviderState extends State<NotificationProvider> {
Future _showNotification() async {
var androidDetails = new AndroidNotificationDetails(
"Notification ID", "Diary notification provider", "This is reminder to add daily diary to your app",
importance: Importance.max,
// playSound: true,
// sound: RawResourceAndroidNotificationSound('Notification sound')
);
var iSODetails = new IOSNotificationDetails();
var generalNotificationDetails =
new NotificationDetails(android: androidDetails, iOS: iSODetails);
// await fltrNotification.show(
// 0, "Task", "You created a Task", generalNotificationDetails, payload: "Task");
var scheduledTime;
if (_selectedParam == "Hour") {
scheduledTime = DateTime.now().add(Duration(hours: val));
......@@ -52,12 +48,11 @@ class _NotificationProviderState extends State<NotificationProvider> {
scheduledTime = DateTime.now().add(Duration(minutes: val));
} else {
scheduledTime = DateTime.now().add(Duration(seconds: val));
// scheduledTime = Timer.periodic(scheduledTime,(timer){});
}
fltrNotification.schedule(
1, "DIARY NOTIFICATION", task, scheduledTime, generalNotificationDetails);
fltrNotification.periodicallyShow(
1, "DIARY NOTIFICATION", task, scheduledTime, generalNotificationDetails, androidAllowWhileIdle: true);
}
......@@ -213,10 +208,18 @@ class _NotificationProviderState extends State<NotificationProvider> {
context: context,
builder: (context) => AlertDialog(
content: Text("Notification Clicked $payload"),
actions: [
CupertinoDialogAction(
isDefaultAction: true,
child: Text('ok'),
onPressed: () async{
Navigator.of(context, rootNavigator: true).pop();
await Navigator.push(context, SlideUpRoute(widget: AddEntry()));
},
// onPressed: () => Navigator.of(context).push(SlideUpRoute(widget: AddEntry())),
)
],
),
);
GestureDetector(
onTap: () => Navigator.of(context).push(SlideUpRoute(widget: AddEntry())),
);
}
}
lib/ui/entries/add_entries.dart
+ 6
− 1
View file @ 272bd28d
import 'package:firebase_auth/firebase_auth.dart';
import 'package:firebase_core/firebase_core.dart';
import 'package:firebase_database/firebase_database.dart';
import 'package:flutter_app/utils/input_validator.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:firebase_auth/firebase_auth.dart';
class AddEntry extends StatefulWidget {
......@@ -26,14 +28,17 @@ class _AddEntryState extends State<AddEntry> {
_contentController = TextEditingController();
_ref = FirebaseDatabase.instance.reference().child('diary');
}
Widget build(BuildContext context) {
void saveContent() {
String title = _titleController.text;
String content = _contentController.text;
String user = FirebaseAuth.instance.currentUser.uid;
Map<String, String> diary = {
'uid': user,
'title' : title,
'content' : content,
'Created at' : DateTime.now().toString(),
'Timestamp' : DateTime.now().millisecondsSinceEpoch.toString(),
};
_ref.push().set(diary).then((value) {
Navigator.of(context).pop();
......
lib/ui/entries/emoji_entries.dart
+ 4
− 1
View file @ 272bd28d
import 'package:firebase_auth/firebase_auth.dart';
import 'package:firebase_database/firebase_database.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
......@@ -25,9 +26,11 @@ class _EmojisState extends State<Emojis> {
void saveContent(String title) {
setState(() {
_typeSelected = title;
_createdAt = DateTime.now().toString();
_createdAt = DateTime.now().millisecondsSinceEpoch.toString();
});
String user = FirebaseAuth.instance.currentUser.uid;
Map<String, String> emojis = {
'uid' : user,
'content' : _typeSelected,
'Timestamp' : _createdAt,
};
......
pubspec.lock
+ 7
− 0
View file @ 272bd28d
......@@ -190,6 +190,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "4.4.0"
firebase_dynamic_links:
dependency: "direct dev"
description:
name: firebase_dynamic_links
url: "https://pub.dartlang.org"
source: hosted
version: "0.6.3"
flutter:
dependency: "direct main"
description: flutter
......
pubspec.yaml
+ 1
− 0
View file @ 272bd28d
......@@ -63,6 +63,7 @@ dev_dependencies:
intl: ^0.16.0
flutter_local_notifications: ^4.0.1+2
rxdart: ^0.23.1
firebase_dynamic_links: ^0.6.3
# For information on the generic Dart part of this file, see the
# following page: https://dart.dev/tools/pub/pubspec
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment