Implement a UI to open projects/datasets via native OS file picker on windows/linux/macos

images/images.qrc

@@ -164,6 +164,7 @@
         <file>themes/qfield/nodpi/ic_chevron_up.svg</file>
         <file>themes/qfield/nodpi/ic_arrow_left_white_24dp.svg</file>
         <file>themes/qfield/nodpi/ic_opacity_black_24dp.svg</file>
+        <file>themes/qfield/nodpi/ic_open_black_24dp.svg</file>
         <file>themes/qfield/nodpi/ic_common_angle_white_24dp.svg</file>
         <file>themes/qfield/nodpi/ic_password_48dp.svg</file>
         <file>themes/qfield/nodpi/ic_arrow_drop_down_48dp.svg</file>

src/core/platforms/android/androidplatformutilities.cpp

@@ -77,7 +77,7 @@ AndroidPlatformUtilities::AndroidPlatformUtilities()
 
 PlatformUtilities::Capabilities AndroidPlatformUtilities::capabilities() const
 {
-  PlatformUtilities::Capabilities capabilities = Capabilities() | NativeCamera | AdjustBrightness | CustomLocalDataPicker | CustomImport | CustomExport | CustomSend | FilePicker | VolumeKeys | UpdateProjectFromArchive;
+  PlatformUtilities::Capabilities capabilities = Capabilities() | NativeCamera | AdjustBrightness | CustomImport | CustomExport | CustomSend | FilePicker | VolumeKeys | UpdateProjectFromArchive;
 #ifdef WITH_SENTRY
   capabilities |= SentryFramework;
 #endif
@@ -287,16 +287,29 @@ void AndroidPlatformUtilities::exportDatasetTo( const QString &path ) const
 
 void AndroidPlatformUtilities::removeDataset( const QString &path ) const
 {
-  if ( mActivity.isValid() )
+  bool allowed = false;
+  const QStringList allowedDirectories = QStringList() << applicationDirectory() << additionalApplicationDirectories();
+  for ( const QString &directory : allowedDirectories )
   {
-    runOnAndroidMainThread( [path] {
-      auto activity = qtAndroidContext();
-      if ( activity.isValid() )
-      {
-        QJniObject pathJni = QJniObject::fromString( path );
-        activity.callMethod<void>( "removeDataset", "(Ljava/lang/String;)V", pathJni.object<jstring>() );
-      }
-    } );
+    if ( path.startsWith( directory ) )
+    {
+      allowed = true;
+      break;
+    }
+  }
+  if ( allowed )
+  {
+    if ( mActivity.isValid() )
+    {
+      runOnAndroidMainThread( [path] {
+        auto activity = qtAndroidContext();
+        if ( activity.isValid() )
+        {
+          QJniObject pathJni = QJniObject::fromString( path );
+          activity.callMethod<void>( "removeDataset", "(Ljava/lang/String;)V", pathJni.object<jstring>() );
+        }
+      } );
+    }
   }
 }
 
@@ -332,16 +345,29 @@ void AndroidPlatformUtilities::sendCompressedFolderTo( const QString &path ) con
 
 void AndroidPlatformUtilities::removeFolder( const QString &path ) const
 {
-  if ( mActivity.isValid() )
+  bool allowed = false;
+  const QStringList allowedDirectories = QStringList() << applicationDirectory() << additionalApplicationDirectories();
+  for ( const QString &directory : allowedDirectories )
   {
-    runOnAndroidMainThread( [path] {
-      auto activity = qtAndroidContext();
-      if ( activity.isValid() )
-      {
-        QJniObject pathJni = QJniObject::fromString( path );
-        activity.callMethod<void>( "removeProjectFolder", "(Ljava/lang/String;)V", pathJni.object<jstring>() );
-      }
-    } );
+    if ( path.startsWith( directory ) )
+    {
+      allowed = true;
+      break;
+    }
+  }
+  if ( allowed )
+  {
+    if ( mActivity.isValid() )
+    {
+      runOnAndroidMainThread( [path] {
+        auto activity = qtAndroidContext();
+        if ( activity.isValid() )
+        {
+          QJniObject pathJni = QJniObject::fromString( path );
+          activity.callMethod<void>( "removeProjectFolder", "(Ljava/lang/String;)V", pathJni.object<jstring>() );
+        }
+      } );
+    }
   }
 }
 

src/core/platforms/ios/iosplatformutilities.mm

@@ -65,7 +65,7 @@ - (void)documentInteractionControllerDidEndPreview:
 
 PlatformUtilities::Capabilities IosPlatformUtilities::capabilities() const {
   PlatformUtilities::Capabilities capabilities =
-      Capabilities() | NativeCamera | AdjustBrightness | CustomLocalDataPicker;
+      Capabilities() | NativeCamera | AdjustBrightness | FilePicker;
 #ifdef WITH_SENTRY
   capabilities |= SentryFramework;
 #endif

src/core/platforms/platformutilities.cpp

@@ -35,6 +35,7 @@
 #include <QDir>
 #include <QFileDialog>
 #include <QMargins>
+#include <QMessageBox>
 #include <QQuickWindow>
 #include <QStandardPaths>
 #include <QStorageInfo>
@@ -58,7 +59,7 @@ PlatformUtilities::~PlatformUtilities()
 
 PlatformUtilities::Capabilities PlatformUtilities::capabilities() const
 {
-  PlatformUtilities::Capabilities capabilities = FilePicker;
+  PlatformUtilities::Capabilities capabilities = PlatformUtilities::Capabilities() | FilePicker | NativeLocalDataPicker;
 #if WITH_SENTRY
   capabilities |= SentryFramework;
 #endif
@@ -274,12 +275,52 @@ void PlatformUtilities::sendCompressedFolderTo( const QString &path ) const
 
 void PlatformUtilities::removeDataset( const QString &path ) const
 {
-  Q_UNUSED( path )
+  bool allowed = false;
+  const QStringList allowedDirectories = QStringList() << applicationDirectory() << additionalApplicationDirectories();
+  for ( const QString &directory : allowedDirectories )
+  {
+    if ( path.startsWith( directory ) )
+    {
+      allowed = true;
+      break;
+    }
+  }
+  if ( allowed )
+  {
+    if ( QMessageBox::warning( nullptr,
+                               tr( "Removal Confirmation" ),
+                               tr( "The dataset will be deleted, proceed with removal?" ),
+                               QMessageBox::StandardButtons() | QMessageBox::Ok | QMessageBox::Abort )
+         == QMessageBox::Ok )
+    {
+      QFile::moveToTrash( path );
+    }
+  }
 }
 
 void PlatformUtilities::removeFolder( const QString &path ) const
 {
-  Q_UNUSED( path )
+  bool allowed = false;
+  const QStringList allowedDirectories = QStringList() << applicationDirectory() << additionalApplicationDirectories();
+  for ( const QString &directory : allowedDirectories )
+  {
+    if ( path.startsWith( directory ) )
+    {
+      allowed = true;
+      break;
+    }
+  }
+  if ( allowed )
+  {
+    if ( QMessageBox::warning( nullptr,
+                               tr( "Removal Confirmation" ),
+                               tr( "The project folder will be deleted, proceed with removal?" ),
+                               QMessageBox::StandardButtons() | QMessageBox::Ok | QMessageBox::Abort )
+         == QMessageBox::Ok )
+    {
+      QFile::moveToTrash( path );
+    }
+  }
 }
 
 ResourceSource *PlatformUtilities::getCameraPicture( const QString &, const QString &, const QString &, QObject * )

src/core/platforms/platformutilities.h

@@ -47,7 +47,7 @@ class QFIELD_CORE_EXPORT PlatformUtilities : public QObject
       NativeCamera = 1,                   //!< Native camera handling support
       AdjustBrightness = 1 << 1,          //!< Screen brightness adjustment support
       SentryFramework = 1 << 2,           //!< Sentry framework support
-      CustomLocalDataPicker = 1 << 3,     //!< Custom QML local data picker support
+      NativeLocalDataPicker = 1 << 3,     //!< Native local data picker support
       CustomImport = 1 << 4,              //!< Import project and dataset support
       CustomExport = 1 << 5,              //!< Export project and dataset support
       CustomSend = 1 << 6,                //!< Send/share files support

src/qml/QFieldLocalDataPickerScreen.qml

@@ -145,7 +145,7 @@ Page {
           property string itemPath: ItemPath
           property bool itemIsFavorite: ItemIsFavorite
           property bool itemMenuLoadable: !projectFolderView && (ItemMetaType === LocalFilesModel.Project || ItemMetaType === LocalFilesModel.Dataset)
-          property bool itemMenuVisible: ((ItemType === LocalFilesModel.SimpleFolder || ItemMetaType == LocalFilesModel.File) && table.model.currentPath !== 'root') || ((platformUtilities.capabilities & PlatformUtilities.CustomExport || platformUtilities.capabilities & PlatformUtilities.CustomSend) && (ItemMetaType === LocalFilesModel.Dataset)) || (ItemMetaType === LocalFilesModel.Dataset && ItemType === LocalFilesModel.RasterDataset && cloudProjectsModel.currentProjectId)
+          property bool itemMenuVisible: ((ItemType === LocalFilesModel.SimpleFolder || ItemMetaType == LocalFilesModel.Dataset || ItemMetaType == LocalFilesModel.File) && table.model.currentPath !== 'root') || ((platformUtilities.capabilities & PlatformUtilities.CustomExport || platformUtilities.capabilities & PlatformUtilities.CustomSend) && (ItemMetaType === LocalFilesModel.Dataset)) || (ItemMetaType === LocalFilesModel.Dataset && ItemType === LocalFilesModel.RasterDataset && cloudProjectsModel.currentProjectId)
 
           width: parent ? parent.width : undefined
           height: line.height
@@ -325,6 +325,37 @@ Page {
         }
       }
 
+      Connections {
+        target: nativeLocalDataPickerButton.__projectSource
+
+        function onProjectOpened(path) {
+          finished(true);
+          iface.loadFile(path);
+        }
+      }
+
+      QfToolButton {
+        id: nativeLocalDataPickerButton
+        round: true
+
+        property ProjectSource __projectSource
+
+        visible: platformUtilities.capabilities & PlatformUtilities.NativeLocalDataPicker && table.model.currentPath === 'root'
+
+        anchors.bottom: actionButton.top
+        anchors.right: parent.right
+        anchors.bottomMargin: 4
+        anchors.rightMargin: 10
+
+        bgcolor: Theme.mainColor
+        iconSource: Theme.getThemeVectorIcon("ic_open_black_24dp")
+        iconColor: Theme.toolButtonColor
+
+        onClicked: {
+          __projectSource = platformUtilities.openProject(this);
+        }
+      }
+
       QfToolButton {
         id: actionButton
         round: true
@@ -341,6 +372,7 @@ Page {
 
         bgcolor: Theme.mainColor
         iconSource: Theme.getThemeVectorIcon("ic_add_white_24dp")
+        iconColor: Theme.toolButtonColor
 
         onClicked: {
           var xy = mapToItem(mainWindow.contentItem, actionButton.width, actionButton.height);
@@ -451,7 +483,7 @@ Page {
       }
 
       MenuSeparator {
-        enabled: toggleFavoriteState.visible
+        enabled: toggleFavoriteState.visible && (exportFolderTo.visible || sendCompressedFolderTo.visible || uploadFolderToWebdav.visible || downloadFolderFromWebdav.visible)
         visible: enabled
         width: parent.width
         height: enabled ? undefined : 0
@@ -526,7 +558,7 @@ Page {
       }
 
       MenuSeparator {
-        enabled: removeProjectFolder.visible
+        enabled: removeDataset.visible || removeProjectFolder.visible
         visible: enabled
         width: parent.width
         height: enabled ? undefined : 0
@@ -545,6 +577,7 @@ Page {
         text: qsTr("Remove dataset")
         onTriggered: {
           platformUtilities.removeDataset(itemMenu.itemPath);
+          table.model.resetToPath(table.model.currentPath);
         }
       }
 
@@ -561,6 +594,7 @@ Page {
         text: qsTr("Remove folder")
         onTriggered: {
           platformUtilities.removeFolder(itemMenu.itemPath);
+          table.model.resetToPath(table.model.currentPath);
         }
       }
     }

src/qml/qgismobileapp.qml

@@ -3918,7 +3918,6 @@ ApplicationWindow {
     model: RecentProjectListModel {
       id: recentProjectListModel
     }
-    property ProjectSource __projectSource
 
     anchors.fill: parent
 
@@ -4113,14 +4112,6 @@ ApplicationWindow {
     }
   }
 
-  Connections {
-    target: welcomeScreen.__projectSource
-
-    function onProjectOpened(path) {
-      iface.loadFile(path);
-    }
-  }
-
   // ! MODELS !
   FeatureModel {
     id: geometryEditingFeature
@@ -4180,7 +4171,7 @@ ApplicationWindow {
     standardButtons: Dialog.Yes | Dialog.No
   }
 
-  Dialog {
+  QfDialog {
     id: cancelAlgorithmDialog
     parent: mainWindow.contentItem