diff --git a/mastodon/build.gradle b/mastodon/build.gradle index 67164cef..396ecb99 100644 --- a/mastodon/build.gradle +++ b/mastodon/build.gradle @@ -90,7 +90,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.4.1' + implementation 'me.grishka.appkit:appkit:1.4.2' implementation 'com.google.code.gson:gson:2.8.9' implementation 'org.jsoup:jsoup:1.14.3' implementation 'com.squareup:otto:1.3.8' diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java index 0c615443..f1ef52f7 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java @@ -236,6 +236,8 @@ public class ThreadFragment extends StatusListFragment{ protected void drawDivider(View child, View bottomSibling, RecyclerView.ViewHolder holder, RecyclerView.ViewHolder siblingHolder, RecyclerView parent, Canvas c, Paint paint){ if(holder instanceof StatusDisplayItem.Holder statusHolder && siblingHolder instanceof StatusDisplayItem.Holder siblingStatusHolder){ Status siblingStatus=getStatusByID(siblingStatusHolder.getItemID()); + if(siblingStatus==null) + return; if(statusHolder.getItemID().equals(siblingStatus.inReplyToId) && siblingStatus!=mainStatus && !statusHolder.getItemID().equals(mainStatus.id)) return; } @@ -291,6 +293,7 @@ public class ThreadFragment extends StatusListFragment{ continue; float lineX=V.dp(36); + paint.setAlpha(Math.round(255*child.getAlpha())); c.save(); c.clipRect(child.getX(), child.getY(), child.getX()+child.getWidth(), child.getY()+child.getHeight()); if(holder instanceof HeaderStatusDisplayItem.Holder){