Skip to content

Commit 1f0e479

Browse files
amaury901130amaury901130
authored
improve theme colors and text styles (#115)
* improve theme colors and text styles * add focus node to allow nav with keyboard
1 parent dff57df commit 1f0e479

10 files changed

Lines changed: 405 additions & 12 deletions

File tree

‎app/lib/presentation/navigation/routers.dart‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import 'package:app/presentation/ui/custom/debug_banner.dart';
33
import 'package:app/presentation/ui/pages/main/home/home_page.dart';
44
import 'package:app/presentation/ui/pages/auth/login/login_page.dart';
55
import 'package:app/presentation/ui/pages/auth/sign_up/sign_up_page.dart';
6+
import 'package:app/presentation/ui/pages/onboarding/onboarding_page.dart';
67
import 'package:app/presentation/ui/pages/splash/splash_page.dart';
78
import 'package:common/core/resource.dart';
89
import 'package:domain/bloc/auth/auth_cubit.dart';
@@ -14,6 +15,7 @@ import 'package:go_router/go_router.dart';
1415

1516
enum Routes {
1617
auth,
18+
onboarding,
1719
login,
1820
signup,
1921
app,
@@ -50,7 +52,7 @@ class Routers {
5052
initialLocation: initialLocation ??
5153
(getIt<AuthCubit>().isLoggedIn()
5254
? Routes.app.path
53-
: Routes.auth.path),
55+
: Routes.onboarding.path),
5456
routes: [
5557
GoRoute(
5658
path: '/',
@@ -79,7 +81,7 @@ class Routers {
7981
return;
8082
}
8183
debugPrint('Navigating to auth route');
82-
Routes.auth.go(context);
84+
Routes.onboarding.go(context);
8385
break;
8486
case _:
8587
}
@@ -93,6 +95,11 @@ class Routers {
9395
builder: (context, state, child) =>
9496
kDebugMode ? DebugBanner(child: child) : child,
9597
routes: [
98+
GoRoute(
99+
name: Routes.onboarding.name,
100+
path: Routes.onboarding.path,
101+
builder: (context, state) => const OnboardingPage(),
102+
),
96103
GoRoute(
97104
name: Routes.auth.name,
98105
path: Routes.auth.path,

‎app/lib/presentation/resources/dim.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ class Dimen {
1919
static const spacingXxxl = 48.0;
2020

2121
static const double buttonHeightM = 48.0;
22+
static const double onboardingIconSize = 120.0;
2223
}

‎app/lib/presentation/resources/locale/generated/intl/messages_en.dart‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
2020
class MessageLookup extends MessageLookupByLibrary {
2121
String get localeName => 'en';
2222

23+
static String m0(currentPage, totalPages) =>
24+
"Page ${currentPage} of ${totalPages}";
25+
2326
final messages = _notInlinedMessages(_notInlinedMessages);
2427
static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
2528
"appName": MessageLookupByLibrary.simpleMessage("Flutter Target"),
@@ -70,6 +73,26 @@ class MessageLookup extends MessageLookupByLibrary {
7073
"Invalid email or password.",
7174
),
7275
"noConnection": MessageLookupByLibrary.simpleMessage("No connection"),
76+
"onboardingBack": MessageLookupByLibrary.simpleMessage("Back"),
77+
"onboardingNext": MessageLookupByLibrary.simpleMessage("Next"),
78+
"onboardingPage1Description": MessageLookupByLibrary.simpleMessage(
79+
"This is the first page of the onboarding flow",
80+
),
81+
"onboardingPage1Title": MessageLookupByLibrary.simpleMessage("Welcome"),
82+
"onboardingPage2Description": MessageLookupByLibrary.simpleMessage(
83+
"This is the second page of the onboarding flow",
84+
),
85+
"onboardingPage2Title": MessageLookupByLibrary.simpleMessage("Discover"),
86+
"onboardingPage3Description": MessageLookupByLibrary.simpleMessage(
87+
"This is the third page of the onboarding flow",
88+
),
89+
"onboardingPage3Title": MessageLookupByLibrary.simpleMessage("Connect"),
90+
"onboardingPage4Description": MessageLookupByLibrary.simpleMessage(
91+
"This is the fourth page of the onboarding flow",
92+
),
93+
"onboardingPage4Title": MessageLookupByLibrary.simpleMessage("Get Started"),
94+
"onboardingPageIndicator": m0,
95+
"onboardingStart": MessageLookupByLibrary.simpleMessage("Start"),
7396
"passwordInstructions": MessageLookupByLibrary.simpleMessage(
7497
"Min 8 characters long: 1 uppercase letter, 1 lowercase letter, 1 number, and 1 special character.",
7598
),

‎app/lib/presentation/resources/locale/generated/intl/messages_es.dart‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
2020
class MessageLookup extends MessageLookupByLibrary {
2121
String get localeName => 'es';
2222

23+
static String m0(currentPage, totalPages) =>
24+
"Página ${currentPage} de ${totalPages}";
25+
2326
final messages = _notInlinedMessages(_notInlinedMessages);
2427
static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
2528
"appName": MessageLookupByLibrary.simpleMessage("Flutter Target"),
@@ -72,6 +75,26 @@ class MessageLookup extends MessageLookupByLibrary {
7275
"Correo electrónico o contraseña incorrectos.",
7376
),
7477
"noConnection": MessageLookupByLibrary.simpleMessage("Sin conexión"),
78+
"onboardingBack": MessageLookupByLibrary.simpleMessage("Atrás"),
79+
"onboardingNext": MessageLookupByLibrary.simpleMessage("Siguiente"),
80+
"onboardingPage1Description": MessageLookupByLibrary.simpleMessage(
81+
"Esta es la primera página del flujo de incorporación",
82+
),
83+
"onboardingPage1Title": MessageLookupByLibrary.simpleMessage("Bienvenido"),
84+
"onboardingPage2Description": MessageLookupByLibrary.simpleMessage(
85+
"Esta es la segunda página del flujo de incorporación",
86+
),
87+
"onboardingPage2Title": MessageLookupByLibrary.simpleMessage("Descubrir"),
88+
"onboardingPage3Description": MessageLookupByLibrary.simpleMessage(
89+
"Esta es la tercera página del flujo de incorporación",
90+
),
91+
"onboardingPage3Title": MessageLookupByLibrary.simpleMessage("Conectar"),
92+
"onboardingPage4Description": MessageLookupByLibrary.simpleMessage(
93+
"Esta es la cuarta página del flujo de incorporación",
94+
),
95+
"onboardingPage4Title": MessageLookupByLibrary.simpleMessage("Comenzar"),
96+
"onboardingPageIndicator": m0,
97+
"onboardingStart": MessageLookupByLibrary.simpleMessage("Comenzar"),
7598
"passwordInstructions": MessageLookupByLibrary.simpleMessage(
7699
"Mínimo 8 caracteres: 1 mayúscula, 1 minúscula, 1 número y 1 carácter especial.",
77100
),

‎app/lib/presentation/resources/locale/generated/l10n.dart‎

Lines changed: 105 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/lib/presentation/resources/locale/intl_en.arb‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,17 @@
3030
"debugModeResetAppTitle": "Reset App",
3131
"debugModeResetAppMessage": "Are you sure you want to reset the app?",
3232
"debugModeCancel": "Cancel",
33-
"debugModeConfirm": "Confirm"
34-
}
33+
"debugModeConfirm": "Confirm",
34+
"onboardingBack": "Back",
35+
"onboardingNext": "Next",
36+
"onboardingStart": "Start",
37+
"onboardingPage1Title": "Welcome",
38+
"onboardingPage1Description": "This is the first page of the onboarding flow",
39+
"onboardingPage2Title": "Discover",
40+
"onboardingPage2Description": "This is the second page of the onboarding flow",
41+
"onboardingPage3Title": "Connect",
42+
"onboardingPage3Description": "This is the third page of the onboarding flow",
43+
"onboardingPage4Title": "Get Started",
44+
"onboardingPage4Description": "This is the fourth page of the onboarding flow",
45+
"onboardingPageIndicator": "Page {currentPage} of {totalPages}"
46+
}

‎app/lib/presentation/resources/locale/intl_es.arb‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,17 @@
3030
"debugModeResetAppTitle": "Resetear App",
3131
"debugModeResetAppMessage": "¿Estás seguro de que deseas resetear la aplicación?",
3232
"debugModeCancel": "Cancelar",
33-
"debugModeConfirm": "Confirmar"
33+
"debugModeConfirm": "Confirmar",
34+
"onboardingBack": "Atrás",
35+
"onboardingNext": "Siguiente",
36+
"onboardingStart": "Comenzar",
37+
"onboardingPage1Title": "Bienvenido",
38+
"onboardingPage1Description": "Esta es la primera página del flujo de incorporación",
39+
"onboardingPage2Title": "Descubrir",
40+
"onboardingPage2Description": "Esta es la segunda página del flujo de incorporación",
41+
"onboardingPage3Title": "Conectar",
42+
"onboardingPage3Description": "Esta es la tercera página del flujo de incorporación",
43+
"onboardingPage4Title": "Comenzar",
44+
"onboardingPage4Description": "Esta es la cuarta página del flujo de incorporación",
45+
"onboardingPageIndicator": "Página {currentPage} de {totalPages}"
3446
}

‎app/lib/presentation/ui/pages/auth/login/login_form.dart‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,18 +72,13 @@ class _LoginFormState extends State<LoginForm> {
7272
obscureText: true,
7373
controller: passwordController,
7474
validator: (value) {
75-
if (!FormValidator.isStrongPassword(value)) {
76-
return S.of(context).errorPasswordWeak;
75+
if (value?.trim().isEmpty ?? true) {
76+
return S.of(context).errorPasswordRequired;
7777
}
7878
return null;
7979
},
8080
),
8181
const Gap(Dimen.spacingM),
82-
Text(
83-
S.of(context).passwordInstructions,
84-
style: Theme.of(context).textTheme.bodySmall,
85-
),
86-
const Gap(Dimen.spacingM),
8782
TermsServicesCheck(
8883
agreeToTerms: agreeToTerms,
8984
onChanged: (value) {

0 commit comments

Comments
 (0)