fix(ui/views/App/Main/Assistant): refactoring

linphone-desktop/resources.qrc

@@ -334,16 +334,16 @@
     <file>ui/views/App/Calls/IncomingCall.qml</file>
     <file>ui/views/App/Calls/OutgoingCall.qml</file>
     <file>ui/views/App/Main/Assistant/AssistantAbstractView.qml</file>
-    <file>ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccount.qml</file>
-    <file>ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccountWithEmail.qml</file>
-    <file>ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccountWithPhoneNumber.qml</file>
-    <file>ui/views/App/Main/Assistant/AssistantFetchRemoteConfiguration.qml</file>
     <file>ui/views/App/Main/Assistant/AssistantHome.qml</file>
-    <file>ui/views/App/Main/Assistant/AssistantUseLinphoneSipAccount.qml</file>
-    <file>ui/views/App/Main/Assistant/AssistantUseLinphoneSipAccountWithPhoneNumber.qml</file>
-    <file>ui/views/App/Main/Assistant/AssistantUseLinphoneSipAccountWithUsername.qml</file>
-    <file>ui/views/App/Main/Assistant/AssistantUseOtherSipAccount.qml</file>
+    <file>ui/views/App/Main/Assistant/CreateLinphoneSipAccount.qml</file>
+    <file>ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithEmail.qml</file>
+    <file>ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithPhoneNumber.qml</file>
+    <file>ui/views/App/Main/Assistant/FetchRemoteConfiguration.qml</file>
     <file>ui/views/App/Main/Assistant.qml</file>
+    <file>ui/views/App/Main/Assistant/UseLinphoneSipAccount.qml</file>
+    <file>ui/views/App/Main/Assistant/UseLinphoneSipAccountWithPhoneNumber.qml</file>
+    <file>ui/views/App/Main/Assistant/UseLinphoneSipAccountWithUsername.qml</file>
+    <file>ui/views/App/Main/Assistant/UseOtherSipAccount.qml</file>
     <file>ui/views/App/Main/ContactEdit.js</file>
     <file>ui/views/App/Main/ContactEdit.qml</file>
     <file>ui/views/App/Main/Contacts.qml</file>
@@ -369,10 +369,10 @@
     <file>ui/views/App/Styles/Calls/CallStyle.qml</file>
     <file>ui/views/App/Styles/Calls/CallsWindowStyle.qml</file>
     <file>ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml</file>
-    <file>ui/views/App/Styles/Main/Assistant/AssistantCreateLinphoneSipAccountStyle.qml</file>
     <file>ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml</file>
-    <file>ui/views/App/Styles/Main/Assistant/AssistantUseLinphoneSipAccountStyle.qml</file>
+    <file>ui/views/App/Styles/Main/Assistant/CreateLinphoneSipAccountStyle.qml</file>
     <file>ui/views/App/Styles/Main/AssistantStyle.qml</file>
+    <file>ui/views/App/Styles/Main/Assistant/UseLinphoneSipAccountStyle.qml</file>
     <file>ui/views/App/Styles/Main/ContactEditStyle.qml</file>
     <file>ui/views/App/Styles/Main/ContactsStyle.qml</file>
     <file>ui/views/App/Styles/Main/ConversationStyle.qml</file>

linphone-desktop/ui/views/App/Main/Assistant/AssistantHome.qml

@@ -98,22 +98,22 @@ ColumnLayout {
     model: ListModel {
       ListElement {
         $text: qsTr('createLinphoneSipAccount')
-        $view: 'AssistantCreateLinphoneSipAccount'
+        $view: 'CreateLinphoneSipAccount'
       }
 
       ListElement {
         $text: qsTr('useLinphoneSipAccount')
-        $view: 'AssistantUseLinphoneSipAccount'
+        $view: 'UseLinphoneSipAccount'
       }
 
       ListElement {
         $text: qsTr('useOtherSipAccount')
-        $view: 'AssistantUseOtherSipAccount'
+        $view: 'UseOtherSipAccount'
       }
 
       ListElement {
         $text: qsTr('fetchRemoteConfiguration')
-        $view: 'AssistantFetchRemoteConfiguration'
+        $view: 'FetchRemoteConfiguration'
       }
     }
 

linphone-desktop/ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccount.qml → linphone-desktop/ui/views/App/Main/Assistant/CreateLinphoneSipAccount.qml

@@ -16,25 +16,25 @@ AssistantAbstractView {
 
   Column {
     anchors.centerIn: parent
-    spacing: AssistantCreateLinphoneSipAccountStyle.buttons.spacing
-    width: AssistantCreateLinphoneSipAccountStyle.buttons.button.width
+    spacing: CreateLinphoneSipAccountStyle.buttons.spacing
+    width: CreateLinphoneSipAccountStyle.buttons.button.width
 
     TextButtonA {
       text: qsTr('withPhoneNumber')
 
-      height: AssistantCreateLinphoneSipAccountStyle.buttons.button.height
+      height: CreateLinphoneSipAccountStyle.buttons.button.height
       width: parent.width
 
-      onClicked: assistant.pushView('AssistantCreateLinphoneSipAccountWithPhoneNumber')
+      onClicked: assistant.pushView('CreateLinphoneSipAccountWithPhoneNumber')
     }
 
     TextButtonA {
       text: qsTr('withEmailAddress')
 
-      height: AssistantCreateLinphoneSipAccountStyle.buttons.button.height
+      height: CreateLinphoneSipAccountStyle.buttons.button.height
       width: parent.width
 
-      onClicked: assistant.pushView('AssistantCreateLinphoneSipAccountWithEmail')
+      onClicked: assistant.pushView('CreateLinphoneSipAccountWithEmail')
     }
   }
 }

linphone-desktop/ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccountWithPhoneNumber.qml → linphone-desktop/ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithPhoneNumber.qml

@@ -3,8 +3,6 @@ import QtQuick 2.7
 import Common 1.0
 import Linphone 1.0
 
-import App.Styles 1.0
-
 // =============================================================================
 
 AssistantAbstractView {

linphone-desktop/ui/views/App/Main/Assistant/AssistantUseLinphoneSipAccount.qml → linphone-desktop/ui/views/App/Main/Assistant/UseLinphoneSipAccount.qml

@@ -25,7 +25,7 @@ AssistantAbstractView {
     Loader {
       id: loader
 
-      source: 'AssistantUseLinphoneSipAccountWith' + (
+      source: 'UseLinphoneSipAccountWith' + (
         checkBox.checked ? 'Username' : 'PhoneNumber'
       ) + '.qml'
       width: parent.width
@@ -35,7 +35,7 @@ AssistantAbstractView {
       id: checkBox
 
       text: qsTr('useUsernameToLogin')
-      width: AssistantUseLinphoneSipAccountStyle.checkBox.width
+      width: UseLinphoneSipAccountStyle.checkBox.width
 
       onClicked: {
         assistantModel.reset()

linphone-desktop/ui/views/App/Styles/qmldir

@@ -8,9 +8,9 @@ singleton CallStyle                              1.0 Calls/CallStyle.qml
 singleton CallsWindowStyle                       1.0 Calls/CallsWindowStyle.qml
 
 singleton AssistantAbstractViewStyle             1.0 Main/Assistant/AssistantAbstractViewStyle.qml
-singleton AssistantCreateLinphoneSipAccountStyle 1.0 Main/Assistant/AssistantCreateLinphoneSipAccountStyle.qml
 singleton AssistantHomeStyle                     1.0 Main/Assistant/AssistantHomeStyle.qml
-singleton AssistantUseLinphoneSipAccountStyle    1.0 Main/Assistant/AssistantUseLinphoneSipAccountStyle.qml
+singleton CreateLinphoneSipAccountStyle          1.0 Main/Assistant/CreateLinphoneSipAccountStyle.qml
+singleton UseLinphoneSipAccountStyle             1.0 Main/Assistant/UseLinphoneSipAccountStyle.qml
 
 singleton AssistantStyle                         1.0 Main/AssistantStyle.qml
 singleton ContactEditStyle                       1.0 Main/ContactEditStyle.qml