remove duplicate include, change ui for match with stt

Change-Id: Ib73309576e02d030a8f79eeafa10eca4f29bcf29
(cherry picked from commit 4b62615fbda99c251511bba79b850042c54b9dce)

diff --git a/SettingVoiceControl/SettingVoiceControl/SettingVoiceControl.cs b/SettingVoiceControl/SettingVoiceControl/SettingVoiceControl.cs
index a8b6054..c19fea0 100644 (file)
--- a/SettingVoiceControl/SettingVoiceControl/SettingVoiceControl.cs
+++ b/SettingVoiceControl/SettingVoiceControl/SettingVoiceControl.cs
@@ -5,6 +5,8 @@ using Tizen.Applications;
 using Tizen.NUI;
 using Tizen.NUI.BaseComponents;
 using Tizen.NUI.Components;
+using SettingCore;
+using SettingCore.Views;
 using SettingVoiceControl.TextResources;
 
 
@@ -61,6 +63,7 @@ namespace SettingVoiceControl
             }
             sections.Clear();
 
+            // VOICE WAKEUP
             bool isWakeupEnabled = (mVoiceSettingManager.VcSettingMgrGetVoiceWakeUpSetting() == 1) ? true : false;
 
             var voiceWakeUp = new SettingCore.Views.SwitchListItem(NUIGadgetResourceManager.GetString(nameof(Resources.IDS_WAKEUP_BODY_WAKEUP_ENABLE)), isSelected: isWakeupEnabled);
@@ -71,11 +74,12 @@ namespace SettingVoiceControl
             };
             sections.Add(voiceWakeUp);
 
-            var preferredEngineHeader = new SettingCore.Views.TextHeaderListItem(NUIGadgetResourceManager.GetString(nameof(Resources.IDS_ST_MBODY_PREFERRED_ENGINE)));
-            sections.Add(preferredEngineHeader);
 
+            // ENGINE
+            var preferredEngineText = NUIGadgetResourceManager.GetString(nameof(Resources.IDS_ST_MBODY_PREFERRED_ENGINE));
             var preferredEngineName = mVoiceSettingManager.VcSettingMgrGetCurrentEngine();
-            var preferredEngine = SettingCore.Views.TextListItem.CreatePrimaryTextItem(preferredEngineName);
+
+            var preferredEngine = SettingCore.Views.TextListItem.CreatePrimaryTextItemWithSecondaryText(preferredEngineText, preferredEngineName);
             preferredEngine.Clicked += (s, e) =>
             {
                 NavigateTo(MenuProvider.VoiceControl_Engine);
@@ -83,16 +87,17 @@ namespace SettingVoiceControl
             };
             sections.Add(preferredEngine);
 
-            var defaultLanguageHeader = new SettingCore.Views.TextHeaderListItem(NUIGadgetResourceManager.GetString(nameof(Resources.IDS_ST_BODY_DEFAULT_LANGUAGE_STATUS)));
-            sections.Add(defaultLanguageHeader);
-            string defaultLanguageName = mVoiceSettingManager.VcSettingMgrGetCurrentLanguage();
-            var defaultLanguage = SettingCore.Views.TextListItem.CreatePrimaryTextItem(defaultLanguageName);
-            defaultLanguage.Clicked += (s, e) =>
+
+            // LANGUAGE
+            var languageText = NUIGadgetResourceManager.GetString(nameof(Resources.IDS_ST_BODY_DEFAULT_LANGUAGE_STATUS));
+            var languageName = mVoiceSettingManager.VcSettingMgrGetCurrentLanguage();
+            var language = SettingCore.Views.TextListItem.CreatePrimaryTextItemWithSecondaryText(languageText, languageName);
+            language.Clicked += (s, e) =>
             {
                 NavigateTo(MenuProvider.VoiceControl_Language);
                 navigator.Popped += PoppedEvent;
             };
-            sections.Add(defaultLanguage);
+            sections.Add(language);
 
             foreach (var view in sections)
             {

diff --git a/SettingVoiceControl/SettingVoiceControl/SettingVoiceControl.csproj b/SettingVoiceControl/SettingVoiceControl/SettingVoiceControl.csproj
index b327f16..6642afb 100644 (file)
--- a/SettingVoiceControl/SettingVoiceControl/SettingVoiceControl.csproj
+++ b/SettingVoiceControl/SettingVoiceControl/SettingVoiceControl.csproj
@@ -17,10 +17,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Tizen.NET.API10" Version="10.0.0.17629" />
-  </ItemGroup>
-
-  <ItemGroup>
     <PackageReference Include="SettingCore" Version="1.0.346" />
     <PackageReference Include="Tizen.NET" Version="11.0.0.18009" />
   </ItemGroup>