diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/Account.java b/app/src/main/java/org/ntlab/acanthus_client/entities/Account.java index 53c4b44..7bec5e5 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/Account.java +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/Account.java @@ -2,6 +2,7 @@ import java.time.LocalDateTime; import java.util.HashMap; +import java.util.UUID; //----------------------------------------------------------------- // ユーザーアカウント @@ -11,7 +12,55 @@ private String email; private String password; private String token; - private HashMap workHashMap = new HashMap<>(); + private HashMap workHashMap = new HashMap<>(); private Boolean isDummy; private LocalDateTime lastAccess; + + //----------------------------------------------------------------- + public Account(String name, String email, String password){ + this.name = name; + this.email = email; + this.password = password; + } + //----------------------------------------------------------------- + // getter + public Integer getUid() { + return this.uid; + } + + public String getName() { + return this.name; + } + + public String getEmail() { + return this.email; + } + + public String getPassword() { + return this.password; + } + + public String getToken() { + return this.token; + } + + public HashMap getWorkHashMap() { + return this.workHashMap; + } + + //----------------------------------------------------------------- + // setter + public void setUid(Integer uid) { + this.uid = uid; + } + + public void setName(String name) { + this.name = name; + } + + public void setEmail(String email) { + this.email = email; + } + //----------------------------------------------------------------- + } diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/AccountJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/AccountJson.java index c6728f9..0e48b2c 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/AccountJson.java +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/AccountJson.java @@ -5,4 +5,14 @@ public class AccountJson { private Integer uid; private String name; + + //----------------------------------------------------------------- + // getter + public Integer getUid() { + return uid; + } + + public String getName() { + return name; + } } diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/AccountTokenJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/AccountTokenJson.java index bb76238..f0b17ea 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/AccountTokenJson.java +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/AccountTokenJson.java @@ -4,4 +4,10 @@ // アカウントに発行されたトークン public class AccountTokenJson { private String token; + + //----------------------------------------------------------------- + // getter + public String getToken() { + return token; + } } diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/AccountUidJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/AccountUidJson.java index 35d81b9..f1c50b3 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/AccountUidJson.java +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/AccountUidJson.java @@ -4,4 +4,10 @@ // アカウントのUid public class AccountUidJson { private Integer uid; + + //----------------------------------------------------------------- + // getter + public Integer getUid() { + return uid; + } } diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/AidJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/AidJson.java new file mode 100644 index 0000000..6b350e6 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/AidJson.java @@ -0,0 +1,19 @@ +package org.ntlab.acanthus_client.entities; + +//----------------------------------------------------------------- +// 作品のID +public class AidJson { + private Integer aid; + + //----------------------------------------------------------------- + // setter + public void setAid(Integer aid) { + this.aid = aid; + } + + //----------------------------------------------------------------- + // getter + public Integer getAid() { + return this.aid; + } +} diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/Animation.java b/app/src/main/java/org/ntlab/acanthus_client/entities/Animation.java new file mode 100644 index 0000000..fea8f51 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/Animation.java @@ -0,0 +1,140 @@ +package org.ntlab.acanthus_client.entities; + +import android.content.SharedPreferences; +import android.os.Build; + +import androidx.annotation.RequiresApi; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.UUID; + +import static java.time.LocalDateTime.now; + +//----------------------------------------------------------------- +// 作品 +public class Animation { + private Integer aid; + private Integer likes; + private Integer views; + private String name; + private String description; + private Account owner; + private Boolean isPublic; + private LocalDateTime createdDate; + private LocalDateTime lastUpdate; + private ArrayList hashTag = new ArrayList<>(); + private ArrayList editors = new ArrayList<>(); + private ArrayList invites = new ArrayList<>(); + private HashMap pageMap = new HashMap<>(); + private Boolean isDummy; + + //----------------------------------------------------------------- + public Animation() { + } + + public Animation(Integer aid, String name, Account owner) { + this.aid = aid; + this.name = name; + this.owner = owner; + } + + //----------------------------------------------------------------- + // getter + public Integer getAid() { + return this.aid; + } + + public Integer getLikes() { + return this.likes; + } + + public Integer getViews() { + return this.views; + } + + public String getName() { + return this.name; + } + + public String getDescription() { + return this.description; + } + + public Account getOwner() { + return this.owner; + } + + public Boolean getPublic() { + return this.isPublic; + } + + public LocalDateTime getCreatedDate() { + return this.createdDate; + } + + public LocalDateTime getLastUpdate() { + return this.lastUpdate; + } + + public ArrayList getHashTag() { + return this.hashTag; + } + + public ArrayList getInvites() { + return this.invites; + } + + public ArrayList getEditors() { + return this.editors; + } + + public HashMap getPageMap() { + return this.pageMap; + } + + //----------------------------------------------------------------- + // setter + public void setAid(Integer aid) { + this.aid = aid; + } + + public void setLikes(Integer likes) { + this.likes = likes; + } + + public void setViews(Integer views) { + this.views = views; + } + + public void setName(String name) { + this.name = name; + } + + public void setDescription(String description) { + this.description = description; + } + + public void setPublic(Boolean aPublic) { + this.isPublic = aPublic; + } + + //----------------------------------------------------------------- + //----------------------------------------------------------------- + // 招待するアカウントの追加 + public void addInviteAccount(Account account){ + this.invites.add(account); + } + //----------------------------------------------------------------- + // 編集者の追加 + public void addEditor(Editor editor){ + this.editors.add(editor); + } + //----------------------------------------------------------------- + // 新規ページの追加 + public void addPage(Integer page){ + + } + +} diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/AnimationJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/AnimationJson.java new file mode 100644 index 0000000..8391ebc --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/AnimationJson.java @@ -0,0 +1,18 @@ +package org.ntlab.acanthus_client.entities; + +import java.util.ArrayList; +import java.util.Collection; + +//----------------------------------------------------------------- +// アニメーション +public class AnimationJson { + private Integer aid; + private Integer ownerUid; + private String animationName; + private ArrayList editors; + + //----------------------------------------------------------------- + public AnimationJson() { + } + +} diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/Editor.java b/app/src/main/java/org/ntlab/acanthus_client/entities/Editor.java new file mode 100644 index 0000000..5d73e77 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/Editor.java @@ -0,0 +1,36 @@ +package org.ntlab.acanthus_client.entities; + +//----------------------------------------------------------------- +// 作品編集者情報 +public class Editor { + private Account editorAccount; + private Boolean isOwner; + + //----------------------------------------------------------------- + public Editor() { + } + + public Editor(Account account, boolean aOwner) { + this.editorAccount = account; + this.isOwner = aOwner; + } + + //----------------------------------------------------------------- + // getter + public Account getEditorAccount() { + return this.editorAccount; + } + + //----------------------------------------------------------------- + // setter + public void setEditorAccount(Account editorAccount) { + this.editorAccount = editorAccount; + } + + //----------------------------------------------------------------- + //----------------------------------------------------------------- + // 自身がオーナーかどうか + public Boolean isOwnerAccount() { + return this.isOwner; + } +} diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/EditorJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/EditorJson.java new file mode 100644 index 0000000..dd5cb03 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/EditorJson.java @@ -0,0 +1,25 @@ +package org.ntlab.acanthus_client.entities; + +import java.util.ArrayList; + +//----------------------------------------------------------------- +// 作品編集者の一覧 +public class EditorJson { + private ArrayList uidList = new ArrayList<>(); + + //----------------------------------------------------------------- + public EditorJson() { + } + + //----------------------------------------------------------------- + // getter + public ArrayList getUidList() { + return uidList; + } + + //----------------------------------------------------------------- + // setter + public void addUid(Integer uid) { + this.uidList.add(uid); + } +} diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/Layer.java b/app/src/main/java/org/ntlab/acanthus_client/entities/Layer.java new file mode 100644 index 0000000..99927bc --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/Layer.java @@ -0,0 +1,6 @@ +package org.ntlab.acanthus_client.entities; + +//----------------------------------------------------------------- +// レイヤー情報 +public class Layer { +} diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/Page.java b/app/src/main/java/org/ntlab/acanthus_client/entities/Page.java new file mode 100644 index 0000000..61b4502 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/Page.java @@ -0,0 +1,6 @@ +package org.ntlab.acanthus_client.entities; + +//----------------------------------------------------------------- +// ページ情報 +public class Page { +} diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/Position.java b/app/src/main/java/org/ntlab/acanthus_client/entities/Position.java new file mode 100644 index 0000000..7d254be --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/Position.java @@ -0,0 +1,25 @@ +package org.ntlab.acanthus_client.entities; + +//----------------------------------------------------------------- +// ペン座標 +public class Position { + private Float x; + private Float y; + + //----------------------------------------------------------------- + // getter + public Float getX() { + return this.x; + } + + public Float getY() { + return this.y; + } + + //----------------------------------------------------------------- + // setter + public void setPosition(float x, float y) { + this.x = x; + this.y = y; + } +} diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/Stroke.java b/app/src/main/java/org/ntlab/acanthus_client/entities/Stroke.java new file mode 100644 index 0000000..3c574a6 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/Stroke.java @@ -0,0 +1,6 @@ +package org.ntlab.acanthus_client.entities; + +//----------------------------------------------------------------- +// 筆跡 +public class Stroke { +} diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/Work.java b/app/src/main/java/org/ntlab/acanthus_client/entities/Work.java index 849e8ac..77f3d3b 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/Work.java +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/Work.java @@ -1,4 +1,33 @@ package org.ntlab.acanthus_client.entities; +//----------------------------------------------------------------- +// 参加作品 public class Work { + Integer status; + Animation animation; + + //----------------------------------------------------------------- + // getter + public Animation getAnimation() { + return animation; + } + + //----------------------------------------------------------------- + // setter + public void setAnimation(Animation animation){ + this.animation = animation; + } + + //----------------------------------------------------------------- + // 作品に招待されている状態に更新する + public void updateToInvitingStatus(){ + this.status = 1; + } + //----------------------------------------------------------------- + // 作品に参加している状態に更新する + public void updateToWorkingStatus(){ + this.status = 2; + } + //----------------------------------------------------------------- + } diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/WorkJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/WorkJson.java new file mode 100644 index 0000000..2f29ec4 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/WorkJson.java @@ -0,0 +1,4 @@ +package org.ntlab.acanthus_client.entities; + +public class WorkJson { +}