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

UI Improvements (#445)

Browse source 
UI Improvements
This commit is contained in:
Konrad Pozniak 2017-11-30 20:12:09 +01:00 • committed by GitHub
commit 41233a837b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
54 changed files with 1266 additions and 1042 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,13 +38,15 @@ public abstract class NotificationViewData {
private final String id;
private final Account account;
private final StatusViewData.Concrete statusViewData;
private final boolean isExpanded;
public Concrete(Notification.Type type, String id, Account account,
StatusViewData.Concrete statusViewData) {
StatusViewData.Concrete statusViewData, boolean isExpanded) {
this.type = type;
this.id = id;
this.account = account;
this.statusViewData = statusViewData;
this.isExpanded = isExpanded;
}
public Notification.Type getType() {
@ -62,6 +64,10 @@ public abstract class NotificationViewData {
public StatusViewData.Concrete getStatusViewData() {
return statusViewData;
}
public boolean isExpanded() {
return isExpanded;
}
}
public static final class Placeholder extends NotificationViewData {

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

@ -18,6 +18,7 @@ package com.keylesspalace.tusky.viewdata;
import android.support.annotation.Nullable;
import android.text.Spanned;
import com.keylesspalace.tusky.entity.Attachment;
import com.keylesspalace.tusky.entity.Card;
import com.keylesspalace.tusky.entity.Status;
@ -45,14 +46,14 @@ public abstract class StatusViewData {
@Nullable
private final String spoilerText;
private final Status.Visibility visibility;
private final Status.MediaAttachment[] attachments;
private final Attachment[] attachments;
@Nullable
private final String rebloggedByUsername;
@Nullable
private final String rebloggedAvatar;
private final boolean isSensitive;
private final boolean isExpanded;
private final boolean isShowingSensitiveContent;
private final boolean isShowingContent;
private final String userFullName;
private final String nickname;
private final String avatar;
@ -72,9 +73,9 @@ public abstract class StatusViewData {
private final Card card;
public Concrete(String id, Spanned content, boolean reblogged, boolean favourited,
@Nullable String spoilerText, Status.Visibility visibility, Status.MediaAttachment[] attachments,
@Nullable String spoilerText, Status.Visibility visibility, Attachment[] attachments,
@Nullable String rebloggedByUsername, @Nullable String rebloggedAvatar, boolean sensitive, boolean isExpanded,
boolean isShowingSensitiveWarning, String userFullName, String nickname, String avatar,
boolean isShowingContent, String userFullName, String nickname, String avatar,
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) {
@ -89,7 +90,7 @@ public abstract class StatusViewData {
this.rebloggedAvatar = rebloggedAvatar;
this.isSensitive = sensitive;
this.isExpanded = isExpanded;
this.isShowingSensitiveContent = isShowingSensitiveWarning;
this.isShowingContent = isShowingContent;
this.userFullName = userFullName;
this.nickname = nickname;
this.avatar = avatar;
@ -130,7 +131,7 @@ public abstract class StatusViewData {
return visibility;
}
public Status.MediaAttachment[] getAttachments() {
public Attachment[] getAttachments() {
return attachments;
}
@ -147,8 +148,8 @@ public abstract class StatusViewData {
return isExpanded;
}
public boolean isShowingSensitiveContent() {
return isShowingSensitiveContent;
public boolean isShowingContent() {
return isShowingContent;
}
@Nullable
@ -232,12 +233,12 @@ public abstract class StatusViewData {
private boolean favourited;
private String spoilerText;
private Status.Visibility visibility;
private Status.MediaAttachment[] attachments;
private Attachment[] attachments;
private String rebloggedByUsername;
private String rebloggedAvatar;
private boolean isSensitive;
private boolean isExpanded;
private boolean isShowingSensitiveContent;
private boolean isShowingContent;
private String userFullName;
private String nickname;
private String avatar;
@ -267,7 +268,7 @@ public abstract class StatusViewData {
rebloggedAvatar = viewData.rebloggedAvatar;
isSensitive = viewData.isSensitive;
isExpanded = viewData.isExpanded;
isShowingSensitiveContent = viewData.isShowingSensitiveContent;
isShowingContent = viewData.isShowingContent;
userFullName = viewData.userFullName;
nickname = viewData.nickname;
avatar = viewData.avatar;
@ -313,7 +314,7 @@ public abstract class StatusViewData {
return this;
}
public Builder setAttachments(Status.MediaAttachment[] attachments) {
public Builder setAttachments(Attachment[] attachments) {
this.attachments = attachments;
return this;
}
@ -339,7 +340,7 @@ public abstract class StatusViewData {
}
public Builder setIsShowingSensitiveContent(boolean isShowingSensitiveContent) {
this.isShowingSensitiveContent = isShowingSensitiveContent;
this.isShowingContent = isShowingSensitiveContent;
return this;
}
@ -414,7 +415,7 @@ public abstract class StatusViewData {
return new StatusViewData.Concrete(id, content, reblogged, favourited, spoilerText, visibility,
attachments, rebloggedByUsername, rebloggedAvatar, isSensitive, isExpanded,
isShowingSensitiveContent, userFullName, nickname, avatar, createdAt, reblogsCount,
isShowingContent, userFullName, nickname, avatar, createdAt, reblogsCount,
favouritesCount, inReplyToId, mentions, senderId, rebloggingEnabled, application,
emojis, card);
}