From: Yurii Zinchuk/Tizen Services & IoT (PLT) /SRPOL/Engineer/Samsung Electronics Date: Wed, 5 Apr 2023 09:48:26 +0000 (+0200) Subject: replace radiobutton with radiobutton list item X-Git-Tag: accepted/tizen/unified/20230421.033221~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c277699ef4fd0125c3c161e1df69a3072b755eaf;p=profile%2Fiot%2Fapps%2Fdotnet%2Fsettings.git replace radiobutton with radiobutton list item --- diff --git a/SettingMainGadget/DateTime/DateTimeSetTimezoneGadget.cs b/SettingMainGadget/DateTime/DateTimeSetTimezoneGadget.cs index 47a318d..7e74ee9 100644 --- a/SettingMainGadget/DateTime/DateTimeSetTimezoneGadget.cs +++ b/SettingMainGadget/DateTime/DateTimeSetTimezoneGadget.cs @@ -1,4 +1,5 @@ using SettingCore.TextResources; +using SettingCore.Views; using SettingMainGadget.DateTime; using System.Linq; using Tizen.NUI; @@ -37,17 +38,11 @@ namespace Setting.Menu.DateTime foreach (var timeZone in timeZones) { - RadioButton radioButton = new RadioButton() - { - ThemeChangeSensitive = true, - ItemHorizontalAlignment = HorizontalAlignment.Begin, - Text = timeZone.DisplayName, - IsSelected = SystemSettings.LocaleTimeZone == timeZone.Info.Id, - Margin = new Extents(24, 0, 0, 0).SpToPx(), - }; + RadioButtonListItem item = new RadioButtonListItem(timeZone.DisplayName); + item.RadioButton.IsSelected = SystemSettings.LocaleTimeZone == timeZone.Info.Id; - radioButtonGroup.Add(radioButton); - content.Add(radioButton); + radioButtonGroup.Add(item.RadioButton); + content.Add(item); } radioButtonGroup.SelectedChanged += (o, e) => diff --git a/SettingMainGadget/Display/DisplayFontTypeGadget.cs b/SettingMainGadget/Display/DisplayFontTypeGadget.cs index 309dd12..5256277 100644 --- a/SettingMainGadget/Display/DisplayFontTypeGadget.cs +++ b/SettingMainGadget/Display/DisplayFontTypeGadget.cs @@ -7,6 +7,7 @@ using Tizen.NUI; using Tizen.NUI.BaseComponents; using Tizen.NUI.Components; using Tizen.System; +using SettingCore.Views; namespace Setting.Menu.Display { @@ -34,17 +35,12 @@ namespace Setting.Menu.Display for (int i = 0; i < fontTypeList.Count; i++) { - RadioButton radioButton = new RadioButton() - { - ThemeChangeSensitive = true, - Text = fontTypeList[i], - IsSelected = fontTypeList[i] == SystemSettings.FontType, - Margin = new Extents(24, 0, 0, 0).SpToPx(), - }; - radioButton.TextLabel.FontFamily = fontTypeList[i]; + RadioButtonListItem item = new RadioButtonListItem(fontTypeList[i]); + item.RadioButton.IsSelected = fontTypeList[i] == SystemSettings.FontType; + item.RadioButton.TextLabel.FontFamily = fontTypeList[i]; - radioButtonGroup.Add(radioButton); - content.Add(radioButton); + radioButtonGroup.Add(item.RadioButton); + content.Add(item); } radioButtonGroup.SelectedChanged += (o, e) => diff --git a/SettingMainGadget/Display/DisplayTimeOutGadget.cs b/SettingMainGadget/Display/DisplayTimeOutGadget.cs index dc1145d..e4b9e19 100644 --- a/SettingMainGadget/Display/DisplayTimeOutGadget.cs +++ b/SettingMainGadget/Display/DisplayTimeOutGadget.cs @@ -1,4 +1,5 @@ using SettingCore.TextResources; +using SettingCore.Views; using SettingMainGadget.Display; using System.Linq; using Tizen.NUI; @@ -33,16 +34,11 @@ namespace Setting.Menu.Display for (int i = 0; i < timeoutList.Count; i++) { - RadioButton radioButton = new RadioButton() - { - Text = timeoutList[i], - ThemeChangeSensitive = true, - IsSelected = i.Equals(DisplayTimeOutManager.GetScreenTimeoutIndex()), - Margin = new Extents(24, 0, 0, 0).SpToPx(), - }; - - radioButtonGroup.Add(radioButton); - content.Add(radioButton); + RadioButtonListItem item = new RadioButtonListItem(timeoutList[i]); + item.RadioButton.IsSelected = i.Equals(DisplayTimeOutManager.GetScreenTimeoutIndex()); + + radioButtonGroup.Add(item.RadioButton); + content.Add(item); } radioButtonGroup.SelectedChanged += (o, e) => diff --git a/SettingMainGadget/LanguageInput/LanguageInputDisplayLanguageGadget.cs b/SettingMainGadget/LanguageInput/LanguageInputDisplayLanguageGadget.cs index 43fcb57..7b7e94b 100644 --- a/SettingMainGadget/LanguageInput/LanguageInputDisplayLanguageGadget.cs +++ b/SettingMainGadget/LanguageInput/LanguageInputDisplayLanguageGadget.cs @@ -1,6 +1,6 @@ using SettingCore.TextResources; +using SettingCore.Views; using SettingMainGadget.LanguageInput; -using System.Linq; using Tizen.NUI; using Tizen.NUI.BaseComponents; using Tizen.NUI.Components; @@ -31,16 +31,11 @@ namespace Setting.Menu.LanguageInput for (int i = 0; i < LanguageInputDisplayLanguageManager.LanguageList.Count; i++) { - RadioButton radioButton = new RadioButton() - { - ThemeChangeSensitive = true, - Text = LanguageInputDisplayLanguageManager.LanguageList[i].GetName(), - IsSelected = i.Equals(LanguageInputDisplayLanguageManager.GetDisplayLanguageIndex()), - Margin = new Extents(24, 0, 0, 0).SpToPx(), - }; - - radioButtonGroup.Add(radioButton); - content.Add(radioButton); + RadioButtonListItem item = new RadioButtonListItem(LanguageInputDisplayLanguageManager.LanguageList[i].GetName()); + item.RadioButton.IsSelected = i.Equals(LanguageInputDisplayLanguageManager.GetDisplayLanguageIndex()); + + radioButtonGroup.Add(item.RadioButton); + content.Add(item); } radioButtonGroup.SelectedChanged += (o, e) => diff --git a/SettingMainGadget/Sound/SoundmodeGadget.cs b/SettingMainGadget/Sound/SoundmodeGadget.cs index 1e461d1..e7db525 100644 --- a/SettingMainGadget/Sound/SoundmodeGadget.cs +++ b/SettingMainGadget/Sound/SoundmodeGadget.cs @@ -1,4 +1,5 @@ using SettingCore.TextResources; +using SettingCore.Views; using SettingMainGadget.Sound; using System.Linq; using Tizen.NUI; @@ -37,16 +38,11 @@ namespace Setting.Menu.Sound for (int i = 0; i < sounds.Length; i++) { - RadioButton radioButton = new RadioButton() - { - ThemeChangeSensitive = true, - Text = SoundmodeManager.GetSoundmodeName(sounds[i]), - IsSelected = i.Equals(sounds.ToList().IndexOf(SoundmodeManager.GetSoundmode())), - Margin = new Extents(24, 0, 0, 0).SpToPx(), - }; - - radioButtonGroup.Add(radioButton); - content.Add(radioButton); + RadioButtonListItem item = new RadioButtonListItem(SoundmodeManager.GetSoundmodeName(sounds[i])); + item.RadioButton.IsSelected = i.Equals(sounds.ToList().IndexOf(SoundmodeManager.GetSoundmode())); + + radioButtonGroup.Add(item.RadioButton); + content.Add(item); } radioButtonGroup.SelectedChanged += (o, e) => diff --git a/SettingMainGadget/Sound/SoundnotificationGadget.cs b/SettingMainGadget/Sound/SoundnotificationGadget.cs index 883408a..dce55c6 100644 --- a/SettingMainGadget/Sound/SoundnotificationGadget.cs +++ b/SettingMainGadget/Sound/SoundnotificationGadget.cs @@ -7,6 +7,7 @@ using System.Linq; using Tizen.NUI; using Tizen.NUI.BaseComponents; using Tizen.NUI.Components; +using SettingCore.Views; namespace Setting.Menu.Sound { @@ -38,16 +39,11 @@ namespace Setting.Menu.Sound for (int i = 0; i < soundList.Count; i++) { - RadioButton radioButton = new RadioButton() - { - ThemeChangeSensitive = true, - Text = SoundNotificationManager.SettingMediaBasename(soundList[i].ToString()), - IsSelected = i.Equals(GetNotificationSoundIndex(soundList)), - Margin = new Extents(24, 0, 0, 0).SpToPx(), - }; - - radioButtonGroup.Add(radioButton); - content.Add(radioButton); + RadioButtonListItem item = new RadioButtonListItem(SoundNotificationManager.SettingMediaBasename(soundList[i].ToString())); + item.RadioButton.IsSelected = i.Equals(GetNotificationSoundIndex(soundList)); + + radioButtonGroup.Add(item.RadioButton); + content.Add(item); } radioButtonGroup.SelectedChanged += (o, e) =>