Skip to content

Accessibility follow-ups: insights contrast, stat grouping, lint sweep #646

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
kasnder merged 3 commits into from
Jul 12, 2026
+83 −23
Merged

Accessibility follow-ups: insights contrast, stat grouping, lint sweep #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9864a4
Accessibility follow-ups: insights contrast, stat grouping, lint swee…
kasnder Jul 12, 2026
80866b7
Merge branch 'master' into claude/a11y-followups-636
kasnder Jul 12, 2026
3fcdfe4
Make insight stat announcements localizable
kasnder Jul 12, 2026
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
2 changes: 2 additions & 0 deletions app/src/main/java/eu/faircode/netguard/ActivityMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,8 @@ protected void onCreate(Bundle savedInstanceState) {
ivQueue = actionView.findViewById(R.id.ivQueue);
swEnabled = actionView.findViewById(R.id.swEnabled);
ivMetered = actionView.findViewById(R.id.ivMetered);
ivQueue.setContentDescription(getString(R.string.msg_queue));
ivMetered.setContentDescription(getString(R.string.msg_metered));

// Get daily changing title
if (!Util.isPlayStoreInstall())
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/eu/faircode/netguard/AdapterAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,12 @@ public void bindView(final View view, final Context context, final Cursor cursor

// Set values
tvTime.setText(new SimpleDateFormat("dd HH:mm").format(time));
if (block < 0)
if (block < 0) {
ivBlock.setImageDrawable(null);
else {
ivBlock.setContentDescription(null);
} else {
ivBlock.setImageResource(block > 0 ? R.drawable.host_blocked : R.drawable.host_allowed);
ivBlock.setContentDescription(context.getString(block > 0 ? R.string.blocked : R.string.allowed));
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
Drawable wrap = DrawableCompat.wrap(ivBlock.getDrawable());
DrawableCompat.setTint(wrap, block > 0 ? colorOff : colorOn);
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/eu/faircode/netguard/WidgetMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ private static void update(int[] appWidgetIds, AppWidgetManager appWidgetManager
RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widgetmain);
views.setOnClickPendingIntent(R.id.ivEnabled, pi);
views.setImageViewResource(R.id.ivEnabled, enabled ? R.drawable.ic_rocket_colour : R.drawable.ic_rocket_white_60);
views.setContentDescription(R.id.ivEnabled, context.getString(
enabled ? R.string.widget_toggle_disable_description
: R.string.widget_toggle_enable_description));
appWidgetManager.updateAppWidget(id, views);
}
} catch (Throwable ex) {
Expand Down
27 changes: 24 additions & 3 deletions app/src/main/java/net/kollnig/missioncontrol/InsightsHeaderAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,27 @@ public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
}

NumberFormat nf = NumberFormat.getNumberInstance(Locale.getDefault());
holder.tvBlocked.setText(nf.format(data.getTotalTrackingAttempts()));
holder.tvCompanies.setText(String.valueOf(data.getUniqueTrackerCompanies()));
String blockedText = nf.format(data.getTotalTrackingAttempts());
String companiesText = String.valueOf(data.getUniqueTrackerCompanies());
holder.tvBlocked.setText(blockedText);
holder.tvCompanies.setText(companiesText);

// Protection percentage + bar (weights divide the bar into blocked/allowed)
int pct = data.getBlockedPercentage();
holder.tvBlockedPct.setText(pct + "%");
String pctText = pct + "%";
holder.tvBlockedPct.setText(pctText);

// Group each stat number + label so TalkBack announces them as a
// single unit instead of two separate reads.
holder.llBlockedStat.setContentDescription(
context.getString(R.string.accessibility_stat_description, blockedText,
context.getString(R.string.insights_tracking_attempts)));
holder.llCompaniesStat.setContentDescription(
context.getString(R.string.accessibility_stat_description, companiesText,
context.getString(R.string.insights_tracker_companies)));
holder.llBlockedPctStat.setContentDescription(
context.getString(R.string.accessibility_stat_description, pctText,
context.getString(R.string.insights_blocked)));
LinearLayout.LayoutParams blockedLp =
(LinearLayout.LayoutParams) holder.vBlockedProgress.getLayoutParams();
blockedLp.weight = pct;
Expand Down Expand Up @@ -280,6 +295,9 @@ static class ViewHolder extends RecyclerView.ViewHolder {
TextView tvBlockedPct;
View vBlockedProgress;
View vAllowedProgress;
View llBlockedStat;
View llCompaniesStat;
View llBlockedPctStat;

ViewHolder(View itemView) {
super(itemView);
Expand All @@ -292,6 +310,9 @@ static class ViewHolder extends RecyclerView.ViewHolder {
tvBlockedPct = itemView.findViewById(R.id.tvHeroBlockedPct);
vBlockedProgress = itemView.findViewById(R.id.vBlockedProgress);
vAllowedProgress = itemView.findViewById(R.id.vAllowedProgress);
llBlockedStat = itemView.findViewById(R.id.llHeroBlockedStat);
llCompaniesStat = itemView.findViewById(R.id.llHeroCompaniesStat);
llBlockedPctStat = itemView.findViewById(R.id.llHeroBlockedPctStat);
}
}
}
1 change: 1 addition & 0 deletions app/src/main/res/layout/activity_insights.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,7 @@
<ImageView
android:layout_width="64dp"
android:layout_height="64dp"
android:importantForAccessibility="no"
android:src="@drawable/ic_shield_off"
app:tint="?android:attr/textColorSecondary"
android:alpha="0.5" />
Expand Down
22 changes: 17 additions & 5 deletions app/src/main/res/layout/item_insights_header.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:alpha="0.9"
android:alpha="0.95"
android:text="@string/insights_subtitle_7days"
android:textColor="@android:color/white"
android:textSize="13sp"
Expand Down Expand Up @@ -92,23 +92,27 @@

<!-- Hosts contacted -->
<LinearLayout
android:id="@+id/llHeroBlockedStat"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:focusable="true"
android:orientation="vertical">

<TextView
android:id="@+id/tvHeroBlocked"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:importantForAccessibility="no"
android:textColor="@android:color/white"
android:textSize="36sp"
android:textStyle="bold" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0.85"
android:alpha="0.95"
android:importantForAccessibility="no"
android:text="@string/insights_tracking_attempts"
android:textColor="@android:color/white"
android:textSize="11sp" />
Expand All @@ -117,23 +121,27 @@

<!-- Companies count -->
<LinearLayout
android:id="@+id/llHeroCompaniesStat"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:focusable="true"
android:orientation="vertical">

<TextView
android:id="@+id/tvHeroCompanies"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:importantForAccessibility="no"
android:textColor="@android:color/white"
android:textSize="36sp"
android:textStyle="bold" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0.85"
android:alpha="0.95"
android:importantForAccessibility="no"
android:text="@string/insights_tracker_companies"
android:textColor="@android:color/white"
android:textSize="11sp" />
Expand All @@ -142,8 +150,10 @@

<!-- Protection % -->
<LinearLayout
android:id="@+id/llHeroBlockedPctStat"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="true"
android:gravity="end"
android:orientation="vertical">

Expand All @@ -152,15 +162,17 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:textColor="#A5D6A7"
android:importantForAccessibility="no"
android:textColor="#F1F8E9"
android:textSize="36sp"
android:textStyle="bold" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:alpha="0.85"
android:alpha="0.95"
android:importantForAccessibility="no"
android:text="@string/insights_blocked"
android:textColor="@android:color/white"
android:textSize="11sp" />
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/item_onboarding.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
android:layout_height="120dp"
android:layout_marginBottom="24dp"
android:layout_gravity="start"
android:importantForAccessibility="no"
android:src="@drawable/ic_rocket2"
app:tint="?attr/colorAccent" />

Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/item_onboarding_blocking_mode.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
android:layout_height="80dp"
android:layout_marginBottom="16dp"
android:layout_gravity="start"
android:importantForAccessibility="no"
android:src="@drawable/ic_rocket2"
app:tint="?attr/colorAccent" />

Expand Down
39 changes: 26 additions & 13 deletions app/src/main/res/layout/legend.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_rocket_colour"/>
android:src="@drawable/ic_rocket_colour"
android:importantForAccessibility="no"/>

<TextView
android:layout_width="wrap_content"
Expand Down Expand Up @@ -53,7 +54,8 @@
android:layout_gravity="center_vertical"
android:layout_margin="4dp"
android:background="?attr/colorPrimary"
android:src="@drawable/ic_rocket_white_60"/>
android:src="@drawable/ic_rocket_white_60"
android:importantForAccessibility="no"/>

<TextView
android:layout_width="wrap_content"
Expand All @@ -75,7 +77,8 @@
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:layout_margin="4dp"
android:src="?attr/iconQueue"/>
android:src="?attr/iconQueue"
android:importantForAccessibility="no"/>

<TextView
android:layout_width="wrap_content"
Expand All @@ -97,7 +100,8 @@
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:layout_margin="4dp"
android:src="?attr/iconMetered"/>
android:src="?attr/iconMetered"
android:importantForAccessibility="no"/>

<TextView
android:layout_width="wrap_content"
Expand All @@ -120,7 +124,8 @@
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:layout_margin="4dp"
android:src="@drawable/wifi_on"/>
android:src="@drawable/wifi_on"
android:importantForAccessibility="no"/>

<TextView
android:layout_width="wrap_content"
Expand All @@ -143,7 +148,8 @@
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:layout_margin="4dp"
android:src="@drawable/wifi_off"/>
android:src="@drawable/wifi_off"
android:importantForAccessibility="no"/>

<TextView
android:layout_width="wrap_content"
Expand All @@ -165,7 +171,8 @@
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:layout_margin="4dp"
android:src="@drawable/wifi_off_disabled"/>
android:src="@drawable/wifi_off_disabled"
android:importantForAccessibility="no"/>

<TextView
android:layout_width="wrap_content"
Expand All @@ -188,7 +195,8 @@
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:layout_margin="4dp"
android:src="@drawable/other_on"/>
android:src="@drawable/other_on"
android:importantForAccessibility="no"/>

<TextView
android:layout_width="wrap_content"
Expand All @@ -211,7 +219,8 @@
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:layout_margin="4dp"
android:src="@drawable/other_off"/>
android:src="@drawable/other_off"
android:importantForAccessibility="no"/>

<TextView
android:layout_width="wrap_content"
Expand All @@ -233,7 +242,8 @@
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:layout_margin="4dp"
android:src="@drawable/other_off_disabled"/>
android:src="@drawable/other_off_disabled"
android:importantForAccessibility="no"/>

<TextView
android:layout_width="wrap_content"
Expand All @@ -256,7 +266,8 @@
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:layout_margin="4dp"
android:src="@drawable/screen_on"/>
android:src="@drawable/screen_on"
android:importantForAccessibility="no"/>

<TextView
android:layout_width="wrap_content"
Expand Down Expand Up @@ -303,7 +314,8 @@
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:layout_margin="4dp"
android:src="@drawable/host_allowed"/>
android:src="@drawable/host_allowed"
android:importantForAccessibility="no"/>

<TextView
android:layout_width="wrap_content"
Expand All @@ -326,7 +338,8 @@
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:layout_margin="4dp"
android:src="@drawable/host_blocked"/>
android:src="@drawable/host_blocked"
android:importantForAccessibility="no"/>

<TextView
android:layout_width="wrap_content"
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,10 @@ Your internet traffic is not being sent to a remote VPN server.</string>
<string name="toggle_internet_unavailable_description">Internet access control unavailable for %1$s</string>
<!-- Dynamic content description for the per-category tracker-blocking switch -->
<string name="toggle_block_category_description">Tracker blocking for category %1$s</string>
<!-- Dynamic content description for the home-screen widget toggle (accessibility follow-up, issue #636) -->
<string name="widget_toggle_enable_description">Enable tracker blocking</string>
<string name="widget_toggle_disable_description">Disable tracker blocking</string>
<string name="accessibility_stat_description">%1$s, %2$s</string>
<plurals name="n_companies_found_week">
<item quantity="one">contacted %d company last week</item>
<item quantity="other">contacted %d companies last week</item>
Expand Down