Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/146059
Change subject: Adapt Captcha handler to night mode.
......................................................................
Adapt Captcha handler to night mode.
Change-Id: I7ab36d53d01b0d026777251f310354a3ca7b9b68
---
M wikipedia/res/layout/group_captcha.xml
M wikipedia/src/main/java/org/wikipedia/editing/CaptchaHandler.java
2 files changed, 16 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/59/146059/1
diff --git a/wikipedia/res/layout/group_captcha.xml
b/wikipedia/res/layout/group_captcha.xml
index ab574a2..eb56475 100644
--- a/wikipedia/res/layout/group_captcha.xml
+++ b/wikipedia/res/layout/group_captcha.xml
@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
- android:background="@android:color/background_light"
+ android:background="?attr/window_background_color"
android:orientation="vertical"
android:padding="16dp"
android:visibility="gone"
@@ -28,7 +28,6 @@
<ProgressBar
android:id="@+id/captcha_image_progress"
android:indeterminate="true"
- style="?android:progressBarStyleSmall"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="80dp"/>
diff --git a/wikipedia/src/main/java/org/wikipedia/editing/CaptchaHandler.java
b/wikipedia/src/main/java/org/wikipedia/editing/CaptchaHandler.java
index 750bed7..296b1aa 100644
--- a/wikipedia/src/main/java/org/wikipedia/editing/CaptchaHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/editing/CaptchaHandler.java
@@ -2,6 +2,7 @@
import android.app.Activity;
import android.app.ProgressDialog;
+import android.graphics.ColorMatrixColorFilter;
import android.net.Uri;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
@@ -15,6 +16,7 @@
import org.wikipedia.R;
import org.wikipedia.Site;
import org.wikipedia.ViewAnimations;
+import org.wikipedia.WikipediaApp;
public class CaptchaHandler {
private final Activity activity;
@@ -102,6 +104,19 @@
progressDialog.hide();
}
+ // for our Dark theme, show a "negative image" of the
captcha!
+ if (WikipediaApp.getInstance().getCurrentTheme() ==
WikipediaApp.THEME_DARK) {
+ float[] colorMatrixNegative = {
+ -1.0f, 0, 0, 0, 255, //red
+ 0, -1.0f, 0, 0, 255, //green
+ 0, 0, -1.0f, 0, 255, //blue
+ 0, 0, 0, 1.0f, 0 //alpha
+ };
+ captchaImage.getDrawable().setColorFilter(new
ColorMatrixColorFilter(colorMatrixNegative));
+ } else {
+ captchaImage.getDrawable().clearColorFilter();
+ }
+
// In case there was a captcha attempt before
captchaText.setText("");
if (isReload) {
--
To view, visit https://gerrit.wikimedia.org/r/146059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ab36d53d01b0d026777251f310354a3ca7b9b68
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
