kadu/gotify-android-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add null-check of swipe icon.

Browse Source
This commit is contained in:
leopoldsedev
2020-02-15 17:25:03 +01:00
committed by Jannis Mattheis
parent 6b00bfb63c
commit ed8689daa0
1 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/github/gotify/messages/MessagesActivity.java
View File

@@ -425,6 +425,7 @@ public class MessagesActivity extends AppCompatActivity
Drawable drawable = Drawable drawable =
ContextCompat.getDrawable(MessagesActivity.this, R.drawable.ic_delete); ContextCompat.getDrawable(MessagesActivity.this, R.drawable.ic_delete);
icon = null;
if (drawable != null) { if (drawable != null) {
icon = DrawableCompat.wrap(drawable.mutate()); icon = DrawableCompat.wrap(drawable.mutate());
DrawableCompat.setTint(icon, iconColorId); DrawableCompat.setTint(icon, iconColorId);
@@ -457,6 +458,7 @@ public class MessagesActivity extends AppCompatActivity
float dY, float dY,
int actionState, int actionState,
boolean isCurrentlyActive) { boolean isCurrentlyActive) {
if (icon != null) {
View itemView = viewHolder.itemView; View itemView = viewHolder.itemView;
int iconHeight = itemView.getHeight() / 3; int iconHeight = itemView.getHeight() / 3;
@@ -498,6 +500,7 @@ public class MessagesActivity extends AppCompatActivity
background.draw(c); background.draw(c);
icon.draw(c); icon.draw(c);
}
super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive); super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
} }