Mastodon/Twidere-App-Android-Twitter-Mastodon
1
0
Fork 0
mirror of https://github.com/TwidereProject/Twidere-Android synced 2025-02-17 04:00:48 +01:00
Code Issues Releases Wiki Activity

make some models serializable

Browse Source
This commit is contained in:
Mariotaku Lee 2016-04-27 22:23:05 +08:00
parent a5084e5822
commit 941a81f5e2
43 changed files with 1299 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
twidere.component.common/src/main/java/org/mariotaku/twidere/api/fanfou/model/Photo.java
View File

@ -1,13 +1,18 @@
package org.mariotaku.twidere.api.fanfou.model;
import android.os.Parcel;
import android.os.Parcelable;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
/**
* Created by mariotaku on 16/3/10.
*/
@ParcelablePlease
@JsonObject
public class Photo {
public class Photo implements Parcelable {
@JsonField(name = "url")
String url;
@JsonField(name = "imageurl")
@ -42,4 +47,28 @@ public class Photo {
", largeUrl='" + largeUrl + '\'' +
'}';
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
PhotoParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<Photo> CREATOR = new Creator<Photo>() {
@Override
public Photo createFromParcel(Parcel source) {
Photo target = new Photo();
PhotoParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public Photo[] newArray(int size) {
return new Photo[size];
}
};
}

49
twidere.component.common/src/main/java/org/mariotaku/twidere/api/gnusocial/model/Attachment.java
View File

@ -1,15 +1,20 @@
package org.mariotaku.twidere.api.gnusocial.model;
import android.os.Parcel;
import android.os.Parcelable;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
/**
* GNUSocial attachment model
*
* <p/>
* Created by mariotaku on 16/1/26.
*/
@ParcelablePlease
@JsonObject
public class Attachment {
public class Attachment implements Parcelable {
@JsonField(name = "width")
int width;
@JsonField(name = "height")
@ -70,4 +75,44 @@ public class Attachment {
public String getVersion() {
return version;
}
@Override
public int describeContents() {
return 0;
}
@Override
public String toString() {
return "Attachment{" +
"width=" + width +
", height=" + height +
", url='" + url + '\'' +
", thumbUrl='" + thumbUrl + '\'' +
", largeThumbUrl='" + largeThumbUrl + '\'' +
", mimetype='" + mimetype + '\'' +
", id=" + id +
", oembed=" + oembed +
", size=" + size +
", version='" + version + '\'' +
'}';
}
@Override
public void writeToParcel(Parcel dest, int flags) {
AttachmentParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<Attachment> CREATOR = new Creator<Attachment>() {
@Override
public Attachment createFromParcel(Parcel source) {
Attachment target = new Attachment();
AttachmentParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public Attachment[] newArray(int size) {
return new Attachment[size];
}
};
}

31
twidere.component.common/src/main/java/org/mariotaku/twidere/api/statusnet/model/Attention.java
View File

@ -1,13 +1,18 @@
package org.mariotaku.twidere.api.statusnet.model;
import android.os.Parcel;
import android.os.Parcelable;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
/**
* Created by mariotaku on 16/3/7.
*/
@ParcelablePlease
@JsonObject
public class Attention {
public class Attention implements Parcelable {
@JsonField(name = "fullname")
String fullName;
@ -50,4 +55,28 @@ public class Attention {
", screenName='" + screenName + '\'' +
'}';
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
AttentionParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<Attention> CREATOR = new Creator<Attention>() {
@Override
public Attention createFromParcel(Parcel source) {
Attention target = new Attention();
AttentionParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public Attention[] newArray(int size) {
return new Attention[size];
}
};
}

31
twidere.component.common/src/main/java/org/mariotaku/twidere/api/statusnet/model/Group.java
View File

@ -1,7 +1,11 @@
package org.mariotaku.twidere.api.statusnet.model;
import android.os.Parcel;
import android.os.Parcelable;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
import org.mariotaku.twidere.api.twitter.util.TwitterDateConverter;
@ -10,8 +14,9 @@ import java.util.Date;
/**
* Created by mariotaku on 16/3/4.
*/
@ParcelablePlease
@JsonObject
public class Group {
public class Group implements Parcelable {
@JsonField(name = "modified", typeConverter = TwitterDateConverter.class)
Date modified;
@ -154,4 +159,28 @@ public class Group {
public int hashCode() {
return id.hashCode();
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
GroupParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<Group> CREATOR = new Creator<Group>() {
@Override
public Group createFromParcel(Parcel source) {
Group target = new Group();
GroupParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public Group[] newArray(int size) {
return new Group[size];
}
};
}

57
twidere.component.common/src/main/java/org/mariotaku/twidere/api/statusnet/model/StatusNetConfig.java
View File

@ -1,13 +1,18 @@
package org.mariotaku.twidere.api.statusnet.model;
import android.os.Parcel;
import android.os.Parcelable;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
/**
* Created by mariotaku on 16/2/29.
*/
@ParcelablePlease
@JsonObject
public class StatusNetConfig {
public class StatusNetConfig implements Parcelable {
@JsonField(name = "site")
Site site;
@ -16,8 +21,9 @@ public class StatusNetConfig {
return site;
}
@ParcelablePlease
@JsonObject
public static class Site {
public static class Site implements Parcelable {
@JsonField(name = "textlimit")
int textLimit;
@ -25,5 +31,52 @@ public class StatusNetConfig {
return textLimit;
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
StatusNetConfig$SiteParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<Site> CREATOR = new Creator<Site>() {
@Override
public Site createFromParcel(Parcel source) {
Site target = new Site();
StatusNetConfig$SiteParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public Site[] newArray(int size) {
return new Site[size];
}
};
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
StatusNetConfigParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<StatusNetConfig> CREATOR = new Creator<StatusNetConfig>() {
@Override
public StatusNetConfig createFromParcel(Parcel source) {
StatusNetConfig target = new StatusNetConfig();
StatusNetConfigParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public StatusNetConfig[] newArray(int size) {
return new StatusNetConfig[size];
}
};
}

3
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/TwitterException.java
View File

@ -277,14 +277,17 @@ public class TwitterException extends Exception implements TwitterResponse, Http
this.code = -1;
}
@Override
public int getCode() {
return code;
}
@Override
public String getRequest() {
return request;
}
@Override
public String getMessage() {
return message;
}

31
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Activity.java
View File

@ -19,10 +19,14 @@
package org.mariotaku.twidere.api.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.NonNull;
import android.support.annotation.StringDef;
import android.text.TextUtils;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
import org.mariotaku.twidere.api.twitter.annotation.NoObfuscate;
import java.lang.annotation.Retention;
@ -33,8 +37,9 @@ import java.util.Date;
/**
* Twitter Activity object
*/
@ParcelablePlease
@NoObfuscate
public class Activity extends TwitterResponseObject implements TwitterResponse, Comparable<Activity> {
public class Activity extends TwitterResponseObject implements TwitterResponse, Comparable<Activity>,Parcelable {
@Action
String action;
@ -219,4 +224,28 @@ public class Activity extends TwitterResponseObject implements TwitterResponse,
String[] MENTION_ACTIONS = {MENTION, REPLY, QUOTE};
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
ActivityParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<Activity> CREATOR = new Creator<Activity>() {
@Override
public Activity createFromParcel(Parcel source) {
Activity target = new Activity();
ActivityParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public Activity[] newArray(int size) {
return new Activity[size];
}
};
}

182
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/CardEntity.java
View File

@ -19,9 +19,14 @@
package org.mariotaku.twidere.api.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.bluelinelabs.logansquare.annotation.OnJsonParseComplete;
import com.hannesdorfmann.parcelableplease.annotation.ParcelableNoThanks;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
import java.util.HashMap;
import java.util.Map;
@ -29,8 +34,9 @@ import java.util.Map;
/**
* Created by mariotaku on 15/5/7.
*/
@ParcelablePlease
@JsonObject
public class CardEntity {
public class CardEntity implements Parcelable {
@JsonField(name = "name")
String name;
@ -39,7 +45,8 @@ public class CardEntity {
String url;
@JsonField(name = "binding_values")
Map<String, RawBindingValue> rawBindingValues;
HashMap<String, RawBindingValue> rawBindingValues;
@ParcelableNoThanks
Map<String, BindingValue> bindingValues;
public String getName() {
@ -90,8 +97,9 @@ public class CardEntity {
}
@ParcelablePlease
@JsonObject
public static class ImageValue implements BindingValue {
public static class ImageValue implements BindingValue, Parcelable {
@JsonField(name = "width")
int width;
@JsonField(name = "height")
@ -119,15 +127,44 @@ public class CardEntity {
", url='" + url + '\'' +
'}';
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
CardEntity$ImageValueParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<ImageValue> CREATOR = new Creator<ImageValue>() {
@Override
public ImageValue createFromParcel(Parcel source) {
ImageValue target = new ImageValue();
CardEntity$ImageValueParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public ImageValue[] newArray(int size) {
return new ImageValue[size];
}
};
}
public static class BooleanValue implements BindingValue {
@ParcelablePlease
public static class BooleanValue implements BindingValue, Parcelable {
public BooleanValue(boolean value) {
this.value = value;
}
private boolean value;
boolean value;
BooleanValue() {
}
public boolean getValue() {
return value;
@ -139,15 +176,44 @@ public class CardEntity {
"value=" + value +
'}';
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
CardEntity$BooleanValueParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<BooleanValue> CREATOR = new Creator<BooleanValue>() {
@Override
public BooleanValue createFromParcel(Parcel source) {
BooleanValue target = new BooleanValue();
CardEntity$BooleanValueParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public BooleanValue[] newArray(int size) {
return new BooleanValue[size];
}
};
}
public static class StringValue implements BindingValue {
private final String value;
@ParcelablePlease
public static class StringValue implements BindingValue, Parcelable {
String value;
public StringValue(String value) {
this.value = value;
}
StringValue() {
}
public String getValue() {
return value;
}
@ -158,10 +224,35 @@ public class CardEntity {
"value='" + value + '\'' +
'}';
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
CardEntity$StringValueParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<StringValue> CREATOR = new Creator<StringValue>() {
@Override
public StringValue createFromParcel(Parcel source) {
StringValue target = new StringValue();
CardEntity$StringValueParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public StringValue[] newArray(int size) {
return new StringValue[size];
}
};
}
@ParcelablePlease
@JsonObject
public static class UserValue implements BindingValue {
public static class UserValue implements BindingValue, Parcelable {
@JsonField(name = "id")
long userId;
@ -176,10 +267,35 @@ public class CardEntity {
"userId=" + userId +
'}';
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
CardEntity$UserValueParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<UserValue> CREATOR = new Creator<UserValue>() {
@Override
public UserValue createFromParcel(Parcel source) {
UserValue target = new UserValue();
CardEntity$UserValueParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public UserValue[] newArray(int size) {
return new UserValue[size];
}
};
}
@ParcelablePlease
@JsonObject
public static class RawBindingValue {
public static class RawBindingValue implements Parcelable {
@JsonField(name = "type")
String type;
@ -222,5 +338,53 @@ public class CardEntity {
", userValue=" + userValue +
'}';
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
CardEntity$RawBindingValueParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<RawBindingValue> CREATOR = new Creator<RawBindingValue>() {
@Override
public RawBindingValue createFromParcel(Parcel source) {
RawBindingValue target = new RawBindingValue();
CardEntity$RawBindingValueParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public RawBindingValue[] newArray(int size) {
return new RawBindingValue[size];
}
};
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
CardEntityParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<CardEntity> CREATOR = new Creator<CardEntity>() {
@Override
public CardEntity createFromParcel(Parcel source) {
CardEntity target = new CardEntity();
CardEntityParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public CardEntity[] newArray(int size) {
return new CardEntity[size];
}
};
}

31
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Category.java
View File

@ -19,11 +19,16 @@
package org.mariotaku.twidere.api.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
@ParcelablePlease
@JsonObject
public class Category {
public class Category implements Parcelable {
@JsonField(name = "name")
String name;
@JsonField(name = "size")
@ -51,4 +56,28 @@ public class Category {
", slug='" + slug + '\'' +
'}';
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
CategoryParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<Category> CREATOR = new Creator<Category>() {
@Override
public Category createFromParcel(Parcel source) {
Category target = new Category();
CategoryParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public Category[] newArray(int size) {
return new Category[size];
}
};
}

39
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Contributor.java
View File

@ -19,14 +19,19 @@
package org.mariotaku.twidere.api.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
/**
* Created by mariotaku on 15/12/25.
*/
@ParcelablePlease
@JsonObject
public class Contributor {
public class Contributor implements Parcelable {
@JsonField(name = "id")
long id;
@JsonField(name = "screen_name")
@ -39,4 +44,36 @@ public class Contributor {
public String getScreenName() {
return screenName;
}
@Override
public String toString() {
return "Contributor{" +
"id=" + id +
", screenName='" + screenName + '\'' +
'}';
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
ContributorParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<Contributor> CREATOR = new Creator<Contributor>() {
@Override
public Contributor createFromParcel(Parcel source) {
Contributor target = new Contributor();
ContributorParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public Contributor[] newArray(int size) {
return new Contributor[size];
}
};
}

144
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/DMResponse.java
View File

@ -1,19 +1,24 @@
package org.mariotaku.twidere.api.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.StringDef;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.HashMap;
import java.util.Map;
/**
* Created by mariotaku on 16/3/1.
*/
@ParcelablePlease
@JsonObject
public class DMResponse {
public class DMResponse implements Parcelable {
@JsonField(name = "status")
@Status
@ -31,10 +36,10 @@ public class DMResponse {
long lastSeenEvent;
@JsonField(name = "users")
Map<String, User> users;
HashMap<String, User> users;
@JsonField(name = "conversations")
Map<String, Conversation> conversations;
HashMap<String, Conversation> conversations;
@JsonField(name = "entries")
Entry[] entries;
@ -82,15 +87,17 @@ public class DMResponse {
String AT_END = "AT_END";
}
@ParcelablePlease
@JsonObject
public static class Entry {
public static class Entry implements Parcelable {
@JsonField(name = "message")
Message message;
@ParcelablePlease
@JsonObject
public static class Message {
public static class Message implements Parcelable {
@JsonField(name = "id")
long id;
@ -195,12 +202,59 @@ public class DMResponse {
}
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
DMResponse$Entry$MessageParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<Message> CREATOR = new Creator<Message>() {
@Override
public Message createFromParcel(Parcel source) {
Message target = new Message();
DMResponse$Entry$MessageParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public Message[] newArray(int size) {
return new Message[size];
}
};
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
DMResponse$EntryParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<Entry> CREATOR = new Creator<Entry>() {
@Override
public Entry createFromParcel(Parcel source) {
Entry target = new Entry();
DMResponse$EntryParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public Entry[] newArray(int size) {
return new Entry[size];
}
};
}
@ParcelablePlease
@JsonObject
public static class Conversation {
public static class Conversation implements Parcelable {
@JsonField(name = "conversation_id")
String conversationId;
@ -221,7 +275,8 @@ public class DMResponse {
@JsonField(name = "sort_timestamp")
long sortTimestamp;
@JsonField(name = "status")
Status status;
@Status
String status;
@JsonField(name = "type")
Type type;
@ -259,8 +314,9 @@ public class DMResponse {
}
}
@ParcelablePlease
@JsonObject
public static class Participant {
public static class Participant implements Parcelable {
@JsonField(name = "user_id")
long userId;
@ -268,6 +324,78 @@ public class DMResponse {
public long getUserId() {
return userId;
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
DMResponse$Conversation$ParticipantParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<Participant> CREATOR = new Creator<Participant>() {
@Override
public Participant createFromParcel(Parcel source) {
Participant target = new Participant();
DMResponse$Conversation$ParticipantParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public Participant[] newArray(int size) {
return new Participant[size];
}
};
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
DMResponse$ConversationParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<Conversation> CREATOR = new Creator<Conversation>() {
@Override
public Conversation createFromParcel(Parcel source) {
Conversation target = new Conversation();
DMResponse$ConversationParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public Conversation[] newArray(int size) {
return new Conversation[size];
}
};
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
DMResponseParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<DMResponse> CREATOR = new Creator<DMResponse>() {
@Override
public DMResponse createFromParcel(Parcel source) {
DMResponse target = new DMResponse();
DMResponseParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public DMResponse[] newArray(int size) {
return new DMResponse[size];
}
};
}

35
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/DirectMessage.java
View File

@ -19,9 +19,13 @@
package org.mariotaku.twidere.api.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.bluelinelabs.logansquare.annotation.OnJsonParseComplete;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
import org.mariotaku.twidere.api.twitter.util.TwitterDateConverter;
@ -31,8 +35,10 @@ import java.util.Date;
/**
* Created by mariotaku on 15/5/7.
*/
@ParcelablePlease
@JsonObject
public class DirectMessage extends TwitterResponseObject implements TwitterResponse, EntitySupport {
public class DirectMessage extends TwitterResponseObject implements TwitterResponse, EntitySupport,
Parcelable {
@JsonField(name = "created_at", typeConverter = TwitterDateConverter.class)
Date createdAt;
@ -114,6 +120,31 @@ public class DirectMessage extends TwitterResponseObject implements TwitterRespo
@OnJsonParseComplete
void onJsonParseComplete() throws IOException {
if (id == null || recipient == null || sender == null) throw new IOException("Malformed DirectMessage object");
if (id == null || recipient == null || sender == null)
throw new IOException("Malformed DirectMessage object");
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
DirectMessageParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<DirectMessage> CREATOR = new Creator<DirectMessage>() {
@Override
public DirectMessage createFromParcel(Parcel source) {
DirectMessage target = new DirectMessage();
DirectMessageParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public DirectMessage[] newArray(int size) {
return new DirectMessage[size];
}
};
}

35
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Entities.java
View File

@ -19,16 +19,21 @@
package org.mariotaku.twidere.api.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
import java.util.Arrays;
/**
* Created by mariotaku on 15/3/31.
*/
@ParcelablePlease
@JsonObject
public class Entities {
public class Entities implements Parcelable {
@JsonField(name = "hashtags")
HashtagEntity[] hashtags;
@ -41,11 +46,11 @@ public class Entities {
@JsonField(name = "media")
MediaEntity[] media;
public org.mariotaku.twidere.api.twitter.model.HashtagEntity[] getHashtags() {
public HashtagEntity[] getHashtags() {
return hashtags;
}
public org.mariotaku.twidere.api.twitter.model.UserMentionEntity[] getUserMentions() {
public UserMentionEntity[] getUserMentions() {
return userMentions;
}
@ -66,4 +71,28 @@ public class Entities {
", media=" + Arrays.toString(media) +
'}';
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
EntitiesParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<Entities> CREATOR = new Creator<Entities>() {
@Override
public Entities createFromParcel(Parcel source) {
Entities target = new Entities();
EntitiesParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public Entities[] newArray(int size) {
return new Entities[size];
}
};
}

57
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/ExtendedProfile.java
View File

@ -19,10 +19,13 @@
package org.mariotaku.twidere.api.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.StringDef;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@ -30,8 +33,9 @@ import java.lang.annotation.RetentionPolicy;
/**
* Created by mariotaku on 15/7/8.
*/
@ParcelablePlease
@JsonObject
public class ExtendedProfile {
public class ExtendedProfile implements Parcelable {
@JsonField(name = "id")
long id;
@ -46,8 +50,9 @@ public class ExtendedProfile {
return birthdate;
}
@ParcelablePlease
@JsonObject
public static class Birthdate {
public static class Birthdate implements Parcelable {
@JsonField(name = "day")
int day;
@ -93,5 +98,53 @@ public class ExtendedProfile {
String PUBLIC = "public";
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
ExtendedProfile$BirthdateParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<Birthdate> CREATOR = new Creator<Birthdate>() {
@Override
public Birthdate createFromParcel(Parcel source) {
Birthdate target = new Birthdate();
ExtendedProfile$BirthdateParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public Birthdate[] newArray(int size) {
return new Birthdate[size];
}
};
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
ExtendedProfileParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<ExtendedProfile> CREATOR = new Creator<ExtendedProfile>() {
@Override
public ExtendedProfile createFromParcel(Parcel source) {
ExtendedProfile target = new ExtendedProfile();
ExtendedProfileParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public ExtendedProfile[] newArray(int size) {
return new ExtendedProfile[size];
}
};
}

36
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/GeoLocation.java
View File

@ -19,6 +19,11 @@
package org.mariotaku.twidere.api.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
import org.mariotaku.restfu.http.ValueMap;
/**
@ -26,7 +31,8 @@ import org.mariotaku.restfu.http.ValueMap;
*
* @author Yusuke Yamamoto - yusuke at mac.com
*/
public class GeoLocation implements ValueMap {
@ParcelablePlease
public class GeoLocation implements ValueMap, Parcelable {
double latitude;
double longitude;
@ -42,6 +48,10 @@ public class GeoLocation implements ValueMap {
this.longitude = longitude;
}
public GeoLocation() {
}
@Override
public boolean equals(final Object o) {
@ -106,4 +116,28 @@ public class GeoLocation implements ValueMap {
public String[] keys() {
return new String[]{"lat", "long"};
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
GeoLocationParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<GeoLocation> CREATOR = new Creator<GeoLocation>() {
@Override
public GeoLocation createFromParcel(Parcel source) {
GeoLocation target = new GeoLocation();
GeoLocationParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public GeoLocation[] newArray(int size) {
return new GeoLocation[size];
}
};
}

34
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/GeoPoint.java
View File

@ -19,17 +19,22 @@
package org.mariotaku.twidere.api.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import org.mariotaku.twidere.api.twitter.model.GeoLocation;
import com.hannesdorfmann.parcelableplease.annotation.ParcelableNoThanks;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
/**
* Created by mariotaku on 15/5/7.
*/
@ParcelablePlease
@JsonObject
public class GeoPoint {
public class GeoPoint implements Parcelable {
@ParcelableNoThanks
private volatile GeoLocation geoLocation;
@JsonField(name = "coordinates")
@ -44,4 +49,27 @@ public class GeoPoint {
return geoLocation = new GeoLocation(coordinates[0], coordinates[1]);
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
GeoPointParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<GeoPoint> CREATOR = new Creator<GeoPoint>() {
@Override
public GeoPoint createFromParcel(Parcel source) {
GeoPoint target = new GeoPoint();
GeoPointParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public GeoPoint[] newArray(int size) {
return new GeoPoint[size];
}
};
}

39
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/HashtagEntity.java
View File

@ -19,14 +19,19 @@
package org.mariotaku.twidere.api.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
/**
* Created by mariotaku on 15/3/31.
*/
@ParcelablePlease
@JsonObject
public class HashtagEntity {
public class HashtagEntity implements Parcelable {
@JsonField(name = "text")
String text;
@ -44,4 +49,36 @@ public class HashtagEntity {
public String getText() {
return text;
}
@Override
public int describeContents() {
return 0;
}
@Override
public String toString() {
return "HashtagEntity{" +
"text='" + text + '\'' +
", indices=" + indices +
'}';
}
@Override
public void writeToParcel(Parcel dest, int flags) {
HashtagEntityParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<HashtagEntity> CREATOR = new Creator<HashtagEntity>() {
@Override
public HashtagEntity createFromParcel(Parcel source) {
HashtagEntity target = new HashtagEntity();
HashtagEntityParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public HashtagEntity[] newArray(int size) {
return new HashtagEntity[size];
}
};
}

37
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Indices.java
View File

@ -19,12 +19,22 @@
package org.mariotaku.twidere.api.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
/**
* Created by mariotaku on 15/3/31.
*/
public class Indices {
@ParcelablePlease
public class Indices implements Parcelable {
private int start, end;
int start, end;
Indices() {
}
public int getEnd() {
return end;
@ -47,4 +57,27 @@ public class Indices {
'}';
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
IndicesParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<Indices> CREATOR = new Creator<Indices>() {
@Override
public Indices createFromParcel(Parcel source) {
Indices target = new Indices();
IndicesParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public Indices[] newArray(int size) {
return new Indices[size];
}
};
}

180
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/MediaEntity.java
View File

@ -19,11 +19,14 @@
package org.mariotaku.twidere.api.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.IntDef;
import android.support.annotation.StringDef;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@ -34,8 +37,9 @@ import java.util.Map;
/**
* Created by mariotaku on 15/3/31.
*/
@ParcelablePlease
@JsonObject
public class MediaEntity extends UrlEntity {
public class MediaEntity extends UrlEntity implements Parcelable {
@JsonField(name = "id")
long id;
@ -154,8 +158,9 @@ public class MediaEntity extends UrlEntity {
}
@ParcelablePlease
@JsonObject
public static class Feature {
public static class Feature implements Parcelable {
@JsonField(name = "faces")
Face[] faces;
@ -166,8 +171,9 @@ public class MediaEntity extends UrlEntity {
'}';
}
@ParcelablePlease
@JsonObject
public static class Face {
public static class Face implements Parcelable {
@JsonField(name = "x")
int x;
@JsonField(name = "y")
@ -202,12 +208,60 @@ public class MediaEntity extends UrlEntity {
public int getWidth() {
return width;
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
MediaEntity$Feature$FaceParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<Face> CREATOR = new Creator<Face>() {
@Override
public Face createFromParcel(Parcel source) {
Face target = new Face();
MediaEntity$Feature$FaceParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public Face[] newArray(int size) {
return new Face[size];
}
};
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
MediaEntity$FeatureParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<Feature> CREATOR = new Creator<Feature>() {
@Override
public Feature createFromParcel(Parcel source) {
Feature target = new Feature();
MediaEntity$FeatureParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public Feature[] newArray(int size) {
return new Feature[size];
}
};
}
@ParcelablePlease
@JsonObject
public static class VideoInfo {
public static class VideoInfo implements Parcelable {
@JsonField(name = "duration")
long duration;
@ -237,8 +291,9 @@ public class MediaEntity extends UrlEntity {
return duration;
}
@ParcelablePlease
@JsonObject
public static class Variant {
public static class Variant implements Parcelable {
@JsonField(name = "bitrate")
long bitrate;
@JsonField(name = "content_type")
@ -266,29 +321,78 @@ public class MediaEntity extends UrlEntity {
public long getBitrate() {
return bitrate;
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
MediaEntity$VideoInfo$VariantParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<Variant> CREATOR = new Creator<Variant>() {
@Override
public Variant createFromParcel(Parcel source) {
Variant target = new Variant();
MediaEntity$VideoInfo$VariantParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public Variant[] newArray(int size) {
return new Variant[size];
}
};
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
MediaEntity$VideoInfoParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<VideoInfo> CREATOR = new Creator<VideoInfo>() {
@Override
public VideoInfo createFromParcel(Parcel source) {
VideoInfo target = new VideoInfo();
MediaEntity$VideoInfoParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public VideoInfo[] newArray(int size) {
return new VideoInfo[size];
}
};
}
@StringDef({Size.THUMB, Size.SMALL, Size.MEDIUM, Size.LARGE})
@StringDef({ScaleType.THUMB, ScaleType.SMALL, ScaleType.MEDIUM, ScaleType.LARGE})
@Retention(RetentionPolicy.SOURCE)
public @interface SizeType {
}
@IntDef({Size.FIT, Size.CROP})
@IntDef({ScaleType.FIT, ScaleType.CROP})
@Retention(RetentionPolicy.SOURCE)
public @interface ScaleType {
int CROP = 101;
int FIT = 100;
String THUMB = "thumb";
String SMALL = "small";
String MEDIUM = "medium";
String LARGE = "large";
}
@ParcelablePlease
@JsonObject
public static class Size {
public static class Size implements Parcelable {
public static final String THUMB = "thumb";
public static final String SMALL = "small";
public static final String MEDIUM = "medium";
public static final String LARGE = "large";
public static final int FIT = 100;
public static final int CROP = 101;
@JsonField(name = "w")
int width;
@JsonField(name = "h")
@ -317,5 +421,53 @@ public class MediaEntity extends UrlEntity {
", resize='" + resize + '\'' +
'}';
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
MediaEntity$SizeParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<Size> CREATOR = new Creator<Size>() {
@Override
public Size createFromParcel(Parcel source) {
Size target = new Size();
MediaEntity$SizeParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public Size[] newArray(int size) {
return new Size[size];
}
};
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
MediaEntityParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<MediaEntity> CREATOR = new Creator<MediaEntity>() {
@Override
public MediaEntity createFromParcel(Parcel source) {
MediaEntity target = new MediaEntity();
MediaEntityParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public MediaEntity[] newArray(int size) {
return new MediaEntity[size];
}
};
}

29
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Place.java
View File

@ -19,16 +19,20 @@
package org.mariotaku.twidere.api.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.NonNull;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
/**
* Created by mariotaku on 15/5/7.
*/
@ParcelablePlease
@JsonObject
public class Place extends TwitterResponseObject implements TwitterResponse, Comparable<Place> {
public class Place extends TwitterResponseObject implements TwitterResponse, Comparable<Place>, Parcelable {
@JsonField(name = "full_name")
String fullName;
@ -90,4 +94,27 @@ public class Place extends TwitterResponseObject implements TwitterResponse, Com
return 0;
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
PlaceParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<Place> CREATOR = new Creator<Place>() {
@Override
public Place createFromParcel(Parcel source) {
Place target = new Place();
PlaceParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public Place[] newArray(int size) {
return new Place[size];
}
};
}

58
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Status.java
View File

@ -19,6 +19,8 @@
package org.mariotaku.twidere.api.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.TextUtils;
@ -26,6 +28,8 @@ import android.text.TextUtils;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.bluelinelabs.logansquare.annotation.OnJsonParseComplete;
import com.hannesdorfmann.parcelableplease.annotation.ParcelableNoThanks;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
import org.mariotaku.twidere.api.fanfou.model.Photo;
import org.mariotaku.twidere.api.gnusocial.model.Attachment;
@ -39,9 +43,10 @@ import java.util.Date;
/**
* Created by mariotaku on 15/5/5.
*/
@ParcelablePlease
@JsonObject
public class Status extends TwitterResponseObject implements Comparable<Status>, TwitterResponse,
ExtendedEntitySupport {
ExtendedEntitySupport, Parcelable {
@JsonField(name = "created_at", typeConverter = TwitterDateConverter.class)
Date createdAt;
@ -170,6 +175,7 @@ public class Status extends TwitterResponseObject implements Comparable<Status>,
@JsonField(name = "location")
String location;
@ParcelableNoThanks
private transient long sortId = -1;
@ -495,10 +501,58 @@ public class Status extends TwitterResponseObject implements Comparable<Status>,
}
@ParcelablePlease
@JsonObject
public static class CurrentUserRetweet {
public static class CurrentUserRetweet implements Parcelable {
@JsonField(name = "id")
String id;
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
Status$CurrentUserRetweetParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<CurrentUserRetweet> CREATOR = new Creator<CurrentUserRetweet>() {
@Override
public CurrentUserRetweet createFromParcel(Parcel source) {
CurrentUserRetweet target = new CurrentUserRetweet();
Status$CurrentUserRetweetParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public CurrentUserRetweet[] newArray(int size) {
return new CurrentUserRetweet[size];
}
};
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
StatusParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<Status> CREATOR = new Creator<Status>() {
@Override
public Status createFromParcel(Parcel source) {
Status target = new Status();
StatusParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public Status[] newArray(int size) {
return new Status[size];
}
};
}

31
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/UrlEntity.java
View File

@ -19,14 +19,19 @@
package org.mariotaku.twidere.api.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
/**
* Created by mariotaku on 15/3/31.
*/
@ParcelablePlease
@JsonObject
public class UrlEntity {
public class UrlEntity implements Parcelable {
@JsonField(name = "indices", typeConverter = IndicesConverter.class)
Indices indices;
@JsonField(name = "display_url")
@ -66,4 +71,28 @@ public class UrlEntity {
public String getUrl() {
return url;
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
UrlEntityParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<UrlEntity> CREATOR = new Creator<UrlEntity>() {
@Override
public UrlEntity createFromParcel(Parcel source) {
UrlEntity target = new UrlEntity();
UrlEntityParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public UrlEntity[] newArray(int size) {
return new UrlEntity[size];
}
};
}

30
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/User.java
View File

@ -20,11 +20,14 @@
package org.mariotaku.twidere.api.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.NonNull;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.bluelinelabs.logansquare.annotation.OnJsonParseComplete;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
import org.mariotaku.twidere.api.twitter.util.TwitterDateConverter;
@ -34,8 +37,9 @@ import java.util.Date;
/**
* Created by mariotaku on 15/3/31.
*/
@ParcelablePlease
@JsonObject
public class User extends TwitterResponseObject implements Comparable<User> {
public class User extends TwitterResponseObject implements Comparable<User>, Parcelable {
@JsonField(name = "id")
String id;
@ -600,4 +604,28 @@ public class User extends TwitterResponseObject implements Comparable<User> {
void onJsonParseComplete() throws IOException {
if (id == null || screenName == null) throw new IOException("Malformed User object");
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
UserParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<User> CREATOR = new Creator<User>() {
@Override
public User createFromParcel(Parcel source) {
User target = new User();
UserParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public User[] newArray(int size) {
return new User[size];
}
};
}

34
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/UserEntities.java
View File

@ -19,17 +19,19 @@
package org.mariotaku.twidere.api.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import org.mariotaku.twidere.api.twitter.model.Entities;
import org.mariotaku.twidere.api.twitter.model.UrlEntity;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
/**
* Created by mariotaku on 15/3/31.
*/
@ParcelablePlease
@JsonObject
public class UserEntities {
public class UserEntities implements Parcelable {
@JsonField(name = "url")
Entities url;
@ -54,4 +56,28 @@ public class UserEntities {
", description=" + description +
'}';
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
UserEntitiesParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<UserEntities> CREATOR = new Creator<UserEntities>() {
@Override
public UserEntities createFromParcel(Parcel source) {
UserEntities target = new UserEntities();
UserEntitiesParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public UserEntities[] newArray(int size) {
return new UserEntities[size];
}
};
}

30
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/UserList.java
View File

@ -19,11 +19,14 @@
package org.mariotaku.twidere.api.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.NonNull;
import android.support.annotation.StringDef;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
import org.mariotaku.twidere.api.twitter.util.TwitterDateConverter;
@ -34,8 +37,9 @@ import java.util.Date;
/**
* Created by mariotaku on 15/4/7.
*/
@ParcelablePlease
@JsonObject
public class UserList extends TwitterResponseObject implements Comparable<UserList>, TwitterResponse {
public class UserList extends TwitterResponseObject implements Comparable<UserList>, TwitterResponse, Parcelable {
@JsonField(name = "id")
String id;
@ -153,4 +157,28 @@ public class UserList extends TwitterResponseObject implements Comparable<UserLi
String PRIVATE = "private";
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
UserListParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<UserList> CREATOR = new Creator<UserList>() {
@Override
public UserList createFromParcel(Parcel source) {
UserList target = new UserList();
UserListParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public UserList[] newArray(int size) {
return new UserList[size];
}
};
}

50
twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/UserMentionEntity.java
View File

@ -19,14 +19,19 @@
package org.mariotaku.twidere.api.twitter.model;
import android.os.Parcel;
import android.os.Parcelable;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
/**
* Created by mariotaku on 15/3/31.
*/
@ParcelablePlease
@JsonObject
public class UserMentionEntity {
public class UserMentionEntity implements Parcelable {
@JsonField(name = "indices", typeConverter = IndicesConverter.class)
Indices indices;
@JsonField(name = "id")
@ -36,16 +41,6 @@ public class UserMentionEntity {
@JsonField(name = "screen_name")
String screenName;
@Override
public String toString() {
return "UserMentionEntity{" +
"indices=" + indices +
", id=" + id +
", name='" + name + '\'' +
", screenName='" + screenName + '\'' +
'}';
}
public int getEnd() {
return indices.getEnd();
}
@ -66,4 +61,37 @@ public class UserMentionEntity {
return indices.getStart();
}
@Override
public String toString() {
return "UserMentionEntity{" +
"indices=" + indices +
", id='" + id + '\'' +
", name='" + name + '\'' +
", screenName='" + screenName + '\'' +
'}';
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
UserMentionEntityParcelablePlease.writeToParcel(this, dest, flags);
}
public static final Creator<UserMentionEntity> CREATOR = new Creator<UserMentionEntity>() {
@Override
public UserMentionEntity createFromParcel(Parcel source) {
UserMentionEntity target = new UserMentionEntity();
UserMentionEntityParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public UserMentionEntity[] newArray(int size) {
return new UserMentionEntity[size];
}
};
}

2
twidere.component.common/src/main/java/org/mariotaku/twidere/model/Draft.java
View File

@ -85,12 +85,14 @@ public class Draft implements Parcelable {
}
public static final Creator<Draft> CREATOR = new Creator<Draft>() {
@Override
public Draft createFromParcel(Parcel source) {
Draft target = new Draft();
DraftParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public Draft[] newArray(int size) {
return new Draft[size];
}

2
twidere.component.common/src/main/java/org/mariotaku/twidere/model/MediaUploadResult.java
View File

@ -28,12 +28,14 @@ public class MediaUploadResult implements Parcelable {
public String extras;
public static final Creator<MediaUploadResult> CREATOR = new Creator<MediaUploadResult>() {
@Override
public MediaUploadResult createFromParcel(Parcel source) {
MediaUploadResult target = new MediaUploadResult();
MediaUploadResultParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public MediaUploadResult[] newArray(int size) {
return new MediaUploadResult[size];
}

2
twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableAccount.java
View File

@ -101,12 +101,14 @@ public class ParcelableAccount implements Parcelable {
public boolean is_dummy;
public static final Creator<ParcelableAccount> CREATOR = new Creator<ParcelableAccount>() {
@Override
public ParcelableAccount createFromParcel(Parcel source) {
ParcelableAccount target = new ParcelableAccount();
ParcelableAccountParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public ParcelableAccount[] newArray(int size) {
return new ParcelableAccount[size];
}

2
twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableDirectMessage.java
View File

@ -176,12 +176,14 @@ public class ParcelableDirectMessage implements Parcelable, Comparable<Parcelabl
}
public static final Creator<ParcelableDirectMessage> CREATOR = new Creator<ParcelableDirectMessage>() {
@Override
public ParcelableDirectMessage createFromParcel(Parcel source) {
ParcelableDirectMessage target = new ParcelableDirectMessage();
ParcelableDirectMessageParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public ParcelableDirectMessage[] newArray(int size) {
return new ParcelableDirectMessage[size];
}

2
twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableGroup.java
View File

@ -133,12 +133,14 @@ public class ParcelableGroup implements Parcelable, Comparable<ParcelableGroup>
}
public static final Creator<ParcelableGroup> CREATOR = new Creator<ParcelableGroup>() {
@Override
public ParcelableGroup createFromParcel(Parcel source) {
ParcelableGroup target = new ParcelableGroup();
ParcelableGroupParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public ParcelableGroup[] newArray(int size) {
return new ParcelableGroup[size];
}

2
twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableLocation.java
View File

@ -127,12 +127,14 @@ public class ParcelableLocation implements Parcelable {
}
public static final Creator<ParcelableLocation> CREATOR = new Creator<ParcelableLocation>() {
@Override
public ParcelableLocation createFromParcel(Parcel source) {
ParcelableLocation target = new ParcelableLocation();
ParcelableLocationParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public ParcelableLocation[] newArray(int size) {
return new ParcelableLocation[size];
}

2
twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatusUpdate.java
View File

@ -89,12 +89,14 @@ public class ParcelableStatusUpdate implements Parcelable {
}
public static final Creator<ParcelableStatusUpdate> CREATOR = new Creator<ParcelableStatusUpdate>() {
@Override
public ParcelableStatusUpdate createFromParcel(Parcel source) {
ParcelableStatusUpdate target = new ParcelableStatusUpdate();
ParcelableStatusUpdateParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public ParcelableStatusUpdate[] newArray(int size) {
return new ParcelableStatusUpdate[size];
}

4
twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUser.java
View File

@ -182,12 +182,14 @@ public class ParcelableUser implements Parcelable, Comparable<ParcelableUser> {
public String nickname;
public static final Creator<ParcelableUser> CREATOR = new Creator<ParcelableUser>() {
@Override
public ParcelableUser createFromParcel(Parcel source) {
ParcelableUser target = new ParcelableUser();
ParcelableUserParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public ParcelableUser[] newArray(int size) {
return new ParcelableUser[size];
}
@ -359,12 +361,14 @@ public class ParcelableUser implements Parcelable, Comparable<ParcelableUser> {
}
public static final Creator<Extras> CREATOR = new Creator<Extras>() {
@Override
public Extras createFromParcel(Parcel source) {
Extras target = new Extras();
ParcelableUser$ExtrasParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public Extras[] newArray(int size) {
return new Extras[size];
}

2
twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUserMention.java
View File

@ -85,12 +85,14 @@ public class ParcelableUserMention implements Parcelable {
}
public static final Creator<ParcelableUserMention> CREATOR = new Creator<ParcelableUserMention>() {
@Override
public ParcelableUserMention createFromParcel(Parcel source) {
ParcelableUserMention target = new ParcelableUserMention();
ParcelableUserMentionParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public ParcelableUserMention[] newArray(int size) {
return new ParcelableUserMention[size];
}

2
twidere.component.common/src/main/java/org/mariotaku/twidere/model/StatusNetAccountExtra.java
View File

@ -16,12 +16,14 @@ import com.hannesdorfmann.parcelableplease.annotation.ParcelableThisPlease;
public class StatusNetAccountExtra implements Parcelable, AccountExtras {
public static final Creator<StatusNetAccountExtra> CREATOR = new Creator<StatusNetAccountExtra>() {
@Override
public StatusNetAccountExtra createFromParcel(Parcel source) {
StatusNetAccountExtra target = new StatusNetAccountExtra();
StatusNetAccountExtraParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public StatusNetAccountExtra[] newArray(int size) {
return new StatusNetAccountExtra[size];
}

2
twidere.component.common/src/main/java/org/mariotaku/twidere/model/StatusShortenResult.java
View File

@ -75,12 +75,14 @@ public class StatusShortenResult implements Parcelable {
}
public static final Creator<StatusShortenResult> CREATOR = new Creator<StatusShortenResult>() {
@Override
public StatusShortenResult createFromParcel(Parcel source) {
StatusShortenResult target = new StatusShortenResult();
StatusShortenResultParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public StatusShortenResult[] newArray(int size) {
return new StatusShortenResult[size];
}

2
twidere.component.common/src/main/java/org/mariotaku/twidere/model/TwitterAccountExtra.java
View File

@ -16,12 +16,14 @@ import com.hannesdorfmann.parcelableplease.annotation.ParcelableThisPlease;
public class TwitterAccountExtra implements Parcelable, AccountExtras {
public static final Creator<TwitterAccountExtra> CREATOR = new Creator<TwitterAccountExtra>() {
@Override
public TwitterAccountExtra createFromParcel(Parcel source) {
TwitterAccountExtra target = new TwitterAccountExtra();
TwitterAccountExtraParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public TwitterAccountExtra[] newArray(int size) {
return new TwitterAccountExtra[size];
}

2
twidere.component.common/src/main/java/org/mariotaku/twidere/model/draft/SendDirectMessageActionExtra.java
View File

@ -36,12 +36,14 @@ public class SendDirectMessageActionExtra implements ActionExtra {
}
public static final Creator<SendDirectMessageActionExtra> CREATOR = new Creator<SendDirectMessageActionExtra>() {
@Override
public SendDirectMessageActionExtra createFromParcel(Parcel source) {
SendDirectMessageActionExtra target = new SendDirectMessageActionExtra();
SendDirectMessageActionExtraParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public SendDirectMessageActionExtra[] newArray(int size) {
return new SendDirectMessageActionExtra[size];
}

2
twidere.component.common/src/main/java/org/mariotaku/twidere/model/draft/UpdateStatusActionExtra.java
View File

@ -71,12 +71,14 @@ public class UpdateStatusActionExtra implements ActionExtra {
}
public static final Creator<UpdateStatusActionExtra> CREATOR = new Creator<UpdateStatusActionExtra>() {
@Override
public UpdateStatusActionExtra createFromParcel(Parcel source) {
UpdateStatusActionExtra target = new UpdateStatusActionExtra();
UpdateStatusActionExtraParcelablePlease.readFromParcel(target, source);
return target;
}
@Override
public UpdateStatusActionExtra[] newArray(int size) {
return new UpdateStatusActionExtra[size];
}

2
twidere.component.common/src/main/java/org/mariotaku/twidere/util/ParseUtils.java
View File

@ -23,8 +23,6 @@ import android.graphics.Color;
import org.mariotaku.twidere.TwidereConstants;
import java.util.Locale;
import static android.text.TextUtils.isEmpty;
public final class ParseUtils implements TwidereConstants {

2
twidere.component.common/src/main/java/org/mariotaku/twidere/util/TwitterContentUtils.java
View File

@ -24,9 +24,7 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import org.mariotaku.twidere.api.twitter.model.Status;
import org.mariotaku.twidere.api.twitter.model.User;
import org.mariotaku.twidere.api.twitter.model.UserMentionEntity;
import org.mariotaku.twidere.common.R;
import org.mariotaku.twidere.model.ConsumerKeyType;

2
twidere/src/main/java/org/mariotaku/twidere/model/util/ParcelableMediaUtils.java
View File

@ -77,7 +77,7 @@ public class ParcelableMediaUtils {
media.end = entity.getEnd();
media.type = ParcelableMediaUtils.getTypeInt(entity.getType());
media.alt_text = entity.getAltText();
final MediaEntity.Size size = entity.getSizes().get(MediaEntity.Size.LARGE);
final MediaEntity.Size size = entity.getSizes().get(MediaEntity.ScaleType.LARGE);
if (size != null) {
media.width = size.getWidth();
media.height = size.getHeight();