From 8ae63eff296430a03cd8e3ce540abafb5a66aea9 Mon Sep 17 00:00:00 2001 From: Andries Smit Date: Wed, 1 Dec 2021 14:16:00 +0100 Subject: [PATCH] Fix wear page indicator --- .../androidaps/interaction/actions/BolusActivity.java | 6 ++++-- .../androidaps/interaction/actions/CPPActivity.java | 6 ++++-- .../androidaps/interaction/actions/ECarbActivity.java | 6 ++++-- .../androidaps/interaction/actions/TempTargetActivity.java | 6 ++++-- .../androidaps/interaction/actions/WizardActivity.java | 6 ++++-- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/BolusActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/BolusActivity.java index fc5c252839..4382f8d323 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/BolusActivity.java +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/BolusActivity.java @@ -41,16 +41,18 @@ public class BolusActivity extends ViewSelectorActivity { pager.setOnPageChangeListener(new GridViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int row, int column, float rowOffset, float columnOffset, int rowOffsetPixels, int columnOffsetPixels) { + dotsPageIndicator.onPageScrolled(row, column, rowOffset, columnOffset, rowOffsetPixels, + columnOffsetPixels); } - @Override public void onPageSelected(int row, int column) { + dotsPageIndicator.onPageSelected(row, column); View view = pager.getChildAt(column); view.requestFocus(); } - @Override public void onPageScrollStateChanged(int state) { + dotsPageIndicator.onPageScrollStateChanged(state); } }); } diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/CPPActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/CPPActivity.java index e1da75e567..a2cc5f2b4d 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/CPPActivity.java +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/CPPActivity.java @@ -56,16 +56,18 @@ public class CPPActivity extends ViewSelectorActivity { pager.setOnPageChangeListener(new GridViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int row, int column, float rowOffset, float columnOffset, int rowOffsetPixels, int columnOffsetPixels) { + dotsPageIndicator.onPageScrolled(row, column, rowOffset, columnOffset, rowOffsetPixels, + columnOffsetPixels); } - @Override public void onPageSelected(int row, int column) { + dotsPageIndicator.onPageSelected(row, column); View view = pager.getChildAt(column); view.requestFocus(); } - @Override public void onPageScrollStateChanged(int state) { + dotsPageIndicator.onPageScrollStateChanged(state); } }); } diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/ECarbActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/ECarbActivity.java index 3d2ff7d3f8..33835ff01f 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/ECarbActivity.java +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/ECarbActivity.java @@ -43,16 +43,18 @@ public class ECarbActivity extends ViewSelectorActivity { pager.setOnPageChangeListener(new GridViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int row, int column, float rowOffset, float columnOffset, int rowOffsetPixels, int columnOffsetPixels) { + dotsPageIndicator.onPageScrolled(row, column, rowOffset, columnOffset, rowOffsetPixels, + columnOffsetPixels); } - @Override public void onPageSelected(int row, int column) { + dotsPageIndicator.onPageSelected(row, column); View view = pager.getChildAt(column); view.requestFocus(); } - @Override public void onPageScrollStateChanged(int state) { + dotsPageIndicator.onPageScrollStateChanged(state); } }); } diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TempTargetActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TempTargetActivity.java index 430b82fd5d..17515ad282 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TempTargetActivity.java +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TempTargetActivity.java @@ -51,16 +51,18 @@ public class TempTargetActivity extends ViewSelectorActivity { pager.setOnPageChangeListener(new GridViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int row, int column, float rowOffset, float columnOffset, int rowOffsetPixels, int columnOffsetPixels) { + dotsPageIndicator.onPageScrolled(row, column, rowOffset, columnOffset, rowOffsetPixels, + columnOffsetPixels); } - @Override public void onPageSelected(int row, int column) { + dotsPageIndicator.onPageSelected(row, column); View view = pager.getChildAt(column); view.requestFocus(); } - @Override public void onPageScrollStateChanged(int state) { + dotsPageIndicator.onPageScrollStateChanged(state); } }); } diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/WizardActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/WizardActivity.java index f376bb954a..6ab4f3375c 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/WizardActivity.java +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/WizardActivity.java @@ -48,16 +48,18 @@ public class WizardActivity extends ViewSelectorActivity { pager.setOnPageChangeListener(new GridViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int row, int column, float rowOffset, float columnOffset, int rowOffsetPixels, int columnOffsetPixels) { + dotsPageIndicator.onPageScrolled(row, column, rowOffset, columnOffset, rowOffsetPixels, + columnOffsetPixels); } - @Override public void onPageSelected(int row, int column) { + dotsPageIndicator.onPageSelected(row, column); View view = pager.getChildAt(column); view.requestFocus(); } - @Override public void onPageScrollStateChanged(int state) { + dotsPageIndicator.onPageScrollStateChanged(state); } }); }