Skip to content

feat: menu — active items in orange, the focus frame stays blue (#114) #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
compot-dev merged 1 commit into from
Oct 13, 2026
Merged

feat: menu — active items in orange, the focus frame stays blue (#114) #116

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 29 additions & 14 deletions android/app/src/main/java/com/openipc/decoder/MenuManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
import android.widget.RadioGroup;
import android.widget.TextView;

import java.util.HashSet;
import java.util.Set;

class MenuManager {
private static final String TAG = "OpenIPCDecoder";
private static final int CAM_COUNT = Decoder.CAM_COUNT;
Expand Down Expand Up @@ -374,16 +377,35 @@ private TextView createItem(String title) {
return text;
}

/** On / active (D on, Q, U, the active slot): orange, unlike the blue focus (#114). */
private static final int ACTIVE_BORDER = 0xFFFF9800;
private static final int ACTIVE_FILL = 0xFF4A2C00;
private static final int FOCUS_BORDER = Color.BLUE;
private final Set<View> activeItems = new HashSet<>();

private void highlightItem(TextView item) {
GradientDrawable bg = new GradientDrawable();
bg.setColor(Color.BLACK);
bg.setStroke(2, Color.BLUE);
item.setBackground(bg);
activeItems.add(item);
paintItem(item, item.hasFocus());
}

private void resetItem(TextView item) {
item.setTextColor(Color.WHITE);
focusChange(item);
activeItems.remove(item);
paintItem(item, item.hasFocus());
}

/**
* Active items have an orange fill and border, the focused item a thick blue border; an
* item that is both keeps the orange fill under the blue border, so neither state hides.
*/
private void paintItem(View item, boolean focused) {
boolean active = activeItems.contains(item);
GradientDrawable bg = new GradientDrawable();
bg.setColor(active ? ACTIVE_FILL : Color.BLACK);
if (focused) bg.setStroke(dp(2), FOCUS_BORDER);
else if (active) bg.setStroke(dp(2), ACTIVE_BORDER);
else bg.setStroke(1, Color.GRAY);
item.setBackground(bg);
}

private void applyQualityColor(TextView btn, int slot, boolean quadEnabled,
Expand Down Expand Up @@ -459,15 +481,8 @@ void showUrlEditor(int mActive, String[] mHosts, Transport.Mode[] mTransports) {
}

private void focusChange(View item) {
GradientDrawable border = new GradientDrawable();
border.setColor(Color.BLACK);
border.setStroke(1, Color.GRAY);
item.setBackground(border);
item.setOnFocusChangeListener((v, hasFocus) -> {
if (hasFocus) border.setStroke(1, Color.BLUE);
else border.setStroke(1, Color.GRAY);
v.setBackground(border);
});
paintItem(item, false);
item.setOnFocusChangeListener((v, hasFocus) -> paintItem(v, hasFocus));
}

@SuppressLint("SetJavaScriptEnabled")
Expand Down
Loading