Browse Source

Merge pull request #9812 from nextcloud/avatarSize

Use 512px for avatar
Tobias Kaminsky 3 years ago
parent
commit
1d4bc98de7

+ 1 - 1
src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java

@@ -952,7 +952,7 @@ public final class ThumbnailsCacheManager {
                         mClient = OwnCloudClientManagerFactory.getDefaultSingleton().getClientFor(ocAccount, mContext);
                         mClient = OwnCloudClientManagerFactory.getDefaultSingleton().getClientFor(ocAccount, mContext);
                     }
                     }
 
 
-                    int px = getAvatarDimension();
+                    int px = mResources.getInteger(R.integer.file_avatar_px);
                     String uri = mClient.getBaseUri() + "/index.php/avatar/" + Uri.encode(mUserId) + "/" + px;
                     String uri = mClient.getBaseUri() + "/index.php/avatar/" + Uri.encode(mUserId) + "/" + px;
                     Log_OC.d("Avatar", "URI: " + uri);
                     Log_OC.d("Avatar", "URI: " + uri);
                     get = new GetMethod(uri);
                     get = new GetMethod(uri);

+ 5 - 2
src/main/java/com/owncloud/android/ui/AvatarGroupLayout.java

@@ -144,7 +144,10 @@ public class AvatarGroupLayout extends RelativeLayout implements DisplayUtils.Av
         setLayoutParams(rememberParam);
         setLayoutParams(rememberParam);
     }
     }
 
 
-    private void showFederatedShareAvatar(Context context, String user, float avatarRadius, Resources resources,
+    private void showFederatedShareAvatar(Context context,
+                                          String user,
+                                          float avatarRadius,
+                                          Resources resources,
                                           ImageView avatar) {
                                           ImageView avatar) {
         // maybe federated share
         // maybe federated share
         String[] split = user.split("@");
         String[] split = user.split("@");
@@ -152,7 +155,7 @@ public class AvatarGroupLayout extends RelativeLayout implements DisplayUtils.Av
         String server = split[1];
         String server = split[1];
 
 
         String url = "https://" + server + "/index.php/avatar/" + userId + "/" +
         String url = "https://" + server + "/index.php/avatar/" + userId + "/" +
-            DisplayUtils.convertDpToPixel(avatarRadius, context);
+            resources.getInteger(R.integer.file_avatar_px);
 
 
         Drawable placeholder;
         Drawable placeholder;
         try {
         try {

+ 1 - 0
src/main/res/values/dims.xml

@@ -26,6 +26,7 @@
     <dimen name="file_icon_rounded_corner_radius">8dp</dimen>
     <dimen name="file_icon_rounded_corner_radius">8dp</dimen>
     <dimen name="file_icon_rounded_corner_radius_for_grid_mode">3dp</dimen>
     <dimen name="file_icon_rounded_corner_radius_for_grid_mode">3dp</dimen>
     <dimen name="file_avatar_size">128dp</dimen>
     <dimen name="file_avatar_size">128dp</dimen>
+    <integer name="file_avatar_px">512</integer>
     <dimen name="standard_padding">16dp</dimen>
     <dimen name="standard_padding">16dp</dimen>
     <dimen name="standard_double_padding">32dp</dimen>
     <dimen name="standard_double_padding">32dp</dimen>
     <dimen name="standard_half_padding">8dp</dimen>
     <dimen name="standard_half_padding">8dp</dimen>