Yimaru/Yimaru-Mobile
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Yimaru:210f7b13b9d693105dcda940b109c9740b6bf2d3
Branches Tags
Yimaru:main
Yimaru:develop
Yimaru:ios
..
compare: Yimaru:d0557b86749c0c846fc76d2216dcf88ea26c0c9f
Branches Tags
Yimaru:develop
Yimaru:ios
Yimaru:main

No commits in common. "210f7b13b9d693105dcda940b109c9740b6bf2d3" and "d0557b86749c0c846fc76d2216dcf88ea26c0c9f" have entirely different histories.
210f7b13b9 ... d0557b8674

3 changed files with 9 additions and 12 deletions
Show Stats Expand all files Collapse all files

4
lib/services/google_auth_service.dart
View File

@ -30,10 +30,6 @@ class GoogleAuthService with ListenableServiceMixin {
_googleUser ??= _googleUser ??=
await _signIn.authenticate(scopeHint: ['email', 'profile']); await _signIn.authenticate(scopeHint: ['email', 'profile']);
print('GOOGLE AUTH');
print(_googleUser?.email);
print(_googleUser?.displayName);
print(_googleUser?.authentication.idToken);
}); });
notifyListeners(); notifyListeners();
} catch (e) { } catch (e) {

15
lib/ui/views/onboarding/screens/full_name_form_screen.dart
View File

@ -122,7 +122,11 @@ class FullNameFormScreen extends ViewModelWidget<OnboardingViewModel> {
Widget _buildFullNameValidator(OnboardingViewModel viewModel) => Text( Widget _buildFullNameValidator(OnboardingViewModel viewModel) => Text(
viewModel.fullNameValidationMessage!, viewModel.fullNameValidationMessage!,
style: style12R700, style: const TextStyle(
fontSize: 12,
color: Colors.red,
fontWeight: FontWeight.w700,
),
); );
Widget _buildContinueButtonWrapper(OnboardingViewModel viewModel) => Padding( Widget _buildContinueButtonWrapper(OnboardingViewModel viewModel) => Padding(
@ -136,13 +140,10 @@ class FullNameFormScreen extends ViewModelWidget<OnboardingViewModel> {
text: 'Continue', text: 'Continue',
borderRadius: 12, borderRadius: 12,
foregroundColor: kcWhite, foregroundColor: kcWhite,
backgroundColor: fullNameController.text.isNotEmpty && onTap:
!viewModel.hasFullNameValidationMessage fullNameController.text.isNotEmpty ? () => _next(viewModel) : null,
backgroundColor: fullNameController.text.isNotEmpty
? kcPrimaryColor ? kcPrimaryColor
: kcPrimaryColor.withOpacity(0.1), : kcPrimaryColor.withOpacity(0.1),
onTap: fullNameController.text.isNotEmpty &&
!viewModel.hasFullNameValidationMessage
? () => _next(viewModel)
: null,
); );
} }

2
pubspec.yaml
View File

@ -1,5 +1,5 @@
name: yimaru_app name: yimaru_app
version: 0.1.8+10 version: 0.1.7+9
publish_to: 'none' publish_to: 'none'
description: A new Flutter project. description: A new Flutter project.