[MediaWiki-commits] [Gerrit] Add link to open current page in external browser. - change (apps...wikipedia)
Dbrant has uploaded a new change for review. https://gerrit.wikimedia.org/r/223332 Change subject: Add link to open current page in external browser. .. Add link to open current page in external browser. ...in the bottom content area. Bug: T104705 Change-Id: I0b8800e582344e0bbdad627c8c0db99c5bd878d6 --- M wikipedia/res/layout/fragment_page.xml M wikipedia/res/values-qq/strings.xml M wikipedia/res/values/strings.xml M wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java 4 files changed, 26 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/32/223332/1 diff --git a/wikipedia/res/layout/fragment_page.xml b/wikipedia/res/layout/fragment_page.xml index d96eecf..78698d4 100644 --- a/wikipedia/res/layout/fragment_page.xml +++ b/wikipedia/res/layout/fragment_page.xml @@ -153,6 +153,16 @@ android:textIsSelectable=true android:textColorLink=?attr/link_color android:gravity=center/ +TextView +android:id=@+id/page_external_link +android:layout_width=match_parent +android:layout_height=wrap_content +android:paddingLeft=@dimen/activity_horizontal_margin + android:paddingRight=@dimen/activity_horizontal_margin +style=?android:textAppearanceSmall +android:text=@string/page_view_in_browser +android:textColor=?attr/link_color +android:gravity=center/ /LinearLayout /LinearLayout diff --git a/wikipedia/res/values-qq/strings.xml b/wikipedia/res/values-qq/strings.xml index 737f2b7..4596476 100644 --- a/wikipedia/res/values-qq/strings.xml +++ b/wikipedia/res/values-qq/strings.xml @@ -379,4 +379,5 @@ string name=menu_save_page_popupMenu item for saving a page for later reading./string string name=tool_tip_select_textVery short advice on how to highlight text for copying to the clipboard or sharing./string string name=tool_tip_shareVery short advice on sharing highlighted text on social networks./string + string name=page_view_in_browserText for a link that will open the current page in an external browser app on the device./string /resources diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml index 101704d..46a0714 100644 --- a/wikipedia/res/values/strings.xml +++ b/wikipedia/res/values/strings.xml @@ -290,4 +290,5 @@ string name=menu_save_page_popupSave for later/string string name=tool_tip_select_textPress and hold anywhere in the text to highlight it for copying and sharing./string string name=tool_tip_shareAfter highlighting an interesting fact, try sharing it on your favorite networks!/string +string name=page_view_in_browserView in browser/string /resources diff --git a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java index 410ea53..d78a418 100644 --- a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java +++ b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java @@ -1,5 +1,7 @@ package org.wikipedia.page.bottomcontent; +import android.graphics.Paint; +import android.net.Uri; import android.text.Html; import android.text.TextUtils; import android.util.Log; @@ -56,13 +58,14 @@ private View bottomContentContainer; private TextView pageLastUpdatedText; private TextView pageLicenseText; +private TextView pageExternalLink; private View readMoreContainer; private ListView readMoreList; private SuggestedPagesFunnel funnel; private SearchResults readMoreItems; -public BottomContentHandler(PageViewFragmentInternal parentFragment, +public BottomContentHandler(final PageViewFragmentInternal parentFragment, CommunicationBridge bridge, ObservableWebView webview, LinkHandler linkHandler, ViewGroup hidingView) { this.parentFragment = parentFragment; @@ -82,6 +85,16 @@ readMoreContainer = bottomContentContainer.findViewById(R.id.read_more_container); readMoreList = (ListView)bottomContentContainer.findViewById(R.id.read_more_list); +pageExternalLink = (TextView) bottomContentContainer.findViewById(R.id.page_external_link); +pageExternalLink.setPaintFlags(pageExternalLink.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG); +pageExternalLink.setOnClickListener(new View.OnClickListener() { +@Override +public void onClick(View v) { +
[MediaWiki-commits] [Gerrit] Add link to open current page in external browser. - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged. Change subject: Add link to open current page in external browser. .. Add link to open current page in external browser. ...in the bottom content area. Bug: T104705 Change-Id: I0b8800e582344e0bbdad627c8c0db99c5bd878d6 --- M wikipedia/res/layout/fragment_page.xml M wikipedia/res/values-qq/strings.xml M wikipedia/res/values/strings.xml M wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java 4 files changed, 24 insertions(+), 0 deletions(-) Approvals: BearND: Looks good to me, approved Niedzielski: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wikipedia/res/layout/fragment_page.xml b/wikipedia/res/layout/fragment_page.xml index d96eecf..78698d4 100644 --- a/wikipedia/res/layout/fragment_page.xml +++ b/wikipedia/res/layout/fragment_page.xml @@ -153,6 +153,16 @@ android:textIsSelectable=true android:textColorLink=?attr/link_color android:gravity=center/ +TextView +android:id=@+id/page_external_link +android:layout_width=match_parent +android:layout_height=wrap_content +android:paddingLeft=@dimen/activity_horizontal_margin + android:paddingRight=@dimen/activity_horizontal_margin +style=?android:textAppearanceSmall +android:text=@string/page_view_in_browser +android:textColor=?attr/link_color +android:gravity=center/ /LinearLayout /LinearLayout diff --git a/wikipedia/res/values-qq/strings.xml b/wikipedia/res/values-qq/strings.xml index 737f2b7..4596476 100644 --- a/wikipedia/res/values-qq/strings.xml +++ b/wikipedia/res/values-qq/strings.xml @@ -379,4 +379,5 @@ string name=menu_save_page_popupMenu item for saving a page for later reading./string string name=tool_tip_select_textVery short advice on how to highlight text for copying to the clipboard or sharing./string string name=tool_tip_shareVery short advice on sharing highlighted text on social networks./string + string name=page_view_in_browserText for a link that will open the current page in an external browser app on the device./string /resources diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml index 101704d..46a0714 100644 --- a/wikipedia/res/values/strings.xml +++ b/wikipedia/res/values/strings.xml @@ -290,4 +290,5 @@ string name=menu_save_page_popupSave for later/string string name=tool_tip_select_textPress and hold anywhere in the text to highlight it for copying and sharing./string string name=tool_tip_shareAfter highlighting an interesting fact, try sharing it on your favorite networks!/string +string name=page_view_in_browserView in browser/string /resources diff --git a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java index 410ea53..488479e 100644 --- a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java +++ b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java @@ -1,5 +1,7 @@ package org.wikipedia.page.bottomcontent; +import android.graphics.Paint; +import android.net.Uri; import android.text.Html; import android.text.TextUtils; import android.util.Log; @@ -56,6 +58,7 @@ private View bottomContentContainer; private TextView pageLastUpdatedText; private TextView pageLicenseText; +private TextView pageExternalLink; private View readMoreContainer; private ListView readMoreList; @@ -82,6 +85,15 @@ readMoreContainer = bottomContentContainer.findViewById(R.id.read_more_container); readMoreList = (ListView)bottomContentContainer.findViewById(R.id.read_more_list); +pageExternalLink = (TextView) bottomContentContainer.findViewById(R.id.page_external_link); +pageExternalLink.setPaintFlags(pageExternalLink.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG); +pageExternalLink.setOnClickListener(new View.OnClickListener() { +@Override +public void onClick(View v) { +Utils.visitInExternalBrowser(activity, Uri.parse(pageTitle.getMobileUri())); +} +}); + // set up pass-through scroll functionality for the ListView readMoreList.setOnTouchListener(new View.OnTouchListener() { private int touchSlop = ViewConfiguration.get(readMoreList.getContext()) -- To view, visit https://gerrit.wikimedia.org/r/223332 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged