jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372194 )
Change subject: Show full reading list description in detail view
......................................................................
Show full reading list description in detail view
Bug: T164926
Change-Id: Iab785071cc4a5b12ea5b2b503ae823e40564635c
---
M app/src/main/java/org/wikipedia/readinglist/ReadingListItemView.java
M app/src/main/res/layout/item_reading_list.xml
M app/src/main/res/values/dimens.xml
3 files changed, 7 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Mholloway: Looks good to me, approved
diff --git
a/app/src/main/java/org/wikipedia/readinglist/ReadingListItemView.java
b/app/src/main/java/org/wikipedia/readinglist/ReadingListItemView.java
index 0488db9..a211840 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListItemView.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListItemView.java
@@ -77,7 +77,11 @@
public void setReadingList(@NonNull ReadingList readingList, @NonNull
Description description) {
this.readingList = readingList;
- CharSequence text = description == Description.DETAIL
+ boolean isDetailView = description == Description.DETAIL;
+ descriptionView.setMaxLines(isDetailView
+ ? Integer.MAX_VALUE
+ :
getResources().getInteger(R.integer.reading_list_description_summary_view_max_lines));
+ CharSequence text = isDetailView
? buildStatisticalDetailText(readingList)
: buildStatisticalSummaryText(readingList);
statisticalDescriptionView.setText(text);
diff --git a/app/src/main/res/layout/item_reading_list.xml
b/app/src/main/res/layout/item_reading_list.xml
index 4a2fec7..d88e491 100644
--- a/app/src/main/res/layout/item_reading_list.xml
+++ b/app/src/main/res/layout/item_reading_list.xml
@@ -92,7 +92,7 @@
style="@style/RtlAwareTextView"
android:textAppearance="?android:attr/textAppearanceSmall"
android:ellipsize="end"
- android:maxLines="2"
+
android:maxLines="@integer/reading_list_description_summary_view_max_lines"
android:textColor="?attr/list_item_text_secondary_color"
tools:text="Sample description" />
diff --git a/app/src/main/res/values/dimens.xml
b/app/src/main/res/values/dimens.xml
index 0f66ef0..094e900 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -116,5 +116,6 @@
<!-- Reading lists -->
<integer name="reading_list_item_size_bytes_per_unit">1000000</integer>
<!-- 1 MB -->
+ <integer name="reading_list_description_summary_view_max_lines">2</integer>
</resources>
--
To view, visit https://gerrit.wikimedia.org/r/372194
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iab785071cc4a5b12ea5b2b503ae823e40564635c
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
