[#6] Add app constants and update localizations

nimblehq · Aug 7, 2023 · 65327b0 · 65327b0
1 parent d25e885
commit 65327b0
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 8 deletions.
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -1,3 +1,5 @@
 {
-  "hello": "Hello!"
+    "emailInputHint": "Email",
+    "passwordInputHint": "Password",
+    "loginButton": "Log in"
 }
diff --git a/lib/l10n/app_th.arb b/lib/l10n/app_th.arb
@@ -1,3 +1,5 @@
 {
-  "hello": "สวัสดี"
+    "emailInputHint": "",
+    "passwordInputHint": "",
+    "loginButton": ""
 }
diff --git a/lib/l10n/app_vi.arb b/lib/l10n/app_vi.arb
@@ -1,3 +1,5 @@
 {
-  "hello": "Xin chào!"
+    "emailInputHint": "",
+    "passwordInputHint": "",
+    "loginButton": ""
 }
diff --git a/lib/screens/login/login_form.dart b/lib/screens/login/login_form.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:survey_flutter/screens/widgets/primary_button_style.dart';
 import 'package:survey_flutter/screens/widgets/primary_text_field_decoration.dart';
 
@@ -12,12 +13,13 @@ class _LoginFormState extends State<LoginForm> {
   final _formKey = GlobalKey<FormState>();
 
   TextTheme get _textTheme => Theme.of(context).textTheme;
+  AppLocalizations get _localizations => AppLocalizations.of(context)!;
 
   TextFormField get _emailTextField => TextFormField(
         keyboardType: TextInputType.emailAddress,
         autocorrect: false,
         decoration: PrimaryTextFieldDecoration(
-          hintText: 'Email',
+          hintText: _localizations.emailInputHint,
           hintTextStyle: _textTheme.bodyMedium,
         ),
         style: _textTheme.bodyMedium,
@@ -27,7 +29,7 @@ class _LoginFormState extends State<LoginForm> {
         autocorrect: false,
         obscureText: true,
         decoration: PrimaryTextFieldDecoration(
-          hintText: 'Password',
+          hintText: _localizations.passwordInputHint,
           hintTextStyle: _textTheme.bodyMedium,
         ),
         style: _textTheme.bodyMedium,
@@ -36,7 +38,7 @@ class _LoginFormState extends State<LoginForm> {
   ElevatedButton get _loginButton => ElevatedButton(
         style: PrimaryButtonStyle(hintTextStyle: _textTheme.labelMedium),
         onPressed: _submit,
-        child: const Text('Log in'),
+        child: Text(_localizations.loginButton),
       );
 
   void _submit() {

diff --git a/lib/screens/widgets/primary_button_style.dart b/lib/screens/widgets/primary_button_style.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:survey_flutter/theme/app_constants.dart';
 
 class PrimaryButtonStyle extends ButtonStyle {
   PrimaryButtonStyle({required TextStyle? hintTextStyle})
@@ -11,7 +12,7 @@ class PrimaryButtonStyle extends ButtonStyle {
           overlayColor: MaterialStateProperty.all(Colors.black12),
           shape: MaterialStateProperty.all<RoundedRectangleBorder>(
             RoundedRectangleBorder(
-              borderRadius: BorderRadius.circular(12.0),
+              borderRadius: BorderRadius.circular(Metrics.defaultBorderRadius),
             ),
           ),
         );

diff --git a/lib/screens/widgets/primary_text_field_decoration.dart b/lib/screens/widgets/primary_text_field_decoration.dart
@@ -1,12 +1,13 @@
 import 'package:flutter/material.dart';
+import 'package:survey_flutter/theme/app_constants.dart';
 
 class PrimaryTextFieldDecoration extends InputDecoration {
   PrimaryTextFieldDecoration(
       {required String hintText, required TextStyle? hintTextStyle})
       : super(
           border: OutlineInputBorder(
             borderSide: BorderSide.none,
-            borderRadius: BorderRadius.circular(12.0),
+            borderRadius: BorderRadius.circular(Metrics.defaultBorderRadius),
           ),
           fillColor: Colors.white24,
           filled: true,

diff --git a/lib/theme/app_constants.dart b/lib/theme/app_constants.dart
@@ -0,0 +1,3 @@
+class Metrics {
+  static const defaultBorderRadius = 12.0;
+}