From a7abe2d16867b6e8378c9af0972b0b6204afa051 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 7 Jul 2016 22:17:58 -1000 Subject: [PATCH] Show appropriate color selection page by default --- QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java index 44b61496..15bd05c2 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java @@ -519,6 +519,7 @@ public class ThemeManager { } }); + int swatchColor = getSwatchColor(getColor()); holder.mPalette.init(19, 4, color -> { holder.mPalette.init(getSwatch(color).length, 4, color2 -> { setActiveColor(color2); @@ -527,7 +528,11 @@ public class ThemeManager { }); holder.mPalette.drawPalette(getSwatch(color), getColor()); }); - holder.mPalette.drawPalette(PALETTE, getSwatchColor(getColor())); + holder.mPalette.drawPalette(PALETTE, swatchColor); + + if (swatchColor == getColor()) { // If the current theme was set from the RGB picker, show that page instead + holder.mPager.setCurrentItem(1); + } SeekBar.OnSeekBarChangeListener seekListener = new SeekBar.OnSeekBarChangeListener() {