Also use Glide to load images in pending upload list so gif are animated
This commit is contained in:
parent
389b40f637
commit
f9b2c2e7b2
3 changed files with 3 additions and 23 deletions
|
@ -29,8 +29,6 @@ import android.content.ClipData;
|
||||||
import android.content.ClipboardManager;
|
import android.content.ClipboardManager;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.graphics.Bitmap;
|
|
||||||
import android.graphics.BitmapFactory;
|
|
||||||
import android.graphics.Rect;
|
import android.graphics.Rect;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
@ -57,6 +55,7 @@ import android.widget.LinearLayout;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
import com.bumptech.glide.Glide;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
@ -87,7 +86,6 @@ import org.linphone.core.Reason;
|
||||||
import org.linphone.core.tools.Log;
|
import org.linphone.core.tools.Log;
|
||||||
import org.linphone.settings.LinphonePreferences;
|
import org.linphone.settings.LinphonePreferences;
|
||||||
import org.linphone.utils.FileUtils;
|
import org.linphone.utils.FileUtils;
|
||||||
import org.linphone.utils.ImageUtils;
|
|
||||||
import org.linphone.utils.LinphoneUtils;
|
import org.linphone.utils.LinphoneUtils;
|
||||||
import org.linphone.utils.SelectableHelper;
|
import org.linphone.utils.SelectableHelper;
|
||||||
|
|
||||||
|
@ -1015,11 +1013,6 @@ public class ChatMessagesFragment extends Fragment
|
||||||
mSendMessageButton.setEnabled(true);
|
mSendMessageButton.setEnabled(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private Bitmap scaleToFitHeight(Bitmap b, int height) {
|
|
||||||
float factor = height / (float) b.getHeight();
|
|
||||||
return Bitmap.createScaledBitmap(b, (int) (b.getWidth() * factor), height, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void addImageToPendingList(String path) {
|
private void addImageToPendingList(String path) {
|
||||||
if (path == null) {
|
if (path == null) {
|
||||||
Log.e("Can't add image to pending list because it's path is null...");
|
Log.e("Can't add image to pending list because it's path is null...");
|
||||||
|
@ -1031,9 +1024,7 @@ public class ChatMessagesFragment extends Fragment
|
||||||
pendingImage.setTag(path);
|
pendingImage.setTag(path);
|
||||||
|
|
||||||
ImageView image = pendingImage.findViewById(R.id.pendingImageForUpload);
|
ImageView image = pendingImage.findViewById(R.id.pendingImageForUpload);
|
||||||
Bitmap bm = BitmapFactory.decodeFile(path);
|
Glide.with(mContext).load(path).into(image);
|
||||||
if (bm == null) return;
|
|
||||||
image.setImageBitmap(scaleToFitHeight(bm, (int) ImageUtils.dpToPixels(mContext, 100)));
|
|
||||||
|
|
||||||
ImageView remove = pendingImage.findViewById(R.id.remove);
|
ImageView remove = pendingImage.findViewById(R.id.remove);
|
||||||
remove.setTag(pendingImage);
|
remove.setTag(pendingImage);
|
||||||
|
|
|
@ -31,21 +31,10 @@ import android.net.Uri;
|
||||||
import android.provider.MediaStore;
|
import android.provider.MediaStore;
|
||||||
import android.util.DisplayMetrics;
|
import android.util.DisplayMetrics;
|
||||||
import android.util.TypedValue;
|
import android.util.TypedValue;
|
||||||
import android.widget.ImageView;
|
|
||||||
import com.bumptech.glide.Glide;
|
|
||||||
import org.linphone.R;
|
import org.linphone.R;
|
||||||
|
|
||||||
public class ImageUtils {
|
public class ImageUtils {
|
||||||
|
|
||||||
public static void setDefaultContactImage(ImageView view) {
|
|
||||||
Glide.with(view).load(R.drawable.avatar).into(view);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void setImagePictureFromUri(
|
|
||||||
Context c, ImageView view, Uri pictureUri, Uri thumbnailUri) {
|
|
||||||
Glide.with(c).load(pictureUri).thumbnail(Glide.with(c).load(thumbnailUri)).into(view);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Bitmap getRoundBitmapFromUri(Context context, Uri fromPictureUri) {
|
public static Bitmap getRoundBitmapFromUri(Context context, Uri fromPictureUri) {
|
||||||
Bitmap bm;
|
Bitmap bm;
|
||||||
Bitmap roundBm;
|
Bitmap roundBm;
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/pendingImageForUpload"
|
android:id="@+id/pendingImageForUpload"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="100dp"
|
||||||
android:adjustViewBounds="true" />
|
android:adjustViewBounds="true" />
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
|
|
Loading…
Reference in a new issue