This commit is contained in:
Grishka
2022-02-08 13:25:17 +03:00
parent 1f4611bc4e
commit d9cd15eb2d
22 changed files with 110 additions and 22 deletions

View File

@@ -1,7 +1,9 @@
package org.joinmastodon.android.model;
import org.joinmastodon.android.api.RequiredField;
import org.parceler.Parcel;
@Parcel
public class Application extends BaseModel{
@RequiredField
public String name;

View File

@@ -10,7 +10,9 @@ import org.joinmastodon.android.api.ObjectValidationException;
import org.joinmastodon.android.api.RequiredField;
import org.joinmastodon.android.ui.utils.BlurHashDecoder;
import org.joinmastodon.android.ui.utils.BlurHashDrawable;
import org.parceler.Parcel;
@Parcel
public class Attachment extends BaseModel{
@RequiredField
public String id;
@@ -88,6 +90,7 @@ public class Attachment extends BaseModel{
UNKNOWN
}
@Parcel
public static class Metadata{
public double duration;
public int width;
@@ -111,6 +114,7 @@ public class Attachment extends BaseModel{
}
}
@Parcel
public static class SizeMetadata{
public int width;
public int height;

View File

@@ -9,7 +9,9 @@ import org.joinmastodon.android.api.ObjectValidationException;
import org.joinmastodon.android.api.RequiredField;
import org.joinmastodon.android.ui.utils.BlurHashDecoder;
import org.joinmastodon.android.ui.utils.BlurHashDrawable;
import org.parceler.Parcel;
@Parcel
public class Card extends BaseModel{
@RequiredField
public String url;

View File

@@ -1,9 +1,11 @@
package org.joinmastodon.android.model;
import org.joinmastodon.android.api.RequiredField;
import org.parceler.Parcel;
import java.util.List;
@Parcel
public class Hashtag extends BaseModel{
@RequiredField
public String name;

View File

@@ -1,8 +1,10 @@
package org.joinmastodon.android.model;
import org.joinmastodon.android.api.AllFieldsAreRequired;
import org.parceler.Parcel;
@AllFieldsAreRequired
@Parcel
public class History extends BaseModel{
public long day; // unixtime
public int uses;

View File

@@ -1,8 +1,10 @@
package org.joinmastodon.android.model;
import org.joinmastodon.android.api.AllFieldsAreRequired;
import org.parceler.Parcel;
@AllFieldsAreRequired
@Parcel
public class Mention extends BaseModel{
public String id;
public String username;

View File

@@ -2,12 +2,14 @@ package org.joinmastodon.android.model;
import org.joinmastodon.android.api.AllFieldsAreRequired;
import org.joinmastodon.android.api.ObjectValidationException;
import org.parceler.Parcel;
import java.time.Instant;
import java.util.Arrays;
import java.util.List;
@AllFieldsAreRequired
@Parcel
public class Poll extends BaseModel{
public String id;
public Instant expiresAt;
@@ -41,6 +43,7 @@ public class Poll extends BaseModel{
'}';
}
@Parcel
public static class Option{
public String title;
public Integer votesCount;

View File

@@ -3,10 +3,12 @@ package org.joinmastodon.android.model;
import org.joinmastodon.android.api.ObjectValidationException;
import org.joinmastodon.android.api.RequiredField;
import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
import org.parceler.Parcel;
import java.time.Instant;
import java.util.List;
@Parcel
public class Status extends BaseModel implements DisplayItemsParent{
@RequiredField
public String id;
@@ -116,6 +118,7 @@ public class Status extends BaseModel implements DisplayItemsParent{
public void update(StatusCountersUpdatedEvent ev){
favouritesCount=ev.favorites;
reblogsCount=ev.reblogs;
repliesCount=ev.replies;
favourited=ev.favorited;
reblogged=ev.reblogged;
}