chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

implement "load more" placeholder

Browse source
This commit is contained in:
Conny Duck 2017-11-03 22:17:31 +01:00
commit 80a10c1ac1
16 changed files with 398 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/src/main/java/com/keylesspalace/tusky/viewdata/NotificationViewData.java
View file

@ -1,3 +1,18 @@
/* Copyright 2017 Andrew Dawson
*
* This file is a part of Tusky.
*
* This program is free software; you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with Tusky; if not,
* see <http://www.gnu.org/licenses>. */
package com.keylesspalace.tusky.viewdata;
import com.keylesspalace.tusky.entity.Account;
@ -12,13 +27,15 @@ public final class NotificationViewData {
private final String id;
private final Account account;
private final StatusViewData statusViewData;
private final boolean placeholderLoading;
public NotificationViewData(Notification.Type type, String id, Account account,
StatusViewData statusViewData) {
StatusViewData statusViewData, boolean placeholderLoading) {
this.type = type;
this.id = id;
this.account = account;
this.statusViewData = statusViewData;
this.placeholderLoading = placeholderLoading;
}
public Notification.Type getType() {
@ -36,4 +53,8 @@ public final class NotificationViewData {
public StatusViewData getStatusViewData() {
return statusViewData;
}
public boolean isPlaceholderLoading() {
return placeholderLoading;
}
}

60
app/src/main/java/com/keylesspalace/tusky/viewdata/StatusViewData.java
View file

@ -1,3 +1,18 @@
/* Copyright 2017 Andrew Dawson
*
* This file is a part of Tusky.
*
* This program is free software; you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with Tusky; if not,
* see <http://www.gnu.org/licenses>. */
package com.keylesspalace.tusky.viewdata;
import android.support.annotation.Nullable;
@ -48,13 +63,18 @@ public final class StatusViewData {
@Nullable
private final Card card;
private final boolean placeholder;
private final boolean placeholderLoading;
public StatusViewData(String id, Spanned content, boolean reblogged, boolean favourited,
String spoilerText, Status.Visibility visibility, Status.MediaAttachment[] attachments,
String rebloggedByUsername, String rebloggedAvatar, boolean sensitive, boolean isExpanded,
@Nullable String spoilerText, Status.Visibility visibility, Status.MediaAttachment[] attachments,
@Nullable String rebloggedByUsername, @Nullable String rebloggedAvatar, boolean sensitive, boolean isExpanded,
boolean isShowingSensitiveWarning, String userFullName, String nickname, String avatar,
Date createdAt, String reblogsCount, String favouritesCount, String inReplyToId,
Status.Mention[] mentions, String senderId, boolean rebloggingEnabled,
Status.Application application, List<Status.Emoji> emojis, Card card) {
Date createdAt, String reblogsCount, String favouritesCount, @Nullable String inReplyToId,
@Nullable Status.Mention[] mentions, String senderId, boolean rebloggingEnabled,
Status.Application application, List<Status.Emoji> emojis, @Nullable Card card,
boolean placeholder, boolean placeholderLoading) {
this.id = id;
this.content = content;
this.reblogged = reblogged;
@ -80,6 +100,8 @@ public final class StatusViewData {
this.application = application;
this.emojis = emojis;
this.card = card;
this.placeholder = placeholder;
this.placeholderLoading = placeholderLoading;
}
public String getId() {
@ -183,10 +205,19 @@ public final class StatusViewData {
return emojis;
}
@Nullable
public Card getCard() {
return card;
}
public boolean isPlaceholder() {
return placeholder;
}
public boolean isPlaceholderLoading() {
return placeholderLoading;
}
public static class Builder {
private String id;
private Spanned content;
@ -213,6 +244,8 @@ public final class StatusViewData {
private Status.Application application;
private List<Status.Emoji> emojis;
private Card card;
private boolean placeholder;
private boolean placeholderLoading;
public Builder() {
}
@ -243,6 +276,8 @@ public final class StatusViewData {
application = viewData.application;
emojis = viewData.getEmojis();
card = viewData.getCard();
placeholder = viewData.isPlaceholder();
placeholderLoading = viewData.isPlaceholderLoading();
}
@ -371,12 +406,25 @@ public final class StatusViewData {
return this;
}
public Builder setPlaceholder(boolean placeholder) {
this.placeholder = placeholder;
return this;
}
public Builder setPlaceholderLoading(boolean placeholderLoading) {
this.placeholderLoading = placeholderLoading;
return this;
}
public StatusViewData createStatusViewData() {
if (this.emojis == null) emojis = Collections.emptyList();
if (this.createdAt == null) createdAt = new Date();
return new StatusViewData(id, content, reblogged, favourited, spoilerText, visibility,
attachments, rebloggedByUsername, rebloggedAvatar, isSensitive, isExpanded,
isShowingSensitiveContent, userFullName, nickname, avatar, createdAt, reblogsCount,
favouritesCount, inReplyToId, mentions, senderId, rebloggingEnabled, application, emojis, card);
favouritesCount, inReplyToId, mentions, senderId, rebloggingEnabled, application,
emojis, card, placeholder, placeholderLoading);
}
}
}