bossanyit/workouttest_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wt1.1a fb and firebase temporary elimination

Browse Source
This commit is contained in:
Bossanyi Tibor 2020-08-17 19:51:32 +02:00
parent ac1c6be8f3
commit a9682fb072
7 changed files with 30 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/push_notifications.dart
View File

@ -1,4 +1,4 @@
import 'package:firebase_messaging/firebase_messaging.dart'; /*import 'package:firebase_messaging/firebase_messaging.dart';
class PushNotificationsManager { class PushNotificationsManager {
@ -24,4 +24,6 @@ class PushNotificationsManager {
_initialized = true; _initialized = true;
} }
} }
} }
*/

4
lib/util/session.dart
View File

@ -9,7 +9,7 @@ import 'package:flutter/services.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import 'package:aitrainer_app/model/auth.dart'; import 'package:aitrainer_app/model/auth.dart';
import '../push_notifications.dart'; //import '../push_notifications.dart';
class Session { class Session {
@ -32,7 +32,7 @@ class Session {
await _fetchToken(_sharedPreferences); await _fetchToken(_sharedPreferences);
initDeviceLocale(); initDeviceLocale();
PushNotificationsManager().init(); // PushNotificationsManager().init();
} }
} }

24
lib/view/custom_exercise_page.dart
View File

@ -199,7 +199,7 @@ class _CustomExerciseNewPageState extends State<CustomExercisePage> {
delegate: SliverChildListDelegate( delegate: SliverChildListDelegate(
[ [
TextFieldBlocBuilder( TextFieldBlocBuilder(
isEnabled: false, readOnly: true,
textFieldBloc: bloc.rmWendlerField, textFieldBloc: bloc.rmWendlerField,
padding: EdgeInsets.only(left:30), padding: EdgeInsets.only(left:30),
style: TextStyle(color: Colors.deepOrange, fontSize: 12), style: TextStyle(color: Colors.deepOrange, fontSize: 12),
@ -210,7 +210,7 @@ class _CustomExerciseNewPageState extends State<CustomExercisePage> {
labelText: "1RM by Wendler: ", labelText: "1RM by Wendler: ",
)), )),
TextFieldBlocBuilder( TextFieldBlocBuilder(
isEnabled: false, readOnly: true,
padding: EdgeInsets.only(left:30), padding: EdgeInsets.only(left:30),
textFieldBloc: bloc.rmMcGothlinField, textFieldBloc: bloc.rmMcGothlinField,
style: TextStyle(color: Colors.deepOrange, fontSize: 12), style: TextStyle(color: Colors.deepOrange, fontSize: 12),
@ -221,7 +221,7 @@ class _CustomExerciseNewPageState extends State<CustomExercisePage> {
labelText: "1RM by McGlothin: ", labelText: "1RM by McGlothin: ",
)), )),
TextFieldBlocBuilder( TextFieldBlocBuilder(
isEnabled: false, readOnly: true,
padding: EdgeInsets.only(left:30), padding: EdgeInsets.only(left:30),
maxLines: 1, maxLines: 1,
textFieldBloc: bloc.rmLombardiField, textFieldBloc: bloc.rmLombardiField,
@ -233,7 +233,7 @@ class _CustomExerciseNewPageState extends State<CustomExercisePage> {
labelText: "1RM by Lambordini: ", labelText: "1RM by Lambordini: ",
)), )),
TextFieldBlocBuilder( TextFieldBlocBuilder(
isEnabled: false, readOnly: true,
padding: EdgeInsets.only(left:30), padding: EdgeInsets.only(left:30),
maxLines: 1, maxLines: 1,
textFieldBloc: bloc.rmWathenField, textFieldBloc: bloc.rmWathenField,
@ -245,7 +245,7 @@ class _CustomExerciseNewPageState extends State<CustomExercisePage> {
labelText: "1RM by Wahten: ", labelText: "1RM by Wahten: ",
)), )),
TextFieldBlocBuilder( TextFieldBlocBuilder(
isEnabled: false, readOnly: true,
padding: EdgeInsets.only(left:30), padding: EdgeInsets.only(left:30),
maxLines: 1, maxLines: 1,
textFieldBloc: bloc.rmOconnerField, textFieldBloc: bloc.rmOconnerField,
@ -257,7 +257,7 @@ class _CustomExerciseNewPageState extends State<CustomExercisePage> {
labelText: "1RM by O'Conner: ", labelText: "1RM by O'Conner: ",
)), )),
TextFieldBlocBuilder( TextFieldBlocBuilder(
isEnabled: false, readOnly: true,
padding: EdgeInsets.only(left:30), padding: EdgeInsets.only(left:30),
maxLines: 1, maxLines: 1,
textFieldBloc: bloc.rmMayhewField, textFieldBloc: bloc.rmMayhewField,
@ -269,7 +269,7 @@ class _CustomExerciseNewPageState extends State<CustomExercisePage> {
labelText: "1RM by Mayhew: ", labelText: "1RM by Mayhew: ",
)), )),
TextFieldBlocBuilder( TextFieldBlocBuilder(
isEnabled: false, readOnly: true,
padding: EdgeInsets.only(left:30), padding: EdgeInsets.only(left:30),
maxLines: 1, maxLines: 1,
textFieldBloc: bloc.rmAverageField, textFieldBloc: bloc.rmAverageField,
@ -281,7 +281,7 @@ class _CustomExerciseNewPageState extends State<CustomExercisePage> {
labelText: "1RM Average: ", labelText: "1RM Average: ",
)), )),
TextFieldBlocBuilder( TextFieldBlocBuilder(
isEnabled: false, readOnly: true,
padding: EdgeInsets.only(left:30), padding: EdgeInsets.only(left:30),
maxLines: 1, maxLines: 1,
textFieldBloc: bloc.rm90Field, textFieldBloc: bloc.rm90Field,
@ -293,7 +293,7 @@ class _CustomExerciseNewPageState extends State<CustomExercisePage> {
labelText: "1RM 90%: ", labelText: "1RM 90%: ",
)), )),
TextFieldBlocBuilder( TextFieldBlocBuilder(
isEnabled: false, readOnly: true,
padding: EdgeInsets.only(left:30), padding: EdgeInsets.only(left:30),
maxLines: 1, maxLines: 1,
textFieldBloc: bloc.rm80Field, textFieldBloc: bloc.rm80Field,
@ -305,7 +305,7 @@ class _CustomExerciseNewPageState extends State<CustomExercisePage> {
labelText: "1RM 80%: ", labelText: "1RM 80%: ",
)), )),
TextFieldBlocBuilder( TextFieldBlocBuilder(
isEnabled: false, readOnly: true,
padding: EdgeInsets.only(left:30), padding: EdgeInsets.only(left:30),
maxLines: 1, maxLines: 1,
textFieldBloc: bloc.rm70Field, textFieldBloc: bloc.rm70Field,
@ -317,7 +317,7 @@ class _CustomExerciseNewPageState extends State<CustomExercisePage> {
labelText: "1RM 70%: ", labelText: "1RM 70%: ",
)), )),
TextFieldBlocBuilder( TextFieldBlocBuilder(
isEnabled: false, readOnly: true,
padding: EdgeInsets.only(left:30), padding: EdgeInsets.only(left:30),
maxLines: 1, maxLines: 1,
textFieldBloc: bloc.rm60Field, textFieldBloc: bloc.rm60Field,
@ -329,7 +329,7 @@ class _CustomExerciseNewPageState extends State<CustomExercisePage> {
labelText: "1RM 60%: ", labelText: "1RM 60%: ",
)), )),
TextFieldBlocBuilder( TextFieldBlocBuilder(
isEnabled: false, readOnly: true,
padding: EdgeInsets.only(left:30), padding: EdgeInsets.only(left:30),
maxLines: 1, maxLines: 1,
textFieldBloc: bloc.rm50Field, textFieldBloc: bloc.rm50Field,

8
lib/view/login.dart
View File

@ -7,7 +7,7 @@ import 'package:aitrainer_app/widgets/splash.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter_bloc/flutter_bloc.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 'package:flutter_form_bloc/flutter_form_bloc.dart';
import '../library_keys.dart'; import '../library_keys.dart';
@ -87,7 +87,7 @@ class _LoginWidget extends State<LoginWidget> {
width: cWidth * .85, width: cWidth * .85,
), ),
onPressed: () => { onPressed: () => {
_fbLogin(), //_fbLogin(),
print("Login with FB"), print("Login with FB"),
}, },
), ),
@ -172,7 +172,7 @@ class _LoginWidget extends State<LoginWidget> {
content: Text(error, style: TextStyle(color: Colors.white)))); content: Text(error, style: TextStyle(color: Colors.white))));
} }
Future<Null> _fbLogin() async { /* Future<Null> _fbLogin() async {
final FacebookLogin facebookSignIn = new FacebookLogin(); final FacebookLogin facebookSignIn = new FacebookLogin();
final FacebookLoginResult result = await facebookSignIn.logIn(['email']); final FacebookLoginResult result = await facebookSignIn.logIn(['email']);
@ -197,5 +197,5 @@ class _LoginWidget extends State<LoginWidget> {
'Here\'s the error Facebook gave us: ${result.errorMessage}'); 'Here\'s the error Facebook gave us: ${result.errorMessage}');
break; break;
} }
} } */
} }

8
lib/view/registration.dart
View File

@ -8,7 +8,7 @@ import 'package:aitrainer_app/widgets/splash.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter_bloc/flutter_bloc.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 'package:flutter_form_bloc/flutter_form_bloc.dart';
import '../library_keys.dart'; import '../library_keys.dart';
@ -92,7 +92,7 @@ class _RegistrationWidget extends State<RegistrationWidget> {
width: cWidth * .85, width: cWidth * .85,
), ),
onPressed: () => { onPressed: () => {
_fbLogin(), // _fbLogin(),
print("Login with FB"), print("Login with FB"),
}, },
), ),
@ -188,7 +188,7 @@ class _RegistrationWidget extends State<RegistrationWidget> {
style: TextStyle(color: Colors.white)))); style: TextStyle(color: Colors.white))));
} }
Future<Null> _fbLogin() async { /* Future<Null> _fbLogin() async {
final FacebookLogin facebookSignIn = new FacebookLogin(); final FacebookLogin facebookSignIn = new FacebookLogin();
final FacebookLoginResult result = await facebookSignIn.logIn(['email']); final FacebookLoginResult result = await facebookSignIn.logIn(['email']);
@ -212,5 +212,5 @@ class _RegistrationWidget extends State<RegistrationWidget> {
'Here\'s the error Facebook gave us: ${result.errorMessage}'); 'Here\'s the error Facebook gave us: ${result.errorMessage}');
break; break;
} }
} } */
} }

18
pubspec.lock
View File

@ -42,7 +42,7 @@ packages:
name: bloc name: bloc
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "6.0.1" version: "6.0.2"
bloc_test: bloc_test:
dependency: "direct dev" dependency: "direct dev"
description: description:
@ -155,13 +155,6 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "5.2.1" 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: flutter:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
@ -179,13 +172,6 @@ packages:
description: flutter description: flutter
source: sdk source: sdk
version: "0.0.0" 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: flutter_form_bloc:
dependency: "direct main" dependency: "direct main"
description: description:
@ -527,7 +513,7 @@ packages:
name: shelf name: shelf
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.7.8" version: "0.7.9"
shelf_packages_handler: shelf_packages_handler:
dependency: transitive dependency: transitive
description: description:

4
pubspec.yaml
View File

@ -29,9 +29,9 @@ dependencies:
cupertino_icons: ^0.1.3 cupertino_icons: ^0.1.3
devicelocale: ^0.3.1 devicelocale: ^0.3.1
sentry: ^3.0.1 sentry: ^3.0.1
firebase_messaging: ^6.0.16 # firebase_messaging: ^6.0.16
flutter_local_notifications: 1.1.1 flutter_local_notifications: 1.1.1
flutter_facebook_login: ^3.0.0 #flutter_facebook_login: ^3.0.0
flutter_bloc: ^6.0.1 flutter_bloc: ^6.0.1
equatable: ^1.2.3 equatable: ^1.2.3
flutter_form_bloc: ^0.19.0 flutter_form_bloc: ^0.19.0