Merge branch 'master' into enable-predictive-text

app/notificationmodel.cpp

@@ -150,6 +150,12 @@ void NotificationModel::onNotificationClicked( uint id )
           emit showSwitchWorkspaceActionClicked();
           break;
         }
+        case NotificationType::ActionType::ShowSyncFailedDialog:
+        {
+          remove( id );
+          emit showSyncFailedDialogClicked();
+          break;
+        }
         default: break;
       }
     }

app/notificationmodel.h

@@ -41,7 +41,8 @@ class NotificationType
     {
       NoAction,
       ShowProjectIssuesAction,
-      ShowSwitchWorkspaceAction
+      ShowSwitchWorkspaceAction,
+      ShowSyncFailedDialog
     };
     Q_ENUM( ActionType )
 
@@ -109,6 +110,7 @@ class NotificationModel : public QAbstractListModel
     void rowCountChanged();
     void showProjectIssuesActionClicked();
     void showSwitchWorkspaceActionClicked();
+    void showSyncFailedDialogClicked();
 
   private:
     void add( const QString &message, uint interval, NotificationType::MessageType type = NotificationType::Information, NotificationType::IconType icon = NotificationType::NoneIcon, NotificationType::ActionType action = NotificationType::ActionType::NoAction );

app/qml/account/MMAccountController.qml

@@ -95,11 +95,11 @@ Item {
         } else
         {
           if (__merginApi.apiVersionStatus === MM.MerginApiStatus.INCOMPATIBLE) {
-            qsTr("Please update the app to use the latest features.")
+            qsTr( "Please update the app to use the latest features." )
           } else if (__merginApi.apiVersionStatus === MM.MerginApiStatus.PENDING) {
             ""
           } else {
-            qsTr("Server is currently unavailable - please try again later.")
+            qsTr( "Server is currently unavailable, check your connection or try again later." )
           }
         }
       }
@@ -130,6 +130,12 @@ Item {
       }
 
       onChangeServerClicked: function ( newServer ) {
+        // Ensure the newServer string ends with a '/'
+        // to format it as "https://my-server-app.com/"
+        if ( newServer && newServer.slice( -1 ) !== '/' ) {
+          newServer += '/';
+        }
+
         __merginApi.apiRoot = newServer
       }
 

app/qml/account/MMLoginPage.qml

@@ -204,6 +204,7 @@ MMPage {
             textFieldBackground.color: __style.lightGreenColor
 
             text: root.apiRoot
+            placeholderText: "https://my-server-app.com/"
 
             // Qt.ImhNoPredictiveText must be accompanied by Qt.ImhSensitiveData, see https://bugreports.qt.io/browse/QTBUG-86982
             textField.inputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhSensitiveData | Qt.ImhNoAutoUppercase | Qt.ImhUrlCharactersOnly

app/qml/main.qml

@@ -837,8 +837,8 @@ ApplicationWindow {
           syncFailedDialog.detailedText = qsTr( "Details" ) + ": " + errorMessage
           if ( willRetry )
           {
-            // TODO: open sync failed dialogue when clicked on the notification
-            __notificationModel.addError( qsTr( "There was an issue during synchronisation, we will try again. Click to learn more" ) )
+            __notificationModel.addError( qsTr( "There was an issue during synchronisation, we will try again. Click to learn more" ),
+            MM.NotificationType.ShowSyncFailedDialog )
           }
           else
           {
@@ -925,6 +925,9 @@ ApplicationWindow {
       stateManager.state = "projects"
       projectController.showSelectWorkspacePage()
     }
+    function onShowSyncFailedDialogClicked() {
+      syncFailedDialog.open()
+    }
   }
 
   Connections {

app/qml/project/MMProjectHomeTab.qml

@@ -142,6 +142,19 @@ Item {
     }
 
     onOpenProjectRequested: function( projectFilePath ) {
+
+      //
+      // There was an issue when closing the projects controller while having the searchbar textField focused
+      // (not neccessarily with keyboard opened). This is a kind-of workaround and hotfix.
+      // It might be related to https://bugreports.qt.io/browse/QTBUG-123876 as it started
+      // to occur more frequently when we upgraded to Qt 6.6.3
+      //
+      // See https://github.com/MerginMaps/mobile/issues/3027
+      //
+      if ( searchBar.textField.activeFocus ) {
+        searchBar.textField.focus = false
+      }
+
       root.openProjectRequested( projectFilePath )
     }
     onShowLocalChangesRequested: function( projectId ) {

app/qml/project/MMProjectServerTab.qml

@@ -64,6 +64,19 @@ Item {
     }
 
     onOpenProjectRequested: function( projectFilePath ) {
+
+      //
+      // There was an issue when closing the projects controller while having the searchbar textField focused
+      // (not neccessarily with keyboard opened). This is a kind-of workaround and hotfix.
+      // It might be related to https://bugreports.qt.io/browse/QTBUG-123876 as it started
+      // to occur more frequently when we upgraded to Qt 6.6.3
+      //
+      // See https://github.com/MerginMaps/mobile/issues/3027
+      //
+      if ( searchBar.textField.activeFocus ) {
+        searchBar.textField.focus = false
+      }
+
       root.openProjectRequested( projectFilePath )
     }
     onShowLocalChangesRequested: function( projectId ) {

core/merginapi.cpp

@@ -1181,7 +1181,7 @@ void MerginApi::createProjectFinished()
 
     CoreUtils::log( "create " + projectFullName, message );
 
-    emit projectCreated( projectName, false );
+    emit projectCreated( projectFullName, false );
 
     if ( showLimitReachedDialog )
     {