Skip to content

Commit 4e8209d

Browse files
authored
feat: Same layout between country/language pickers (settings) (#6231)
* Use the same layout between the country and language picker (in the settings) * Add missing type
1 parent 663a125 commit 4e8209d

16 files changed

+1098
-567
lines changed

packages/smooth_app/lib/generic_lib/widgets/language_selector.dart renamed to packages/smooth_app/lib/generic_lib/widgets/languages_selector.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import 'package:smooth_app/pages/preferences/user_preferences_languages_list.dar
1212
import 'package:smooth_app/query/product_query.dart';
1313
import 'package:smooth_app/widgets/smooth_text.dart';
1414

15-
class LanguageSelector extends StatelessWidget {
16-
const LanguageSelector({
15+
class LanguagesSelector extends StatelessWidget {
16+
const LanguagesSelector({
1717
required this.setLanguage,
1818
this.selectedLanguages,
1919
this.displayedLanguage,

packages/smooth_app/lib/l10n/app_en.arb

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2685,6 +2685,14 @@
26852685
"@language_picker_label": {
26862686
"description": "Choose Application Language"
26872687
},
2688+
"country_picker_label": "Your country",
2689+
"@country_picker_label": {
2690+
"description": "Choose Application Country"
2691+
},
2692+
"currency_picker_label": "Your currency",
2693+
"@currency_picker_label": {
2694+
"description": "Choose Application Country"
2695+
},
26882696
"help_with_openfoodfacts": "Help with OpenFoodFacts",
26892697
"@help_with_openfoodfacts": {
26902698
"description": "Label for the email title"

packages/smooth_app/lib/l10n/app_fr.arb

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2681,6 +2681,14 @@
26812681
"@language_picker_label": {
26822682
"description": "Choose Application Language"
26832683
},
2684+
"country_picker_label": "Votre pays",
2685+
"@country_picker_label": {
2686+
"description": "Choose Application Country"
2687+
},
2688+
"currency_picker_label": "Votre devise",
2689+
"@currency_picker_label": {
2690+
"description": "Choose Application Country"
2691+
},
26842692
"help_with_openfoodfacts": "Bienvenue sur OpenFoodFacts",
26852693
"@help_with_openfoodfacts": {
26862694
"description": "Label for the email title"

packages/smooth_app/lib/pages/onboarding/welcome_page.dart

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,24 @@ class WelcomePage extends StatelessWidget {
105105
padding: const EdgeInsetsDirectional.only(
106106
start: SMALL_SPACE,
107107
end: LARGE_SPACE,
108+
top: SMALL_SPACE,
109+
bottom: SMALL_SPACE,
108110
),
109111
inkWellBorderRadius: ANGULAR_BORDER_RADIUS,
110-
icon: const icons.Arrow.right(
111-
size: 15.0,
112+
icon: const DecoratedBox(
113+
decoration: BoxDecoration(
114+
color: Colors.black,
115+
shape: BoxShape.circle,
116+
),
117+
child: Padding(
118+
padding: EdgeInsetsDirectional.all(
119+
SMALL_SPACE,
120+
),
121+
child: icons.Arrow.right(
122+
size: 15.0,
123+
color: Colors.white,
124+
),
125+
),
112126
),
113127
textStyle:
114128
TextStyle(color: theme.primaryColor),

0 commit comments

Comments
 (0)