-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: added a dialog for manage accounts
- Loading branch information
Showing
5 changed files
with
319 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
229 changes: 229 additions & 0 deletions
229
owncloudApp/src/main/java/com/owncloud/android/ui/dialog/AccountsManagementDialog.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,229 @@ | ||
| package com.owncloud.android.ui.dialog | ||
|
|
||
| import android.accounts.Account | ||
| import android.accounts.AccountManager | ||
| import android.accounts.AccountManagerCallback | ||
| import android.accounts.AccountManagerFuture | ||
| import android.accounts.OperationCanceledException | ||
| import android.app.AlertDialog | ||
| import android.app.Dialog | ||
| import android.content.Intent | ||
| import android.os.Bundle | ||
| import android.os.Handler | ||
| import android.view.ContextThemeWrapper | ||
| import android.widget.ImageView | ||
| import androidx.fragment.app.DialogFragment | ||
| import androidx.recyclerview.widget.LinearLayoutManager | ||
| import androidx.recyclerview.widget.RecyclerView | ||
| import com.owncloud.android.MainApp | ||
| import com.owncloud.android.R | ||
| import com.owncloud.android.presentation.accounts.AccountsManagementAdapter | ||
| import com.owncloud.android.presentation.accounts.AccountsManagementViewModel | ||
| import com.owncloud.android.presentation.accounts.RemoveAccountDialogFragment | ||
| import com.owncloud.android.presentation.accounts.RemoveAccountDialogViewModel | ||
| import com.owncloud.android.presentation.authentication.AccountUtils | ||
| import com.owncloud.android.ui.activity.FileActivity | ||
| import com.owncloud.android.ui.activity.FileDisplayActivity | ||
| import com.owncloud.android.utils.PreferenceUtils | ||
| import org.koin.androidx.viewmodel.ext.android.viewModel | ||
| import timber.log.Timber | ||
|
|
||
| class AccountsManagementDialog : DialogFragment(), AccountsManagementAdapter.AccountAdapterListener, AccountManagerCallback<Boolean> { | ||
| private var accountListAdapter: AccountsManagementAdapter = AccountsManagementAdapter(this) | ||
|
|
||
| private lateinit var originalAccounts: Set<String> | ||
| private lateinit var originalCurrentAccount: String | ||
| private var account: Account? = null | ||
| private lateinit var accountBeingRemoved: String | ||
| private lateinit var handler: Handler | ||
|
|
||
| private val removeAccountDialogViewModel: RemoveAccountDialogViewModel by viewModel() | ||
| private val accountsManagementViewModel: AccountsManagementViewModel by viewModel() | ||
|
|
||
| override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { | ||
| val builder = AlertDialog.Builder(ContextThemeWrapper(requireContext(), R.style.Theme_AppCompat_Dialog_Alert)) | ||
| val inflater = this.layoutInflater | ||
| val dialogView = inflater.inflate(R.layout.manage_accounts_dialog, null) | ||
| builder.setView(dialogView) | ||
|
|
||
| val recyclerView = dialogView.findViewById<RecyclerView>(R.id.account_list_recycler_view_2) | ||
|
|
||
| recyclerView.run { | ||
| filterTouchesWhenObscured = PreferenceUtils.shouldDisallowTouchesWithOtherVisibleWindows(context) | ||
| adapter = accountListAdapter | ||
| layoutManager = LinearLayoutManager(requireContext()) | ||
| } | ||
|
|
||
| // Listener for the cross button | ||
| val closeButton = dialogView.findViewById<ImageView>(R.id.cross) | ||
| closeButton.setOnClickListener { | ||
| dismiss() | ||
| } | ||
|
|
||
| //subscribeToViewModels() | ||
|
|
||
| return builder.create() | ||
| } | ||
|
|
||
| private fun subscribeToViewModels() { | ||
| TODO("Not yet implemented") | ||
| } | ||
|
|
||
| override fun onStart() { | ||
| super.onStart() | ||
|
|
||
| val accountList = accountsManagementViewModel.getLoggedAccounts() | ||
| originalAccounts = toAccountNameSet(accountList) | ||
| originalCurrentAccount = accountsManagementViewModel.getCurrentAccount()?.name.toString() | ||
|
|
||
| accountListAdapter.submitAccountList(accountList = getAccountListItems()) | ||
|
|
||
| account = accountsManagementViewModel.getCurrentAccount() | ||
|
|
||
| handler = Handler() | ||
| //onAccountSet(false) -> Take a look | ||
|
|
||
| } | ||
|
|
||
| override fun removeAccount(account: Account) { | ||
| accountBeingRemoved = account.name | ||
| val dialog = RemoveAccountDialogFragment.newInstance( | ||
| account, | ||
| removeAccountDialogViewModel.hasCameraUploadsAttached(account.name) | ||
| ) | ||
| dialog.show(childFragmentManager, ConfirmationDialogFragment.FTAG_CONFIRMATION) | ||
| } | ||
|
|
||
| override fun cleanAccountLocalStorage(account: Account) { | ||
| dismiss() | ||
| val dialog = androidx.appcompat.app.AlertDialog.Builder(requireContext()) | ||
| .setTitle(getString(R.string.clean_data_account_title)) | ||
| .setIcon(R.drawable.ic_warning) | ||
| .setMessage(getString(R.string.clean_data_account_message)) | ||
| .setPositiveButton(getString(R.string.clean_data_account_button_yes)) { dialog, _ -> | ||
| accountsManagementViewModel.cleanAccountLocalStorage(account.name) | ||
| dialog.dismiss() | ||
| } | ||
| .setNegativeButton(R.string.drawer_close) { dialog, _ -> | ||
| dialog.dismiss() | ||
| } | ||
| .create() | ||
| dialog.show() | ||
| } | ||
|
|
||
| override fun createAccount() { | ||
| val am = AccountManager.get(requireContext()) | ||
| am.addAccount( | ||
| MainApp.accountType, | ||
| null, | ||
| null, | ||
| null, | ||
| requireActivity(), | ||
| { future: AccountManagerFuture<Bundle>? -> | ||
| if (future != null) { | ||
| try { | ||
| val result = future.result | ||
| val name = result.getString(AccountManager.KEY_ACCOUNT_NAME) | ||
| AccountUtils.setCurrentOwnCloudAccount(requireContext(), name) | ||
| accountListAdapter.submitAccountList(accountList = getAccountListItems()) | ||
| } catch (e: OperationCanceledException) { | ||
| Timber.e(e, "Account creation canceled") | ||
| } catch (e: Exception) { | ||
| Timber.e(e, "Account creation finished in exception") | ||
| } | ||
| } | ||
| }, handler | ||
| ) | ||
| dismiss() | ||
| } | ||
|
|
||
| /** | ||
| * Switch current account to that contained in the received position of the list adapter. | ||
| * | ||
| * @param position A position of the account adapter containing an account. | ||
| */ | ||
| override fun switchAccount(position: Int) { | ||
| val clickedAccount: Account = (accountListAdapter.getItem(position) as AccountsManagementAdapter.AccountRecyclerItem.AccountItem).account | ||
| if (account?.name == clickedAccount.name) { | ||
| // current account selected, just go back | ||
| dismiss() | ||
| } else { | ||
| // restart list of files with new account | ||
| AccountUtils.setCurrentOwnCloudAccount( | ||
| requireContext(), | ||
| clickedAccount.name | ||
| ) | ||
| // Refresh dependencies to be used in selected account | ||
| MainApp.initDependencyInjection() | ||
| val i = Intent( | ||
| requireContext(), | ||
| FileDisplayActivity::class.java | ||
| ) | ||
| i.putExtra(FileActivity.EXTRA_ACCOUNT, clickedAccount) | ||
| i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) | ||
| startActivity(i) | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * converts an array of accounts into a set of account names. | ||
| * | ||
| * @param accountList the account array | ||
| * @return set of account names | ||
| */ | ||
| private fun toAccountNameSet(accountList: Array<Account>): Set<String> { | ||
| val actualAccounts: MutableSet<String> = HashSet(accountList.size) | ||
| accountList.forEach { account -> | ||
| actualAccounts.add(account.name) | ||
| } | ||
| return actualAccounts | ||
| } | ||
|
|
||
| /** | ||
| * creates the account list items list including the add-account action in case multiaccount_support is enabled. | ||
| * | ||
| * @return list of account list items | ||
| */ | ||
| private fun getAccountListItems(): List<AccountsManagementAdapter.AccountRecyclerItem> { | ||
| val accountList = accountsManagementViewModel.getLoggedAccounts() | ||
| val provisionalAccountList = mutableListOf<AccountsManagementAdapter.AccountRecyclerItem>() | ||
| accountList.forEach { | ||
| provisionalAccountList.add(AccountsManagementAdapter.AccountRecyclerItem.AccountItem(it)) | ||
| } | ||
|
|
||
| // Add Create Account item at the end of account list if multi-account is enabled | ||
| if (resources.getBoolean(R.bool.multiaccount_support) || accountList.isEmpty()) { | ||
| provisionalAccountList.add(AccountsManagementAdapter.AccountRecyclerItem.NewAccount) | ||
| } | ||
| return provisionalAccountList | ||
| } | ||
|
|
||
| override fun run(future: AccountManagerFuture<Boolean>) { | ||
| if (future.isDone) { | ||
| // Create new adapter with the remaining accounts | ||
| accountListAdapter.submitAccountList(accountList = getAccountListItems()) | ||
| val am = AccountManager.get(requireContext()) | ||
| if (accountsManagementViewModel.getLoggedAccounts().isEmpty()) { | ||
| // Show create account screen if there isn't any account | ||
| am.addAccount( | ||
| MainApp.accountType, | ||
| null, null, null, | ||
| requireActivity(), | ||
| null, null | ||
| ) | ||
| } else { // at least one account left | ||
| if (accountsManagementViewModel.getCurrentAccount() == null) { | ||
| // current account was removed - set another as current | ||
| var accountName = "" | ||
| val accounts = accountsManagementViewModel.getLoggedAccounts() | ||
| if (accounts.isNotEmpty()) { | ||
| accountName = accounts[0].name | ||
| } | ||
| AccountUtils.setCurrentOwnCloudAccount(requireContext(), accountName) | ||
| } | ||
|
|
||
| } | ||
| } | ||
| } | ||
|
|
||
| } |
10 changes: 10 additions & 0 deletions
10
owncloudApp/src/main/res/drawable/ic_cross_manage_accounts.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="24dp" | ||
| android:height="24dp" | ||
| android:viewportWidth="960" | ||
| android:viewportHeight="960" | ||
| android:tint="@color/white"> | ||
| <path | ||
| android:fillColor="@color/white" | ||
| android:pathData="M256,760L200,704L424,480L200,256L256,200L480,424L704,200L760,256L536,480L760,704L704,760L480,536L256,760Z" /> | ||
| </vector> |
Oops, something went wrong.