gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 19:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve avatars

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-01-11 14:13:29 +01:00
parent ae479655c0
commit 15c2bcc852
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java
View File

@ -122,7 +122,7 @@ public class AdvancedUserItem extends AbstractFlexibleItem<AdvancedUserItem.User
layoutParams.removeRule(RelativeLayout.ALIGN_PARENT_START); layoutParams.removeRule(RelativeLayout.ALIGN_PARENT_START);
holder.linearLayout.setLayoutParams(layoutParams); holder.linearLayout.setLayoutParams(layoutParams);
GlideUrl glideUrl = new GlideUrl(ApiHelper.getUrlForAvatarWithName(userEntity.getBaseUrl(), GlideUrl glideUrl = new GlideUrl(ApiHelper.getUrlForAvatarWithName(userEntity.getBaseUrl(),
participant.getUserId()), new LazyHeaders.Builder() participant.getUserId(), false), new LazyHeaders.Builder()
.setHeader("Accept", "image/*") .setHeader("Accept", "image/*")
.setHeader("User-Agent", ApiHelper.getUserAgent()) .setHeader("User-Agent", ApiHelper.getUserAgent())
.build()); .build());

2
app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java
View File

@ -121,7 +121,7 @@ public class CallItem extends AbstractFlexibleItem<CallItem.RoomItemViewHolder>
if (!TextUtils.isEmpty(room.getName())) { if (!TextUtils.isEmpty(room.getName())) {
GlideUrl glideUrl = new GlideUrl(ApiHelper.getUrlForAvatarWithName(userEntity.getBaseUrl(), GlideUrl glideUrl = new GlideUrl(ApiHelper.getUrlForAvatarWithName(userEntity.getBaseUrl(),
room.getName()), new LazyHeaders.Builder() room.getName(), false), new LazyHeaders.Builder()
.setHeader("Accept", "image/*") .setHeader("Accept", "image/*")
.setHeader("User-Agent", ApiHelper.getUserAgent()) .setHeader("User-Agent", ApiHelper.getUserAgent())
.build()); .build());

2
app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
View File

@ -103,7 +103,7 @@ public class UserItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder>
} }
GlideUrl glideUrl = new GlideUrl(ApiHelper.getUrlForAvatarWithName(userEntity.getBaseUrl(), GlideUrl glideUrl = new GlideUrl(ApiHelper.getUrlForAvatarWithName(userEntity.getBaseUrl(),
participant.getUserId()), new LazyHeaders.Builder() participant.getUserId(), false), new LazyHeaders.Builder()
.setHeader("Accept", "image/*") .setHeader("Accept", "image/*")
.setHeader("User-Agent", ApiHelper.getUserAgent()) .setHeader("User-Agent", ApiHelper.getUserAgent())
.build()); .build());

14
app/src/main/java/com/nextcloud/talk/api/helpers/api/ApiHelper.java
View File

@ -143,8 +143,18 @@ public class ApiHelper {
return "/status.php"; return "/status.php";
} }
public static String getUrlForAvatarWithName(String baseUrl, String name) { public static String getUrlForAvatarWithName(String baseUrl, String name, boolean isLargeAvatar) {
return baseUrl + "/index.php/avatar/" + Uri.encode(name) + "/128"; int avatarSize;
if (isLargeAvatar) {
avatarSize = Math.round(NextcloudTalkApplication
.getSharedApplication().getResources().getDimension(R.dimen.avatar_size_big));
} else {
avatarSize = Math.round(NextcloudTalkApplication
.getSharedApplication().getResources().getDimension(R.dimen.avatar_size));
}
return baseUrl + "/index.php/avatar/" + Uri.encode(name) + "/" + avatarSize;
} }
public static String getCredentials(String username, String token) { public static String getCredentials(String username, String token) {

2
app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
View File

@ -419,7 +419,7 @@ public class SettingsController extends BaseController {
} }
GlideUrl glideUrl = new GlideUrl(ApiHelper.getUrlForAvatarWithName(userEntity.getBaseUrl(), GlideUrl glideUrl = new GlideUrl(ApiHelper.getUrlForAvatarWithName(userEntity.getBaseUrl(),
avatarId), new LazyHeaders.Builder() avatarId, true), new LazyHeaders.Builder()
.setHeader("Accept", "image/*") .setHeader("Accept", "image/*")
.setHeader("User-Agent", ApiHelper.getUserAgent()) .setHeader("User-Agent", ApiHelper.getUserAgent())
.build()); .build());