From 39a472216afae98ab15290492e7d77609f1ea922 Mon Sep 17 00:00:00 2001 From: vanous Date: Wed, 26 Aug 2020 21:12:54 +0200 Subject: [PATCH] Better handling of end of summary items list --- .../activities/ActivitySummaryDetail.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java index aad37f7b6..971eb2405 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java @@ -119,10 +119,11 @@ public class ActivitySummaryDetail extends AbstractGBActivity { layout.setOnTouchListener(new SwipeEvents(this) { @Override public void onSwipeRight() { - currentItem = items.getNextItem(); - if (currentItem != null) { - makeSummaryHeader(currentItem); - makeSummaryContent(currentItem); + BaseActivitySummary newItem = items.getNextItem(); + if (newItem != null) { + currentItem = newItem; + makeSummaryHeader(newItem); + makeSummaryContent(newItem); layout.startAnimation(animFadeRight); } else { @@ -132,10 +133,11 @@ public class ActivitySummaryDetail extends AbstractGBActivity { @Override public void onSwipeLeft() { - currentItem = items.getPrevItem(); - if (currentItem != null) { - makeSummaryHeader(currentItem); - makeSummaryContent(currentItem); + BaseActivitySummary newItem = items.getPrevItem(); + if (newItem != null) { + currentItem = newItem; + makeSummaryHeader(newItem); + makeSummaryContent(newItem); layout.startAnimation(animFadeLeft); } else { layout.startAnimation(animBounceLeft);