From a9682fb0726ff28189aa54ad754ee6589cb7d288 Mon Sep 17 00:00:00 2001 From: Bossanyi Tibor Date: Mon, 17 Aug 2020 19:51:32 +0200 Subject: [PATCH] wt1.1a fb and firebase temporary elimination --- lib/push_notifications.dart | 6 ++++-- lib/util/session.dart | 4 ++-- lib/view/custom_exercise_page.dart | 24 ++++++++++++------------ lib/view/login.dart | 8 ++++---- lib/view/registration.dart | 8 ++++---- pubspec.lock | 18 ++---------------- pubspec.yaml | 4 ++-- 7 files changed, 30 insertions(+), 42 deletions(-) diff --git a/lib/push_notifications.dart b/lib/push_notifications.dart index 4128f5c..b25d135 100644 --- a/lib/push_notifications.dart +++ b/lib/push_notifications.dart @@ -1,4 +1,4 @@ -import 'package:firebase_messaging/firebase_messaging.dart'; +/*import 'package:firebase_messaging/firebase_messaging.dart'; class PushNotificationsManager { @@ -24,4 +24,6 @@ class PushNotificationsManager { _initialized = true; } } -} \ No newline at end of file +} + +*/ diff --git a/lib/util/session.dart b/lib/util/session.dart index f62a256..bcb95c8 100644 --- a/lib/util/session.dart +++ b/lib/util/session.dart @@ -9,7 +9,7 @@ import 'package:flutter/services.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:aitrainer_app/model/auth.dart'; -import '../push_notifications.dart'; +//import '../push_notifications.dart'; class Session { @@ -32,7 +32,7 @@ class Session { await _fetchToken(_sharedPreferences); initDeviceLocale(); - PushNotificationsManager().init(); + // PushNotificationsManager().init(); } } diff --git a/lib/view/custom_exercise_page.dart b/lib/view/custom_exercise_page.dart index 820f8eb..6f23994 100644 --- a/lib/view/custom_exercise_page.dart +++ b/lib/view/custom_exercise_page.dart @@ -199,7 +199,7 @@ class _CustomExerciseNewPageState extends State { delegate: SliverChildListDelegate( [ TextFieldBlocBuilder( - isEnabled: false, + readOnly: true, textFieldBloc: bloc.rmWendlerField, padding: EdgeInsets.only(left:30), style: TextStyle(color: Colors.deepOrange, fontSize: 12), @@ -210,7 +210,7 @@ class _CustomExerciseNewPageState extends State { labelText: "1RM by Wendler: ", )), TextFieldBlocBuilder( - isEnabled: false, + readOnly: true, padding: EdgeInsets.only(left:30), textFieldBloc: bloc.rmMcGothlinField, style: TextStyle(color: Colors.deepOrange, fontSize: 12), @@ -221,7 +221,7 @@ class _CustomExerciseNewPageState extends State { labelText: "1RM by McGlothin: ", )), TextFieldBlocBuilder( - isEnabled: false, + readOnly: true, padding: EdgeInsets.only(left:30), maxLines: 1, textFieldBloc: bloc.rmLombardiField, @@ -233,7 +233,7 @@ class _CustomExerciseNewPageState extends State { labelText: "1RM by Lambordini: ", )), TextFieldBlocBuilder( - isEnabled: false, + readOnly: true, padding: EdgeInsets.only(left:30), maxLines: 1, textFieldBloc: bloc.rmWathenField, @@ -245,7 +245,7 @@ class _CustomExerciseNewPageState extends State { labelText: "1RM by Wahten: ", )), TextFieldBlocBuilder( - isEnabled: false, + readOnly: true, padding: EdgeInsets.only(left:30), maxLines: 1, textFieldBloc: bloc.rmOconnerField, @@ -257,7 +257,7 @@ class _CustomExerciseNewPageState extends State { labelText: "1RM by O'Conner: ", )), TextFieldBlocBuilder( - isEnabled: false, + readOnly: true, padding: EdgeInsets.only(left:30), maxLines: 1, textFieldBloc: bloc.rmMayhewField, @@ -269,7 +269,7 @@ class _CustomExerciseNewPageState extends State { labelText: "1RM by Mayhew: ", )), TextFieldBlocBuilder( - isEnabled: false, + readOnly: true, padding: EdgeInsets.only(left:30), maxLines: 1, textFieldBloc: bloc.rmAverageField, @@ -281,7 +281,7 @@ class _CustomExerciseNewPageState extends State { labelText: "1RM Average: ", )), TextFieldBlocBuilder( - isEnabled: false, + readOnly: true, padding: EdgeInsets.only(left:30), maxLines: 1, textFieldBloc: bloc.rm90Field, @@ -293,7 +293,7 @@ class _CustomExerciseNewPageState extends State { labelText: "1RM 90%: ", )), TextFieldBlocBuilder( - isEnabled: false, + readOnly: true, padding: EdgeInsets.only(left:30), maxLines: 1, textFieldBloc: bloc.rm80Field, @@ -305,7 +305,7 @@ class _CustomExerciseNewPageState extends State { labelText: "1RM 80%: ", )), TextFieldBlocBuilder( - isEnabled: false, + readOnly: true, padding: EdgeInsets.only(left:30), maxLines: 1, textFieldBloc: bloc.rm70Field, @@ -317,7 +317,7 @@ class _CustomExerciseNewPageState extends State { labelText: "1RM 70%: ", )), TextFieldBlocBuilder( - isEnabled: false, + readOnly: true, padding: EdgeInsets.only(left:30), maxLines: 1, textFieldBloc: bloc.rm60Field, @@ -329,7 +329,7 @@ class _CustomExerciseNewPageState extends State { labelText: "1RM 60%: ", )), TextFieldBlocBuilder( - isEnabled: false, + readOnly: true, padding: EdgeInsets.only(left:30), maxLines: 1, textFieldBloc: bloc.rm50Field, diff --git a/lib/view/login.dart b/lib/view/login.dart index 88e4372..986ecf6 100644 --- a/lib/view/login.dart +++ b/lib/view/login.dart @@ -7,7 +7,7 @@ import 'package:aitrainer_app/widgets/splash.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_facebook_login/flutter_facebook_login.dart'; +//import 'package:flutter_facebook_login/flutter_facebook_login.dart'; import 'package:flutter_form_bloc/flutter_form_bloc.dart'; import '../library_keys.dart'; @@ -87,7 +87,7 @@ class _LoginWidget extends State { width: cWidth * .85, ), onPressed: () => { - _fbLogin(), + //_fbLogin(), print("Login with FB"), }, ), @@ -172,7 +172,7 @@ class _LoginWidget extends State { content: Text(error, style: TextStyle(color: Colors.white)))); } - Future _fbLogin() async { + /* Future _fbLogin() async { final FacebookLogin facebookSignIn = new FacebookLogin(); final FacebookLoginResult result = await facebookSignIn.logIn(['email']); @@ -197,5 +197,5 @@ class _LoginWidget extends State { 'Here\'s the error Facebook gave us: ${result.errorMessage}'); break; } - } + } */ } diff --git a/lib/view/registration.dart b/lib/view/registration.dart index 946ba4f..74a8cf0 100644 --- a/lib/view/registration.dart +++ b/lib/view/registration.dart @@ -8,7 +8,7 @@ import 'package:aitrainer_app/widgets/splash.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_facebook_login/flutter_facebook_login.dart'; +//import 'package:flutter_facebook_login/flutter_facebook_login.dart'; import 'package:flutter_form_bloc/flutter_form_bloc.dart'; import '../library_keys.dart'; @@ -92,7 +92,7 @@ class _RegistrationWidget extends State { width: cWidth * .85, ), onPressed: () => { - _fbLogin(), + // _fbLogin(), print("Login with FB"), }, ), @@ -188,7 +188,7 @@ class _RegistrationWidget extends State { style: TextStyle(color: Colors.white)))); } - Future _fbLogin() async { + /* Future _fbLogin() async { final FacebookLogin facebookSignIn = new FacebookLogin(); final FacebookLoginResult result = await facebookSignIn.logIn(['email']); @@ -212,5 +212,5 @@ class _RegistrationWidget extends State { 'Here\'s the error Facebook gave us: ${result.errorMessage}'); break; } - } + } */ } diff --git a/pubspec.lock b/pubspec.lock index 0f8c960..bcf76f4 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -42,7 +42,7 @@ packages: name: bloc url: "https://pub.dartlang.org" source: hosted - version: "6.0.1" + version: "6.0.2" bloc_test: dependency: "direct dev" description: @@ -155,13 +155,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "5.2.1" - firebase_messaging: - dependency: "direct main" - description: - name: firebase_messaging - url: "https://pub.dartlang.org" - source: hosted - version: "6.0.16" flutter: dependency: "direct main" description: flutter @@ -179,13 +172,6 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_facebook_login: - dependency: "direct main" - description: - name: flutter_facebook_login - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.0" flutter_form_bloc: dependency: "direct main" description: @@ -527,7 +513,7 @@ packages: name: shelf url: "https://pub.dartlang.org" source: hosted - version: "0.7.8" + version: "0.7.9" shelf_packages_handler: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index cde5a4d..a889211 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -29,9 +29,9 @@ dependencies: cupertino_icons: ^0.1.3 devicelocale: ^0.3.1 sentry: ^3.0.1 - firebase_messaging: ^6.0.16 + # firebase_messaging: ^6.0.16 flutter_local_notifications: 1.1.1 - flutter_facebook_login: ^3.0.0 + #flutter_facebook_login: ^3.0.0 flutter_bloc: ^6.0.1 equatable: ^1.2.3 flutter_form_bloc: ^0.19.0