jenkins-bot has submitted this change and it was merged.
Change subject: Fix title and thumbnail in "continue reading" card.
......................................................................
Fix title and thumbnail in "continue reading" card.
Change-Id: Ifc4ef9396cfe40560b70b76045920503a6e7d696
---
M app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCard.java
M
app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
M app/src/main/java/org/wikipedia/feed/continuereading/LastPageReadTask.java
M app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
4 files changed, 15 insertions(+), 5 deletions(-)
Approvals:
Mholloway: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCard.java
b/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCard.java
index 193e5ab..b9a765e 100644
---
a/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCard.java
+++
b/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCard.java
@@ -1,7 +1,9 @@
package org.wikipedia.feed.continuereading;
+import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
+import android.text.TextUtils;
import org.wikipedia.feed.model.Card;
import org.wikipedia.history.HistoryEntry;
@@ -16,13 +18,17 @@
}
@Override @NonNull public String title() {
- return entry.getTitle().getText();
+ return entry.getTitle().getDisplayText();
}
@Override @Nullable public String subtitle() {
return entry.getTitle().getDescription();
}
+ @Override @Nullable public Uri image() {
+ return TextUtils.isEmpty(entry.getTitle().getThumbUrl()) ? null :
Uri.parse(entry.getTitle().getThumbUrl());
+ }
+
/** @return The last visit age in days. */
public long daysOld() {
long now = System.currentTimeMillis();
diff --git
a/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
b/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
index 9ba9567..36f7874 100644
---
a/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
+++
b/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
@@ -41,6 +41,7 @@
ContinueReadingCard card = item(position);
holder.getView().setTitle(card.title());
holder.getView().setSubtitle(card.subtitle());
+ holder.getView().setImage(card.image());
}
}
}
\ No newline at end of file
diff --git
a/app/src/main/java/org/wikipedia/feed/continuereading/LastPageReadTask.java
b/app/src/main/java/org/wikipedia/feed/continuereading/LastPageReadTask.java
index 50a5de5..09b4027 100644
--- a/app/src/main/java/org/wikipedia/feed/continuereading/LastPageReadTask.java
+++ b/app/src/main/java/org/wikipedia/feed/continuereading/LastPageReadTask.java
@@ -11,6 +11,7 @@
import org.wikipedia.concurrency.SaneAsyncTask;
import org.wikipedia.database.contract.PageHistoryContract;
+import org.wikipedia.database.contract.PageImageHistoryContract;
import org.wikipedia.history.HistoryEntry;
import java.util.Date;
@@ -34,7 +35,9 @@
try {
if (cursor.moveToPosition(age)) {
- return HistoryEntry.DATABASE_TABLE.fromCursor(cursor);
+ HistoryEntry entry =
HistoryEntry.DATABASE_TABLE.fromCursor(cursor);
+
entry.getTitle().setThumbUrl(PageImageHistoryContract.Col.IMAGE_NAME.val(cursor));
+ return entry;
}
} finally {
cursor.close();
@@ -45,11 +48,11 @@
@Nullable private Cursor queryLastPage(long earlierThanTime) {
ContentProviderClient client =
HistoryEntry.DATABASE_TABLE.acquireClient(context);
try {
- Uri uri = PageHistoryContract.Page.URI;
+ Uri uri = PageHistoryContract.PageWithImage.URI;
final String[] projection = null;
final String selection =
PageHistoryContract.Col.TIMESTAMP.getName() + " < ?";
final String[] selectionArgs = {Long.toString(earlierThanTime)};
- String order = PageHistoryContract.Page.ORDER_MRU + " limit " +
(age + 1);
+ String order = PageHistoryContract.PageWithImage.ORDER_MRU + "
limit " + (age + 1);
return client.query(uri, projection, selection, selectionArgs,
order);
} catch (RemoteException e) {
throw new RuntimeException(e);
diff --git a/app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
b/app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
index 6119b07..1154b48 100644
--- a/app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
+++ b/app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
@@ -26,7 +26,7 @@
ButterKnife.bind(this);
}
- @NonNull public ListCardItemView setImage(@NonNull Uri uri) {
+ @NonNull public ListCardItemView setImage(@Nullable Uri uri) {
imageView.setImageURI(uri);
return this;
}
--
To view, visit https://gerrit.wikimedia.org/r/293753
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc4ef9396cfe40560b70b76045920503a6e7d696
Gerrit-PatchSet: 3
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[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
