From e40841c1289eb33d95c8cfee48b83fbeffff02ca Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 30 Sep 2023 20:26:54 +0200 Subject: [PATCH 01/10] New translations strings.xml (Portuguese, Brazilian) --- mastodon/src/main/res/values-pt-rBR/strings.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mastodon/src/main/res/values-pt-rBR/strings.xml b/mastodon/src/main/res/values-pt-rBR/strings.xml index f6a4a8127c..f8e304352d 100644 --- a/mastodon/src/main/res/values-pt-rBR/strings.xml +++ b/mastodon/src/main/res/values-pt-rBR/strings.xml @@ -572,5 +572,15 @@ %dh atrás %dd atrás + Traduzido de %s + Traduzido de %1$s usando %2$s + Mostrar original + A tradução falhou. Talvez o administrador não tenha habilitado as traduções neste servidor ou este servidor esteja executando uma versão mais antiga do Mastodon onde as traduções ainda não são suportadas. + Privacidade e alcance + Incluir publicações públicas nos resultados de pesquisa + + %,d participante + %,d participantes + From b91840fb95fb9e0911232f6230a8580b38bf6b9b Mon Sep 17 00:00:00 2001 From: Grishka Date: Sun, 1 Oct 2023 07:16:21 +0300 Subject: [PATCH 02/10] Another attempt to fix ZoomPanView crash --- mastodon/build.gradle | 4 ++-- .../org/joinmastodon/android/ui/photoviewer/ZoomPanView.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mastodon/build.gradle b/mastodon/build.gradle index 592344c168..7d1646926a 100644 --- a/mastodon/build.gradle +++ b/mastodon/build.gradle @@ -9,8 +9,8 @@ android { applicationId "org.joinmastodon.android" minSdk 23 targetSdk 33 - versionCode 70 - versionName "2.1.4" + versionCode 71 + versionName "2.1.5" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "da-rDK", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fa-rIR", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "ig-rNG", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "kab", "ko-rKR", "my-rMM", "nl-rNL", "no-rNO", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "ur-rIN", "vi-rVN", "zh-rCN", "zh-rTW" } diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/ZoomPanView.java b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/ZoomPanView.java index ac9f5fbaa9..5425c095a0 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/ZoomPanView.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/ZoomPanView.java @@ -119,8 +119,10 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto int width=right-left; int height=bottom-top; - if(width==0 || height==0) + if(width==0 || height==0 || child.getWidth()==0 || child.getWidth()==0){ + matrix.reset(); return; + } float scale=Math.min(width/(float)child.getWidth(), height/(float)child.getHeight()); minScale=scale; From c5b52b27817410961a66b7a72ae993b81a93fadc Mon Sep 17 00:00:00 2001 From: Grishka Date: Sun, 1 Oct 2023 12:17:21 +0300 Subject: [PATCH 03/10] Fix default server not loading sometimes --- .../org/joinmastodon/android/fragments/SplashFragment.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java index 12c6e0af4b..05622a216c 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java @@ -47,13 +47,12 @@ public class SplashFragment extends AppKitFragment{ private ProgressBarButton defaultServerButton; private ProgressBar defaultServerProgress; private String chosenDefaultServer=DEFAULT_SERVER; - private boolean loadingDefaultServer; + private boolean loadingDefaultServer, loadedDefaultServer; @Override public void onCreate(Bundle savedInstanceState){ super.onCreate(savedInstanceState); motionEffect=new InterpolatingMotionEffect(MastodonApp.context); - loadAndChooseDefaultServer(); } @Nullable @@ -101,6 +100,8 @@ public boolean onPreDraw(){ }); } }); + if(!loadedDefaultServer && !loadingDefaultServer) + loadAndChooseDefaultServer(); return contentView; } @@ -239,6 +240,7 @@ public void onError(ErrorResponse error){ private void setChosenDefaultServer(String domain){ chosenDefaultServer=domain; loadingDefaultServer=false; + loadedDefaultServer=true; if(defaultServerButton!=null && getActivity()!=null){ defaultServerButton.setTextVisible(true); defaultServerProgress.setVisibility(View.GONE); From f43352b790539db053b2493c64767f2aa85f777c Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 1 Oct 2023 16:30:51 +0200 Subject: [PATCH 04/10] New translations strings.xml (Indonesian) --- mastodon/src/main/res/values-in-rID/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mastodon/src/main/res/values-in-rID/strings.xml b/mastodon/src/main/res/values-in-rID/strings.xml index 80680fa33e..0dafc3b3c0 100644 --- a/mastodon/src/main/res/values-in-rID/strings.xml +++ b/mastodon/src/main/res/values-in-rID/strings.xml @@ -554,5 +554,9 @@ %dj yang lalu %dh yang lalu + Terjemahkan dari bahasa %s + Diterjemahkan dari bahasa %1$s menggunakan %2$s + Tampilkan yang asli + Terjemahan gagal. Administrator mungkin belum mengaktifkan terjemahan di server ini atau server ini menjalankan Mastodon versi lama yang belum mendukung terjemahan. From c38c2a425b762ffece370fe36e42881135e46832 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 1 Oct 2023 17:30:46 +0200 Subject: [PATCH 05/10] New translations strings.xml (Indonesian) --- mastodon/src/main/res/values-in-rID/strings.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mastodon/src/main/res/values-in-rID/strings.xml b/mastodon/src/main/res/values-in-rID/strings.xml index 0dafc3b3c0..f980da9162 100644 --- a/mastodon/src/main/res/values-in-rID/strings.xml +++ b/mastodon/src/main/res/values-in-rID/strings.xml @@ -559,4 +559,13 @@ Diterjemahkan dari bahasa %1$s menggunakan %2$s Tampilkan yang asli Terjemahan gagal. Administrator mungkin belum mengaktifkan terjemahan di server ini atau server ini menjalankan Mastodon versi lama yang belum mendukung terjemahan. + Privasi dan jangkauan + Fiturkan profil dan kiriman dalam algoritma penjelajahan + Sertakan kiriman publik dalam hasil pencarian + + %,d peserta + + + %,d kiriman hari ini + From 1feccdc26d154f1468abdcdf0b7051cb41a179a1 Mon Sep 17 00:00:00 2001 From: Grishka Date: Sun, 1 Oct 2023 23:11:33 +0300 Subject: [PATCH 06/10] Fixes --- .../android/fragments/HashtagTimelineFragment.java | 2 +- .../org/joinmastodon/android/ui/photoviewer/PhotoViewer.java | 4 +++- .../org/joinmastodon/android/ui/photoviewer/ZoomPanView.java | 3 +++ mastodon/src/main/res/values/strings.xml | 2 ++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java index e919f9dbe8..e8419d1513 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java @@ -176,7 +176,7 @@ protected void onUpdateToolbar(){ } private void updateHeader(){ - if(hashtag==null) + if(hashtag==null || getActivity()==null) return; if(hashtag.history!=null && !hashtag.history.isEmpty()){ diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java index 7eded40941..00d4c06a34 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java @@ -822,7 +822,9 @@ private void startPlayer(){ @Override public boolean onError(MediaPlayer mp, int what, int extra){ Log.e(TAG, "video player onError() called with: mp = ["+mp+"], what = ["+what+"], extra = ["+extra+"]"); - return false; + Toast.makeText(activity, R.string.error_playing_video, Toast.LENGTH_SHORT).show(); + onStartSwipeToDismissTransition(0f); + return true; } public void prepareAndStartPlayer(){ diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/ZoomPanView.java b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/ZoomPanView.java index 5425c095a0..31d9a78fd9 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/ZoomPanView.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/ZoomPanView.java @@ -193,6 +193,9 @@ private void setCropAnimationValue(float val){ private float prepareTransitionCropRect(Rect rect){ float initialScale; + if(rect.isEmpty()){ + rect.set(rect.centerX()-child.getWidth()/2, rect.centerY()-child.getHeight()/2, rect.centerX()+child.getWidth()/2, rect.centerY()+child.getWidth()/2); + } float scaleW=rect.width()/(float)child.getWidth(); float scaleH=rect.height()/(float)child.getHeight(); if(scaleW>scaleH){ diff --git a/mastodon/src/main/res/values/strings.xml b/mastodon/src/main/res/values/strings.xml index af28ff40a5..9ae6db2cfd 100644 --- a/mastodon/src/main/res/values/strings.xml +++ b/mastodon/src/main/res/values/strings.xml @@ -608,4 +608,6 @@ %,d post today %,d posts today + + Error playing video \ No newline at end of file From 74ae3bf706053ec6d1492a2b2522dc7a82452faa Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 2 Oct 2023 07:26:27 +0200 Subject: [PATCH 07/10] New translations strings.xml (Armenian) --- mastodon/src/main/res/values-hy-rAM/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mastodon/src/main/res/values-hy-rAM/strings.xml b/mastodon/src/main/res/values-hy-rAM/strings.xml index 48b1644f7e..4c133ca6ee 100644 --- a/mastodon/src/main/res/values-hy-rAM/strings.xml +++ b/mastodon/src/main/res/values-hy-rAM/strings.xml @@ -13,6 +13,7 @@ %s հետեւելու հարցում է ուղարկել %s-ը հավանեց ձեր գրառումը %s տարածեց ձեր գրառումը + Տեսեք ձեր քվեարկած հարցման արդյունքները Տարածել Կարգավորումներ Հրապարակել @@ -102,6 +103,7 @@ Ջնջում… Նվագարկել Դադար տալ + Ելք Ավելացնել հաշիվ Որոնել Պիտակներ From cbce90c4615ce3d7b097c5f06ed6582853236e7b Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 2 Oct 2023 21:16:49 +0200 Subject: [PATCH 08/10] New translations strings.xml (Sinhala) --- mastodon/src/main/res/values-si-rLK/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mastodon/src/main/res/values-si-rLK/strings.xml b/mastodon/src/main/res/values-si-rLK/strings.xml index d26a76f2ac..e7218851d2 100644 --- a/mastodon/src/main/res/values-si-rLK/strings.xml +++ b/mastodon/src/main/res/values-si-rLK/strings.xml @@ -11,7 +11,7 @@ ඉවතලන්න අවලංගු මාධ්‍ය - පිලිබඳව + පිළිබඳව පැතිකඩ සංස්කරණය %s නිහඬ %s නොනිහඬ From 70386ea1b22249635ee21803146a479784e1d35c Mon Sep 17 00:00:00 2001 From: Grishka Date: Tue, 3 Oct 2023 02:11:04 +0300 Subject: [PATCH 09/10] Update appkit to finally fix that ViewPager2 crash --- mastodon/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mastodon/build.gradle b/mastodon/build.gradle index 7d1646926a..b1097408f3 100644 --- a/mastodon/build.gradle +++ b/mastodon/build.gradle @@ -76,7 +76,7 @@ dependencies { implementation 'me.grishka.litex:viewpager:1.0.0' implementation 'me.grishka.litex:viewpager2:1.0.0' implementation 'me.grishka.litex:palette:1.0.0' - implementation 'me.grishka.appkit:appkit:1.2.13' + implementation 'me.grishka.appkit:appkit:1.2.14' implementation 'com.google.code.gson:gson:2.8.9' implementation 'org.jsoup:jsoup:1.14.3' implementation 'com.squareup:otto:1.3.8' From 1f4152b588f05ffafa93bc4e9a422ad9653195af Mon Sep 17 00:00:00 2001 From: Grishka Date: Tue, 3 Oct 2023 02:52:07 +0300 Subject: [PATCH 10/10] Fix #705 and improve handling of unknown attachment dimensions --- mastodon/build.gradle | 4 +-- .../android/model/Attachment.java | 16 +++++++--- .../drawables/BlurhashCrossfadeDrawable.java | 4 +++ .../android/ui/photoviewer/PhotoViewer.java | 32 +++++++++++++++---- .../android/ui/photoviewer/ZoomPanView.java | 3 -- .../utils/MediaAttachmentViewController.java | 7 ++++ .../android/ui/views/MediaGridLayout.java | 3 -- 7 files changed, 51 insertions(+), 18 deletions(-) diff --git a/mastodon/build.gradle b/mastodon/build.gradle index b1097408f3..48be30f99f 100644 --- a/mastodon/build.gradle +++ b/mastodon/build.gradle @@ -9,8 +9,8 @@ android { applicationId "org.joinmastodon.android" minSdk 23 targetSdk 33 - versionCode 71 - versionName "2.1.5" + versionCode 72 + versionName "2.1.6" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "da-rDK", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fa-rIR", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "ig-rNG", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "kab", "ko-rKR", "my-rMM", "nl-rNL", "no-rNO", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "ur-rIN", "vi-rVN", "zh-rCN", "zh-rTW" } diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Attachment.java b/mastodon/src/main/java/org/joinmastodon/android/model/Attachment.java index 3c48c4f421..d3ef9d9e19 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/model/Attachment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/model/Attachment.java @@ -45,26 +45,34 @@ public Attachment(@ParcelProperty("blurhash") String blurhash){ public int getWidth(){ if(meta==null) - return 0; + return 1920; if(meta.width>0) return meta.width; if(meta.original!=null && meta.original.width>0) return meta.original.width; if(meta.small!=null && meta.small.width>0) return meta.small.width; - return 0; + return 1920; } public int getHeight(){ if(meta==null) - return 0; + return 1080; if(meta.height>0) return meta.height; if(meta.original!=null && meta.original.height>0) return meta.original.height; if(meta.small!=null && meta.small.height>0) return meta.small.height; - return 0; + return 1080; + } + + public boolean hasKnownDimensions(){ + return meta!=null && ( + (meta.height>0 && meta.width>0) + || (meta.original!=null && meta.original.height>0 && meta.original.width>0) + || (meta.small!=null && meta.small.height>0 && meta.small.width>0) + ); } public double getDuration(){ diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/drawables/BlurhashCrossfadeDrawable.java b/mastodon/src/main/java/org/joinmastodon/android/ui/drawables/BlurhashCrossfadeDrawable.java index e0236a7a1e..e33c612ab0 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/drawables/BlurhashCrossfadeDrawable.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/drawables/BlurhashCrossfadeDrawable.java @@ -66,6 +66,10 @@ public void setBlurhashDrawable(Drawable blurhashDrawable){ public void setImageDrawable(Drawable imageDrawable){ this.imageDrawable=imageDrawable; + if(imageDrawable!=null){ + width=imageDrawable.getIntrinsicWidth(); + height=imageDrawable.getIntrinsicHeight(); + } invalidateSelf(); } diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java index 00d4c06a34..778c6d9309 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java @@ -716,9 +716,18 @@ public PhotoViewHolder(){ public void onBind(Attachment item){ super.onBind(item); FrameLayout.LayoutParams params=(FrameLayout.LayoutParams) imageView.getLayoutParams(); - params.width=item.getWidth(); - params.height=item.getHeight(); - ViewImageLoader.load(this, listener.getPhotoViewCurrentDrawable(getAbsoluteAdapterPosition()), new UrlImageLoaderRequest(item.url), false); + Drawable currentDrawable=listener.getPhotoViewCurrentDrawable(getAbsoluteAdapterPosition()); + if(item.hasKnownDimensions()){ + params.width=item.getWidth(); + params.height=item.getHeight(); + }else if(currentDrawable!=null){ + params.width=currentDrawable.getIntrinsicWidth(); + params.height=currentDrawable.getIntrinsicHeight(); + }else{ + params.width=1920; + params.height=1080; + } + ViewImageLoader.load(this, currentDrawable, new UrlImageLoaderRequest(item.url), false); } @Override @@ -760,9 +769,18 @@ public void onBind(Attachment item){ super.onBind(item); playerReady=false; FrameLayout.LayoutParams params=(FrameLayout.LayoutParams) wrap.getLayoutParams(); - params.width=item.getWidth(); - params.height=item.getHeight(); - wrap.setBackground(listener.getPhotoViewCurrentDrawable(getAbsoluteAdapterPosition())); + Drawable currentDrawable=listener.getPhotoViewCurrentDrawable(getAbsoluteAdapterPosition()); + if(item.hasKnownDimensions()){ + params.width=item.getWidth(); + params.height=item.getHeight(); + }else if(currentDrawable!=null){ + params.width=currentDrawable.getIntrinsicWidth(); + params.height=currentDrawable.getIntrinsicHeight(); + }else{ + params.width=1920; + params.height=1080; + } + wrap.setBackground(currentDrawable); progressBar.setVisibility(item.type==Attachment.Type.VIDEO ? View.VISIBLE : View.GONE); if(itemView.isAttachedToWindow()){ reset(); @@ -845,6 +863,8 @@ public void prepareAndStartPlayer(){ player.prepareAsync(); }catch(IOException x){ Log.w(TAG, "Error initializing gif player", x); + Toast.makeText(activity, R.string.error_playing_video, Toast.LENGTH_SHORT).show(); + onStartSwipeToDismissTransition(0f); } } diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/ZoomPanView.java b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/ZoomPanView.java index 31d9a78fd9..5425c095a0 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/ZoomPanView.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/ZoomPanView.java @@ -193,9 +193,6 @@ private void setCropAnimationValue(float val){ private float prepareTransitionCropRect(Rect rect){ float initialScale; - if(rect.isEmpty()){ - rect.set(rect.centerX()-child.getWidth()/2, rect.centerY()-child.getHeight()/2, rect.centerX()+child.getWidth()/2, rect.centerY()+child.getWidth()/2); - } float scaleW=rect.width()/(float)child.getWidth(); float scaleH=rect.height()/(float)child.getHeight(); if(scaleW>scaleH){ diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/MediaAttachmentViewController.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/MediaAttachmentViewController.java index 5b7dfb1ba1..b8b57f2b78 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/MediaAttachmentViewController.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/MediaAttachmentViewController.java @@ -27,6 +27,7 @@ public class MediaAttachmentViewController{ private final Context context; private boolean didClear; private Status status; + private Attachment attachment; public MediaAttachmentViewController(Context context, MediaGridStatusDisplayItem.GridItemType type){ view=context.getSystemService(LayoutInflater.class).inflate(switch(type){ @@ -50,6 +51,7 @@ public MediaAttachmentViewController(Context context, MediaGridStatusDisplayItem public void bind(Attachment attachment, Status status){ this.status=status; + this.attachment=attachment; crossfadeDrawable.setSize(attachment.getWidth(), attachment.getHeight()); crossfadeDrawable.setBlurhashDrawable(attachment.blurhashPlaceholder); crossfadeDrawable.setCrossfadeAlpha(0f); @@ -69,6 +71,11 @@ public void setImage(Drawable drawable){ crossfadeDrawable.setImageDrawable(drawable); if(didClear) crossfadeDrawable.animateAlpha(0f); + // Make sure the image is not stretched if the server returned wrong dimensions + if(drawable!=null && (drawable.getIntrinsicWidth()!=attachment.getWidth() || drawable.getIntrinsicHeight()!=attachment.getHeight())){ + photo.setImageDrawable(null); + photo.setImageDrawable(crossfadeDrawable); + } } public void clearImage(){ diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/views/MediaGridLayout.java b/mastodon/src/main/java/org/joinmastodon/android/ui/views/MediaGridLayout.java index 67ff45d8d7..554fc69037 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/views/MediaGridLayout.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/views/MediaGridLayout.java @@ -2,14 +2,11 @@ import android.content.Context; import android.util.AttributeSet; -import android.util.Log; import android.view.View; import android.view.ViewGroup; import org.joinmastodon.android.ui.PhotoLayoutHelper; -import java.util.Arrays; - import me.grishka.appkit.utils.V; public class MediaGridLayout extends ViewGroup{