diff --git a/lib/services/google_auth_service.dart b/lib/services/google_auth_service.dart index d9c438d..468406c 100644 --- a/lib/services/google_auth_service.dart +++ b/lib/services/google_auth_service.dart @@ -30,6 +30,10 @@ class GoogleAuthService with ListenableServiceMixin { _googleUser ??= await _signIn.authenticate(scopeHint: ['email', 'profile']); + print('GOOGLE AUTH'); + print(_googleUser?.email); + print(_googleUser?.displayName); + print(_googleUser?.authentication.idToken); }); notifyListeners(); } catch (e) { diff --git a/lib/ui/views/onboarding/screens/full_name_form_screen.dart b/lib/ui/views/onboarding/screens/full_name_form_screen.dart index 58a8ad5..3e86413 100644 --- a/lib/ui/views/onboarding/screens/full_name_form_screen.dart +++ b/lib/ui/views/onboarding/screens/full_name_form_screen.dart @@ -122,11 +122,7 @@ class FullNameFormScreen extends ViewModelWidget { Widget _buildFullNameValidator(OnboardingViewModel viewModel) => Text( viewModel.fullNameValidationMessage!, - style: const TextStyle( - fontSize: 12, - color: Colors.red, - fontWeight: FontWeight.w700, - ), + style: style12R700, ); Widget _buildContinueButtonWrapper(OnboardingViewModel viewModel) => Padding( @@ -140,10 +136,13 @@ class FullNameFormScreen extends ViewModelWidget { text: 'Continue', borderRadius: 12, foregroundColor: kcWhite, - onTap: - fullNameController.text.isNotEmpty ? () => _next(viewModel) : null, - backgroundColor: fullNameController.text.isNotEmpty + backgroundColor: fullNameController.text.isNotEmpty && + !viewModel.hasFullNameValidationMessage ? kcPrimaryColor : kcPrimaryColor.withOpacity(0.1), + onTap: fullNameController.text.isNotEmpty && + !viewModel.hasFullNameValidationMessage + ? () => _next(viewModel) + : null, ); } diff --git a/pubspec.yaml b/pubspec.yaml index 63d76e2..8d453df 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: yimaru_app -version: 0.1.7+9 +version: 0.1.8+10 publish_to: 'none' description: A new Flutter project.