wt1.1a fb and firebase temporary elimination
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -199,7 +199,7 @@ class _CustomExerciseNewPageState extends State<CustomExercisePage> {
|
||||
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<CustomExercisePage> {
|
||||
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<CustomExercisePage> {
|
||||
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<CustomExercisePage> {
|
||||
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<CustomExercisePage> {
|
||||
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<CustomExercisePage> {
|
||||
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<CustomExercisePage> {
|
||||
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<CustomExercisePage> {
|
||||
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<CustomExercisePage> {
|
||||
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<CustomExercisePage> {
|
||||
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<CustomExercisePage> {
|
||||
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<CustomExercisePage> {
|
||||
labelText: "1RM 60%: ",
|
||||
)),
|
||||
TextFieldBlocBuilder(
|
||||
isEnabled: false,
|
||||
readOnly: true,
|
||||
padding: EdgeInsets.only(left:30),
|
||||
maxLines: 1,
|
||||
textFieldBloc: bloc.rm50Field,
|
||||
|
||||
+4
-4
@@ -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<LoginWidget> {
|
||||
width: cWidth * .85,
|
||||
),
|
||||
onPressed: () => {
|
||||
_fbLogin(),
|
||||
//_fbLogin(),
|
||||
print("Login with FB"),
|
||||
},
|
||||
),
|
||||
@@ -172,7 +172,7 @@ class _LoginWidget extends State<LoginWidget> {
|
||||
content: Text(error, style: TextStyle(color: Colors.white))));
|
||||
}
|
||||
|
||||
Future<Null> _fbLogin() async {
|
||||
/* Future<Null> _fbLogin() async {
|
||||
final FacebookLogin facebookSignIn = new FacebookLogin();
|
||||
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}');
|
||||
break;
|
||||
}
|
||||
}
|
||||
} */
|
||||
}
|
||||
|
||||
@@ -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<RegistrationWidget> {
|
||||
width: cWidth * .85,
|
||||
),
|
||||
onPressed: () => {
|
||||
_fbLogin(),
|
||||
// _fbLogin(),
|
||||
print("Login with FB"),
|
||||
},
|
||||
),
|
||||
@@ -188,7 +188,7 @@ class _RegistrationWidget extends State<RegistrationWidget> {
|
||||
style: TextStyle(color: Colors.white))));
|
||||
}
|
||||
|
||||
Future<Null> _fbLogin() async {
|
||||
/* Future<Null> _fbLogin() async {
|
||||
final FacebookLogin facebookSignIn = new FacebookLogin();
|
||||
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}');
|
||||
break;
|
||||
}
|
||||
}
|
||||
} */
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user