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

@@ -17,6 +17,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.rule.GrantPermissionRule
 import com.nextcloud.test.Flaky
 import com.nextcloud.test.GrantTestPermissionRule
+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.kt

@@ -27,12 +27,12 @@ import com.nextcloud.client.onboarding.WhatsNewActivity
 import com.nextcloud.client.widget.DashboardWidgetConfigurationActivity
 import com.nextcloud.client.widget.DashboardWidgetProvider
 import com.nextcloud.client.widget.DashboardWidgetService
-import com.nextcloud.ui.ChooseAccountDialogFragment
-import com.nextcloud.ui.ChooseStorageLocationDialogFragment
-import com.nextcloud.ui.SetOnlineStatusBottomSheet
-import com.nextcloud.ui.SetStatusMessageBottomSheet
 import com.nextcloud.ui.albumItemActions.AlbumItemActionsBottomSheet
 import com.nextcloud.ui.composeActivity.ComposeActivity
+import com.nextcloud.ui.dialog.account.ChooseAccountDialogFragment
+import com.nextcloud.ui.dialog.account.onlineStatus.SetOnlineStatusBottomSheet
+import com.nextcloud.ui.dialog.account.statusMessage.SetStatusMessageBottomSheet
+import com.nextcloud.ui.dialog.chooseStorage.ChooseStorageLocationDialogFragment
 import com.nextcloud.ui.fileInfo.FileInfoFragment
 import com.nextcloud.ui.fileactions.FileActionsBottomSheet
 import com.nextcloud.ui.tags.TagManagementBottomSheet

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.avatar.AvatarGenerationListener
 import com.nextcloud.utils.avatar.AvatarGenerator
 import com.nextcloud.utils.extensions.getParcelableArgument

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.SnackbarUtil
 import com.nextcloud.utils.extensions.setVisibleIf
 import com.owncloud.android.R

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.nextcloud.utils.SnackbarUtil
 import com.nextcloud.utils.text.DisplayTextFormatter
 import com.owncloud.android.R

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,7 @@
  * 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

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,7 @@
  * 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

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,7 @@
  * 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

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,7 @@
  * 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

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

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

@@ -61,7 +61,7 @@
 import com.nextcloud.client.systembars.SystemBarBackgroundCallbacks;
 import com.nextcloud.client.utils.IntentUtil;
 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"