[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Add a small overflow on each inset article card within "On t...

2017-12-21 Thread Jcasariego (Code Review) 
Jcasariego has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/399662 )

Change subject: Add a small overflow on each inset article card within "On this 
day"
..

Add a small overflow on each inset article card within "On this day"

This task allow a reader share an article or adding an article to a reading list

Bug:T180391
Change-Id: If0f4c43b236f53cc2ff8eee43a34a9a86e994f3b
---
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCardView.java
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java
M app/src/main/java/org/wikipedia/feed/view/FeedAdapter.java
M app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
M app/src/main/res/layout/item_on_this_day_pages.xml
6 files changed, 129 insertions(+), 5 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCardView.java 
b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCardView.java
index 0d827ee..80280a5 100644
--- a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCardView.java
+++ b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCardView.java
@@ -6,6 +6,7 @@
 import android.support.annotation.Nullable;
 import android.support.v4.app.ActivityOptionsCompat;
 import android.support.v4.graphics.drawable.DrawableCompat;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.CardView;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -23,9 +24,13 @@
 import org.wikipedia.feed.view.CardHeaderView;
 import org.wikipedia.feed.view.DefaultFeedCardView;
 import org.wikipedia.feed.view.FeedAdapter;
+import org.wikipedia.history.HistoryEntry;
+import org.wikipedia.page.ExclusiveBottomSheetPresenter;
+import org.wikipedia.readinglist.AddToReadingListDialog;
 import org.wikipedia.util.DateUtil;
 import org.wikipedia.util.GradientUtil;
 import org.wikipedia.util.ResourceUtil;
+import org.wikipedia.util.ShareUtil;
 import org.wikipedia.views.DontInterceptTouchListener;
 import org.wikipedia.views.ItemTouchHelperSwipeAdapter;
 import org.wikipedia.views.MarginItemDecoration;
@@ -79,11 +84,17 @@
 private List pages;
 private WikiSite wiki;
 private final boolean isSingleCard;
+private OnThisDayPagesViewHolder.Callback callback;
 
 RecyclerAdapter(@NonNull List pages, @NonNull WikiSite 
wiki, boolean isSingleCard) {
 this.pages = pages;
 this.wiki = wiki;
 this.isSingleCard = isSingleCard;
+}
+
+public RecyclerAdapter setCallback(OnThisDayPagesViewHolder.Callback 
callback) {
+this.callback = callback;
+return this;
 }
 
 @Override
@@ -96,7 +107,9 @@
 
 @Override
 public void onBindViewHolder(OnThisDayPagesViewHolder 
onThisDayPagesViewHolder, int i) {
-onThisDayPagesViewHolder.setFields(pages.get(i));
+onThisDayPagesViewHolder
+.setCallback(callback)
+.setFields(pages.get(i));
 }
 
 @Override
@@ -111,6 +124,7 @@
 super.setCallback(callback);
 headerView.setCallback(callback);
 }
+
 
 private void header(@NonNull OnThisDayCard card) {
 headerView.setTitle(card.title())
@@ -150,9 +164,27 @@
 
 private void setPagesRecycler(OnThisDayCard card) {
 if (card.pages() != null) {
-pagesRecycler.setAdapter(new RecyclerAdapter(card.pages(), 
card.wiki(), true));
+RecyclerAdapter recyclerAdapter = new 
RecyclerAdapter(card.pages(), card.wiki(), true);
+recyclerAdapter.setCallback(new Callback());
+pagesRecycler.setAdapter(recyclerAdapter);
 } else {
 pagesRecycler.setVisibility(GONE);
 }
 }
+
+private ExclusiveBottomSheetPresenter bottomSheetPresenter = new 
ExclusiveBottomSheetPresenter();
+
+class Callback implements OnThisDayPagesViewHolder.Callback {
+@Override
+public void onAddPageToList(@NonNull HistoryEntry entry) {
+
bottomSheetPresenter.show(((AppCompatActivity)getContext()).getSupportFragmentManager(),
+AddToReadingListDialog.newInstance(entry.getTitle(),
+
AddToReadingListDialog.InvokeSource.ON_THIS_DAY_ACTIVITY));
+}
+
+@Override
+public void onSharePage(@NonNull HistoryEntry entry) {
+ShareUtil.shareText((Activity) getContext(), entry.getTitle());
+}
+}
 }
diff --git 
a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java 
b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
index c28d915..6eef4f9 100644
---

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Modify time to update Featured Article widget

2017-10-10 Thread Jcasariego (Code Review) 
Jcasariego has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383428 )

Change subject: Modify time to update Featured Article widget
..

Modify time to update Featured Article widget

At the moment, the Featured Article widget is hard-coded to update itself every 
12 hours. Now, this was updated to update every 4 hours.

Bug: T121410
Change-Id: I2914e1accf5e17a09399ef8eb807ca571b6378af
---
M app/src/main/res/xml/widget_featured_page.xml
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/app/src/main/res/xml/widget_featured_page.xml 
b/app/src/main/res/xml/widget_featured_page.xml
index 94772ad..fb37598 100644
--- a/app/src/main/res/xml/widget_featured_page.xml
+++ b/app/src/main/res/xml/widget_featured_page.xml
@@ -5,6 +5,6 @@
 android:minHeight="32dp"
 android:minResizeWidth="100dp"
 android:resizeMode="horizontal|vertical"
-android:updatePeriodMillis="4320"
+android:updatePeriodMillis="1440"
 android:initialLayout="@layout/widget_featured_page">
 
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2914e1accf5e17a09399ef8eb807ca571b6378af
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Jcasariego 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Design tweak: Change 'Next' button color for Light and Dark ...

2017-09-13 Thread Jcasariego (Code Review) 
Jcasariego has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377868 )

Change subject: Design tweak: Change 'Next' button color for Light and Dark 
modes
..

Design tweak: Change 'Next' button color for Light and Dark modes

Change Next button color from the outdated teal color to Accent50 (Light mode) 
and Accent75 (Dark mode).

Bug: T175674
Change-Id: I8302758ffa38bb764ab9417032912aca2632adf6
---
M app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
M app/src/main/res/values/attrs.xml
M app/src/main/res/values/styles_dark.xml
M app/src/main/res/values/styles_light.xml
4 files changed, 9 insertions(+), 1 deletion(-)


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

diff --git a/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java 
b/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
index 77ee6a9..c6d13d1 100644
--- a/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
+++ b/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
@@ -48,6 +48,7 @@
 import org.wikipedia.page.PageProperties;
 import org.wikipedia.page.PageTitle;
 import org.wikipedia.util.FeedbackUtil;
+import org.wikipedia.util.ResourceUtil;
 import org.wikipedia.util.StringUtil;
 import org.wikipedia.util.log.L;
 import org.wikipedia.views.ViewAnimations;
@@ -581,7 +582,8 @@
 });
 
 v.setBackgroundColor(ContextCompat.getColor(this, item.isEnabled()
-? (editPreviewFragment.isActive() ? R.color.accent50 : 
R.color.green50) : R.color.base50));
+? (editPreviewFragment.isActive() ? R.color.accent50
+: ResourceUtil.getThemedAttributeId(this, 
R.attr.edit_preview)) : R.color.base50));
 
 return true;
 }
diff --git a/app/src/main/res/values/attrs.xml 
b/app/src/main/res/values/attrs.xml
index 45e1c59..1ceb73e 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -44,6 +44,8 @@
 
 
 
+
+
 
 
 
diff --git a/app/src/main/res/values/styles_dark.xml 
b/app/src/main/res/values/styles_dark.xml
index aae4dba..2615f00 100644
--- a/app/src/main/res/values/styles_dark.xml
+++ b/app/src/main/res/values/styles_dark.xml
@@ -78,6 +78,8 @@
 @color/base14
 @style/BlueSwitchDark
 
+@color/accent75
+
 
 
 
diff --git a/app/src/main/res/values/styles_light.xml 
b/app/src/main/res/values/styles_light.xml
index b276c94..769e30f 100644
--- a/app/src/main/res/values/styles_light.xml
+++ b/app/src/main/res/values/styles_light.xml
@@ -79,6 +79,8 @@
 @color/base100
 @style/BlueSwitchLight
 
+@color/accent50
+

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Show error message in a scrollable view in landscape mode

2017-08-14 Thread Jcasariego (Code Review) 
Jcasariego has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371970 )

Change subject: Show error message in a scrollable view in landscape mode
..

Show error message in a scrollable view in landscape mode

To solve the problem of the error view that can not be seen completely when the 
device is offline is added a NestedScrollView.

Bug: T172701
Change-Id: I0f2e53de4179a8d33dfd52abe66290bbe706ddae
---
M app/src/main/res/layout/view_wiki_error.xml
1 file changed, 67 insertions(+), 55 deletions(-)


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

diff --git a/app/src/main/res/layout/view_wiki_error.xml 
b/app/src/main/res/layout/view_wiki_error.xml
index cb514f0..e890a3d 100644
--- a/app/src/main/res/layout/view_wiki_error.xml
+++ b/app/src/main/res/layout/view_wiki_error.xml
@@ -2,71 +2,83 @@
 http://schemas.android.com/apk/res/android;
 xmlns:app="http://schemas.android.com/apk/res-auto;
 xmlns:tools="http://schemas.android.com/tools;
-tools:parentTag="LinearLayout"
-tools:orientation="vertical"
+tools:layout_height="wrap_content"
 tools:layout_width="wrap_content"
-tools:layout_height="wrap_content">
+tools:orientation="vertical"
+tools:parentTag="LinearLayout">
 
-
+android:layout_height="match_parent"
+android:fillViewport="true">
 
-
+android:orientation="vertical">
 
-
+
 
-
+
 
-
-
+
 
-
+
 
-
+
+
 
-
-
+
+
+
+
+
+
+
+
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f2e53de4179a8d33dfd52abe66290bbe706ddae
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Jcasariego 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Design tweak: update color states for blue color

2017-08-11 Thread Jcasariego (Code Review) 
Jcasariego has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371489 )

Change subject: Design tweak: update color states for blue color
..

Design tweak: update color states for blue color

This task update color states of blue color from "colorAccent" to "accent50" 
because with colorAccent the button in onboarding tutorial  was showing the old 
teal color.

Bug: T173092

Change-Id: I8c09afec526946dea91a868fab0ecc08074215a2
---
M app/src/main/res/color/color_state_blue.xml
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/app/src/main/res/color/color_state_blue.xml 
b/app/src/main/res/color/color_state_blue.xml
index 38f1ecb..3d16a4e 100644
--- a/app/src/main/res/color/color_state_blue.xml
+++ b/app/src/main/res/color/color_state_blue.xml
@@ -4,5 +4,5 @@
 
 
 
-
+
 
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c09afec526946dea91a868fab0ecc08074215a2
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Jcasariego 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Split yes-no strings used in dialog box questions into separ...

2017-08-07 Thread Jcasariego (Code Review) 
Jcasariego has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370524 )

Change subject: Split yes-no strings used in dialog box questions into separate 
strings tags
..

Split yes-no strings used in dialog box questions into separate strings tags

Currently, the yes-no strings in the Android app are used to confirm the 
following dialog box questions:

- "This saved page may be out of date, and must be refreshed for editing to be 
enabled. Would you like to refresh the page?"
- "The page has been modified. Are you sure you want to exit without saving 
your changes?"
- "This will delete all of your browsing history, and close any currently open 
tabs. Are you sure?"
- "Are you sure you want to cancel downloading this compilation?"
- "Are you sure you want to close all tabs?"
- "Are you sure you want to clear your search history?"
- "This will delete any previously synced reading lists from remote storage. 
Proceed?"

These are the places where new tags were created for the yes-no string.

Bug: T69628
Change-Id: I620d5646a03a0744feab552a8bf3ae04c73de1b3
---
M app/src/main/java/org/wikipedia/edit/EditHandler.java
M app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
M app/src/main/java/org/wikipedia/history/HistoryFragment.java
M app/src/main/java/org/wikipedia/offline/CompilationDownloadControlView.java
M app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
M app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java
M app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
9 files changed, 44 insertions(+), 19 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/edit/EditHandler.java 
b/app/src/main/java/org/wikipedia/edit/EditHandler.java
index 203f456..ef0cef8 100644
--- a/app/src/main/java/org/wikipedia/edit/EditHandler.java
+++ b/app/src/main/java/org/wikipedia/edit/EditHandler.java
@@ -72,13 +72,13 @@
 new AlertDialog.Builder(fragment.getActivity())
 .setCancelable(false)
 .setMessage(R.string.edit_saved_page_refresh)
-.setPositiveButton(android.R.string.yes, new 
DialogInterface.OnClickListener() {
+
.setPositiveButton(R.string.edit_saved_page_refresh_yes, new 
DialogInterface.OnClickListener() {
 @Override
 public void onClick(DialogInterface 
dialogInterface, int i) {
 fragment.refreshPage();
 }
 })
-.setNegativeButton(android.R.string.no, new 
DialogInterface.OnClickListener() {
+
.setNegativeButton(R.string.edit_saved_page_refresh_no, new 
DialogInterface.OnClickListener() {
 @Override
 public void onClick(DialogInterface 
dialogInterface, int i) {
 dialogInterface.dismiss();
diff --git a/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java 
b/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
index 01f2313..9e0edb1 100644
--- a/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
+++ b/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
@@ -718,14 +718,14 @@
 if (sectionTextModified) {
 AlertDialog.Builder alert = new AlertDialog.Builder(this);
 alert.setMessage(getString(R.string.edit_abandon_confirm));
-alert.setPositiveButton(getString(R.string.yes), new 
DialogInterface.OnClickListener() {
+
alert.setPositiveButton(getString(R.string.edit_abandon_confirm_yes), new 
DialogInterface.OnClickListener() {
 @Override
 public void onClick(DialogInterface dialog, int id) {
 dialog.dismiss();
 finish();
 }
 });
-alert.setNegativeButton(getString(R.string.no), new 
DialogInterface.OnClickListener() {
+
alert.setNegativeButton(getString(R.string.edit_abandon_confirm_no), new 
DialogInterface.OnClickListener() {
 @Override
 public void onClick(DialogInterface dialog, int id) {
 dialog.dismiss();
diff --git a/app/src/main/java/org/wikipedia/history/HistoryFragment.java 
b/app/src/main/java/org/wikipedia/history/HistoryFragment.java
index 8d2fd26..083c83d 100644
--- a/app/src/main/java/org/wikipedia/history/HistoryFragment.java
+++ b/app/src/main/java/org/wikipedia/history/HistoryFragment.java
@@ -176,7 +176,7 @@
 new AlertDialog.Builder(getContext())
 .setTitle(R.string.dialog_title_clear_history)

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Show ellipsis to indicate truncation in the reading list lis...

2017-08-07 Thread Jcasariego (Code Review) 
Jcasariego has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370490 )

Change subject: Show ellipsis to indicate truncation in the reading list 
list-item
..

Show ellipsis to indicate truncation in the reading list list-item

This task add ellipsis for reading lists with description text that exceeds the 
2-lines.

Bug: T164926
Change-Id: I5bdf748820b4db15d4a7dc07192a598dae99389f
---
M app/src/main/java/org/wikipedia/readinglist/ReadingListItemView.java
M app/src/main/res/values/strings_no_translate.xml
2 files changed, 23 insertions(+), 0 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/readinglist/ReadingListItemView.java 
b/app/src/main/java/org/wikipedia/readinglist/ReadingListItemView.java
index 0488db9..d0ac931 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListItemView.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListItemView.java
@@ -83,6 +83,11 @@
 statisticalDescriptionView.setText(text);
 
 updateDetails();
+
+if (description != Description.DETAIL){
+showEllipsis();
+}
+
 if (imageContainer.getVisibility() == VISIBLE) {
 getThumbnails();
 }
@@ -255,4 +260,18 @@
 return false;
 }
 }
+
+private void showEllipsis(){
+descriptionView.post(new Runnable() {
+@Override
+public void run() {
+if (descriptionView.getLineCount() > 2) {
+final int threeSpaces = 3;
+int lineEndIndex = 
descriptionView.getLayout().getLineEnd(1);
+String text = descriptionView.getText().subSequence(0, 
lineEndIndex - threeSpaces) + getString(R.string.ellipsis);
+descriptionView.setText(text);
+}
+}
+});
+}
 }
diff --git a/app/src/main/res/values/strings_no_translate.xml 
b/app/src/main/res/values/strings_no_translate.xml
index 35a169a..a0753f1 100644
--- a/app/src/main/res/values/strings_no_translate.xml
+++ b/app/src/main/res/values/strings_no_translate.xml
@@ -112,4 +112,8 @@
 
 %.2f
 
+
+\u2026
+
+
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5bdf748820b4db15d4a7dc07192a598dae99389f
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Jcasariego 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Adjust button dimensions on login and create account screen

2017-07-26 Thread Jcasariego (Code Review) 
Jcasariego has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/367920 )

Change subject: Adjust button dimensions on login and create account screen
..

Adjust button dimensions on login and create account screen

This task fixes buttons dimensions on login/create account, to have the same 
width as the form fields.

Bug: T170757
Change-Id: Ie725017030bba5058068b20fa8013f9224f8fa6a
---
M app/src/main/res/layout/activity_create_account.xml
M app/src/main/res/layout/activity_login.xml
M app/src/main/res/layout/group_captcha.xml
3 files changed, 8 insertions(+), 4 deletions(-)


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

diff --git a/app/src/main/res/layout/activity_create_account.xml 
b/app/src/main/res/layout/activity_create_account.xml
index 9411108..fd65885 100644
--- a/app/src/main/res/layout/activity_create_account.xml
+++ b/app/src/main/res/layout/activity_create_account.xml
@@ -77,8 +77,9 @@
 android:layout_width="match_parent"
 android:text="@string/create_account_next"
 style="@style/App.Button.Blue"
-android:layout_gravity="center_horizontal"
-android:enabled="false" />
+android:enabled="false"
+android:layout_marginLeft="0dp"
+android:layout_marginRight="0dp"/>
 
 
+android:text="@string/menu_login"
+android:layout_marginLeft="0dp"
+android:layout_marginRight="0dp"/>
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie725017030bba5058068b20fa8013f9224f8fa6a
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Jcasariego 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix "No results" message overlapping other error messages in...

2017-06-30 Thread Jcasariego (Code Review) 
Jcasariego has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/362422 )

Change subject: Fix "No results" message overlapping other error messages in 
search results view
..

Fix "No results" message overlapping other error messages in search results view

This task fixes the way messages are shown from within error messages 
container, hiding first "No results" message then showing that there is "No 
Internet Connectivity".

Bug: T166432
Change-Id: I059a025f661b5f043a65b323c8f03231197294cf
---
M app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/search/SearchResultsFragment.java 
b/app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
index e95bff5..27fdca5 100644
--- a/app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
+++ b/app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
@@ -229,6 +229,7 @@
 }
 if (isAdded()) {
 updateProgressBar(false);
+searchEmptyView.setVisibility(View.GONE);
 searchErrorView.setVisibility(View.VISIBLE);
 searchErrorView.setError(caught);
 searchResultsContainer.setVisibility(View.GONE);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I059a025f661b5f043a65b323c8f03231197294cf
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Jcasariego 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update visual design of user education UI for first time add...

2017-06-17 Thread Jcasariego (Code Review) 
Jcasariego has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359668 )

Change subject: Update visual design of user education UI for first time adding 
to a reading list
..

Update visual design of user education UI for first time adding to a reading 
list

This task update the visual design of the current bottom sheet that is based on 
an older outdated styles of the app.

Bug: T162839
Change-Id: I096e1f54a091da013f60abce96417314da0966e8
---
A app/src/main/res/drawable/ic_reading_list.xml
M app/src/main/res/layout/include_add_to_reading_list_onboarding.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
4 files changed, 268 insertions(+), 78 deletions(-)


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

diff --git a/app/src/main/res/drawable/ic_reading_list.xml 
b/app/src/main/res/drawable/ic_reading_list.xml
new file mode 100644
index 000..1c2e0c0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_reading_list.xml
@@ -0,0 +1,142 @@
+http://schemas.android.com/apk/res/android;
+android:autoMirrored="true"
+android:width="96dp"
+android:height="96dp"
+android:viewportWidth="96.0"
+android:viewportHeight="96.0">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/include_add_to_reading_list_onboarding.xml 
b/app/src/main/res/layout/include_add_to_reading_list_onboarding.xml
index 9f719b6..c8e199a 100644
--- a/app/src/main/res/layout/include_add_to_reading_list_onboarding.xml
+++ b/app/src/main/res/layout/include_add_to_reading_list_onboarding.xml
@@ -1,32 +1,37 @@
-http://schemas.android.com/apk/res/android;
+http://schemas.android.com/apk/res/android;
 xmlns:app="http://schemas.android.com/apk/res-auto;
 android:layout_width="match_parent"
 android:layout_height="wrap_content"
+android:background="?attr/bottom_sheet_background_color"
 android:orientation="vertical"
-android:paddingLeft="16dp"
-android:paddingRight="16dp"
-android:paddingTop="16dp"
-android:paddingBottom="16dp"
-android:background="?attr/bottom_sheet_background_color">
+android:paddingBottom="24dp"
+android:paddingLeft="24dp"
+android:paddingRight="24dp"
+android:paddingTop="24dp">
 
 
+android:text="@string/reading_lists_onboarding_intro"
+android:textColor="?attr/feed_text_primary_color"
+android:textSize="16sp"
+android:lineSpacingExtra="8sp" />
 
-
+
 
+
 
-
-
-
-
-
 
-
-
-
-
+android:orientation="horizontal"
+android:layout_marginTop="8dp"
+android:paddingLeft="12dp"
+android:paddingStart="12dp"
+
android:layout_below="@+id/reading_lists_onboarding_for_example_title"
+android:layout_toLeftOf="@+id/reading_list_image"
+android:layout_toStartOf="@+id/reading_list_image">
 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-
-
+app:srcCompat="@drawable/ic_reading_list"
+android:contentDescription="@null"
+android:layout_alignParentRight="true"
+android:layout_alignTop="@+id/reading_lists_onboarding_example1"
+android:layout_alignBottom="@+id/reading_lists_onboarding_example3"
+android:layout_alignParentEnd="true"
+android:layout_centerVertical="true"
+android:paddingLeft="30dp"
+android:paddingStart="30dp"/>
+
+
 
 
+android:fontFamily="sans-serif-medium"
+android:textSize="14sp"/>
+
 
\ No newline at end of file
diff --git a/app/src/main/res/values-qq/strings.xml 
b/app/src/main/res/values-qq/strings.xml
index c3ed7dd..ccde4d6 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -301,6 +301,7 @@
   Descriptive message that explains 
the benefits of reading lists, and the location of the button to add an article 
to a reading list.
   Short introductory statement 
about reading lists to be shown in the onboarding screen, emphasizing that 
reading lists are available for offline access.
   Label stating that the 
items below are examples of reading list titles.
+  Bullet point icon with 
some spaces (using a html entity to generate a non-breaking space) used next to 
reading list items.
   First example of a reading 
list title, in this case places to visit.
   Second example of a reading 
list title, in this case favorite animals.
   Third

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Remove pilimit from PageImages API calls

2017-06-07 Thread Jcasariego (Code Review) 
Jcasariego has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/357752 )

Change subject: Remove pilimit from PageImages API calls
..

Remove pilimit from PageImages API calls

pilimit will no longer be necessary as a result of T153709. PageImages will 
default to returning an image for up to PARAM_MAX (=50, or 500 for bots) 
results rather than 1.

Bug: T166080
Change-Id: I6c6fd0ae89c2dfb48b18931811e73beec25460ff
---
M app/src/main/java/org/wikipedia/pageimages/PageImagesClient.java
1 file changed, 2 insertions(+), 3 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/pageimages/PageImagesClient.java 
b/app/src/main/java/org/wikipedia/pageimages/PageImagesClient.java
index c30d635..63ade86 100644
--- a/app/src/main/java/org/wikipedia/pageimages/PageImagesClient.java
+++ b/app/src/main/java/org/wikipedia/pageimages/PageImagesClient.java
@@ -43,7 +43,7 @@
  @NonNull Service 
service,
  @NonNull final 
List titles,
  @NonNull final 
Callback cb) {
-Call call = 
service.request(TextUtils.join("|", titles), titles.size());
+Call call = 
service.request(TextUtils.join("|", titles));
 call.enqueue(new 
retrofit2.Callback() {
 @Override public void 
onResponse(Call call,
  
Response response) {
@@ -89,7 +89,6 @@
 @VisibleForTesting interface Service {
 
@GET("w/api.php?action=query=json=2=pageimages=thumbnail"
 + "=any=" + 
Constants.PREFERRED_THUMB_SIZE)
-Call request(@NonNull 
@Query("titles") String titles,
-   @Query("pilimit") int 
piLimit);
+Call request(@NonNull 
@Query("titles") String titles);
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c6fd0ae89c2dfb48b18931811e73beec25460ff
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Jcasariego 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Search empty view design tweaks

2017-05-25 Thread Jcasariego (Code Review) 
Jcasariego has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/355732 )

Change subject: Search empty view design tweaks
..

Search empty view design tweaks

* Make background @base80
* Increase text line-height

Bug: T137116
Change-Id: I92ff9343f202a08da2ddab56a5187658d599bbb8
---
M app/src/main/res/layout/fragment_search_recent.xml
1 file changed, 9 insertions(+), 8 deletions(-)


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

diff --git a/app/src/main/res/layout/fragment_search_recent.xml 
b/app/src/main/res/layout/fragment_search_recent.xml
index 5ad7163..23cccf6 100644
--- a/app/src/main/res/layout/fragment_search_recent.xml
+++ b/app/src/main/res/layout/fragment_search_recent.xml
@@ -9,19 +9,18 @@
 
 
+android:visibility="gone"
+android:background="@color/base80">
 
 
 
@@ -29,11 +28,13 @@
 android:id="@+id/search_empty_message"
 android:layout_width="wrap_content"
 android:layout_height="wrap_content"
-android:layout_gravity="center_horizontal"
 android:layout_marginTop="32dp"
+android:layout_marginLeft="30dp"
+android:layout_marginRight="30dp"
 android:gravity="center"
 android:text="@string/search_empty_message"
-android:textSize="16sp" />
+android:textSize="16sp"
+android:lineSpacingMultiplier="1.25"/>
 
 
 https://gerrit.wikimedia.org/r/355732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I92ff9343f202a08da2ddab56a5187658d599bbb8
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Jcasariego 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update design of empty Search screen

2017-05-16 Thread Jcasariego (Code Review) 
Jcasariego has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/354056 )

Change subject: Update design of empty Search screen
..

Update design of empty Search screen

This task make the first time search / cleared search history case more 
visually appealing and provide some prompt for user to search.

Bug: T137116
Change-Id: If19f9fade02895c1a745ecc0ab0feb1199f57d2f
---
M app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java
A app/src/main/res/drawable/ic_search_splash.xml
M app/src/main/res/layout/fragment_search_recent.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
5 files changed, 126 insertions(+), 48 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java 
b/app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java
index 825d8df..9272094 100644
--- a/app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java
+++ b/app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java
@@ -25,6 +25,9 @@
 import org.wikipedia.database.contract.SearchHistoryContract;
 import org.wikipedia.util.FeedbackUtil;
 
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
 import static org.wikipedia.Constants.RECENT_SEARCHES_FRAGMENT_LOADER_ID;
 
 /** Displays a list of recent searches */
@@ -34,19 +37,20 @@
 }
 
 private Parent parentFragment;
-private View container;
-private ListView recentSearchesList;
 private RecentSearchesAdapter adapter;
-private ImageView deleteButton;
+
+@BindView(R.id.recent_searches_list) ListView recentSearchesList;
+@BindView(R.id.search_empty_container) View searchEmptyView;
+@BindView(R.id.recent_searches_container) View recentSearchesContainer;
+@BindView(R.id.recent_searches) View recentSearches;
+@BindView(R.id.recent_searches_delete_button) ImageView deleteButton;
 
 @Override
 public View onCreateView(LayoutInflater inflater, ViewGroup container, 
Bundle savedInstanceState) {
 View rootView = inflater.inflate(R.layout.fragment_search_recent, 
container, false);
-parentFragment = (Parent) getParentFragment();
-this.container = rootView.findViewById(R.id.recent_searches_container);
-recentSearchesList = (ListView) 
rootView.findViewById(R.id.recent_searches_list);
+ButterKnife.bind(this, rootView);
 
-deleteButton = (ImageView) 
rootView.findViewById(R.id.recent_searches_delete_button);
+parentFragment = (Parent) getParentFragment();
 deleteButton.setOnClickListener(new View.OnClickListener() {
 @Override
 public void onClick(View view) {
@@ -70,11 +74,11 @@
 }
 
 public void show() {
-container.setVisibility(View.VISIBLE);
+recentSearchesContainer.setVisibility(View.VISIBLE);
 }
 
 public void hide() {
-container.setVisibility(View.GONE);
+recentSearchesContainer.setVisibility(View.GONE);
 }
 
 @Override
@@ -119,7 +123,8 @@
 }
 adapter.swapCursor(cursorLoader);
 boolean visible = recentSearchesList.getCount() > 0;
-deleteButton.setVisibility(visible ? View.VISIBLE : View.INVISIBLE);
+searchEmptyView.setVisibility(!visible ? View.VISIBLE : 
View.INVISIBLE);
+recentSearches.setVisibility(visible ? View.VISIBLE : View.INVISIBLE);
 }
 
 @Override
diff --git a/app/src/main/res/drawable/ic_search_splash.xml 
b/app/src/main/res/drawable/ic_search_splash.xml
new file mode 100644
index 000..4218ec1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search_splash.xml
@@ -0,0 +1,33 @@
+http://schemas.android.com/apk/res/android;
+android:width="150dp"
+android:height="148dp"
+android:viewportWidth="150.0"
+android:viewportHeight="148.12">
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_search_recent.xml 
b/app/src/main/res/layout/fragment_search_recent.xml
index feab661..889b42b 100644
--- a/app/src/main/res/layout/fragment_search_recent.xml
+++ b/app/src/main/res/layout/fragment_search_recent.xml
@@ -1,51 +1,89 @@
 
 
-http://schemas.android.com/apk/res/android;
+http://schemas.android.com/apk/res/android;
 xmlns:app="http://schemas.android.com/apk/res-auto;
-android:id="@+id/recent_searches_container"
-android:orientation="vertical"
 android:layout_width="match_parent"
 android:layout_height="match_parent"
-android:background="?attr/window_background_color">
+android:background="?attr/window_background_color"
+android:id="@+id/recent_searches_container">
 
-
-
-
+
 
 
+android:id="@+id/search_empty_image"
+android:layout_width="150dp"
+android:layout_height="148dp"
+

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Retrofit SuggestionsTask

2017-05-11 Thread Jcasariego (Code Review) 
Jcasariego has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/353384 )

Change subject: Retrofit SuggestionsTask
..

Retrofit SuggestionsTask

Port SuggestionsTask to Retrofit and try to stay as consistent as possible with 
the existing code.

Bug: T152413
Change-Id: I4bde23e10666ceec5eee105529e5646c14c299bc
---
D app/src/androidTest/java/org/wikipedia/page/SuggestionsTaskTest.java
M app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryPage.java
M app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryResponse.java
A app/src/main/java/org/wikipedia/page/SuggestionsClient.java
D app/src/main/java/org/wikipedia/page/SuggestionsTask.java
M app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
A app/src/test/java/org/wikipedia/page/SuggestionTest.java
A app/src/test/res/raw/suggestion.json
8 files changed, 364 insertions(+), 143 deletions(-)


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

diff --git 
a/app/src/androidTest/java/org/wikipedia/page/SuggestionsTaskTest.java 
b/app/src/androidTest/java/org/wikipedia/page/SuggestionsTaskTest.java
deleted file mode 100644
index 115265f..000
--- a/app/src/androidTest/java/org/wikipedia/page/SuggestionsTaskTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.wikipedia.page;
-
-
-import org.junit.Test;
-import org.wikipedia.Constants;
-import org.wikipedia.WikipediaApp;
-import org.wikipedia.dataclient.WikiSite;
-import org.wikipedia.search.SearchResult;
-import org.wikipedia.search.SearchResults;
-import org.wikipedia.testlib.TestLatch;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.wikipedia.test.TestUtil.runOnMainSync;
-
-/**
- * Tests for getting suggestions for further reading.
- */
-public class SuggestionsTaskTest {
-private static final WikiSite WIKI = WikiSite.forLanguageCode("en"); // 
suggestions don't seem to work on testwiki
-
-private WikipediaApp app = WikipediaApp.getInstance();
-
-@Test public void testTask() {
-final TestLatch latch = new TestLatch();
-runOnMainSync(new Runnable() {
-@Override
-public void run() {
-new SuggestionsTask(app.getAPIForSite(WIKI), WIKI, "test", 
false) {
-@Override
-public void onFinish(SearchResults results) {
-assertThat(results, notNullValue());
-assertThat(results.getResults().size(), 
is(Constants.MAX_SUGGESTION_RESULTS));
-
-for (SearchResult result : results.getResults()) {
-
assertThat(result.getPageTitle().getPrefixedText(), not("Test"));
-}
-latch.countDown();
-}
-}.execute();
-}
-});
-latch.await();
-}
-
-@Test public void testFilterNoResults() {
-List originalResults = new ArrayList<>();
-checkFilter(0, originalResults);
-}
-
-@Test public void testFilter1ResultSameAsTitleIgnoreCase() {
-List originalResults = new ArrayList<>();
-originalResults.add(new SearchResult(new PageTitle("Test", WIKI, null, 
null)));
-checkFilter(0, originalResults);
-}
-
-@Test public void testFilter1ResultDifferentFromTitle() {
-List originalResults = new ArrayList<>();
-originalResults.add(new SearchResult(new PageTitle("something else", 
WIKI, null, null)));
-checkFilter(1, originalResults);
-}
-
-@Test public void testFilter4ResultsDifferentFromTitle() {
-List originalResults = new ArrayList<>();
-originalResults.add(new SearchResult(new PageTitle("something else", 
WIKI, null, null)));
-originalResults.add(new SearchResult(new PageTitle("something else", 
WIKI, null, null)));
-originalResults.add(new SearchResult(new PageTitle("something else", 
WIKI, null, null)));
-originalResults.add(new SearchResult(new PageTitle("something else", 
WIKI, null, null)));
-checkFilter(Constants.MAX_SUGGESTION_RESULTS, originalResults);
-}
-
-private void checkFilter(int expected, List originalResults) 
{
-String title = "test";
-SearchResults searchResults = new SearchResults(originalResults, null, 
null);
-List filteredList = SearchResults.filter(searchResults, 
title, false).getResults();
-assertThat(expected, is(filteredList.size()));
-}
-}
diff --git a/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryPage.java 
b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryPage.java
index 2007a62..4746105 100644
---

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Make on/offline toggle button could use a wider (48dp) touch...

2017-05-04 Thread Jcasariego (Code Review) 
Jcasariego has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/351847 )

Change subject: Make on/offline toggle button could use a wider (48dp) touch 
target
..

Make on/offline toggle button could use a wider (48dp) touch target

This patch make touch target use 48dp x 48dp in line with material design 
guidelines.

Bug: T163389
Change-Id: I42af73b0813045467164817800c404a2e705ffd5
---
M app/src/main/res/layout/item_page_list_entry.xml
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/app/src/main/res/layout/item_page_list_entry.xml 
b/app/src/main/res/layout/item_page_list_entry.xml
index 37e7b87..5eeaa65 100644
--- a/app/src/main/res/layout/item_page_list_entry.xml
+++ b/app/src/main/res/layout/item_page_list_entry.xml
@@ -110,8 +110,8 @@
 
 https://gerrit.wikimedia.org/r/351847
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I42af73b0813045467164817800c404a2e705ffd5
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Jcasariego 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Retrofit ImageLicenseFetchTask

2017-05-03 Thread Jcasariego (Code Review) 
Jcasariego has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/351692 )

Change subject: Retrofit ImageLicenseFetchTask
..

Retrofit ImageLicenseFetchTask

Port ImageLicenseFetchTask to Retrofit and try to stay as consistent as 
possible with the existing code.

Bug T152406

Change-Id: Ib6ad70b969507aaad7356fce2e2e9bf27aaaeddc
---
A app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryImageLicensePage.java
M app/src/main/java/org/wikipedia/gallery/GalleryItem.java
A app/src/main/java/org/wikipedia/page/ImageLicenseFetchClient.java
D app/src/main/java/org/wikipedia/page/ImageLicenseFetchTask.java
M app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
A app/src/test/java/org/wikipedia/page/ImageLicenseFetchClientTest.java
A app/src/test/res/raw/image_license.json
7 files changed, 403 insertions(+), 73 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryImageLicensePage.java 
b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryImageLicensePage.java
new file mode 100644
index 000..5a371f6
--- /dev/null
+++ 
b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryImageLicensePage.java
@@ -0,0 +1,76 @@
+package org.wikipedia.dataclient.mwapi;
+
+import android.support.annotation.Nullable;
+
+import java.util.List;
+
+public class MwQueryImageLicensePage extends MwQueryPage {
+@SuppressWarnings("unused") @Nullable private List imageinfo;
+
+public String imageLicense() {
+return imageinfo != null
+&& imageinfo.get(0).extmetadata() != null
+&& imageinfo.get(0).extmetadata().license() != null
+? imageinfo.get(0).extmetadata().license().value() : "";
+}
+
+public String imageLicenseShortName() {
+return imageinfo != null
+&& imageinfo.get(0).extmetadata() != null
+&& imageinfo.get(0).extmetadata().licenseShortName() != null
+? imageinfo.get(0).extmetadata().licenseShortName().value() : 
"";
+}
+
+public String imageLicenseUrl() {
+return imageinfo != null
+&& imageinfo.get(0).extmetadata() != null
+&& imageinfo.get(0).extmetadata().licenseUrl() != null
+? imageinfo.get(0).extmetadata().licenseUrl().value() : "";
+}
+
+static class ImageInfo {
+@SuppressWarnings("unused") private Extmetadata extmetadata;
+Extmetadata extmetadata() {
+return extmetadata;
+}
+}
+
+static class Extmetadata {
+@SuppressWarnings({"unused", "CheckStyle"}) private License License;
+@SuppressWarnings({"unused", "CheckStyle"}) private LicenseShortName 
LicenseShortName;
+@SuppressWarnings({"unused", "CheckStyle"}) private LicenseUrl 
LicenseUrl;
+
+License license() {
+return License;
+}
+
+LicenseShortName licenseShortName() {
+return LicenseShortName;
+}
+
+LicenseUrl licenseUrl() {
+return LicenseUrl;
+}
+}
+
+static class License {
+@SuppressWarnings("unused") private String value;
+String value() {
+return value;
+}
+}
+
+static class LicenseShortName {
+@SuppressWarnings("unused") private String value;
+String value() {
+return value;
+}
+}
+
+static class LicenseUrl {
+@SuppressWarnings("unused") private String value;
+String value() {
+return value;
+}
+}
+}
diff --git a/app/src/main/java/org/wikipedia/gallery/GalleryItem.java 
b/app/src/main/java/org/wikipedia/gallery/GalleryItem.java
index cd1ace8..f5841ca 100644
--- a/app/src/main/java/org/wikipedia/gallery/GalleryItem.java
+++ b/app/src/main/java/org/wikipedia/gallery/GalleryItem.java
@@ -7,7 +7,6 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.wikipedia.page.ImageLicense;
-import org.wikipedia.page.ImageLicenseFetchTask;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -149,9 +148,21 @@
 String value = 
extmetadata.getJSONObject(key).getString("value");
 metadata.put(key, value);
 }
-license = 
ImageLicenseFetchTask.imageLicenseFromMetadata(extmetadata);
+license = imageLicenseFromMetadata(extmetadata);
 } else {
 license = new ImageLicense();
 }
 }
+
+@NonNull
+public static ImageLicense imageLicenseFromMetadata(JSONObject 
extmetadata) {
+return new ImageLicense(getValueForOptionalKey(extmetadata, "License"),
+getValueForOptionalKey(extmetadata, "LicenseShortName"),
+getValueForOptionalKey(extmetadata, "LicenseUrl"));
+}
+
+@NonNull
+private static String

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Retrofit GetDescriptionsTask

2017-04-27 Thread Jcasariego (Code Review) 
Jcasariego has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350596 )

Change subject: Retrofit GetDescriptionsTask
..

Retrofit GetDescriptionsTask

Port GetDescriptionTask to Retrofit and try to stay as consistent as possible 
with the existing code.

Bug: T152405
Change-Id: I857c8f07a8df09590676629fb5f01bc0e4fcb8c7
---
D app/src/androidTest/java/org/wikipedia/wikidata/GetDescriptionsTaskTest.java
M app/src/main/java/org/wikipedia/page/DisambigListAdapter.java
A app/src/main/java/org/wikipedia/wikidata/GetDescriptionsClient.java
D app/src/main/java/org/wikipedia/wikidata/GetDescriptionsTask.java
A app/src/test/java/org/wikipedia/wikidata/GetDescriptionClientTest.java
5 files changed, 199 insertions(+), 116 deletions(-)


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

diff --git 
a/app/src/androidTest/java/org/wikipedia/wikidata/GetDescriptionsTaskTest.java 
b/app/src/androidTest/java/org/wikipedia/wikidata/GetDescriptionsTaskTest.java
deleted file mode 100644
index 156184a..000
--- 
a/app/src/androidTest/java/org/wikipedia/wikidata/GetDescriptionsTaskTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.wikipedia.wikidata;
-
-
-import org.junit.Test;
-import org.wikipedia.WikipediaApp;
-import org.wikipedia.dataclient.WikiSite;
-import org.wikipedia.page.PageTitle;
-import org.wikipedia.testlib.TestLatch;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.wikipedia.test.TestUtil.runOnMainSync;
-
-/**
- * Tests retrieval of Wikidata descriptions through enwiki.
- */
-public class GetDescriptionsTaskTest {
-private static final WikiSite WIKI = WikiSite.forLanguageCode("en");
-
-@Test public void testOneTitle() throws Throwable {
-getWikidataDescriptions(new PageTitle[] {
-new PageTitle("Test", WIKI)}
-);
-}
-
-@Test public void testThreeTitles() {
-getWikidataDescriptions(new PageTitle[] {
-new PageTitle("SAT", WIKI),
-new PageTitle("Miller–Rabin primality test", WIKI),
-new PageTitle("Radiocarbon dating", WIKI)
-});
-}
-
-private void getWikidataDescriptions(final PageTitle[] ids) {
-final List idList = new ArrayList<>(Arrays.asList(ids));
-final TestLatch latch = new TestLatch();
-runOnMainSync(new Runnable() {
-@Override
-public void run() {
-WikipediaApp app = WikipediaApp.getInstance();
-new GetDescriptionsTask(app.getAPIForSite(WIKI), WIKI, idList) 
{
-@Override
-public void onFinish(Map descriptionsMap) 
{
-assertThat(descriptionsMap, notNullValue());
-assertThat(descriptionsMap.size(), is(idList.size()));
-for (PageTitle title : idList) {
-assertThat(title.getDescription(), notNullValue());
-}
-latch.countDown();
-}
-}.execute();
-}
-});
-latch.await();
-}
-}
diff --git a/app/src/main/java/org/wikipedia/page/DisambigListAdapter.java 
b/app/src/main/java/org/wikipedia/page/DisambigListAdapter.java
index 420217c..b9a11ca 100644
--- a/app/src/main/java/org/wikipedia/page/DisambigListAdapter.java
+++ b/app/src/main/java/org/wikipedia/page/DisambigListAdapter.java
@@ -20,7 +20,7 @@
 import org.wikipedia.pageimages.PageImagesClient;
 import org.wikipedia.views.GoneIfEmptyTextView;
 import org.wikipedia.views.ViewUtil;
-import org.wikipedia.wikidata.GetDescriptionsTask;
+import org.wikipedia.wikidata.GetDescriptionsClient;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -90,16 +90,17 @@
 return;
 }
 
-new GetDescriptionsTask(app.getSiteApi(), wiki, titleList) {
-@Override
-public void onFinish(Map result) {
+new GetDescriptionsClient().request(wiki, titleList, new 
GetDescriptionsClient.Callback() {
+@Override public void success(@NonNull 
Call call,
+@NonNull Map results) {
 notifyDataSetChanged();
 }
+
 @Override
-public void onCatch(Throwable caught) {
+public void failure(@NonNull 
Call call, @NonNull 
Throwable caught) {
 // descriptions are expendable
 }
-}.execute();
+});
 }
 
 class ViewHolder {
diff --git 
a/app/src/main/java/org/wikipedia/wikidata/GetDescriptionsClient.java

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Add link to OSM License

2017-04-12 Thread Jcasariego (Code Review) 
Jcasariego has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/347976 )

Change subject: Add link to OSM License
..

Add link to OSM License

App needs to show a link to OSM copyright on the map.

Bug: T161340
Change-Id: Icf642abadcd7eb9fb627e62806b702cb1d9be614
---
M app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
M app/src/main/res/layout/fragment_nearby.xml
M app/src/main/res/values/strings.xml
3 files changed, 24 insertions(+), 0 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java 
b/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
index 01147be..f2b7561 100644
--- a/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
+++ b/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
@@ -12,9 +12,11 @@
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
 import android.support.v4.content.ContextCompat;
+import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.mapbox.mapboxsdk.Mapbox;
@@ -43,10 +45,12 @@
 import org.wikipedia.json.GsonMarshaller;
 import org.wikipedia.json.GsonUnmarshaller;
 import org.wikipedia.page.PageTitle;
+import org.wikipedia.richtext.RichTextUtil;
 import org.wikipedia.util.DeviceUtil;
 import org.wikipedia.util.FeedbackUtil;
 import org.wikipedia.util.PermissionUtil;
 import org.wikipedia.util.ResourceUtil;
+import org.wikipedia.util.StringUtil;
 import org.wikipedia.util.ThrowableUtil;
 import org.wikipedia.util.log.L;
 
@@ -75,6 +79,7 @@
 private static final int GO_TO_LOCATION_PERMISSION_REQUEST = 50;
 
 @BindView(R.id.mapview) MapView mapView;
+@BindView(R.id.osm_license) TextView osmLicenseTextView;
 private Unbinder unbinder;
 
 @Nullable private MapboxMap mapboxMap;
@@ -110,6 +115,10 @@
 .fromBitmap(ResourceUtil.bitmapFromVectorDrawable(getContext(),
 R.drawable.ic_map_marker));
 
+
osmLicenseTextView.setText(StringUtil.fromHtml(getString(R.string.nearby_osm_license)));
+RichTextUtil.removeUnderlinesFromLinks(osmLicenseTextView);
+osmLicenseTextView.setMovementMethod(LinkMovementMethod.getInstance());
+
 mapView.onCreate(savedInstanceState);
 
 setHasOptionsMenu(true);
diff --git a/app/src/main/res/layout/fragment_nearby.xml 
b/app/src/main/res/layout/fragment_nearby.xml
index 5c89586..f5dafb5 100644
--- a/app/src/main/res/layout/fragment_nearby.xml
+++ b/app/src/main/res/layout/fragment_nearby.xml
@@ -17,6 +17,20 @@
 app:mapbox_uiLogo="false">
 
 
+
+
 %d m
 %.2f km
 Zoom to a location on the 
map
+
 
 Last updated %s
 Talk

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf642abadcd7eb9fb627e62806b702cb1d9be614
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Jcasariego 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits