diff options
| author | cyBerta <cyberta@riseup.net> | 2025-03-19 11:34:17 +0100 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2025-03-19 11:20:05 +0000 |
| commit | e8f9623bcdd5ea1414ce2b513c601d4993284e6e (patch) | |
| tree | a0d5311200f83ccab543d796acc2a01cb4e5d09f | |
| parent | a57dba75a11e6b0f5e4ff9643688c5034372c1cc (diff) | |
fix UI: Disable manual circumvention settings if prefer UDP is turned on
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/base/fragments/SettingsFragment.java | 1 | ||||
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/base/views/IconTextEntry.java | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/SettingsFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/SettingsFragment.java index 598f9908..d4d72812 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/SettingsFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/SettingsFragment.java @@ -153,6 +153,7 @@ public class SettingsFragment extends Fragment implements SharedPreferences.OnSh //bridges can be enabled not only from here but also from error handling boolean useUDP = getPreferUDP() && useUdpEntry.isEnabled(); manualConfiguration.setEnabled(!useUDP); + manualConfigurationSwitch.setVisibility(useUDP ? GONE : VISIBLE); manualConfiguration.setSubtitle(getString(useUDP ? R.string.disabled_while_udp_on : R.string.manual_bridge_description)); } diff --git a/app/src/main/java/se/leap/bitmaskclient/base/views/IconTextEntry.java b/app/src/main/java/se/leap/bitmaskclient/base/views/IconTextEntry.java index 7aefd089..57a33bf4 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/views/IconTextEntry.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/views/IconTextEntry.java @@ -108,4 +108,10 @@ public class IconTextEntry extends LinearLayout { iconView.setImageResource(id); } + @Override + public void setEnabled(boolean enabled) { + super.setEnabled(enabled); + textView.setTextColor(getResources().getColor(enabled ? android.R.color.black : R.color.colorDisabled)); + iconView.setImageAlpha(enabled ? 255 : 128); + } } |