Skip to content

Commit d600d6f

Browse files
committed
Update
- Cambio en textos para Apple Store - Quitar texto de Sin traducir - Agregar Prefiero no contestar a registro - Valores por defecto en registro - Evitar cerrar diálogo de carga
1 parent d4876f1 commit d600d6f

File tree

8 files changed

+28
-10
lines changed

8 files changed

+28
-10
lines changed

lib/l10n/app_en.arb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"init": "Log in",
77
"newSession": "New session",
88
"continueText": "Continue",
9-
"completeData": "Complete the following information to create a new session",
9+
"completeData": "Complete the following information (optional). This will help better understand the issues in your neighborhood.",
1010
"gender": "Gender",
1111
"ageRange": "Age range",
1212
"disability": "Disability",
@@ -29,7 +29,7 @@
2929
"cognitive": "Cognitive",
3030
"other2": "Other",
3131
"selectSession": "Select one of the sessions registered on this device",
32-
"manageSessions": "Manage sessions",
32+
"manageSessions": "Delete sessions",
3333
"detailsCorrect": "Are your details correct?",
3434
"no": "No",
3535
"yes": "Yes",
@@ -74,7 +74,7 @@
7474
"mapping": "Mapping",
7575
"search": "Search",
7676
"searchBy": "Search by state, city or neighborhood",
77-
"noDataYet": "There is no data yet. Please download the mappings and surveys by clicking the button bellow.",
77+
"noDataYet": "There is no data yet. Would you like to download the maps and surveys (122 KB)?",
7878
"goToSurvey": "Go to survey",
7979
"mapOut": "Map out",
8080
"mappingsFinished": "Mappings finished:",
@@ -88,7 +88,7 @@
8888
"sendData": "Submit data",
8989
"mapHere": "Map here",
9090
"downloadRegion": "Download region?",
91-
"download": "Download",
91+
"download": "Yes, download",
9292
"sendMappings": "Submit mappings",
9393
"sendMappingsNow": "Submit the objects now? We recommend to be connected to a WiFi network.",
9494
"send": "Submit",

lib/l10n/app_es.arb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"init": "Inicio",
77
"newSession": "Nueva sesión",
88
"continueText": "Continuar",
9-
"completeData": "Completa los siguientes datos para crear una nueva sesión",
9+
"completeData": "Completa los siguientes datos (opcional). Esta información permitirá entender mejor las problemáticas de tu barrio.",
1010
"gender": "Género",
1111
"ageRange": "Rango de edad",
1212
"disability": "Discapacidad",
@@ -29,7 +29,7 @@
2929
"cognitive": "Cognitiva",
3030
"other2": "Otra",
3131
"selectSession": "Selecciona una de las sesiones registradas en este dispositivo",
32-
"manageSessions": "Administrar sesiones",
32+
"manageSessions": "Eliminar sesiones",
3333
"detailsCorrect": "¿Tus datos son correctos?",
3434
"no": "No",
3535
"yes": "Sí",
@@ -74,7 +74,7 @@
7474
"mapping": "Mapeo",
7575
"search": "Buscar",
7676
"searchBy": "Buscar por estado, ciudad o colonia",
77-
"noDataYet": "Aún no hay datos. Por favor, descargue los mapeos y encuestas presionando el botón inferior.",
77+
"noDataYet": "Aún no hay datos. ¿Deseas descargar los mapeos y encuestas (122 KB)?",
7878
"goToSurvey": "Ir a la encuesta",
7979
"mapOut": "Mapear",
8080
"mappingsFinished": "Mapeos realizados:",
@@ -88,7 +88,7 @@
8888
"sendData": "Enviar datos",
8989
"mapHere": "Mapear aquí",
9090
"downloadRegion": "¿Descargar región?",
91-
"download": "Descargar",
91+
"download": "Sí, descargar",
9292
"sendMappings": "Enviar mapeos",
9393
"sendMappingsNow": "¿Enviar los objetos ahora? Recomendamos estar conectado a una red de WiFi.",
9494
"send": "Enviar",

lib/src/domain/models/mapaton_model.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ List<MapatonModel> mapatonListFromJson(String str) => List<MapatonModel>.from(js
44

55
String mapatonModelToJson(List<MapatonModel> data) => json.encode(List<dynamic>.from(data.map((x) => x.toJson())));
66

7-
const _noTraduction = 'SIN TRADUCIR';
7+
const _noTraduction = '';
88

99
class MapatonModel {
1010
List<Activity> activities;

lib/src/ui/pages/login_module/new_session_tab/new_session_content.dart

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@ class _NewSessionContentState extends State<NewSessionContent> {
2929
@override
3030
Widget build(BuildContext context) {
3131
final bloc = context.read<NewSessionBloc>();
32+
33+
_selectedGender = AppLocalizations.of(context)!.preferNoAnswer;
34+
_selectedAge = AppLocalizations.of(context)!.preferNoAnswer;
35+
_selectedDisability = AppLocalizations.of(context)!.preferNoAnswer;
36+
bloc.setGender(_selectedGender!);
37+
bloc.setAge(_selectedAge!);
38+
bloc.setDisability(_selectedDisability!);
3239

3340
return Scaffold(
3441
body: BlocListener<NewSessionBloc, NewSessionState>(
@@ -78,6 +85,7 @@ class _NewSessionContentState extends State<NewSessionContent> {
7885
return MyBottomSheetTextField(
7986
titleText: AppLocalizations.of(context)!.gender,
8087
options: utils.getGenderOptions(context),
88+
initialValue: utils.getGenderOptions(context).last.label,
8189
callback: (value) {
8290
bloc.setGender(value);
8391
_selectedGender = value;
@@ -89,6 +97,7 @@ class _NewSessionContentState extends State<NewSessionContent> {
8997
return MyBottomSheetTextField(
9098
titleText: AppLocalizations.of(context)!.ageRange,
9199
options: utils.getAgeRange(context),
100+
initialValue: utils.getAgeRange(context).last.label,
92101
callback: (value) {
93102
bloc.setAge(value);
94103
_selectedAge = value;
@@ -100,6 +109,7 @@ class _NewSessionContentState extends State<NewSessionContent> {
100109
return MyBottomSheetTextField(
101110
titleText: AppLocalizations.of(context)!.disability,
102111
options: utils.getDisiability(context),
112+
initialValue: utils.getDisiability(context).last.label,
103113
callback: (value) {
104114
bloc.setDisability(value);
105115
_selectedDisability = value;

lib/src/ui/utils/constants.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,15 @@ class Constants {
3535
ItemModel(label: 'Entre 46 y 55 años', value: '46_55'),
3636
ItemModel(label: 'Entre 56 y 65 años', value: '56_65'),
3737
ItemModel(label: 'Más de 65 años', value: 'MAS_65'),
38+
ItemModel(label: 'Prefiero no contestar', value: 'NO_CONTESTO'),
3839
ItemModel(label: 'Under 18 years', value: 'MENOS_18'),
3940
ItemModel(label: 'Between 18 and 25 years', value: '18_25'),
4041
ItemModel(label: 'Between 26 and 35 years', value: '26_35'),
4142
ItemModel(label: 'Between 36 and 45 years', value: '36_45'),
4243
ItemModel(label: 'Between 46 and 55 years', value: '46_55'),
4344
ItemModel(label: 'Between 56 and 65 years', value: '56_65'),
4445
ItemModel(label: 'More than 65 years', value: 'MAS_65'),
46+
ItemModel(label: 'I prefer not to answer', value: 'NO_CONTESTO'),
4547
];
4648

4749
static List<ItemModel> disability = [
@@ -51,12 +53,14 @@ class Constants {
5153
ItemModel(label: 'Auditiva', value: 'AUDITIVA'),
5254
ItemModel(label: 'Cognitiva', value: 'COGNITIVA'),
5355
ItemModel(label: 'Otra', value: 'OTRA'),
56+
ItemModel(label: 'Prefiero no contestar', value: 'OTRA'),
5457
ItemModel(label: 'None', value: 'NINGUNA'),
5558
ItemModel(label: 'Motor', value: 'MOTRIZ'),
5659
ItemModel(label: 'Visual', value: 'VISUAL'),
5760
ItemModel(label: 'Hearing', value: 'AUDITIVA'),
5861
ItemModel(label: 'Cognitive', value: 'COGNITIVA'),
5962
ItemModel(label: 'Other', value: 'OTRA'),
63+
ItemModel(label: 'I prefer not to answer', value: 'OTRA'),
6064
];
6165

6266
/*

lib/src/ui/utils/dialogs.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import 'constants.dart';
99
void showLoadingDialog(BuildContext context) {
1010
showDialog(
1111
context: context,
12+
barrierDismissible: false,
1213
builder: (context) {
1314
return AlertDialog(
1415
backgroundColor: Colors.white,
@@ -95,6 +96,7 @@ void showMyBottomSheet({
9596
}) {
9697
showModalBottomSheet(
9798
context: context,
99+
isScrollControlled: true,
98100
shape: const RoundedRectangleBorder(
99101
borderRadius: BorderRadius.only(
100102
topLeft: Radius.circular(Constants.borderRadiusBottomSheet),

lib/src/ui/utils/utils.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ List<ItemModel> getAgeRange(BuildContext context) {
106106
ItemModel(label: AppLocalizations.of(context)!.between46, value: '46_55'),
107107
ItemModel(label: AppLocalizations.of(context)!.between56, value: '56_65'),
108108
ItemModel(label: AppLocalizations.of(context)!.more65, value: 'MAS_65'),
109+
ItemModel(label: AppLocalizations.of(context)!.preferNoAnswer, value: 'NO_CONTESTO'),
109110
];
110111
}
111112

@@ -117,6 +118,7 @@ List<ItemModel> getDisiability(BuildContext context) {
117118
ItemModel(label: AppLocalizations.of(context)!.hearing, value: 'AUDITIVA'),
118119
ItemModel(label: AppLocalizations.of(context)!.cognitive, value: 'COGNITIVA'),
119120
ItemModel(label: AppLocalizations.of(context)!.other2, value: 'OTRA'),
121+
ItemModel(label: AppLocalizations.of(context)!.preferNoAnswer, value: 'OTRA'),
120122
];
121123
}
122124

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ dependencies:
5454
rxdart: ^0.28.0
5555
shared_preferences: ^2.2.2
5656
sqflite: ^2.3.0
57-
url_launcher: ^6.2.1
57+
url_launcher: ^6.3.1
5858

5959
dev_dependencies:
6060
flutter_test:

0 commit comments

Comments
 (0)