From 8cda2f74e8a1b851641053e96f1c031a38588381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= Date: Fri, 19 May 2023 21:24:27 +0100 Subject: [PATCH] Extract NonSwipeableViewPager to standalone class --- .../activities/charts/ChartsActivity.java | 22 --------- .../charts/NonSwipeableViewPager.java | 49 +++++++++++++++++++ 2 files changed, 49 insertions(+), 22 deletions(-) create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/NonSwipeableViewPager.java diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsActivity.java index b72f85b6f..629109bc1 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsActivity.java @@ -463,25 +463,3 @@ public class ChartsActivity extends AbstractGBFragmentActivity implements Charts } } -class NonSwipeableViewPager extends ViewPager { - - public NonSwipeableViewPager(Context context, AttributeSet attrs) { - super(context, attrs); - } - - @Override - public boolean onInterceptTouchEvent(MotionEvent ev) { - if (GBApplication.getPrefs().getBoolean("charts_allow_swipe", true)) { - return super.onInterceptTouchEvent(ev); - } - return false; - } - - @Override - public boolean onTouchEvent(MotionEvent ev) { - if (GBApplication.getPrefs().getBoolean("charts_allow_swipe", true)) { - return super.onTouchEvent(ev); - } - return false; - } -} diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/NonSwipeableViewPager.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/NonSwipeableViewPager.java new file mode 100644 index 000000000..92d1c584a --- /dev/null +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/NonSwipeableViewPager.java @@ -0,0 +1,49 @@ +/* Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, vanous, Vebryn + + This file is part of Gadgetbridge. + + Gadgetbridge is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Gadgetbridge is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ +package nodomain.freeyourgadget.gadgetbridge.activities.charts; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.MotionEvent; + +import androidx.viewpager.widget.ViewPager; + +import nodomain.freeyourgadget.gadgetbridge.GBApplication; + +public class NonSwipeableViewPager extends ViewPager { + + public NonSwipeableViewPager(final Context context, final AttributeSet attrs) { + super(context, attrs); + } + + @Override + public boolean onInterceptTouchEvent(final MotionEvent ev) { + if (GBApplication.getPrefs().getBoolean("charts_allow_swipe", true)) { + return super.onInterceptTouchEvent(ev); + } + return false; + } + + @Override + public boolean onTouchEvent(final MotionEvent ev) { + if (GBApplication.getPrefs().getBoolean("charts_allow_swipe", true)) { + return super.onTouchEvent(ev); + } + return false; + } +}