[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update revert help dialog styling

[jenkins-bot (Code Review)]

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

Change subject: Update revert help dialog styling
..


Update revert help dialog styling

Bug: T150477
Change-Id: I832883b56c656cbdfcf484abc45903f2076a6f98
---
M 
app/src/main/java/org/wikipedia/descriptions/DescriptionEditRevertHelpView.java
M app/src/main/res/layout/view_description_edit_revert_help.xml
M app/src/main/res/values/strings.xml
M app/src/main/res/values/strings_no_translate.xml
4 files changed, 21 insertions(+), 12 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditRevertHelpView.java
 
b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditRevertHelpView.java
index 6095d92..00df197 100644
--- 
a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditRevertHelpView.java
+++ 
b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditRevertHelpView.java
@@ -4,12 +4,17 @@
 import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.annotation.StringRes;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
+import android.text.style.BulletSpan;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
 import org.wikipedia.R;
 import org.wikipedia.WikipediaApp;
+import org.wikipedia.util.DimenUtil;
 import org.wikipedia.util.StringUtil;
 
 import butterknife.BindView;
@@ -23,21 +28,24 @@
 init(qNumber);
 }
 
-private void init(@NonNull String qNumber) {
+@SuppressWarnings("checkstyle:magicnumber") private void init(@NonNull 
String qNumber) {
 inflate(getContext(), R.layout.view_description_edit_revert_help, 
this);
 ButterKnife.bind(this);
 helpText.setMovementMethod(new LinkMovementMethod());
 
-String helpStr = getString(R.string.description_edit_revert_help_body)
+Spanned helpStr = 
StringUtil.fromHtml(getString(R.string.description_edit_revert_help_body)
 .replaceAll(":revertSubtitle", 
getString(R.string.description_edit_revert_subtitle))
 .replaceAll(":revertIntro", 
getString(R.string.description_edit_revert_intro))
-.replaceAll(":revertReason1",
-
String.format(getString(R.string.description_edit_revert_reason1), 
getString(R.string.wikidata_description_guide_url)))
-.replaceAll(":revertReason2", 
getString(R.string.description_edit_revert_reason2))
 .replaceAll(":revertHistory",
-
String.format(getString(R.string.description_edit_revert_history), 
getHistoryUri(qNumber)));
+
String.format(getString(R.string.description_edit_revert_history), 
getHistoryUri(qNumber;
 
-helpText.setText(StringUtil.fromHtml(helpStr));
+int gapWidth = DimenUtil.roundedDpToPx(8);
+SpannableString revertReason1 = new 
SpannableString(StringUtil.fromHtml(String.format(getString(R.string.description_edit_revert_reason1),
 getString(R.string.wikidata_description_guide_url;
+SpannableString revertReason2 = new 
SpannableString(StringUtil.fromHtml(getString(R.string.description_edit_revert_reason2)));
+revertReason1.setSpan(new BulletSpan(gapWidth), 0, 
revertReason1.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+revertReason2.setSpan(new BulletSpan(gapWidth), 0, 
revertReason2.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+SpannableString helpSpan = new 
SpannableString(TextUtils.expandTemplate(helpStr, revertReason1, 
revertReason2));
+helpText.setText(helpSpan);
 }
 
 private Uri getHistoryUri(@NonNull String qNumber) {
diff --git a/app/src/main/res/layout/view_description_edit_revert_help.xml 
b/app/src/main/res/layout/view_description_edit_revert_help.xml
index 2a5eb4d..d5054d1 100644
--- a/app/src/main/res/layout/view_description_edit_revert_help.xml
+++ b/app/src/main/res/layout/view_description_edit_revert_help.xml
@@ -10,8 +10,9 @@
 android:layout_width="match_parent"
 android:layout_height="wrap_content"
 style="@style/RtlAwareTextView"
-android:layout_margin="20dp"
-android:lineSpacingMultiplier="1.2"
+android:layout_margin="24dp"
+android:textSize="16sp"
+android:lineSpacingMultiplier="1.25"
 tools:text="Lorem ipsum"/>
 
 
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index 3f29387..09bc33d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -404,7 +404,7 @@
 We know you tried your best, 
but one of the reviewers had a concern. Possible reasons your edit was reverted 
include:
 
 your contribution 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update revert help dialog styling

[Mholloway (Code Review)]

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

Change subject: Update revert help dialog styling
..

Update revert help dialog styling

Bug: T150477
Change-Id: I832883b56c656cbdfcf484abc45903f2076a6f98
---
M 
app/src/main/java/org/wikipedia/descriptions/DescriptionEditRevertHelpView.java
M app/src/main/res/layout/view_description_edit_revert_help.xml
M app/src/main/res/values/strings_no_translate.xml
3 files changed, 18 insertions(+), 11 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditRevertHelpView.java
 
b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditRevertHelpView.java
index 6095d92..beee04d 100644
--- 
a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditRevertHelpView.java
+++ 
b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditRevertHelpView.java
@@ -4,7 +4,11 @@
 import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.annotation.StringRes;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
+import android.text.style.BulletSpan;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
@@ -23,21 +27,23 @@
 init(qNumber);
 }
 
-private void init(@NonNull String qNumber) {
+@SuppressWarnings("checkstyle:magicnumber") private void init(@NonNull 
String qNumber) {
 inflate(getContext(), R.layout.view_description_edit_revert_help, 
this);
 ButterKnife.bind(this);
 helpText.setMovementMethod(new LinkMovementMethod());
 
-String helpStr = getString(R.string.description_edit_revert_help_body)
+Spanned helpStr = 
StringUtil.fromHtml(getString(R.string.description_edit_revert_help_body)
 .replaceAll(":revertSubtitle", 
getString(R.string.description_edit_revert_subtitle))
 .replaceAll(":revertIntro", 
getString(R.string.description_edit_revert_intro))
-.replaceAll(":revertReason1",
-
String.format(getString(R.string.description_edit_revert_reason1), 
getString(R.string.wikidata_description_guide_url)))
-.replaceAll(":revertReason2", 
getString(R.string.description_edit_revert_reason2))
 .replaceAll(":revertHistory",
-
String.format(getString(R.string.description_edit_revert_history), 
getHistoryUri(qNumber)));
+
String.format(getString(R.string.description_edit_revert_history), 
getHistoryUri(qNumber;
 
-helpText.setText(StringUtil.fromHtml(helpStr));
+SpannableString revertReason1 = new 
SpannableString(StringUtil.fromHtml(String.format(getString(R.string.description_edit_revert_reason1),
 getString(R.string.wikidata_description_guide_url;
+SpannableString revertReason2 = new 
SpannableString(StringUtil.fromHtml(getString(R.string.description_edit_revert_reason2)));
+revertReason1.setSpan(new BulletSpan(16), 0, revertReason1.length(), 
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+revertReason2.setSpan(new BulletSpan(16), 0, revertReason2.length(), 
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+SpannableString helpSpan = new 
SpannableString(TextUtils.expandTemplate(helpStr, revertReason1, 
revertReason2));
+helpText.setText(helpSpan);
 }
 
 private Uri getHistoryUri(@NonNull String qNumber) {
diff --git a/app/src/main/res/layout/view_description_edit_revert_help.xml 
b/app/src/main/res/layout/view_description_edit_revert_help.xml
index 2a5eb4d..d5054d1 100644
--- a/app/src/main/res/layout/view_description_edit_revert_help.xml
+++ b/app/src/main/res/layout/view_description_edit_revert_help.xml
@@ -10,8 +10,9 @@
 android:layout_width="match_parent"
 android:layout_height="wrap_content"
 style="@style/RtlAwareTextView"
-android:layout_margin="20dp"
-android:lineSpacingMultiplier="1.2"
+android:layout_margin="24dp"
+android:textSize="16sp"
+android:lineSpacingMultiplier="1.25"
 tools:text="Lorem ipsum"/>
 
 
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_no_translate.xml 
b/app/src/main/res/values/strings_no_translate.xml
index c845987..0631aca 100644
--- a/app/src/main/res/values/strings_no_translate.xml
+++ b/app/src/main/res/values/strings_no_translate.xml
@@ -95,10 +95,10 @@
 :revertSubtitle
 :revertIntro
 
-• :revertReason1
+^1
 
 
-• :revertReason2
+^2
 
 :revertHistory
 ]]>

-- 
To view, visit https://gerrit.wikimedia.org/r/338278
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange