Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Same layout between country/language pickers (settings) #6231

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
+1,098 −567
Open

feat: Same layout between country/language pickers (settings) #6231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5785c06
Use the same layout between the country and language picker (in the s…
g123k Jan 18, 2025
ee87e29
Add missing type
g123k Jan 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...eneric_lib/widgets/language_selector.dart → ...neric_lib/widgets/languages_selector.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import 'package:smooth_app/pages/preferences/user_preferences_languages_list.dar
import 'package:smooth_app/query/product_query.dart';
import 'package:smooth_app/widgets/smooth_text.dart';

class LanguageSelector extends StatelessWidget {
const LanguageSelector({
class LanguagesSelector extends StatelessWidget {
const LanguagesSelector({
required this.setLanguage,
this.selectedLanguages,
this.displayedLanguage,
Expand Down
8 changes: 8 additions & 0 deletions packages/smooth_app/lib/l10n/app_en.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2681,6 +2681,14 @@
"@language_picker_label": {
"description": "Choose Application Language"
},
"country_picker_label": "Your country",
"@country_picker_label": {
"description": "Choose Application Country"
},
"currency_picker_label": "Your currency",
"@currency_picker_label": {
"description": "Choose Application Country"
},
"help_with_openfoodfacts": "Help with OpenFoodFacts",
"@help_with_openfoodfacts": {
"description": "Label for the email title"
Expand Down
8 changes: 8 additions & 0 deletions packages/smooth_app/lib/l10n/app_fr.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2681,6 +2681,14 @@
"@language_picker_label": {
"description": "Choose Application Language"
},
"country_picker_label": "Votre pays",
"@country_picker_label": {
"description": "Choose Application Country"
},
"currency_picker_label": "Votre devise",
"@currency_picker_label": {
"description": "Choose Application Country"
},
"help_with_openfoodfacts": "Bienvenue sur OpenFoodFacts",
"@help_with_openfoodfacts": {
"description": "Label for the email title"
Expand Down
18 changes: 16 additions & 2 deletions packages/smooth_app/lib/pages/onboarding/welcome_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,24 @@ class WelcomePage extends StatelessWidget {
padding: const EdgeInsetsDirectional.only(
start: SMALL_SPACE,
end: LARGE_SPACE,
top: SMALL_SPACE,
bottom: SMALL_SPACE,
),
inkWellBorderRadius: ANGULAR_BORDER_RADIUS,
icon: const icons.Arrow.right(
size: 15.0,
icon: const DecoratedBox(
decoration: BoxDecoration(
color: Colors.black,
shape: BoxShape.circle,
),
child: Padding(
padding: EdgeInsetsDirectional.all(
SMALL_SPACE,
),
child: icons.Arrow.right(
size: 15.0,
color: Colors.white,
),
),
),
textStyle:
TextStyle(color: theme.primaryColor),
Expand Down
Loading
Loading