mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-29 02:38:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6528 from nextcloud/federatedIcon

Browse source 
add ROOM handling for sharees
This commit is contained in:
Andy Scherzinger 2020-07-24 13:41:32 +02:00 committed by GitHub
commit 3a324f11e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 49 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
View file

@ -433,19 +433,41 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
avatar.setImageResource(R.drawable.ic_people); avatar.setImageResource(R.drawable.ic_people);
ThemeUtils.setIconColor(avatar.getDrawable()); ThemeUtils.setIconColor(avatar.getDrawable());
} else { } else {
if (sharee.getShareType().equals(ShareType.GROUP)) { switch (sharee.getShareType()) {
case GROUP:
try { try {
avatar.setImageDrawable( avatar.setImageDrawable(TextDrawable.createAvatarByUserId(sharee.getUserId(),
TextDrawable.createAvatarByUserId(sharee.getUserId(), avatarRadius)); avatarRadius));
} catch (Exception e) { } catch (Exception e) {
Log_OC.e(TAG, "Error calculating RGB value for active account icon.", e); Log_OC.e(TAG, "Error calculating RGB value for active account icon.", e);
avatar.setImageResource(R.drawable.ic_people); avatar.setImageResource(R.drawable.ic_people);
ThemeUtils.setIconColor(avatar.getDrawable()); ThemeUtils.setIconColor(avatar.getDrawable());
} }
} else if (sharee.getShareType().equals(ShareType.CIRCLE)) { break;
case ROOM:
try {
if (!TextUtils.isEmpty(sharee.getDisplayName())) {
avatar.setImageDrawable(
TextDrawable.createNamedAvatar(sharee.getDisplayName(), avatarRadius));
} else {
avatar.setImageDrawable(
TextDrawable.createAvatarByUserId(sharee.getUserId(), avatarRadius));
}
} catch (Exception e) {
Log_OC.e(TAG, "Error calculating RGB value for active account icon.", e);
avatar.setImageResource(R.drawable.ic_people);
ThemeUtils.setIconColor(avatar.getDrawable());
}
break;
case CIRCLE:
avatar.setImageResource(R.drawable.ic_circles); avatar.setImageResource(R.drawable.ic_circles);
ThemeUtils.setIconColor(avatar.getDrawable()); ThemeUtils.setIconColor(avatar.getDrawable());
} else if (sharee.getUserId().contains("@")) { break;
default:
if (sharee.getUserId().contains("@")) {
showFederatedShareAvatar(sharee.getUserId(), avatarRadius, resources, avatar); showFederatedShareAvatar(sharee.getUserId(), avatarRadius, resources, avatar);
} else { } else {
avatar.setTag(sharee); avatar.setTag(sharee);
@ -459,6 +481,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
activity); activity);
} }
} }
}
avatar.setOnClickListener(view -> ocFileListFragmentInterface.showShareDetailView(file)); avatar.setOnClickListener(view -> ocFileListFragmentInterface.showShareDetailView(file));
@ -581,7 +604,9 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
placeholder = TextDrawable.createAvatarByUserId(userId, avatarRadius); placeholder = TextDrawable.createAvatarByUserId(userId, avatarRadius);
} catch (Exception e) { } catch (Exception e) {
Log_OC.e(TAG, "Error calculating RGB value for active account icon.", e); Log_OC.e(TAG, "Error calculating RGB value for active account icon.", e);
placeholder = ResourcesCompat.getDrawable(resources, R.drawable.account_circle_white, null); placeholder = ThemeUtils.tintDrawable(ResourcesCompat.getDrawable(resources,
R.drawable.account_circle_white, null),
R.color.black);
} }
avatar.setTag(null); avatar.setTag(null);