mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 13:45:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

name and avatr clickable (switching accounts)

Browse source
This commit is contained in:
AndyScherzinger 2016-10-11 15:20:16 +02:00
parent 42c61c9ed4
commit 8c9e2206cb
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
4 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
res/drawable/ic_current.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
res/drawable/ic_current_white.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.2 KiB

43
src/com/owncloud/android/ui/activity/ManageAccountsActivity.java
View file

@ -108,37 +108,9 @@ public class ManageAccountsActivity extends FileActivity
mListView.setAdapter(mAccountListAdapter);
// added click listener to switch account
mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
switchAccount(position);
}
});
initializeComponentGetters();
}
/**
* 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.
*/
private void switchAccount(int position) {
Account clickedAccount = mAccountListAdapter.getItem(position).getAccount();
if (getAccount().name.equals(clickedAccount.name)) {
// current account selected, just go back
finish();
} else {
// restart list of files with new account
AccountUtils.setCurrentOwnCloudAccount(ManageAccountsActivity.this, clickedAccount.name);
Intent i = new Intent(ManageAccountsActivity.this, FileDisplayActivity.class);
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.
*
@ -291,6 +263,21 @@ public class ManageAccountsActivity extends FileActivity
}, mHandler);
}
@Override
public void switchAccount(Account account) {
if (getAccount().name.equals(account.name)) {
// current account selected, just go back
finish();
} else {
// restart list of files with new account
AccountUtils.setCurrentOwnCloudAccount(ManageAccountsActivity.this, account.name);
Intent i = new Intent(ManageAccountsActivity.this, FileDisplayActivity.class);
i.putExtra(FileActivity.EXTRA_ACCOUNT, account);
i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(i);
}
}
@Override
public void run(AccountManagerFuture<Boolean> future) {
if (future.isDone()) {

16
src/com/owncloud/android/ui/adapter/AccountListAdapter.java
View file

@ -103,6 +103,20 @@ public class AccountListAdapter extends ArrayAdapter<AccountListItem> implements
viewHolder.checkViewItem.setVisibility(View.INVISIBLE);
}
viewHolder.imageViewItem.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
mListener.switchAccount(mValues.get(position).getAccount());
}
});
viewHolder.accountViewItem.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
mListener.switchAccount(mValues.get(position).getAccount());
}
});
/// bind listener to change password
viewHolder.passwordButtonItem.setOnClickListener(new View.OnClickListener() {
@Override
@ -159,6 +173,8 @@ public class AccountListAdapter extends ArrayAdapter<AccountListItem> implements
void changePasswordOfAccount(Account account);
void createAccount();
void switchAccount(Account account);
}
/**