Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Also use Glide to load images in pending upload list so gif are animated

Browse source
This commit is contained in:
Sylvain Berfini 2019-03-06 09:35:56 +01:00
parent 389b40f637
commit f9b2c2e7b2
3 changed files with 3 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
View file

@ -29,8 +29,6 @@ import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Rect;
import android.net.Uri;
import android.os.Bundle;
@ -57,6 +55,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
@ -87,7 +86,6 @@ import org.linphone.core.Reason;
import org.linphone.core.tools.Log;
import org.linphone.settings.LinphonePreferences;
import org.linphone.utils.FileUtils;
import org.linphone.utils.ImageUtils;
import org.linphone.utils.LinphoneUtils;
import org.linphone.utils.SelectableHelper;
@ -1015,11 +1013,6 @@ public class ChatMessagesFragment extends Fragment
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) {
if (path == 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);
ImageView image = pendingImage.findViewById(R.id.pendingImageForUpload);
Bitmap bm = BitmapFactory.decodeFile(path);
if (bm == null) return;
image.setImageBitmap(scaleToFitHeight(bm, (int) ImageUtils.dpToPixels(mContext, 100)));
Glide.with(mContext).load(path).into(image);
ImageView remove = pendingImage.findViewById(R.id.remove);
remove.setTag(pendingImage);

11
app/src/main/java/org/linphone/utils/ImageUtils.java
View file

@ -31,21 +31,10 @@ import android.net.Uri;
import android.provider.MediaStore;
import android.util.DisplayMetrics;
import android.util.TypedValue;
import android.widget.ImageView;
import com.bumptech.glide.Glide;
import org.linphone.R;
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) {
Bitmap bm;
Bitmap roundBm;

2
app/src/main/res/layout/image_upload_cell.xml
View file

@ -8,7 +8,7 @@
<ImageView
android:id="@+id/pendingImageForUpload"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="100dp"
android:adjustViewBounds="true" />
<ImageView