From: InHong Han Date: Thu, 1 Sep 2022 09:45:17 +0000 (+0900) Subject: Apply UI guide changes X-Git-Tag: accepted/tizen/unified/20220907.021349^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c72065853b004f0e29a59aae64d30bba678c059;p=profile%2Fiot%2Fapps%2Fdotnet%2Fsetting-inputmethod.git Apply UI guide changes Change-Id: I668d25d2ed7797958da665551ff069c31d286c1d --- diff --git a/Settings/SettingInputmethod/Resource/Resources.Designer.cs b/Settings/SettingInputmethod/Resource/Resources.Designer.cs index 3aaefb1..dd7e8b0 100644 --- a/Settings/SettingInputmethod/Resource/Resources.Designer.cs +++ b/Settings/SettingInputmethod/Resource/Resources.Designer.cs @@ -60,6 +60,15 @@ namespace SettingInputmethod.Resource { } } + /// + /// 과(와) 유사한 지역화된 문자열을 찾습니다. + /// + public static string IDS_COM_SK_BACK_ABB { + get { + return ResourceManager.GetString("IDS_COM_SK_BACK_ABB", resourceCulture); + } + } + /// /// 과(와) 유사한 지역화된 문자열을 찾습니다. /// diff --git a/Settings/SettingInputmethod/Resource/Resources.en.resx b/Settings/SettingInputmethod/Resource/Resources.en.resx index c13f579..85ab490 100644 --- a/Settings/SettingInputmethod/Resource/Resources.en.resx +++ b/Settings/SettingInputmethod/Resource/Resources.en.resx @@ -1,159 +1,162 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Turn on - - - Keyboard - - - Default keyboard - - - Cancel - - - Turn on keyboard - - - This input method may be able to collect all the text you type, including personal data like passwords and credit card numbers. It comes from the %s application. Tap Enable to enable this input method. - - - Select keyboard - - - Enable - - - Attention - - - Virtual keyboard - - - Keyboards - - - Keyboard settings - - - Ok - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Turn on + + + Keyboard + + + Default keyboard + + + Cancel + + + Turn on keyboard + + + This input method may be able to collect all the text you type, including personal data like passwords and credit card numbers. It comes from the %s application. Tap Enable to enable this input method. + + + Select keyboard + + + Enable + + + Attention + + + Virtual keyboard + + + Keyboards + + + Keyboard settings + + + Ok + + + Back + \ No newline at end of file diff --git a/Settings/SettingInputmethod/Resource/Resources.en_PH.resx b/Settings/SettingInputmethod/Resource/Resources.en_PH.resx index c13f579..85ab490 100644 --- a/Settings/SettingInputmethod/Resource/Resources.en_PH.resx +++ b/Settings/SettingInputmethod/Resource/Resources.en_PH.resx @@ -1,159 +1,162 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Turn on - - - Keyboard - - - Default keyboard - - - Cancel - - - Turn on keyboard - - - This input method may be able to collect all the text you type, including personal data like passwords and credit card numbers. It comes from the %s application. Tap Enable to enable this input method. - - - Select keyboard - - - Enable - - - Attention - - - Virtual keyboard - - - Keyboards - - - Keyboard settings - - - Ok - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Turn on + + + Keyboard + + + Default keyboard + + + Cancel + + + Turn on keyboard + + + This input method may be able to collect all the text you type, including personal data like passwords and credit card numbers. It comes from the %s application. Tap Enable to enable this input method. + + + Select keyboard + + + Enable + + + Attention + + + Virtual keyboard + + + Keyboards + + + Keyboard settings + + + Ok + + + Back + \ No newline at end of file diff --git a/Settings/SettingInputmethod/Resource/Resources.en_US.resx b/Settings/SettingInputmethod/Resource/Resources.en_US.resx index 0afb938..b515c67 100644 --- a/Settings/SettingInputmethod/Resource/Resources.en_US.resx +++ b/Settings/SettingInputmethod/Resource/Resources.en_US.resx @@ -1,159 +1,162 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Turn on - - - Keyboard - - - Default keyboard - - - Cancel - - - Turn on keyboard - - - This input method may be able to collect all the text you type, including personal data like passwords and credit card numbers. It comes from the %s application. Tap Turn on to turn on this input method. - - - Select keyboard - - - Enable - - - Attention - - - Virtual keyboard - - - Keyboards - - - Keyboard settings - - - Ok - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Turn on + + + Keyboard + + + Default keyboard + + + Cancel + + + Turn on keyboard + + + This input method may be able to collect all the text you type, including personal data like passwords and credit card numbers. It comes from the %s application. Tap Turn on to turn on this input method. + + + Select keyboard + + + Enable + + + Attention + + + Virtual keyboard + + + Keyboards + + + Keyboard settings + + + Ok + + + Back + \ No newline at end of file diff --git a/Settings/SettingInputmethod/Resource/Resources.ko-KR.resx b/Settings/SettingInputmethod/Resource/Resources.ko-KR.resx index f9d62da..aedd41c 100644 --- a/Settings/SettingInputmethod/Resource/Resources.ko-KR.resx +++ b/Settings/SettingInputmethod/Resource/Resources.ko-KR.resx @@ -1,159 +1,162 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 실행 - - - 키보드 - - - 기본 키보드 - - - 취소 - - - 키보드 실행 - - - %s 앱의 입력 방식은 비밀번호 또는 신용카드 번호와 같은 개인정보를 포함하여 입력한 내용을 모두 수집할 수 있습니다. 이 입력 방식을 실행하려면 [실행]을 누르세요. - - - 키보드 선택 - - - 실행 - - - 주의 - - - 가상 키보드 - - - 키보드 - - - 키보드 설정 - - - 확인 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 실행 + + + 키보드 + + + 기본 키보드 + + + 취소 + + + 키보드 실행 + + + %s 앱의 입력 방식은 비밀번호 또는 신용카드 번호와 같은 개인정보를 포함하여 입력한 내용을 모두 수집할 수 있습니다. 이 입력 방식을 실행하려면 [실행]을 누르세요. + + + 키보드 선택 + + + 실행 + + + 주의 + + + 가상 키보드 + + + 키보드 + + + 키보드 설정 + + + 확인 + + + 뒤로 + \ No newline at end of file diff --git a/Settings/SettingInputmethod/Resource/Resources.resx b/Settings/SettingInputmethod/Resource/Resources.resx index eee9e6d..d7ad55e 100644 --- a/Settings/SettingInputmethod/Resource/Resources.resx +++ b/Settings/SettingInputmethod/Resource/Resources.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + diff --git a/Settings/SettingInputmethod/SettingDefaultKeyboard.cs b/Settings/SettingInputmethod/SettingDefaultKeyboard.cs index 94ce3fd..1352aa0 100644 --- a/Settings/SettingInputmethod/SettingDefaultKeyboard.cs +++ b/Settings/SettingInputmethod/SettingDefaultKeyboard.cs @@ -23,10 +23,12 @@ namespace SettingInputmethod Navigator navigator = window.GetDefaultNavigator(); Size2D windowSize = window.Size; - View root = new View() + ScrollableBase root = new ScrollableBase() { WidthSpecification = LayoutParamPolicies.MatchParent, HeightSpecification = LayoutParamPolicies.MatchParent, + ScrollingDirection = ScrollableBase.Direction.Vertical, + HideScrollbar = false, Layout = new LinearLayout() { @@ -57,9 +59,18 @@ namespace SettingInputmethod } } + TextLabel title = new TextLabel() + { + Text = Resource.Resources.IDS_ST_HEADER_DEFAULT_KEYBOARD_ABB, + PointSize = 10, + VerticalAlignment = VerticalAlignment.Center, + HorizontalAlignment = HorizontalAlignment.Center, + }; + Picker picker = new Picker() { - SizeWidth = windowSize.Width, + SizeWidth = (float)(window.WindowSize.Width * 0.7), + SizeHeight = (float)(window.WindowSize.Height * 0.54), MinValue = 1, MaxValue = imeList.Count, CurrentValue = pickerIndex, @@ -69,7 +80,6 @@ namespace SettingInputmethod Button button = new Button() { - SizeWidth = (float)(window.WindowSize.Width * 0.42), Text = Resource.Resources.IDS_COM_SK_OK_ABB, }; button.Clicked += (object sender, ClickedEventArgs e) => @@ -79,6 +89,7 @@ namespace SettingInputmethod navigator.Pop(); }; + root.Add(title); root.Add(picker); root.Add(button); @@ -89,7 +100,7 @@ namespace SettingInputmethod AppBar appBar = new AppBar() { - Title = Resource.Resources.IDS_ST_HEADER_DEFAULT_KEYBOARD_ABB, + Title = Resource.Resources.IDS_COM_SK_BACK_ABB, AutoNavigationContent = false, }; diff --git a/Settings/SettingView/SettingView.cs b/Settings/SettingView/SettingView.cs index 083febd..d48896f 100644 --- a/Settings/SettingView/SettingView.cs +++ b/Settings/SettingView/SettingView.cs @@ -46,7 +46,7 @@ namespace SettingView { var appCustomBorder = new SettingViewBorder(); // Need to fix the window size - var app = new Program("", new Size2D(500, 400), new Position2D(300, 100), appCustomBorder); + var app = new Program("", new Size2D(960, 540), new Position2D(300, 100), appCustomBorder); app.Run(args); } }