refactor naming

This commit is contained in:
Stein Milder 2022-09-20 16:42:09 +02:00
parent 6b55927b65
commit aa435fae17
6 changed files with 20 additions and 20 deletions

View file

@ -1,8 +1,8 @@
import 'dart:async'; import 'dart:async';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import '../login_config.dart'; import '../login_config.dart';
import '../model/confirmation_result.dart'; import '../model/login_confirmation_result.dart';
import '../model/user.dart'; import '../model/login_user.dart';
abstract class LoginRepository with ChangeNotifier { abstract class LoginRepository with ChangeNotifier {
String? _loggedIn = ''; String? _loggedIn = '';
@ -37,7 +37,7 @@ abstract class LoginRepository with ChangeNotifier {
_initialized = true; _initialized = true;
} }
Future<User?> signInWithSocial(SocialLoginBundle bundle); Future<LoginUser?> signInWithSocial(SocialLoginBundle bundle);
Future<bool?> userprofileExists(); Future<bool?> userprofileExists();
Future sendLoginEmail(String input); Future sendLoginEmail(String input);
Future<void> trySignInWithPhoneNumber({ Future<void> trySignInWithPhoneNumber({
@ -45,20 +45,20 @@ abstract class LoginRepository with ChangeNotifier {
void Function( void Function(
String verificationId, String verificationId,
int? resendToken, int? resendToken,
ConfirmationResult? resultWeb, LoginConfirmationResult? resultWeb,
)? )?
onCodeSent, onCodeSent,
void Function(String errorCode)? onVerificationFailed, void Function(String errorCode)? onVerificationFailed,
void Function(User? user)? onAutoLogin, void Function(LoginUser? user)? onAutoLogin,
}); });
Future<User?> signInWithSMSCode( Future<LoginUser?> signInWithSMSCode(
String verificationId, String verificationId,
String smsCode, String smsCode,
String phoneNumber, { String phoneNumber, {
ConfirmationResult? resultWeb, LoginConfirmationResult? resultWeb,
}); });
Future<bool> forgotPassword(String email); Future<bool> forgotPassword(String email);
Future<bool> isRegistrationRequired(User user); Future<bool> isRegistrationRequired(LoginUser user);
Future<void> reLogin(); Future<void> reLogin();
Future<User?> signInAnonymous(); Future<LoginUser?> signInAnonymous();
} }

View file

@ -1 +0,0 @@
class ConfirmationResult {}

View file

@ -0,0 +1 @@
class LoginConfirmationResult {}

View file

@ -1,5 +1,5 @@
class User { class LoginUser {
User({ LoginUser({
this.displayName = '', this.displayName = '',
this.email = '', this.email = '',
}); });

View file

@ -3,7 +3,7 @@ import 'package:flutter_login/flutter_login_view.dart';
import 'package:intl_phone_number_input/intl_phone_number_input.dart'; import 'package:intl_phone_number_input/intl_phone_number_input.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import '../../extensions/widget.dart'; import '../../extensions/widget.dart';
import '../../model/user.dart'; import '../../model/login_user.dart';
import '../form/inputs/validators/phone_number_validator.dart'; import '../form/inputs/validators/phone_number_validator.dart';
import 'login_phone_number_verify.dart'; import 'login_phone_number_verify.dart';
@ -141,7 +141,7 @@ class LoginPhoneNumberState extends State<LoginPhoneNumber>
onLogin: _onLoggedIn, onLogin: _onLoggedIn,
), ),
), ),
onAutoLogin: _onLoggedIn, onAutoLogin: (_) => _onLoggedIn,
onVerificationFailed: (String errorCode) { onVerificationFailed: (String errorCode) {
if (errorCode == 'invalid-phone-number') { if (errorCode == 'invalid-phone-number') {
setState(() { setState(() {
@ -173,7 +173,7 @@ class LoginPhoneNumberState extends State<LoginPhoneNumber>
); );
} }
Future<void> _onLoggedIn(User? user) async { Future<void> _onLoggedIn(LoginUser? user) async {
var prefs = await SharedPreferences.getInstance(); var prefs = await SharedPreferences.getInstance();
await prefs.setBool('autoLogin', true); await prefs.setBool('autoLogin', true);
if (user != null) { if (user != null) {

View file

@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
import 'package:flutter_login/flutter_login_view.dart'; import 'package:flutter_login/flutter_login_view.dart';
import 'package:pinput/pinput.dart'; import 'package:pinput/pinput.dart';
import '../../extensions/widget.dart'; import '../../extensions/widget.dart';
import '../../model/confirmation_result.dart'; import '../../model/login_confirmation_result.dart';
import '../../model/user.dart'; import '../../model/login_user.dart';
class LoginPhoneNumberVerify extends StatefulWidget { class LoginPhoneNumberVerify extends StatefulWidget {
const LoginPhoneNumberVerify({ const LoginPhoneNumberVerify({
@ -16,8 +16,8 @@ class LoginPhoneNumberVerify extends StatefulWidget {
final String verificationId; final String verificationId;
final String phoneNumber; final String phoneNumber;
final Function(User? user) onLogin; final Function(LoginUser? user) onLogin;
final ConfirmationResult? resultWeb; final LoginConfirmationResult? resultWeb;
@override @override
LoginPhoneNumberVerifyState createState() => LoginPhoneNumberVerifyState( LoginPhoneNumberVerifyState createState() => LoginPhoneNumberVerifyState(
@ -32,7 +32,7 @@ class LoginPhoneNumberVerifyState extends State<LoginPhoneNumberVerify>
String? code; String? code;
bool errorMsg = false; bool errorMsg = false;
String verificationId; String verificationId;
ConfirmationResult? resultWeb; LoginConfirmationResult? resultWeb;
TextEditingController pinPutController = TextEditingController(); TextEditingController pinPutController = TextEditingController();
@override @override