From 2e55ceba0c76ee11438020c213d9051e0d13c851 Mon Sep 17 00:00:00 2001 From: Nesswit Date: Tue, 5 Jan 2016 01:22:35 +0900 Subject: [PATCH] Add increase contrast filter --- .../fragment/AdvancedSettingsFragment.java | 9 ++++++++- .../acr/browser/lightning/view/LightningView.java | 13 +++++++++++++ app/src/main/res/values-ko/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/acr/browser/lightning/fragment/AdvancedSettingsFragment.java b/app/src/main/java/acr/browser/lightning/fragment/AdvancedSettingsFragment.java index a7a4b1c..b3aa410 100644 --- a/app/src/main/java/acr/browser/lightning/fragment/AdvancedSettingsFragment.java +++ b/app/src/main/java/acr/browser/lightning/fragment/AdvancedSettingsFragment.java @@ -73,6 +73,9 @@ public class AdvancedSettingsFragment extends LightningPreferenceFragment implem case 3: renderingmode.setSummary(getString(R.string.name_inverted_grayscale)); break; + case 4: + renderingmode.setSummary(getString(R.string.name_increase_contrast)); + break; } textEncoding.setSummary(mPreferenceManager.getTextEncoding()); @@ -135,7 +138,8 @@ public class AdvancedSettingsFragment extends LightningPreferenceFragment implem CharSequence[] chars = {mActivity.getString(R.string.name_normal), mActivity.getString(R.string.name_inverted), mActivity.getString(R.string.name_grayscale), - mActivity.getString(R.string.name_inverted_grayscale)}; + mActivity.getString(R.string.name_inverted_grayscale), + mActivity.getString(R.string.name_increase_contrast)}; int n = mPreferenceManager.getRenderingMode(); @@ -156,6 +160,9 @@ public class AdvancedSettingsFragment extends LightningPreferenceFragment implem case 3: renderingmode.setSummary(getString(R.string.name_inverted_grayscale)); break; + case 4: + renderingmode.setSummary(getString(R.string.name_increase_contrast)); + break; } } }); diff --git a/app/src/main/java/acr/browser/lightning/view/LightningView.java b/app/src/main/java/acr/browser/lightning/view/LightningView.java index ff80b8b..ff56f51 100644 --- a/app/src/main/java/acr/browser/lightning/view/LightningView.java +++ b/app/src/main/java/acr/browser/lightning/view/LightningView.java @@ -85,6 +85,12 @@ public class LightningView { 0, 0, -1.0f, 0, 255, // blue 0, 0, 0, 1.0f, 0 // alpha }; + private static final float[] mIncreaseContrastColorArray = { + 2.0f, 0, 0, 0, -160.f, // red + 0, 2.0f, 0, 0, -160.f, // green + 0, 0, 2.0f, 0, -160.f, // blue + 0, 0, 0, 1.0f, 0 // alpha + }; private final WebViewHandler mWebViewHandler = new WebViewHandler(this); private final Map mRequestHeaders = new ArrayMap<>(); @@ -506,6 +512,13 @@ public class LightningView { mInvertPage = true; break; + case 4: + ColorMatrixColorFilter IncreaseHighContrast = new ColorMatrixColorFilter( + mIncreaseContrastColorArray); + mPaint.setColorFilter(IncreaseHighContrast); + setHardwareRendering(); + break; + } } diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 1b0b128..7d95a0a 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -135,6 +135,7 @@ 반전 그레이스케일 반전된 그레이스케일 + 대비 증가 보통 Google과 기록 동기화 파일 선택기 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e33b2b4..a1b867a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -175,6 +175,7 @@ Inverted Grayscale Inverted Grayscale + Increase Contrast Normal Sync history with Google File Chooser