From 2e60459878bd1b06aebb7d618e5e75048b6b8ddb Mon Sep 17 00:00:00 2001 From: Richard Shiue <71320345+richardshiue@users.noreply.github.com> Date: Sat, 17 Sep 2022 17:40:21 +0800 Subject: [PATCH 1/4] chore: rewrite UI strings for time format hints --- frontend/app_flowy/assets/translations/en.json | 4 ++-- frontend/app_flowy/assets/translations/es-VE.json | 4 ++-- frontend/app_flowy/assets/translations/fr-FR.json | 4 ++-- frontend/app_flowy/assets/translations/id-ID.json | 4 ++-- frontend/app_flowy/assets/translations/ru-RU.json | 4 ++-- frontend/app_flowy/assets/translations/zh-CN.json | 4 ++-- frontend/app_flowy/assets/translations/zh-TW.json | 4 ++-- .../lib/plugins/grid/application/cell/date_cal_bloc.dart | 6 +++--- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/frontend/app_flowy/assets/translations/en.json b/frontend/app_flowy/assets/translations/en.json index 4248a36ba8..b607180f4f 100644 --- a/frontend/app_flowy/assets/translations/en.json +++ b/frontend/app_flowy/assets/translations/en.json @@ -222,8 +222,8 @@ "document": { "menuName": "Doc", "date": { - "timeHintTextInTwelveHour": "12:00 AM", - "timeHintTextInTwentyFourHour": "12:00" + "timeHintTextInTwelveHour": "01:00 PM", + "timeHintTextInTwentyFourHour": "13:00" } }, "board": { diff --git a/frontend/app_flowy/assets/translations/es-VE.json b/frontend/app_flowy/assets/translations/es-VE.json index fa43d7f21d..b07b0a6ef5 100644 --- a/frontend/app_flowy/assets/translations/es-VE.json +++ b/frontend/app_flowy/assets/translations/es-VE.json @@ -210,8 +210,8 @@ "document": { "menuName": "Doc", "date": { - "timeHintTextInTwelveHour": "12:00 AM", - "timeHintTextInTwentyFourHour": "12:00" + "timeHintTextInTwelveHour": "01:00 PM", + "timeHintTextInTwentyFourHour": "13:00" } }, "sideBar": { diff --git a/frontend/app_flowy/assets/translations/fr-FR.json b/frontend/app_flowy/assets/translations/fr-FR.json index f8fc8fa2e3..1408db0343 100644 --- a/frontend/app_flowy/assets/translations/fr-FR.json +++ b/frontend/app_flowy/assets/translations/fr-FR.json @@ -208,8 +208,8 @@ "document": { "menuName": "Doc", "date": { - "timeHintTextInTwelveHour": "12:00 AM", - "timeHintTextInTwentyFourHour": "12:00" + "timeHintTextInTwelveHour": "01:00 PM", + "timeHintTextInTwentyFourHour": "13:00" } } } \ No newline at end of file diff --git a/frontend/app_flowy/assets/translations/id-ID.json b/frontend/app_flowy/assets/translations/id-ID.json index 022cc29713..765865b012 100644 --- a/frontend/app_flowy/assets/translations/id-ID.json +++ b/frontend/app_flowy/assets/translations/id-ID.json @@ -211,8 +211,8 @@ "document": { "menuName": "Doc", "date": { - "timeHintTextInTwelveHour": "12:00 AM", - "timeHintTextInTwentyFourHour": "12:00" + "timeHintTextInTwelveHour": "01:00 PM", + "timeHintTextInTwentyFourHour": "13:00" } }, "sideBar": { diff --git a/frontend/app_flowy/assets/translations/ru-RU.json b/frontend/app_flowy/assets/translations/ru-RU.json index 96958be5a6..a785ccadc7 100644 --- a/frontend/app_flowy/assets/translations/ru-RU.json +++ b/frontend/app_flowy/assets/translations/ru-RU.json @@ -200,8 +200,8 @@ "searchOption": "Поиск" }, "date": { - "timeHintTextInTwelveHour": "12:00 AM", - "timeHintTextInTwentyFourHour": "12:00" + "timeHintTextInTwelveHour": "01:00 PM", + "timeHintTextInTwentyFourHour": "13:00" } }, "sideBar": { diff --git a/frontend/app_flowy/assets/translations/zh-CN.json b/frontend/app_flowy/assets/translations/zh-CN.json index e9133703a9..e5628c8bb8 100644 --- a/frontend/app_flowy/assets/translations/zh-CN.json +++ b/frontend/app_flowy/assets/translations/zh-CN.json @@ -215,8 +215,8 @@ "document": { "menuName": "文档", "date": { - "timeHintTextInTwelveHour": "12:00 AM", - "timeHintTextInTwentyFourHour": "12:00" + "timeHintTextInTwelveHour": "01:00 PM", + "timeHintTextInTwentyFourHour": "13:00" } } } \ No newline at end of file diff --git a/frontend/app_flowy/assets/translations/zh-TW.json b/frontend/app_flowy/assets/translations/zh-TW.json index c3285aa4b3..6990d1697b 100644 --- a/frontend/app_flowy/assets/translations/zh-TW.json +++ b/frontend/app_flowy/assets/translations/zh-TW.json @@ -211,8 +211,8 @@ "document": { "menuName": "檔案", "date": { - "timeHintTextInTwelveHour": "12:00 AM", - "timeHintTextInTwentyFourHour": "12:00" + "timeHintTextInTwelveHour": "01:00 PM", + "timeHintTextInTwentyFourHour": "13:00" } }, "sideBar": { diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/date_cal_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/date_cal_bloc.dart index 6fb8e7e5b0..1dcc74f196 100644 --- a/frontend/app_flowy/lib/plugins/grid/application/cell/date_cal_bloc.dart +++ b/frontend/app_flowy/lib/plugins/grid/application/cell/date_cal_bloc.dart @@ -119,13 +119,13 @@ class DateCalBloc extends Bloc { } String timeFormatPrompt(FlowyError error) { - String msg = "${LocaleKeys.grid_field_invalidTimeFormat.tr()}. "; + String msg = "${LocaleKeys.grid_field_invalidTimeFormat.tr()}."; switch (state.dateTypeOptionPB.timeFormat) { case TimeFormat.TwelveHour: - msg = "${msg}e.g. 01: 00 AM"; + msg = "$msg e.g. 01:00 PM"; break; case TimeFormat.TwentyFourHour: - msg = "${msg}e.g. 13: 00"; + msg = "$msg e.g. 13:00"; break; default: break; From a413746c05dbcbb6534d98f0231cd8524a8af983 Mon Sep 17 00:00:00 2001 From: Richard Shiue <71320345+richardshiue@users.noreply.github.com> Date: Sat, 17 Sep 2022 19:49:13 +0800 Subject: [PATCH 2/4] fix: immediately show or hide time when includeTime changes --- .../field/type_options/date_type_option/date_type_option.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option.rs index e4ac22f299..eaf6764378 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option.rs @@ -51,7 +51,7 @@ impl DateTypeOptionPB { let date = format!("{}", utc.format_with_items(StrftimeItems::new(fmt))); let mut time = "".to_string(); - if has_time { + if has_time && self.include_time { let fmt = format!("{} {}", self.date_format.format_str(), self.time_format.format_str()); time = format!("{}", utc.format_with_items(StrftimeItems::new(&fmt))).replace(&date, ""); } From c3033bd6e84fa0ef8bd1d90e2b314749fc133875 Mon Sep 17 00:00:00 2001 From: Richard Shiue <71320345+richardshiue@users.noreply.github.com> Date: Sat, 17 Sep 2022 23:09:14 +0800 Subject: [PATCH 3/4] fix: few UI/usability issues with the time input field --- .../lib/plugins/grid/application/cell/date_cal_bloc.dart | 2 +- .../grid/presentation/widgets/cell/date_cell/date_editor.dart | 1 + .../field/type_options/date_type_option/date_type_option.rs | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/app_flowy/lib/plugins/grid/application/cell/date_cal_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/cell/date_cal_bloc.dart index 1dcc74f196..0deee8098c 100644 --- a/frontend/app_flowy/lib/plugins/grid/application/cell/date_cal_bloc.dart +++ b/frontend/app_flowy/lib/plugins/grid/application/cell/date_cal_bloc.dart @@ -108,7 +108,7 @@ class DateCalBloc extends Bloc { (err) { switch (ErrorCode.valueOf(err.code)!) { case ErrorCode.InvalidDateTimeFormat: - updateCalData(none(), Some(timeFormatPrompt(err))); + updateCalData(state.calData, Some(timeFormatPrompt(err))); break; default: Log.error(err); diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/date_cell/date_editor.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/date_cell/date_editor.dart index cc502f9cf9..f40380cd34 100644 --- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/date_cell/date_editor.dart +++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/date_cell/date_editor.dart @@ -261,6 +261,7 @@ class _TimeTextFieldState extends State<_TimeTextField> { child: RoundedInputField( height: 40, focusNode: _focusNode, + autoFocus: true, hintText: state.timeHintText, controller: _controller, style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w500), diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option.rs index eaf6764378..e79ae3574c 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option.rs @@ -52,7 +52,7 @@ impl DateTypeOptionPB { let mut time = "".to_string(); if has_time && self.include_time { - let fmt = format!("{} {}", self.date_format.format_str(), self.time_format.format_str()); + let fmt = format!("{}{}", self.date_format.format_str(), self.time_format.format_str()); time = format!("{}", utc.format_with_items(StrftimeItems::new(&fmt))).replace(&date, ""); } From 05975e55f04d8f70412e98133b496ce2800f66cc Mon Sep 17 00:00:00 2001 From: Richard Shiue <71320345+richardshiue@users.noreply.github.com> Date: Sun, 18 Sep 2022 03:47:24 +0800 Subject: [PATCH 4/4] test: fix includeTime-related tests --- .../field/type_options/date_type_option/date_tests.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_tests.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_tests.rs index ea5a33871a..d8f034fa3d 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_tests.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_tests.rs @@ -141,7 +141,9 @@ mod tests { .unwrap(); if type_option.include_time { - format!("{}{}", decoded_data.date, decoded_data.time) + format!("{} {}", decoded_data.date, decoded_data.time) + .trim_end() + .to_owned() } else { decoded_data.date }