refactor: reorganize dialog package structure

app/src/androidTest/java/com/nextcloud/ui/SetOnlineStatusBottomSheetIT.kt

@@ -16,6 +16,7 @@ import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.rule.GrantPermissionRule
+import com.nextcloud.ui.dialog.account.onlineStatus.SetOnlineStatusBottomSheet
 import com.owncloud.android.AbstractIT
 import com.owncloud.android.R
 import com.owncloud.android.lib.resources.users.Status

app/src/androidTest/java/com/nextcloud/ui/SetStatusMessageBottomSheetIT.kt

@@ -16,6 +16,7 @@ import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.rule.GrantPermissionRule
+import com.nextcloud.ui.dialog.account.statusMessage.SetStatusMessageBottomSheet
 import com.owncloud.android.AbstractIT
 import com.owncloud.android.R
 import com.owncloud.android.lib.resources.users.ClearAt

app/src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.kt

@@ -38,9 +38,9 @@ import com.nextcloud.client.account.RegisteredUser
 import com.nextcloud.client.account.Server
 import com.nextcloud.client.device.DeviceInfo
 import com.nextcloud.client.documentscan.AppScanOptionalFeature
-import com.nextcloud.ui.ChooseAccountDialogFragment
-import com.nextcloud.ui.ChooseAccountDialogFragment.Companion.newInstance
-import com.nextcloud.ui.SetOnlineStatusBottomSheet
+import com.nextcloud.ui.dialog.account.ChooseAccountDialogFragment
+import com.nextcloud.ui.dialog.account.ChooseAccountDialogFragment.Companion.newInstance
+import com.nextcloud.ui.dialog.account.onlineStatus.SetOnlineStatusBottomSheet
 import com.nextcloud.ui.fileactions.FileActionsBottomSheet.Companion.newInstance
 import com.nextcloud.utils.EditorUtils
 import com.owncloud.android.AbstractIT

app/src/main/java/com/nextcloud/client/di/ComponentsModule.java

@@ -27,11 +27,11 @@
 import com.nextcloud.client.widget.DashboardWidgetProvider;
 import com.nextcloud.client.widget.DashboardWidgetService;
 import com.nextcloud.receiver.NetworkChangeReceiver;
-import com.nextcloud.ui.ChooseAccountDialogFragment;
-import com.nextcloud.ui.ChooseStorageLocationDialogFragment;
+import com.nextcloud.ui.dialog.account.ChooseAccountDialogFragment;
+import com.nextcloud.ui.dialog.chooseStorage.ChooseStorageLocationDialogFragment;
 import com.nextcloud.ui.ImageDetailFragment;
-import com.nextcloud.ui.SetOnlineStatusBottomSheet;
-import com.nextcloud.ui.SetStatusMessageBottomSheet;
+import com.nextcloud.ui.dialog.account.onlineStatus.SetOnlineStatusBottomSheet;
+import com.nextcloud.ui.dialog.account.statusMessage.SetStatusMessageBottomSheet;
 import com.nextcloud.ui.composeActivity.ComposeActivity;
 import com.nextcloud.ui.fileactions.FileActionsBottomSheet;
 import com.nextcloud.ui.trashbinFileActions.TrashbinFileActionsBottomSheet;

app/src/main/java/com/nextcloud/ui/ChooseAccountDialogFragment.kt → app/src/main/java/com/nextcloud/ui/dialog/account/ChooseAccountDialogFragment.kt

@@ -6,7 +6,7 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
  */
-package com.nextcloud.ui
+package com.nextcloud.ui.dialog.account
 
 import android.annotation.SuppressLint
 import android.app.Dialog
@@ -24,6 +24,8 @@ import com.nextcloud.client.account.User
 import com.nextcloud.client.account.UserAccountManager
 import com.nextcloud.client.di.Injectable
 import com.nextcloud.client.network.ClientFactory
+import com.nextcloud.ui.dialog.account.onlineStatus.SetOnlineStatusBottomSheet
+import com.nextcloud.ui.dialog.account.statusMessage.SetStatusMessageBottomSheet
 import com.nextcloud.utils.extensions.getParcelableArgument
 import com.nextcloud.utils.mdm.MDMConfig
 import com.owncloud.android.R

app/src/main/java/com/nextcloud/ui/RetrieveStatus.kt → app/src/main/java/com/nextcloud/ui/dialog/account/RetrieveStatus.kt

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-package com.nextcloud.ui
+package com.nextcloud.ui.dialog.account
 
 import com.nextcloud.client.account.User
 import com.nextcloud.client.network.ClientFactory

app/src/main/java/com/nextcloud/ui/SetOnlineStatusBottomSheet.kt → app/src/main/java/com/nextcloud/ui/dialog/account/onlineStatus/SetOnlineStatusBottomSheet.kt

@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
  */
 
-package com.nextcloud.ui
+package com.nextcloud.ui.dialog.account.onlineStatus
 
 import android.os.Bundle
 import android.util.Log
@@ -24,6 +24,7 @@ import com.nextcloud.android.common.ui.theme.utils.ColorRole
 import com.nextcloud.client.account.UserAccountManager
 import com.nextcloud.client.core.AsyncRunner
 import com.nextcloud.client.di.Injectable
+import com.nextcloud.ui.dialog.account.statusMessage.task.SetStatusTask
 import com.nextcloud.utils.extensions.setVisibleIf
 import com.owncloud.android.R
 import com.owncloud.android.databinding.SetOnlineStatusBottomSheetBinding
@@ -180,4 +181,4 @@ class SetOnlineStatusBottomSheet(val currentStatus: Status?) :
         binding = SetOnlineStatusBottomSheetBinding.inflate(layoutInflater, container, false)
         return binding.root
     }
-}
+}

app/src/main/java/com/nextcloud/ui/SetStatusMessageBottomSheet.kt → app/src/main/java/com/nextcloud/ui/dialog/account/statusMessage/SetStatusMessageBottomSheet.kt

@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
  */
 
-package com.nextcloud.ui
+package com.nextcloud.ui.dialog.account.statusMessage
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -28,6 +28,9 @@ import com.nextcloud.client.account.User
 import com.nextcloud.client.account.UserAccountManager
 import com.nextcloud.client.core.AsyncRunner
 import com.nextcloud.client.di.Injectable
+import com.nextcloud.ui.dialog.account.statusMessage.task.ClearStatusTask
+import com.nextcloud.ui.dialog.account.statusMessage.task.SetPredefinedCustomStatusTask
+import com.nextcloud.ui.dialog.account.statusMessage.task.SetUserDefinedCustomStatusTask
 import com.owncloud.android.R
 import com.owncloud.android.databinding.SetStatusMessageBottomSheetBinding
 import com.owncloud.android.datamodel.ArbitraryDataProvider

app/src/main/java/com/nextcloud/ui/ClearStatusTask.kt → app/src/main/java/com/nextcloud/ui/dialog/account/statusMessage/task/ClearStatusTask.kt

@@ -5,7 +5,8 @@
  * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
  * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
  */
-package com.nextcloud.ui
+
+package com.nextcloud.ui.dialog.account.statusMessage.task
 
 import android.accounts.Account
 import android.content.Context
@@ -14,7 +15,7 @@ import com.owncloud.android.lib.common.accounts.AccountUtils
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.users.ClearStatusMessageRemoteOperation
 
-public class ClearStatusTask(val account: Account?, val context: Context?) : Function0<Boolean> {
+class ClearStatusTask(val account: Account?, val context: Context?) : Function0<Boolean> {
     override fun invoke(): Boolean = try {
         val client = OwnCloudClientFactory.createNextcloudClient(account, context)
 
@@ -24,4 +25,4 @@ public class ClearStatusTask(val account: Account?, val context: Context?) : Fun
 
         false
     }
-}
+}

app/src/main/java/com/nextcloud/ui/SetPredefinedCustomStatusTask.kt → app/src/main/java/com/nextcloud/ui/dialog/account/statusMessage/task/SetPredefinedCustomStatusTask.kt

@@ -5,7 +5,8 @@
  * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
  * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
  */
-package com.nextcloud.ui
+
+package com.nextcloud.ui.dialog.account.statusMessage.task
 
 import android.accounts.Account
 import android.content.Context
@@ -29,4 +30,4 @@ class SetPredefinedCustomStatusTask(
 
         false
     }
-}
+}

app/src/main/java/com/nextcloud/ui/SetStatusTask.kt → app/src/main/java/com/nextcloud/ui/dialog/account/statusMessage/task/SetStatusTask.kt

@@ -5,7 +5,8 @@
  * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
  * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
  */
-package com.nextcloud.ui
+
+package com.nextcloud.ui.dialog.account.statusMessage.task
 
 import android.accounts.Account
 import android.content.Context
@@ -25,4 +26,4 @@ class SetStatusTask(val statusType: StatusType, val account: Account?, val conte
 
         false
     }
-}
+}

app/src/main/java/com/nextcloud/ui/SetUserDefinedCustomStatusTask.kt → app/src/main/java/com/nextcloud/ui/dialog/account/statusMessage/task/SetUserDefinedCustomStatusTask.kt

@@ -5,7 +5,8 @@
  * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
  * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
  */
-package com.nextcloud.ui
+
+package com.nextcloud.ui.dialog.account.statusMessage.task
 
 import android.accounts.Account
 import android.content.Context
@@ -14,7 +15,7 @@ import com.owncloud.android.lib.common.accounts.AccountUtils
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.users.SetUserDefinedCustomStatusMessageRemoteOperation
 
-public class SetUserDefinedCustomStatusTask(
+class SetUserDefinedCustomStatusTask(
     val message: String,
     val icon: String,
     val clearAt: Long?,

app/src/main/java/com/nextcloud/ui/ChooseStorageLocationDialogFragment.kt → app/src/main/java/com/nextcloud/ui/dialog/chooseStorage/ChooseStorageLocationDialogFragment.kt

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-package com.nextcloud.ui
+package com.nextcloud.ui.dialog.chooseStorage
 
 import android.app.Dialog
 import android.content.DialogInterface
@@ -25,8 +25,6 @@ import com.owncloud.android.R
 import com.owncloud.android.databinding.DialogDataStorageLocationBinding
 import com.owncloud.android.datastorage.DataStorageProvider
 import com.owncloud.android.datastorage.StoragePoint
-import com.owncloud.android.datastorage.StoragePoint.PrivacyType
-import com.owncloud.android.datastorage.StoragePoint.StorageType
 import com.owncloud.android.ui.model.ExtendedSettingsActivityDialog
 import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.theme.ViewThemeUtils
@@ -45,9 +43,9 @@ class ChooseStorageLocationDialogFragment :
     private val storagePoints = DataStorageProvider.getInstance().availableStoragePoints
 
     private val selectedStorageType
-        get() = if (!binding.storageExternalRadio.isChecked) StorageType.INTERNAL else StorageType.EXTERNAL
+        get() = if (!binding.storageExternalRadio.isChecked) StoragePoint.StorageType.INTERNAL else StoragePoint.StorageType.EXTERNAL
     private val selectedPrivacyType
-        get() = if (binding.allowMediaIndexSwitch.isChecked) PrivacyType.PUBLIC else PrivacyType.PRIVATE
+        get() = if (binding.allowMediaIndexSwitch.isChecked) StoragePoint.PrivacyType.PUBLIC else StoragePoint.PrivacyType.PRIVATE
 
     override fun onStart() {
         super.onStart()
@@ -103,18 +101,18 @@ class ChooseStorageLocationDialogFragment :
         val currentStorageLocation = getCurrentStorageLocation() ?: return
 
         val radioButton = when (currentStorageLocation.storageType) {
-            StorageType.EXTERNAL -> binding.storageExternalRadio
+            StoragePoint.StorageType.EXTERNAL -> binding.storageExternalRadio
             else -> binding.storageInternalRadio
         }
 
         radioButton.isChecked = true
         updateMediaIndexSwitch()
     }
 
-    private fun getStoragePointLabel(storageType: StorageType, privacyType: PrivacyType): String {
+    private fun getStoragePointLabel(storageType: StoragePoint.StorageType, privacyType: StoragePoint.PrivacyType): String {
         val typeString = when (storageType) {
-            StorageType.INTERNAL -> getString(R.string.storage_internal_storage)
-            StorageType.EXTERNAL -> getString(R.string.storage_external_storage)
+            StoragePoint.StorageType.INTERNAL -> getString(R.string.storage_internal_storage)
+            StoragePoint.StorageType.EXTERNAL -> getString(R.string.storage_external_storage)
         }
 
         val storagePath =
@@ -137,18 +135,18 @@ class ChooseStorageLocationDialogFragment :
         val privacyTypes =
             storagePoints.filter { it.storageType == selectedStorageType }.map { it.privacyType }.distinct()
         binding.allowMediaIndexSwitch.isEnabled = privacyTypes.size > 1
-        binding.allowMediaIndexSwitch.isChecked = privacyTypes.contains(PrivacyType.PUBLIC)
+        binding.allowMediaIndexSwitch.isChecked = privacyTypes.contains(StoragePoint.PrivacyType.PUBLIC)
     }
 
     private fun updateStorageTypeSelection() {
-        val hasInternalStorage = storagePoints.any { it.storageType == StorageType.INTERNAL }
-        val hasExternalStorage = storagePoints.any { it.storageType == StorageType.EXTERNAL }
+        val hasInternalStorage = storagePoints.any { it.storageType == StoragePoint.StorageType.INTERNAL }
+        val hasExternalStorage = storagePoints.any { it.storageType == StoragePoint.StorageType.EXTERNAL }
 
         binding.storageInternalRadio.isEnabled = hasInternalStorage
-        binding.storageInternalRadio.text = getStoragePointLabel(StorageType.INTERNAL, selectedPrivacyType)
+        binding.storageInternalRadio.text = getStoragePointLabel(StoragePoint.StorageType.INTERNAL, selectedPrivacyType)
 
         binding.storageExternalRadio.isEnabled = hasExternalStorage
-        binding.storageExternalRadio.text = getStoragePointLabel(StorageType.EXTERNAL, selectedPrivacyType)
+        binding.storageExternalRadio.text = getStoragePointLabel(StoragePoint.StorageType.EXTERNAL, selectedPrivacyType)
     }
 
     private fun getCurrentStorageLocation(): StoragePoint? {
@@ -174,4 +172,4 @@ class ChooseStorageLocationDialogFragment :
         @JvmStatic
         val TAG: String = Companion::class.java.simpleName
     }
-}
+}

app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -59,7 +59,7 @@
 import com.nextcloud.client.onboarding.FirstRunActivity;
 import com.nextcloud.client.preferences.AppPreferences;
 import com.nextcloud.common.NextcloudClient;
-import com.nextcloud.ui.ChooseAccountDialogFragment;
+import com.nextcloud.ui.dialog.account.ChooseAccountDialogFragment;
 import com.nextcloud.ui.composeActivity.ComposeActivity;
 import com.nextcloud.ui.composeActivity.ComposeDestination;
 import com.nextcloud.utils.GlideHelper;

app/src/main/java/com/owncloud/android/ui/model/ExtendedSettingsActivityDialog.kt

@@ -9,7 +9,7 @@ package com.owncloud.android.ui.model
 
 import android.app.Activity.RESULT_OK
 import android.content.Intent
-import com.nextcloud.ui.ChooseStorageLocationDialogFragment
+import com.nextcloud.ui.dialog.chooseStorage.ChooseStorageLocationDialogFragment
 import com.owncloud.android.ui.activity.ExtendedSettingsActivity
 import com.owncloud.android.ui.dialog.AppPassCodeDialog
 import com.owncloud.android.ui.dialog.ThemeSelectionDialog

app/src/main/res/layout/dialog_choose_account.xml

@@ -10,7 +10,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context="com.nextcloud.ui.ChooseAccountDialogFragment">
+    tools:context="com.nextcloud.ui.dialog.account.ChooseAccountDialogFragment">
 
     <include
         android:id="@+id/current_account"