Skip to content

Add invert colors accessibility support #269

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
merged 1 commit into from
Apr 19, 2022
Merged

Add invert colors accessibility support #269

Show file tree
Hide file tree
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
83 changes: 46 additions & 37 deletions shell/platform/tizen/accessibility_settings.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,48 +9,49 @@

// SYSTEM_SETTINGS_KEY_MENU_SYSTEM_ACCESSIBILITY_HIGHCONTRAST = 10059 has been
// defined in system_settings_keys.h only for TV profile.
#define SYSTEM_SETTINGS_KEY_MENU_SYSTEM_ACCESSIBILITY_HIGHCONTRAST 10059
#define SYSTEM_SETTINGS_KEY_ACCESSIBILITY_HIGHCONTRAST \
system_settings_key_e(10059)

namespace flutter {

AccessibilitySettings::AccessibilitySettings(FlutterTizenEngine* engine)
: engine_(engine) {
#ifndef WEARABLE_PROFILE
bool tts_enabled = false;
int result = system_settings_get_value_bool(
int ret = system_settings_get_value_bool(
SYSTEM_SETTINGS_KEY_ACCESSIBILITY_TTS, &tts_enabled);
if (result == SYSTEM_SETTINGS_ERROR_NONE) {
if (tts_enabled) {
screen_reader_enabled_ = tts_enabled;
engine_->SetSemanticsEnabled(tts_enabled);
}
} else {
if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
FT_LOG(Error) << "Failed to get value of accessibility tts.";
}

// Add listener for accessibility tts
if (tts_enabled) {
screen_reader_enabled_ = tts_enabled;
engine_->SetSemanticsEnabled(tts_enabled);
}
system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_ACCESSIBILITY_TTS,
OnScreenReaderStateChanged, this);
#endif

#ifdef TV_PROFILE
// Set initialized value of accessibility high contrast.
int high_contrast_enabled = 0;
result = system_settings_get_value_int(
system_settings_key_e(
SYSTEM_SETTINGS_KEY_MENU_SYSTEM_ACCESSIBILITY_HIGHCONTRAST),
&high_contrast_enabled);
if (result == SYSTEM_SETTINGS_ERROR_NONE) {
engine_->UpdateAccessibilityFeatures(false, high_contrast_enabled);
} else {
bool nagative_color = false;
ret = system_settings_get_value_bool(
SYSTEM_SETTINGS_KEY_ACCESSIBILITY_NEGATIVE_COLOR, &nagative_color);
if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
FT_LOG(Error) << "Failed to get value of accessibility negative color.";
}
system_settings_set_changed_cb(
SYSTEM_SETTINGS_KEY_ACCESSIBILITY_NEGATIVE_COLOR,
OnAccessibilityFeatureStateChanged, this);

int high_contrast = 0;
ret = system_settings_get_value_int(
SYSTEM_SETTINGS_KEY_ACCESSIBILITY_HIGHCONTRAST, &high_contrast);
if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
FT_LOG(Error) << "Failed to get value of accessibility high contrast.";
}
system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_ACCESSIBILITY_HIGHCONTRAST,
OnAccessibilityFeatureStateChanged, this);

// Add listener for accessibility high contrast.
system_settings_set_changed_cb(
system_settings_key_e(
SYSTEM_SETTINGS_KEY_MENU_SYSTEM_ACCESSIBILITY_HIGHCONTRAST),
OnHighContrastStateChanged, this);
engine_->UpdateAccessibilityFeatures(nagative_color, high_contrast);
#endif
}

Expand All @@ -59,27 +60,34 @@ AccessibilitySettings::~AccessibilitySettings() {
system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_ACCESSIBILITY_TTS);
#endif
#ifdef TV_PROFILE
system_settings_unset_changed_cb(system_settings_key_e(
SYSTEM_SETTINGS_KEY_MENU_SYSTEM_ACCESSIBILITY_HIGHCONTRAST));
system_settings_unset_changed_cb(
SYSTEM_SETTINGS_KEY_ACCESSIBILITY_NEGATIVE_COLOR);
system_settings_unset_changed_cb(
SYSTEM_SETTINGS_KEY_ACCESSIBILITY_HIGHCONTRAST);
#endif
}

void AccessibilitySettings::OnHighContrastStateChanged(
void AccessibilitySettings::OnAccessibilityFeatureStateChanged(
system_settings_key_e key,
void* user_data) {
#ifdef TV_PROFILE
auto* self = reinterpret_cast<AccessibilitySettings*>(user_data);
int enabled = 0;
int result = system_settings_get_value_int(
system_settings_key_e(
SYSTEM_SETTINGS_KEY_MENU_SYSTEM_ACCESSIBILITY_HIGHCONTRAST),
&enabled);
if (result != SYSTEM_SETTINGS_ERROR_NONE) {

bool nagative_color = false;
int ret = system_settings_get_value_bool(
SYSTEM_SETTINGS_KEY_ACCESSIBILITY_NEGATIVE_COLOR, &nagative_color);
if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
FT_LOG(Error) << "Failed to get value of accessibility negative color.";
}

int high_contrast = 0;
ret = system_settings_get_value_int(
SYSTEM_SETTINGS_KEY_ACCESSIBILITY_HIGHCONTRAST, &high_contrast);
if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
FT_LOG(Error) << "Failed to get value of accessibility high contrast.";
return;
}

self->engine_->UpdateAccessibilityFeatures(false, enabled);
self->engine_->UpdateAccessibilityFeatures(nagative_color, high_contrast);
#endif
}

Expand All @@ -88,9 +96,10 @@ void AccessibilitySettings::OnScreenReaderStateChanged(
void* user_data) {
#ifndef WEARABLE_PROFILE
auto* self = reinterpret_cast<AccessibilitySettings*>(user_data);

bool enabled = false;
int result = system_settings_get_value_bool(key, &enabled);
if (result != SYSTEM_SETTINGS_ERROR_NONE) {
int ret = system_settings_get_value_bool(key, &enabled);
if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
FT_LOG(Error) << "Failed to get value of accessibility tts.";
return;
}
Expand Down
4 changes: 2 additions & 2 deletions shell/platform/tizen/accessibility_settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ class AccessibilitySettings {
virtual ~AccessibilitySettings();

private:
static void OnHighContrastStateChanged(system_settings_key_e key,
void* user_data);
static void OnAccessibilityFeatureStateChanged(system_settings_key_e key,
void* user_data);
static void OnScreenReaderStateChanged(system_settings_key_e key,
void* user_data);

Expand Down