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

convert entity classes to Kotlin data classes (#526)

Browse source 
* convert entity classes to Kotlin data classes

* more data classes, code style
This commit is contained in:
Konrad Pozniak 2018-03-03 13:24:03 +01:00 • committed by GitHub
commit 71954a277e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
51 changed files with 604 additions and 785 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.java
View file

@ -95,9 +95,9 @@ public class LinkHelper {
* that can't be found then just go with whichever one matched last. */
String id = null;
for (Status.Mention mention : mentions) {
if (mention.localUsername.equalsIgnoreCase(accountUsername)) {
id = mention.id;
if (mention.url.contains(getDomain(span.getURL()))) {
if (mention.getLocalUsername().equalsIgnoreCase(accountUsername)) {
id = mention.getId();
if (mention.getUrl().contains(getDomain(span.getURL()))) {
break;
}
}

28
app/src/main/java/com/keylesspalace/tusky/util/NotificationHelper.java
View file

@ -89,7 +89,7 @@ public class NotificationHelper {
for (int i = 0; i < currentNotifications.length(); i++) {
try {
if (currentNotifications.getString(i).equals(body.account.getDisplayName())) {
if (currentNotifications.getString(i).equals(body.getAccount().getName())) {
alreadyContains = true;
}
} catch (JSONException e) {
@ -98,7 +98,7 @@ public class NotificationHelper {
}
if (!alreadyContains) {
currentNotifications.put(body.account.getDisplayName());
currentNotifications.put(body.getAccount().getName());
}
account.setActiveNotifications(currentNotifications.toString());
@ -131,7 +131,7 @@ public class NotificationHelper {
builder.setContentTitle(titleForType(context, body))
.setContentText(bodyForType(body));
if(body.type == Notification.Type.MENTION) {
if(body.getType() == Notification.Type.MENTION) {
builder.setStyle(new NotificationCompat.BigTextStyle()
.bigText(bodyForType(body)));
}
@ -140,7 +140,7 @@ public class NotificationHelper {
Bitmap accountAvatar;
try {
accountAvatar = Picasso.with(context)
.load(body.account.avatar)
.load(body.getAccount().getAvatar())
.transform(new RoundedTransformation(7, 0))
.get();
} catch (IOException e) {
@ -301,7 +301,7 @@ public class NotificationHelper {
return channel.getImportance() > NotificationManager.IMPORTANCE_NONE;
}
switch (notification.type) {
switch (notification.getType()) {
default:
case MENTION:
return account.getNotificationsMentioned();
@ -315,7 +315,7 @@ public class NotificationHelper {
}
private static String getChannelId(AccountEntity account, Notification notification) {
switch (notification.type) {
switch (notification.getType()) {
default:
case MENTION:
return CHANNEL_MENTION+account.getIdentifier();
@ -368,32 +368,32 @@ public class NotificationHelper {
@Nullable
private static String titleForType(Context context, Notification notification) {
switch (notification.type) {
switch (notification.getType()) {
case MENTION:
return String.format(context.getString(R.string.notification_mention_format),
notification.account.getDisplayName());
notification.getAccount().getName());
case FOLLOW:
return String.format(context.getString(R.string.notification_follow_format),
notification.account.getDisplayName());
notification.getAccount().getName());
case FAVOURITE:
return String.format(context.getString(R.string.notification_favourite_format),
notification.account.getDisplayName());
notification.getAccount().getName());
case REBLOG:
return String.format(context.getString(R.string.notification_reblog_format),
notification.account.getDisplayName());
notification.getAccount().getName());
}
return null;
}
@Nullable
private static String bodyForType(Notification notification) {
switch (notification.type) {
switch (notification.getType()) {
case FOLLOW:
return "@"+notification.account.username;
return "@"+ notification.getAccount().getUsername();
case MENTION:
case FAVOURITE:
case REBLOG:
return notification.status.content.toString();
return notification.getStatus().getContent().toString();
}
return null;
}

50
app/src/main/java/com/keylesspalace/tusky/util/ViewDataUtils.java
View file

@ -31,38 +31,38 @@ public final class ViewDataUtils {
public static StatusViewData.Concrete statusToViewData(@Nullable Status status,
boolean alwaysShowSensitiveMedia) {
if (status == null) return null;
Status visibleStatus = status.reblog == null ? status : status.reblog;
return new StatusViewData.Builder().setId(status.id)
.setAttachments(visibleStatus.attachments)
.setAvatar(visibleStatus.account.avatar)
.setContent(visibleStatus.content)
.setCreatedAt(visibleStatus.createdAt)
.setReblogsCount(visibleStatus.reblogsCount)
.setFavouritesCount(visibleStatus.favouritesCount)
.setInReplyToId(visibleStatus.inReplyToId)
.setFavourited(visibleStatus.favourited)
.setReblogged(visibleStatus.reblogged)
Status visibleStatus = status.getReblog() == null ? status : status.getReblog();
return new StatusViewData.Builder().setId(status.getId())
.setAttachments(visibleStatus.getAttachments())
.setAvatar(visibleStatus.getAccount().getAvatar())
.setContent(visibleStatus.getContent())
.setCreatedAt(visibleStatus.getCreatedAt())
.setReblogsCount(visibleStatus.getReblogsCount())
.setFavouritesCount(visibleStatus.getFavouritesCount())
.setInReplyToId(visibleStatus.getInReplyToId())
.setFavourited(visibleStatus.getFavourited())
.setReblogged(visibleStatus.getReblogged())
.setIsExpanded(false)
.setIsShowingSensitiveContent(false)
.setMentions(visibleStatus.mentions)
.setNickname(visibleStatus.account.username)
.setRebloggedAvatar(status.reblog == null ? null : status.account.avatar)
.setSensitive(visibleStatus.sensitive)
.setIsShowingSensitiveContent(alwaysShowSensitiveMedia || !visibleStatus.sensitive)
.setSpoilerText(visibleStatus.spoilerText)
.setRebloggedByUsername(status.reblog == null ? null : status.account.username)
.setUserFullName(visibleStatus.account.getDisplayName())
.setVisibility(visibleStatus.visibility)
.setSenderId(visibleStatus.account.id)
.setMentions(visibleStatus.getMentions())
.setNickname(visibleStatus.getAccount().getUsername())
.setRebloggedAvatar(status.getReblog() == null ? null : status.getAccount().getAvatar())
.setSensitive(visibleStatus.getSensitive())
.setIsShowingSensitiveContent(alwaysShowSensitiveMedia || !visibleStatus.getSensitive())
.setSpoilerText(visibleStatus.getSpoilerText())
.setRebloggedByUsername(status.getReblog() == null ? null : status.getAccount().getUsername())
.setUserFullName(visibleStatus.getAccount().getName())
.setVisibility(visibleStatus.getVisibility())
.setSenderId(visibleStatus.getAccount().getId())
.setRebloggingEnabled(visibleStatus.rebloggingAllowed())
.setApplication(visibleStatus.application)
.setEmojis(visibleStatus.emojis)
.setApplication(visibleStatus.getApplication())
.setEmojis(visibleStatus.getEmojis())
.createStatusViewData();
}
public static NotificationViewData.Concrete notificationToViewData(Notification notification, boolean alwaysShowSensitiveData) {
return new NotificationViewData.Concrete(notification.type, notification.id, notification.account,
statusToViewData(notification.status, alwaysShowSensitiveData), false);
return new NotificationViewData.Concrete(notification.getType(), notification.getId(), notification.getAccount(),
statusToViewData(notification.getStatus(), alwaysShowSensitiveData), false);
}
}