[Extra zoom mode] Update date picker UI to latest specifications

https://bugs.webkit.org/show_bug.cgi?id=184234
<rdar://problem/38804760>

Reviewed by Timothy Hatcher.

Source/WebCore:

Tweak localizable strings. Day, month and year labels should be fully capitalized, and there needs to be a
string for the "Set" button title.

* English.lproj/Localizable.strings:
* platform/LocalizedStrings.cpp:
(WebCore::datePickerSetButtonTitle):
(WebCore::datePickerDayLabelTitle):
(WebCore::datePickerMonthLabelTitle):
(WebCore::datePickerYearLabelTitle):
* platform/LocalizedStrings.h:

Source/WebKit:

Rename WKTextFormControlListViewControllerDelegate to WKTextInputListViewControllerDelegate and adjust for the
new initializer of WKDatePickerViewController.

* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView presentViewControllerForCurrentAssistedNode]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230176 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index b5b7fcb..d4d360b 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2018-04-02  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [Extra zoom mode] Update date picker UI to latest specifications
+        https://bugs.webkit.org/show_bug.cgi?id=184234
+        <rdar://problem/38804760>
+
+        Reviewed by Timothy Hatcher.
+
+        Tweak localizable strings. Day, month and year labels should be fully capitalized, and there needs to be a
+        string for the "Set" button title.
+
+        * English.lproj/Localizable.strings:
+        * platform/LocalizedStrings.cpp:
+        (WebCore::datePickerSetButtonTitle):
+        (WebCore::datePickerDayLabelTitle):
+        (WebCore::datePickerMonthLabelTitle):
+        (WebCore::datePickerYearLabelTitle):
+        * platform/LocalizedStrings.h:
+
 2018-04-02  Ryosuke Niwa  <rniwa@webkit.org>
 
         REGRESSION(r228260):WebHTMLView beeps at every keydown for Chinese/Japanese/Korean Input Method

diff --git a/Source/WebCore/English.lproj/Localizable.strings b/Source/WebCore/English.lproj/Localizable.strings
index 9b40638..68d17b6 100644 (file)
--- a/Source/WebCore/English.lproj/Localizable.strings
+++ b/Source/WebCore/English.lproj/Localizable.strings
@@ -212,7 +212,7 @@
 "Cut (Undo action name)" = "Cut";
 
 /* Day label in date picker */
-"Day (Date picker for extra zoom mode)" = "Day";
+"DAY (Date picker for extra zoom mode)" = "DAY";
 
 /* Fullscreen Deceptive Website Warning Sheet Title */
 "Deceptive Website Warning" = "Deceptive Website Warning";
@@ -403,6 +403,9 @@
 /* Undo action name */
 "Lower Baseline (Undo action name)" = "Lower Baseline";
 
+/* Month label in date picker */
+"MONTH (Date picker for extra zoom mode)" = "MONTH";
+
 /* Make Lower Case context menu item */
 "Make Lower Case" = "Make Lower Case";
 
@@ -415,9 +418,6 @@
 /* Label text to be used when a plugin is missing */
 "Missing Plug-in" = "Missing Plug-in";
 
-/* Month label in date picker */
-"Month (Date picker for extra zoom mode)" = "Month";
-
 /* Media Mute context menu item */
 "Mute" = "Mute";
 
@@ -577,6 +577,9 @@
 /* Selection direction context sub-menu item */
 "Selection Direction" = "Selection Direction";
 
+/* Set button below date picker */
+"Set (Button below date picker for extra zoom mode)" = "Set";
+
 /* Undo action name */
 "Set Background Color (Undo action name)" = "Set Background Color";
 
@@ -836,7 +839,7 @@
 "WebKit encountered an internal error" = "WebKit encountered an internal error";
 
 /* Year label in date picker */
-"Year (Date picker for extra zoom mode)" = "Year";
+"YEAR (Date picker for extra zoom mode)" = "YEAR";
 
 /* message in authentication panel */
 "Your login information will be sent securely." = "Your login information will be sent securely.";

diff --git a/Source/WebCore/platform/LocalizedStrings.cpp b/Source/WebCore/platform/LocalizedStrings.cpp
index e8e7f7e..a87aca7 100644 (file)
--- a/Source/WebCore/platform/LocalizedStrings.cpp
+++ b/Source/WebCore/platform/LocalizedStrings.cpp
@@ -1066,19 +1066,24 @@ String formControlSearchButtonTitle()
     return WEB_UI_STRING("Search", "Title of the Search button for zoomed form controls.");
 }
 
+String datePickerSetButtonTitle()
+{
+    return WEB_UI_STRING_KEY("Set", "Set (Button below date picker for extra zoom mode)", "Set button below date picker");
+}
+
 String datePickerDayLabelTitle()
 {
-    return WEB_UI_STRING_KEY("Day", "Day (Date picker for extra zoom mode)", "Day label in date picker");
+    return WEB_UI_STRING_KEY("DAY", "DAY (Date picker for extra zoom mode)", "Day label in date picker");
 }
 
 String datePickerMonthLabelTitle()
 {
-    return WEB_UI_STRING_KEY("Month", "Month (Date picker for extra zoom mode)", "Month label in date picker");
+    return WEB_UI_STRING_KEY("MONTH", "MONTH (Date picker for extra zoom mode)", "Month label in date picker");
 }
 
 String datePickerYearLabelTitle()
 {
-    return WEB_UI_STRING_KEY("Year", "Year (Date picker for extra zoom mode)", "Year label in date picker");
+    return WEB_UI_STRING_KEY("YEAR", "YEAR (Date picker for extra zoom mode)", "Year label in date picker");
 }
 
 #endif

diff --git a/Source/WebCore/platform/LocalizedStrings.h b/Source/WebCore/platform/LocalizedStrings.h
index 6ae921c..129c0f1 100644 (file)
--- a/Source/WebCore/platform/LocalizedStrings.h
+++ b/Source/WebCore/platform/LocalizedStrings.h
@@ -323,6 +323,7 @@ namespace WebCore {
     WEBCORE_EXPORT String formControlHideButtonTitle();
     WEBCORE_EXPORT String formControlGoButtonTitle();
     WEBCORE_EXPORT String formControlSearchButtonTitle();
+    WEBCORE_EXPORT String datePickerSetButtonTitle();
     WEBCORE_EXPORT String datePickerDayLabelTitle();
     WEBCORE_EXPORT String datePickerMonthLabelTitle();
     WEBCORE_EXPORT String datePickerYearLabelTitle();

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 8625682..a095951 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2018-04-02  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [Extra zoom mode] Update date picker UI to latest specifications
+        https://bugs.webkit.org/show_bug.cgi?id=184234
+        <rdar://problem/38804760>
+
+        Reviewed by Timothy Hatcher.
+
+        Rename WKTextFormControlListViewControllerDelegate to WKTextInputListViewControllerDelegate and adjust for the
+        new initializer of WKDatePickerViewController.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView presentViewControllerForCurrentAssistedNode]):
+
 2018-04-02  Brady Eidson  <beidson@apple.com>
 
         Process swapping on navigation needs to handle server redirects.

diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
index dd8be2c..87c4427 100644 (file)
--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
@@ -125,7 +125,7 @@
 
 #if ENABLE(EXTRA_ZOOM_MODE)
 
-@interface WKContentView (ExtraZoomMode) <WKTextFormControlViewControllerDelegate, WKFocusedFormControlViewControllerDelegate, WKSelectMenuListViewControllerDelegate, WKTextFormControlListViewControllerDelegate>
+@interface WKContentView (ExtraZoomMode) <WKTextFormControlViewControllerDelegate, WKFocusedFormControlViewControllerDelegate, WKSelectMenuListViewControllerDelegate, WKTextInputListViewControllerDelegate>
 @end
 
 #endif
@@ -4236,8 +4236,7 @@ static bool isAssistableInputType(InputType type)
         break;
     case InputType::Date:
         if (!_datePickerViewController) {
-            _datePickerViewController = adoptNS([[WKDatePickerViewController alloc] initWithText:_assistedNodeInformation.value textSuggestions:@[ ]]);
-            [_datePickerViewController setDelegate:self];
+            _datePickerViewController = adoptNS([[WKDatePickerViewController alloc] initWithDelegate:self]);
             [_focusedFormControlViewController presentViewController:_datePickerViewController.get() animated:YES completion:nil];
         }
         break;