From 1cb90e51635888ac01eb26a6f712e33104dc3e33 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Fri, 24 Apr 2026 13:59:41 +0200 Subject: [PATCH 1/2] refactor: reorganize dialog package structure Signed-off-by: alperozturk96 --- .../ui/SetOnlineStatusBottomSheetIT.kt | 1 + .../ui/SetStatusMessageBottomSheetIT.kt | 1 + .../android/ui/dialog/DialogFragmentIT.kt | 6 ++-- .../nextcloud/client/di/ComponentsModule.java | 8 ++--- .../account}/ChooseAccountDialogFragment.kt | 4 ++- .../ui/{ => dialog/account}/RetrieveStatus.kt | 2 +- .../SetOnlineStatusBottomSheet.kt | 5 ++-- .../SetStatusMessageBottomSheet.kt | 5 +++- .../statusMessage/task}/ClearStatusTask.kt | 7 +++-- .../task}/SetPredefinedCustomStatusTask.kt | 5 ++-- .../statusMessage/task}/SetStatusTask.kt | 5 ++-- .../task}/SetUserDefinedCustomStatusTask.kt | 5 ++-- .../ChooseStorageLocationDialogFragment.kt | 30 +++++++++---------- .../android/ui/activity/DrawerActivity.java | 2 +- .../model/ExtendedSettingsActivityDialog.kt | 2 +- .../main/res/layout/dialog_choose_account.xml | 2 +- 16 files changed, 50 insertions(+), 40 deletions(-) rename app/src/main/java/com/nextcloud/ui/{ => dialog/account}/ChooseAccountDialogFragment.kt (97%) rename app/src/main/java/com/nextcloud/ui/{ => dialog/account}/RetrieveStatus.kt (96%) rename app/src/main/java/com/nextcloud/ui/{ => dialog/account/onlineStatus}/SetOnlineStatusBottomSheet.kt (97%) rename app/src/main/java/com/nextcloud/ui/{ => dialog/account/statusMessage}/SetStatusMessageBottomSheet.kt (97%) rename app/src/main/java/com/nextcloud/ui/{ => dialog/account/statusMessage/task}/ClearStatusTask.kt (85%) rename app/src/main/java/com/nextcloud/ui/{ => dialog/account/statusMessage/task}/SetPredefinedCustomStatusTask.kt (94%) rename app/src/main/java/com/nextcloud/ui/{ => dialog/account/statusMessage/task}/SetStatusTask.kt (94%) rename app/src/main/java/com/nextcloud/ui/{ => dialog/account/statusMessage/task}/SetUserDefinedCustomStatusTask.kt (92%) rename app/src/main/java/com/nextcloud/ui/{ => dialog/chooseStorage}/ChooseStorageLocationDialogFragment.kt (86%) diff --git a/app/src/androidTest/java/com/nextcloud/ui/SetOnlineStatusBottomSheetIT.kt b/app/src/androidTest/java/com/nextcloud/ui/SetOnlineStatusBottomSheetIT.kt index c9e07da94cfd..668bf812973c 100644 --- a/app/src/androidTest/java/com/nextcloud/ui/SetOnlineStatusBottomSheetIT.kt +++ b/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 diff --git a/app/src/androidTest/java/com/nextcloud/ui/SetStatusMessageBottomSheetIT.kt b/app/src/androidTest/java/com/nextcloud/ui/SetStatusMessageBottomSheetIT.kt index b9e9feec6e2e..d0be7b3b0446 100644 --- a/app/src/androidTest/java/com/nextcloud/ui/SetStatusMessageBottomSheetIT.kt +++ b/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 diff --git a/app/src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.kt index 5c4707f99e06..4f1f128c9b48 100644 --- a/app/src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/client/di/ComponentsModule.java b/app/src/main/java/com/nextcloud/client/di/ComponentsModule.java index 42be74854cca..956a6c2ee696 100644 --- a/app/src/main/java/com/nextcloud/client/di/ComponentsModule.java +++ b/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; diff --git a/app/src/main/java/com/nextcloud/ui/ChooseAccountDialogFragment.kt b/app/src/main/java/com/nextcloud/ui/dialog/account/ChooseAccountDialogFragment.kt similarity index 97% rename from app/src/main/java/com/nextcloud/ui/ChooseAccountDialogFragment.kt rename to app/src/main/java/com/nextcloud/ui/dialog/account/ChooseAccountDialogFragment.kt index efd2c7bb4e0a..c5fb0dc27cd7 100644 --- a/app/src/main/java/com/nextcloud/ui/ChooseAccountDialogFragment.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/ui/RetrieveStatus.kt b/app/src/main/java/com/nextcloud/ui/dialog/account/RetrieveStatus.kt similarity index 96% rename from app/src/main/java/com/nextcloud/ui/RetrieveStatus.kt rename to app/src/main/java/com/nextcloud/ui/dialog/account/RetrieveStatus.kt index 8231f076d1a6..97ca73182923 100644 --- a/app/src/main/java/com/nextcloud/ui/RetrieveStatus.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/ui/SetOnlineStatusBottomSheet.kt b/app/src/main/java/com/nextcloud/ui/dialog/account/onlineStatus/SetOnlineStatusBottomSheet.kt similarity index 97% rename from app/src/main/java/com/nextcloud/ui/SetOnlineStatusBottomSheet.kt rename to app/src/main/java/com/nextcloud/ui/dialog/account/onlineStatus/SetOnlineStatusBottomSheet.kt index b917d5706fe6..eb27c5ac0fd4 100644 --- a/app/src/main/java/com/nextcloud/ui/SetOnlineStatusBottomSheet.kt +++ b/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 } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/nextcloud/ui/SetStatusMessageBottomSheet.kt b/app/src/main/java/com/nextcloud/ui/dialog/account/statusMessage/SetStatusMessageBottomSheet.kt similarity index 97% rename from app/src/main/java/com/nextcloud/ui/SetStatusMessageBottomSheet.kt rename to app/src/main/java/com/nextcloud/ui/dialog/account/statusMessage/SetStatusMessageBottomSheet.kt index 86efd789df05..24181de7a7ac 100644 --- a/app/src/main/java/com/nextcloud/ui/SetStatusMessageBottomSheet.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/ui/ClearStatusTask.kt b/app/src/main/java/com/nextcloud/ui/dialog/account/statusMessage/task/ClearStatusTask.kt similarity index 85% rename from app/src/main/java/com/nextcloud/ui/ClearStatusTask.kt rename to app/src/main/java/com/nextcloud/ui/dialog/account/statusMessage/task/ClearStatusTask.kt index 0c90f59a469b..e42612591a27 100644 --- a/app/src/main/java/com/nextcloud/ui/ClearStatusTask.kt +++ b/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 { +class ClearStatusTask(val account: Account?, val context: Context?) : Function0 { 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 } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/nextcloud/ui/SetPredefinedCustomStatusTask.kt b/app/src/main/java/com/nextcloud/ui/dialog/account/statusMessage/task/SetPredefinedCustomStatusTask.kt similarity index 94% rename from app/src/main/java/com/nextcloud/ui/SetPredefinedCustomStatusTask.kt rename to app/src/main/java/com/nextcloud/ui/dialog/account/statusMessage/task/SetPredefinedCustomStatusTask.kt index 2cb5b5ea3d08..51d9af341ffa 100644 --- a/app/src/main/java/com/nextcloud/ui/SetPredefinedCustomStatusTask.kt +++ b/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 } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/nextcloud/ui/SetStatusTask.kt b/app/src/main/java/com/nextcloud/ui/dialog/account/statusMessage/task/SetStatusTask.kt similarity index 94% rename from app/src/main/java/com/nextcloud/ui/SetStatusTask.kt rename to app/src/main/java/com/nextcloud/ui/dialog/account/statusMessage/task/SetStatusTask.kt index 547719093b91..b698029764ad 100644 --- a/app/src/main/java/com/nextcloud/ui/SetStatusTask.kt +++ b/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 } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/nextcloud/ui/SetUserDefinedCustomStatusTask.kt b/app/src/main/java/com/nextcloud/ui/dialog/account/statusMessage/task/SetUserDefinedCustomStatusTask.kt similarity index 92% rename from app/src/main/java/com/nextcloud/ui/SetUserDefinedCustomStatusTask.kt rename to app/src/main/java/com/nextcloud/ui/dialog/account/statusMessage/task/SetUserDefinedCustomStatusTask.kt index a35f01c52da9..ca47c970fe62 100644 --- a/app/src/main/java/com/nextcloud/ui/SetUserDefinedCustomStatusTask.kt +++ b/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?, diff --git a/app/src/main/java/com/nextcloud/ui/ChooseStorageLocationDialogFragment.kt b/app/src/main/java/com/nextcloud/ui/dialog/chooseStorage/ChooseStorageLocationDialogFragment.kt similarity index 86% rename from app/src/main/java/com/nextcloud/ui/ChooseStorageLocationDialogFragment.kt rename to app/src/main/java/com/nextcloud/ui/dialog/chooseStorage/ChooseStorageLocationDialogFragment.kt index 6a67415c0168..eca7b0b69ff8 100644 --- a/app/src/main/java/com/nextcloud/ui/ChooseStorageLocationDialogFragment.kt +++ b/app/src/main/java/com/nextcloud/ui/dialog/chooseStorage/ChooseStorageLocationDialogFragment.kt @@ -1,11 +1,11 @@ /* * Nextcloud - Android Client * - * SPDX-FileCopyrightText: 2024 ZetaTom <70907959+ZetaTom@users.noreply.github.com> + * SPDX-FileCopyrightText: 2026 Your Name * 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,7 +101,7 @@ class ChooseStorageLocationDialogFragment : val currentStorageLocation = getCurrentStorageLocation() ?: return val radioButton = when (currentStorageLocation.storageType) { - StorageType.EXTERNAL -> binding.storageExternalRadio + StoragePoint.StorageType.EXTERNAL -> binding.storageExternalRadio else -> binding.storageInternalRadio } @@ -111,10 +109,10 @@ class ChooseStorageLocationDialogFragment : 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 } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java index 27340b873e68..7188944803e9 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java +++ b/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; diff --git a/app/src/main/java/com/owncloud/android/ui/model/ExtendedSettingsActivityDialog.kt b/app/src/main/java/com/owncloud/android/ui/model/ExtendedSettingsActivityDialog.kt index 44bb0bfaac7b..e0d9c6336908 100644 --- a/app/src/main/java/com/owncloud/android/ui/model/ExtendedSettingsActivityDialog.kt +++ b/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 diff --git a/app/src/main/res/layout/dialog_choose_account.xml b/app/src/main/res/layout/dialog_choose_account.xml index 1efda6b4e0ba..68d1312fa0f3 100644 --- a/app/src/main/res/layout/dialog_choose_account.xml +++ b/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"> Date: Fri, 24 Apr 2026 14:01:59 +0200 Subject: [PATCH 2/2] refactor: reorganize dialog package structure Signed-off-by: alperozturk96 --- .../dialog/chooseStorage/ChooseStorageLocationDialogFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/ui/dialog/chooseStorage/ChooseStorageLocationDialogFragment.kt b/app/src/main/java/com/nextcloud/ui/dialog/chooseStorage/ChooseStorageLocationDialogFragment.kt index eca7b0b69ff8..e0b9bc73ca72 100644 --- a/app/src/main/java/com/nextcloud/ui/dialog/chooseStorage/ChooseStorageLocationDialogFragment.kt +++ b/app/src/main/java/com/nextcloud/ui/dialog/chooseStorage/ChooseStorageLocationDialogFragment.kt @@ -1,7 +1,7 @@ /* * Nextcloud - Android Client * - * SPDX-FileCopyrightText: 2026 Your Name + * SPDX-FileCopyrightText: 2024 ZetaTom <70907959+ZetaTom@users.noreply.github.com> * SPDX-License-Identifier: AGPL-3.0-or-later */