Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FEATURE REQUEST] New UI for "Manage accounts" view #4410

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ ownCloud admins and users.
* Enhancement - Add a warning in http connections: [#4284](https://github.com/owncloud/android/issues/4284)
* Enhancement - Make dialog more Android-alike: [#4303](https://github.com/owncloud/android/issues/4303)
* Enhancement - Password generator for public links in oCIS: [#4308](https://github.com/owncloud/android/issues/4308)
* Enhancement - New UI for "Manage accounts" view: [#4312](https://github.com/owncloud/android/issues/4312)
* Enhancement - Improvements in remove dialog alert: [#4342](https://github.com/owncloud/android/issues/4342)
* Enhancement - Content description in UI elements to improve accessibility: [#4360](https://github.com/owncloud/android/issues/4360)
* Enhancement - Added contentDescription attribute in the previewed image: [#4360](https://github.com/owncloud/android/issues/4360)
Expand Down Expand Up @@ -251,6 +252,16 @@ ownCloud admins and users.
https://github.com/owncloud/android/issues/4308
https://github.com/owncloud/android/pull/4349

* Enhancement - New UI for "Manage accounts" view: [#4312](https://github.com/owncloud/android/issues/4312)

A new dialog has been added to substitute the previous view for "Manage
accounts". In addition, all the accounts management related stuff has been
removed from the drawer menu in order not to show repetitive actions and make
this menu simpler.

https://github.com/owncloud/android/issues/4312
https://github.com/owncloud/android/pull/4410

* Enhancement - Improvements in remove dialog alert: [#4342](https://github.com/owncloud/android/issues/4342)

A custom dialog alert has been added when the file that is going to be deleted
Expand Down
8 changes: 8 additions & 0 deletions changelog/unreleased/4410
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Enhancement: New UI for "Manage accounts" view

A new dialog has been added to substitute the previous view for "Manage accounts". In addition,
all the accounts management related stuff has been removed from the drawer menu in order not to
show repetitive actions and make this menu simpler.

https://github.com/owncloud/android/issues/4312
https://github.com/owncloud/android/pull/4410

This file was deleted.

1 change: 0 additions & 1 deletion owncloudApp/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@
android:name=".ui.activity.FileDisplayActivity"
android:theme="@style/Theme.ownCloud.Toolbar.Drawer"
android:windowSoftInputMode="adjustPan" />
<activity android:name=".presentation.accounts.AccountsManagementActivity" />
<activity
android:name=".ui.activity.ReceiveExternalFilesActivity"
android:configChanges="orientation|screenSize"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @author Juan Carlos Garrote Gascón
* @author David Crespo Ríos
*
* Copyright (C) 2023 ownCloud GmbH.
* Copyright (C) 2024 ownCloud GmbH.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2,
Expand All @@ -23,12 +23,10 @@

package com.owncloud.android.dependecyinjection


import com.owncloud.android.MainApp
import com.owncloud.android.domain.files.model.FileListOption
import com.owncloud.android.domain.files.model.OCFile
import com.owncloud.android.presentation.accounts.AccountsManagementViewModel
import com.owncloud.android.presentation.accounts.RemoveAccountDialogViewModel
import com.owncloud.android.presentation.accounts.ManageAccountsViewModel
import com.owncloud.android.presentation.authentication.AuthenticationViewModel
import com.owncloud.android.presentation.authentication.oauth.OAuthViewModel
import com.owncloud.android.presentation.capabilities.CapabilityViewModel
Expand Down Expand Up @@ -64,7 +62,7 @@ import org.koin.androidx.viewmodel.dsl.viewModelOf
import org.koin.dsl.module

val viewModelModule = module {
viewModelOf(::AccountsManagementViewModel)
viewModelOf(::ManageAccountsViewModel)
viewModelOf(::BiometricViewModel)
viewModelOf(::DrawerViewModel)
viewModelOf(::FileDetailsViewModel)
Expand All @@ -78,7 +76,6 @@ val viewModelModule = module {
viewModelOf(::PreviewVideoViewModel)
viewModelOf(::ReceiveExternalFilesViewModel)
viewModelOf(::ReleaseNotesViewModel)
viewModelOf(::RemoveAccountDialogViewModel)
viewModelOf(::SettingsAdvancedViewModel)
viewModelOf(::SettingsLogsViewModel)
viewModelOf(::SettingsMoreViewModel)
Expand All @@ -101,7 +98,6 @@ val viewModelModule = module {
viewModel { MigrationViewModel(MainApp.dataFolder, get(), get(), get(), get(), get(), get(), get()) }
viewModel { TransfersViewModel(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get()) }
viewModel { ReceiveExternalFilesViewModel(get(), get(), get()) }
viewModel { AccountsManagementViewModel(get(), get(), get()) }
viewModel { (accountName: String, showPersonalSpace: Boolean) ->
SpacesListViewModel(get(), get(), get(), get(), get(), accountName, showPersonalSpace)
}
Expand Down