jenkins-bot has submitted this change and it was merged.
Change subject: Fix Wikipedia logo on About page
......................................................................
Fix Wikipedia logo on About page
Bug: T104491
Change-Id: I9991619a30ca7108cd26e3de6b54f7d23ba31572
---
M app/src/main/java/org/wikipedia/richtext/RichTextUtil.java
A app/src/main/java/org/wikipedia/richtext/URLSpanNoUnderline.java
M app/src/main/java/org/wikipedia/settings/AboutActivity.java
D app/src/main/res/drawable-hdpi/about_logo.png
D app/src/main/res/drawable-mdpi/about_logo.png
D app/src/main/res/drawable-xhdpi/about_logo.png
D app/src/main/res/drawable-xxhdpi/about_logo.png
M app/src/main/res/drawable/splash_bg.xml
M app/src/main/res/layout/activity_about.xml
M app/src/main/res/layout/widget_featured_page.xml
M app/src/main/res/layout/widget_search.xml
M app/src/main/res/values/strings.xml
12 files changed, 116 insertions(+), 67 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/richtext/RichTextUtil.java
b/app/src/main/java/org/wikipedia/richtext/RichTextUtil.java
index 3089897..6b6bddc 100644
--- a/app/src/main/java/org/wikipedia/richtext/RichTextUtil.java
+++ b/app/src/main/java/org/wikipedia/richtext/RichTextUtil.java
@@ -4,6 +4,8 @@
import android.text.Spannable;
import android.text.SpannableString;
import android.text.Spanned;
+import android.text.style.URLSpan;
+import android.widget.TextView;
import java.util.ArrayList;
import java.util.Collection;
@@ -80,5 +82,25 @@
return (spanned.getSpanFlags(span) & flags) == flags;
}
+ public static void removeUnderlinesFromLinks(@NonNull TextView textView) {
+ CharSequence text = textView.getText();
+ if (text instanceof Spanned) {
+ Spannable spannable = new SpannableString(text);
+ removeUnderlinesFromLinks(spannable, spannable.getSpans(0,
spannable.length(), URLSpan.class));
+ textView.setText(spannable);
+ }
+ }
+
+ public static void removeUnderlinesFromLinks(@NonNull Spannable spannable,
+ @NonNull URLSpan[] spans) {
+ for (URLSpan span: spans) {
+ int start = spannable.getSpanStart(span);
+ int end = spannable.getSpanEnd(span);
+ spannable.removeSpan(span);
+ span = new URLSpanNoUnderline(span.getURL());
+ spannable.setSpan(span, start, end, 0);
+ }
+ }
+
private RichTextUtil() { }
}
\ No newline at end of file
diff --git a/app/src/main/java/org/wikipedia/richtext/URLSpanNoUnderline.java
b/app/src/main/java/org/wikipedia/richtext/URLSpanNoUnderline.java
new file mode 100644
index 0000000..297f1a1
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/richtext/URLSpanNoUnderline.java
@@ -0,0 +1,15 @@
+package org.wikipedia.richtext;
+
+import android.text.TextPaint;
+import android.text.style.URLSpan;
+
+public class URLSpanNoUnderline extends URLSpan {
+ public URLSpanNoUnderline(String url) {
+ super(url);
+ }
+
+ @Override public void updateDrawState(TextPaint paint) {
+ super.updateDrawState(paint);
+ paint.setUnderlineText(false);
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/wikipedia/settings/AboutActivity.java
b/app/src/main/java/org/wikipedia/settings/AboutActivity.java
index 698e192..034c8ab 100644
--- a/app/src/main/java/org/wikipedia/settings/AboutActivity.java
+++ b/app/src/main/java/org/wikipedia/settings/AboutActivity.java
@@ -14,10 +14,14 @@
import org.wikipedia.BuildConfig;
import org.wikipedia.R;
+import org.wikipedia.WikipediaApp;
import org.wikipedia.activity.ActivityUtil;
import org.wikipedia.activity.ThemedActionBarActivity;
-import org.wikipedia.WikipediaApp;
+import org.wikipedia.richtext.RichTextUtil;
import org.wikipedia.util.FeedbackUtil;
+
+import butterknife.Bind;
+import butterknife.ButterKnife;
import static org.wikipedia.util.DeviceUtil.mailAppExists;
@@ -26,27 +30,36 @@
private static final String KEY_SCROLL_Y = "KEY_SCROLL_Y";
private ScrollView mScrollView;
+ @Bind(R.id.about_translators) TextView translatorsTextView;
+ @Bind(R.id.activity_about_libraries) TextView librariesTextView;
+ @Bind(R.id.send_feedback_text) TextView feedbackTextView;
+ @Bind(R.id.about_wmf) TextView wmfTextView;
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_about);
+ ButterKnife.bind(this);
mScrollView = (ScrollView) findViewById(R.id.about_scrollview);
- ((TextView)
findViewById(R.id.about_translators)).setText(Html.fromHtml(getString(R.string.about_translators_translatewiki)));
- ((TextView)
findViewById(R.id.about_wmf)).setText(Html.fromHtml(getString(R.string.about_wmf)));
+
translatorsTextView.setText(Html.fromHtml(getString(R.string.about_translators_translatewiki)));
+ RichTextUtil.removeUnderlinesFromLinks(translatorsTextView);
+ wmfTextView.setText(Html.fromHtml(getString(R.string.about_wmf)));
+ RichTextUtil.removeUnderlinesFromLinks(wmfTextView);
((TextView)
findViewById(R.id.about_version_text)).setText(BuildConfig.VERSION_NAME);
- ((TextView)
findViewById(R.id.send_feedback_text)).setText(Html.fromHtml(
+ feedbackTextView.setText(Html.fromHtml(
"<a
href=\"mailto:[email protected]?subject=Android App "
+ BuildConfig.VERSION_NAME
+ " Feedback\">"
+ getString(R.string.send_feedback)
+ "</a>"));
+ RichTextUtil.removeUnderlinesFromLinks(feedbackTextView);
+ RichTextUtil.removeUnderlinesFromLinks(librariesTextView);
findViewById(R.id.about_logo_image).setOnClickListener(new
AboutLogoClickListener(this));
//if there's no Email app, hide the Feedback link.
if (!mailAppExists(this)) {
- findViewById(R.id.send_feedback_text).setVisibility(View.GONE);
+ feedbackTextView.setVisibility(View.GONE);
}
WikipediaApp.getInstance().adjustDrawableToTheme(((ImageView)
findViewById(R.id.about_logo_image)).getDrawable());
diff --git a/app/src/main/res/drawable-hdpi/about_logo.png
b/app/src/main/res/drawable-hdpi/about_logo.png
deleted file mode 100644
index 60650cf..0000000
--- a/app/src/main/res/drawable-hdpi/about_logo.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/about_logo.png
b/app/src/main/res/drawable-mdpi/about_logo.png
deleted file mode 100644
index 0283ef6..0000000
--- a/app/src/main/res/drawable-mdpi/about_logo.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/about_logo.png
b/app/src/main/res/drawable-xhdpi/about_logo.png
deleted file mode 100644
index eb02956..0000000
--- a/app/src/main/res/drawable-xhdpi/about_logo.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/about_logo.png
b/app/src/main/res/drawable-xxhdpi/about_logo.png
deleted file mode 100644
index 3628d4f..0000000
--- a/app/src/main/res/drawable-xxhdpi/about_logo.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable/splash_bg.xml
b/app/src/main/res/drawable/splash_bg.xml
index aeb694e..aa68da9 100644
--- a/app/src/main/res/drawable/splash_bg.xml
+++ b/app/src/main/res/drawable/splash_bg.xml
@@ -4,7 +4,7 @@
<item>
<!-- Use a bitmap element with centered gravity to prevent scaling. -->
<bitmap
- android:src="@drawable/about_logo"
+ android:src="@drawable/w_nav_mark"
android:antialias="true"
android:gravity="center" />
</item>
diff --git a/app/src/main/res/layout/activity_about.xml
b/app/src/main/res/layout/activity_about.xml
index 9efd68a..49dbc65 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -14,45 +14,45 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="24dp"
+ android:gravity="center"
>
+ <ImageView
+ android:id="@+id/about_logo_image"
+ android:layout_width="48dp"
+ android:layout_height="48dp"
+ android:src="@drawable/w_nav_mark"
+ android:contentDescription="@null"
+
+ />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:layout_marginBottom="8dp"
>
- <ImageView
- android:id="@+id/about_logo_image"
- android:layout_width="96dp"
- android:layout_height="96dp"
- android:src="@drawable/about_logo"
- android:contentDescription="@null"
- />
<LinearLayout android:layout_width="0dp"
android:layout_height="wrap_content"
- android:minHeight="72dp"
+
android:layout_weight="1"
android:orientation="vertical"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
>
- <TextView android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:minHeight="48dp"
- style="?android:textAppearanceLarge"
- android:gravity="top"
- android:layout_gravity="top"
- android:fontFamily="serif"
- android:textSize="32sp"
- android:text="@string/app_name" />
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:src="@drawable/wp_wordmark"
+ android:tint="@color/gray_highlight"
+ android:contentDescription="@null"
+ />
<TextView android:id="@+id/about_version_text"
android:layout_width="wrap_content"
- android:layout_height="24dp"
+ android:layout_height="wrap_content"
tools:text="2.x-sample-version"
- style="?android:textAppearanceMedium"
+ style="?android:textAppearanceSmall"
android:textIsSelectable="true"
- android:gravity="bottom"
- />
+ android:textColor="#888"
+ />
</LinearLayout>
</LinearLayout>
@@ -62,10 +62,7 @@
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
style="?android:textAppearanceSmall"
- android:fontFamily="serif"
- android:text="@string/about_contributors_heading"
- android:textColor="#888"
- />
+ android:text="@string/about_contributors_heading" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -84,10 +81,7 @@
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
style="?android:textAppearanceSmall"
- android:fontFamily="serif"
- android:text="@string/about_translators_heading"
- android:textColor="#888"
- />
+ android:text="@string/about_translators_heading" />
<TextView
android:id="@+id/about_translators"
android:layout_width="match_parent"
@@ -106,13 +100,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="?android:textAppearanceSmall"
- android:fontFamily="serif"
android:text="@string/about_libraries_heading"
- android:textColor="#888"
android:layout_marginTop="8dp"
- android:layout_marginBottom="8dp"
- />
+ android:layout_marginBottom="8dp" />
<TextView
+ android:id="@+id/activity_about_libraries"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layoutDirection="ltr"
@@ -127,34 +119,41 @@
<TextView
android:id="@+id/send_feedback_text"
- android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/send_feedback"
- android:gravity="center_horizontal"
- style="?android:textAppearanceSmall"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ tools:text="@string/send_feedback"
+ style="?android:textAppearanceMedium"
android:textColor="#555"
android:textColorLink="?attr/link_color"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="32dp"
android:layout_marginBottom="8dp"
/>
- <LinearLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_marginTop="8dp"
- >
- <ImageView android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/wmf_logo" android:padding="4dp"
- android:contentDescription="@null"
- />
- <TextView android:id="@+id/about_wmf"
- android:layout_width="0dp"
android:layout_height="match_parent"
- android:gravity="center_vertical"
android:text="@string/about_wmf"
- style="?android:textAppearanceSmall"
- android:textIsSelectable="true"
- android:layout_weight="1"
- android:textColor="#555"
- android:textColorLink="?attr/link_color"
- />
- </LinearLayout>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1px"
+ android:layout_marginTop="12dp"
+ android:layout_marginBottom="12dp"
+ android:background="@color/gray_background" />
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="12dp"
+ android:padding="4dp"
+ android:src="@drawable/wmf_logo"
+ android:contentDescription="@null" />
+
+ <TextView
+ android:id="@+id/about_wmf"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/about_wmf"
+ style="?android:textAppearanceSmall"
+ android:textIsSelectable="true"
+ android:layout_weight="1"
+ android:textColor="#555"
+ android:textColorLink="?attr/link_color" />
</LinearLayout>
</ScrollView>
diff --git a/app/src/main/res/layout/widget_featured_page.xml
b/app/src/main/res/layout/widget_featured_page.xml
index fc3085f..ac9519e 100644
--- a/app/src/main/res/layout/widget_featured_page.xml
+++ b/app/src/main/res/layout/widget_featured_page.xml
@@ -13,7 +13,7 @@
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:layout_marginTop="2dp"
- android:src="@drawable/about_logo"
+ android:src="@drawable/w_nav_mark"
android:contentDescription="@null"
android:layout_gravity="center_vertical"/>
<LinearLayout
diff --git a/app/src/main/res/layout/widget_search.xml
b/app/src/main/res/layout/widget_search.xml
index 93a419a..6b34249 100644
--- a/app/src/main/res/layout/widget_search.xml
+++ b/app/src/main/res/layout/widget_search.xml
@@ -12,7 +12,7 @@
android:layout_marginTop="2dp"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
- android:src="@drawable/about_logo"
+ android:src="@drawable/w_nav_mark"
android:contentDescription="@null"
android:layout_gravity="center_vertical"/>
<LinearLayout
diff --git a/app/src/main/res/values/strings.xml
b/app/src/main/res/values/strings.xml
index 6f03757..c6dd629 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -172,9 +172,9 @@
<string name="terms_of_use_description">Terms of use</string>
<string
name="privacy_policy_url">https://m.wikimediafoundation.org/wiki/Privacy_Policy</string>
<string
name="terms_of_use_url">https://m.wikimediafoundation.org/wiki/Terms_of_Use</string>
- <string name="about_libraries_heading">libraries used</string>
- <string name="about_contributors_heading">contributors</string>
- <string name="about_translators_heading">translators</string>
+ <string name="about_libraries_heading">Libraries used</string>
+ <string name="about_contributors_heading">Contributors</string>
+ <string name="about_translators_heading">Translators</string>
<string name="about_translators_translatewiki"><![CDATA[This app was
translated by the volunteer translators at <a
href="https://translatewiki.net";>translatewiki.net</a>.]]></string>
<string name="about_wmf"><![CDATA[A product of the <a
href="http://wikimediafoundation.org/wiki/Home";>Wikimedia
Foundation</a>]]></string>
<string name="about_activity_title">About</string>
--
To view, visit https://gerrit.wikimedia.org/r/265294
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9991619a30ca7108cd26e3de6b54f7d23ba31572
Gerrit-PatchSet: 5
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
