From c6b96939b83201a4539bbf7fa400271a198ac240 Mon Sep 17 00:00:00 2001 From: Floens Date: Tue, 2 Jun 2015 20:47:37 +0200 Subject: [PATCH] Focus the entry in the theme selector to the currently selected color. --- .../chan/ui/controller/ThemeSettingsController.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/ThemeSettingsController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/ThemeSettingsController.java index fad0d503..17f95640 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/ThemeSettingsController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/ThemeSettingsController.java @@ -159,7 +159,7 @@ public class ThemeSettingsController extends Controller implements View.OnClickL @Override public View getView(final int position, ViewGroup parent) { - Theme theme = themes.get(position); + final Theme theme = themes.get(position); Context themeContext = new ContextThemeWrapper(context, theme.resValue); @@ -188,13 +188,19 @@ public class ThemeSettingsController extends Controller implements View.OnClickL @Override public void onClick(View v) { List items = new ArrayList<>(); + FloatingMenuItem selected = null; for (ThemeHelper.PrimaryColor color : themeHelper.getColors()) { - items.add(new FloatingMenuItem(color, color.displayName)); + FloatingMenuItem floatingMenuItem = new FloatingMenuItem(color, color.displayName); + items.add(floatingMenuItem); + if (color == colors.get(position)) { + selected = floatingMenuItem; + } } FloatingMenu menu = new FloatingMenu(context); menu.setItems(items); menu.setAdapter(new ColorsAdapter(items)); + menu.setSelectedItem(selected); menu.setAnchor(toolbar, Gravity.CENTER, 0, dp(5)); menu.setPopupWidth(toolbar.getWidth()); menu.setCallback(new FloatingMenu.FloatingMenuCallback() {