Browse Source

add avatar to comment field

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 4 years ago
parent
commit
5c7ebccd1d

+ 20 - 0
src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java

@@ -24,6 +24,7 @@
 package com.owncloud.android.ui.fragment;
 
 import android.content.ContentResolver;
+import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.Editable;
@@ -57,6 +58,7 @@ import com.owncloud.android.ui.events.CommentsEvent;
 import com.owncloud.android.ui.helpers.FileOperationsHelper;
 import com.owncloud.android.ui.interfaces.ActivityListInterface;
 import com.owncloud.android.ui.interfaces.VersionListInterface;
+import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.ThemeUtils;
 
 import org.apache.commons.httpclient.HttpStatus;
@@ -79,6 +81,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 public class FileDetailActivitiesFragment extends Fragment implements
     ActivityListInterface,
+    DisplayUtils.AvatarGenerationListener,
     VersionListInterface.View,
     Injectable {
 
@@ -175,6 +178,13 @@ public class FileDetailActivitiesFragment extends Fragment implements
                                   binding.commentInputField,
                                   ThemeUtils.primaryColor(getContext()));
 
+        DisplayUtils.setAvatar(user,
+                               this,
+                               getResources().getDimension(R.dimen.activity_icon_radius),
+                               getResources(),
+                               binding.avatar,
+                               getContext());
+
         return view;
     }
 
@@ -435,6 +445,16 @@ public class FileDetailActivitiesFragment extends Fragment implements
         operationsHelper.restoreFileVersion(fileVersion);
     }
 
+    @Override
+    public void avatarGenerated(Drawable avatarDrawable, Object callContext) {
+        binding.avatar.setImageDrawable(avatarDrawable);
+    }
+
+    @Override
+    public boolean shouldCallGeneratedCallback(String tag, Object callContext) {
+        return false;
+    }
+
     private static class SubmitCommentTask extends AsyncTask<Void, Void, Boolean> {
 
         private String message;

+ 11 - 0
src/main/res/layout/file_details_activities_fragment.xml

@@ -31,6 +31,17 @@
         android:layout_marginEnd="@dimen/zero"
         android:orientation="horizontal">
 
+        <ImageView
+            android:id="@+id/avatar"
+            android:layout_width="@dimen/activity_icon_width"
+            android:layout_height="@dimen/activity_icon_height"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/zero"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="@dimen/standard_half_margin"
+            android:contentDescription="@null"
+            tools:src="@drawable/ic_user" />
+
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/commentInputField_container"
             android:layout_width="0dp"

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

@@ -87,6 +87,7 @@
     <dimen name="restore_icon_layout_right_end_margin">24dp</dimen>
     <dimen name="activity_icon_width">32dp</dimen>
     <dimen name="activity_icon_height">32dp</dimen>
+    <dimen name="activity_icon_radius">16dp</dimen>
     <dimen name="activity_icon_layout_right_end_margin">24dp</dimen>
     <dimen name="activity_list_item_grid_layout_left_start_margin">-3dp</dimen>
     <dimen name="activity_list_item_title_header_text_size">16sp</dimen>