[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Design tweaks in theme chooser dialog.

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/385992 )

Change subject: Design tweaks in theme chooser dialog.
..


Design tweaks in theme chooser dialog.

Bug: T173407
Change-Id: I402f1c18e20a3d89701082a74de0632c75c57edf
---
M app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
M app/src/main/java/org/wikipedia/views/DiscreteSeekBar.java
M app/src/main/res/drawable/ic_seek_bar_tick.xml
M app/src/main/res/layout/dialog_theme_chooser.xml
4 files changed, 24 insertions(+), 10 deletions(-)

Approvals:
  jenkins-bot: Verified
  Cooltey: Looks good to me, approved



diff --git a/app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java 
b/app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
index 03cda02..385d94a 100644
--- a/app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
+++ b/app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
@@ -2,6 +2,7 @@
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.SwitchCompat;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -21,6 +22,7 @@
 import org.wikipedia.settings.Prefs;
 import org.wikipedia.util.DimenUtil;
 import org.wikipedia.util.FeedbackUtil;
+import org.wikipedia.util.ResourceUtil;
 import org.wikipedia.views.DiscreteSeekBar;
 
 import butterknife.BindView;
@@ -159,6 +161,9 @@
 private void updateDimImagesSwitch() {
 dimImagesSwitch.setChecked(Prefs.shouldDimDarkModeImages());
 dimImagesSwitch.setEnabled(app.getCurrentTheme() == Theme.DARK);
+dimImagesSwitch.setTextColor(dimImagesSwitch.isEnabled()
+? ResourceUtil.getThemedColor(getContext(), 
R.attr.section_title_color)
+: ContextCompat.getColor(getContext(), R.color.black26));
 }
 
 private final class ThemeButtonListener implements View.OnClickListener {
diff --git a/app/src/main/java/org/wikipedia/views/DiscreteSeekBar.java 
b/app/src/main/java/org/wikipedia/views/DiscreteSeekBar.java
index 5101d8f..b620e01 100644
--- a/app/src/main/java/org/wikipedia/views/DiscreteSeekBar.java
+++ b/app/src/main/java/org/wikipedia/views/DiscreteSeekBar.java
@@ -6,6 +6,7 @@
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.AttrRes;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.util.AttributeSet;
@@ -62,11 +63,18 @@
 
 @Override
 protected synchronized void onDraw(Canvas canvas) {
-drawTickMarks(canvas);
-super.onDraw(canvas);
+int value = getValue();
+if (value >= 0) {
+drawTickMarks(canvas, true, false);
+super.onDraw(canvas);
+drawTickMarks(canvas, false, true);
+} else {
+super.onDraw(canvas);
+drawTickMarks(canvas, true, true);
+}
 }
 
-void drawTickMarks(Canvas canvas) {
+void drawTickMarks(@NonNull Canvas canvas, boolean drawCenter, boolean 
drawOther) {
 int max = getMax() + min;
 int value = getValue();
 if (tickDrawable != null) {
@@ -83,10 +91,10 @@
 canvas.save();
 canvas.translate((float) getPaddingLeft(), (float) (getHeight() / 2));
 for (int i = min; i <= max; ++i) {
-if (tickDrawable != null && i > value) {
+if (drawOther && tickDrawable != null && i > value) {
 tickDrawable.draw(canvas);
 }
-if (i == 0 && centerDrawable != null) {
+if (drawCenter && i == 0 && centerDrawable != null) {
 centerDrawable.draw(canvas);
 }
 canvas.translate(tickSpacing, 0.0f);
diff --git a/app/src/main/res/drawable/ic_seek_bar_tick.xml 
b/app/src/main/res/drawable/ic_seek_bar_tick.xml
index 4ddc38d..5483148 100644
--- a/app/src/main/res/drawable/ic_seek_bar_tick.xml
+++ b/app/src/main/res/drawable/ic_seek_bar_tick.xml
@@ -6,5 +6,5 @@
 
+android:fillColor="?attr/chart_shade1"/>
 
diff --git a/app/src/main/res/layout/dialog_theme_chooser.xml 
b/app/src/main/res/layout/dialog_theme_chooser.xml
index f08bc8d..e3d0ec6 100644
--- a/app/src/main/res/layout/dialog_theme_chooser.xml
+++ b/app/src/main/res/layout/dialog_theme_chooser.xml
@@ -26,8 +26,8 @@
 
 
@@ -36,7 +36,6 @@
 android:id="@+id/text_size_percent"
 android:layout_width="match_parent"
 android:layout_height="wrap_content"
-android:layout_marginTop="12dp"
 android:gravity="center"
 android:textSize="16sp"
 android:textColor="?attr/secondary_text_color"
@@ -45,7 +44,7 @@
 
+android:layout_marginTop="4dp">
 
 
 

-- 
To view, visit 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Design tweaks in theme chooser dialog.

[Dbrant (Code Review)]

Dbrant has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/385992 )

Change subject: Design tweaks in theme chooser dialog.
..

Design tweaks in theme chooser dialog.

Bug: T173407
Change-Id: I402f1c18e20a3d89701082a74de0632c75c57edf
---
M app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
M app/src/main/java/org/wikipedia/views/DiscreteSeekBar.java
M app/src/main/res/drawable/ic_seek_bar_tick.xml
M app/src/main/res/layout/dialog_theme_chooser.xml
4 files changed, 24 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/92/385992/1

diff --git a/app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java 
b/app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
index 03cda02..385d94a 100644
--- a/app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
+++ b/app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
@@ -2,6 +2,7 @@
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.SwitchCompat;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -21,6 +22,7 @@
 import org.wikipedia.settings.Prefs;
 import org.wikipedia.util.DimenUtil;
 import org.wikipedia.util.FeedbackUtil;
+import org.wikipedia.util.ResourceUtil;
 import org.wikipedia.views.DiscreteSeekBar;
 
 import butterknife.BindView;
@@ -159,6 +161,9 @@
 private void updateDimImagesSwitch() {
 dimImagesSwitch.setChecked(Prefs.shouldDimDarkModeImages());
 dimImagesSwitch.setEnabled(app.getCurrentTheme() == Theme.DARK);
+dimImagesSwitch.setTextColor(dimImagesSwitch.isEnabled()
+? ResourceUtil.getThemedColor(getContext(), 
R.attr.section_title_color)
+: ContextCompat.getColor(getContext(), R.color.black26));
 }
 
 private final class ThemeButtonListener implements View.OnClickListener {
diff --git a/app/src/main/java/org/wikipedia/views/DiscreteSeekBar.java 
b/app/src/main/java/org/wikipedia/views/DiscreteSeekBar.java
index 5101d8f..b620e01 100644
--- a/app/src/main/java/org/wikipedia/views/DiscreteSeekBar.java
+++ b/app/src/main/java/org/wikipedia/views/DiscreteSeekBar.java
@@ -6,6 +6,7 @@
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.AttrRes;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.util.AttributeSet;
@@ -62,11 +63,18 @@
 
 @Override
 protected synchronized void onDraw(Canvas canvas) {
-drawTickMarks(canvas);
-super.onDraw(canvas);
+int value = getValue();
+if (value >= 0) {
+drawTickMarks(canvas, true, false);
+super.onDraw(canvas);
+drawTickMarks(canvas, false, true);
+} else {
+super.onDraw(canvas);
+drawTickMarks(canvas, true, true);
+}
 }
 
-void drawTickMarks(Canvas canvas) {
+void drawTickMarks(@NonNull Canvas canvas, boolean drawCenter, boolean 
drawOther) {
 int max = getMax() + min;
 int value = getValue();
 if (tickDrawable != null) {
@@ -83,10 +91,10 @@
 canvas.save();
 canvas.translate((float) getPaddingLeft(), (float) (getHeight() / 2));
 for (int i = min; i <= max; ++i) {
-if (tickDrawable != null && i > value) {
+if (drawOther && tickDrawable != null && i > value) {
 tickDrawable.draw(canvas);
 }
-if (i == 0 && centerDrawable != null) {
+if (drawCenter && i == 0 && centerDrawable != null) {
 centerDrawable.draw(canvas);
 }
 canvas.translate(tickSpacing, 0.0f);
diff --git a/app/src/main/res/drawable/ic_seek_bar_tick.xml 
b/app/src/main/res/drawable/ic_seek_bar_tick.xml
index 4ddc38d..5483148 100644
--- a/app/src/main/res/drawable/ic_seek_bar_tick.xml
+++ b/app/src/main/res/drawable/ic_seek_bar_tick.xml
@@ -6,5 +6,5 @@
 
+android:fillColor="?attr/chart_shade1"/>
 
diff --git a/app/src/main/res/layout/dialog_theme_chooser.xml 
b/app/src/main/res/layout/dialog_theme_chooser.xml
index f08bc8d..e3d0ec6 100644
--- a/app/src/main/res/layout/dialog_theme_chooser.xml
+++ b/app/src/main/res/layout/dialog_theme_chooser.xml
@@ -26,8 +26,8 @@
 
 
@@ -36,7 +36,6 @@
 android:id="@+id/text_size_percent"
 android:layout_width="match_parent"
 android:layout_height="wrap_content"
-android:layout_marginTop="12dp"
 android:gravity="center"
 android:textSize="16sp"
 android:textColor="?attr/secondary_text_color"
@@ -45,7 +44,7 @@
 
+android:layout_marginTop="4dp">
 
 
 

-- 
To view, visit