Skip to content

Commit 4ec1d5a

Browse files
authored
Use string resource for view changes button and some minor code updates (#5901)
* Use string resource for view changes button and some minor code updates * More thumbnail url update
1 parent 6b9ee75 commit 4ec1d5a

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

app/src/main/java/org/wikipedia/activitytab/EditingInsightsModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ fun MostViewedCard(
243243
)
244244
}
245245
}
246-
if (pageTitle.thumbUrl != null) {
246+
if (!pageTitle.thumbUrl.isNullOrEmpty()) {
247247
val request =
248248
ImageService.getRequest(
249249
LocalContext.current,

app/src/main/java/org/wikipedia/activitytab/ReadingHistoryModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ private fun ArticleSavedThisMonthCard(
426426

427427
for (i in 0 until itemsToShow) {
428428
val url = readingHistory.articlesSaved[i].thumbUrl
429-
if (url == null) {
429+
if (url.isNullOrEmpty()) {
430430
Box(
431431
modifier = Modifier.padding(start = 4.dp).size(38.dp)
432432
.background(

app/src/main/java/org/wikipedia/activitytab/timeline/TimelineModule.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,12 @@ fun TimelineModule(
116116
)
117117
Text(
118118
modifier = Modifier.padding(start = 6.dp),
119-
text = "View changes"
119+
text = stringResource(R.string.activity_tab_timeline_view_changes_button)
120120
)
121121
}
122122
}
123123
}
124-
if (timelineItem.thumbnailUrl != null) {
124+
if (!timelineItem.thumbnailUrl.isNullOrEmpty()) {
125125
val request =
126126
ImageService.getRequest(LocalContext.current, url = timelineItem.thumbnailUrl)
127127
AsyncImage(
@@ -206,7 +206,7 @@ fun TimelineDateSeparator(
206206
}
207207
}
208208

209-
@Preview
209+
@Preview(showBackground = true)
210210
@Composable
211211
private fun TimelineItemPreview() {
212212
BaseTheme(
@@ -231,7 +231,7 @@ private fun TimelineItemPreview() {
231231
}
232232
}
233233

234-
@Preview
234+
@Preview(showBackground = true)
235235
@Composable
236236
private fun TimelineDateSeparatorPreview() {
237237
BaseTheme(

app/src/main/res/values-qq/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,6 +1242,7 @@
12421242
<string name="activity_tab_timeline_yesterday">Date separator label for yesterday\'s entries in activity timeline.</string>
12431243
<string name="activity_tab_timeline_empty_state_title">Title displayed when the timeline is empty.</string>
12441244
<string name="activity_tab_timeline_empty_state_message">Message shown when there are no items in the timeline.</string>
1245+
<string name="activity_tab_timeline_view_changes_button">Button label to view edit changes in the timeline.</string>
12451246
<string name="activity_tab_onboarding_screen_title">Title for the activity tab onboarding screen.</string>
12461247
<string name="activity_tab_onboarding_reading_patterns_title">Title for the section about user\'s reading habits.</string>
12471248
<string name="activity_tab_onboarding_reading_patterns_message">Short explanation about user\'s reading habits.</string>

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1264,6 +1264,7 @@
12641264
<string name="activity_tab_timeline_yesterday">Yesterday</string>
12651265
<string name="activity_tab_timeline_empty_state_title">Nothing to show</string>
12661266
<string name="activity_tab_timeline_empty_state_message">Start reading and editing to build your history</string>
1267+
<string name="activity_tab_timeline_view_changes_button">View changes</string>
12671268
<string name="activity_tab_onboarding_reading_patterns_title">Reading patterns</string>
12681269
<string name="activity_tab_onboarding_reading_patterns_message">See how much time you\'ve spent reading and which articles or topics you\'ve explored over time.</string>
12691270
<string name="activity_tab_onboarding_screen_title">Introducing Activity</string>

0 commit comments

Comments
 (0)