diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..797acea
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/org/ntlab/acanthus_client/Acanthus.java b/app/src/main/java/org/ntlab/acanthus_client/Acanthus.java
index ffb2f0b..b8f859b 100644
--- a/app/src/main/java/org/ntlab/acanthus_client/Acanthus.java
+++ b/app/src/main/java/org/ntlab/acanthus_client/Acanthus.java
@@ -136,4 +136,6 @@
this.animationJsonList.add(animationJson);
}
//-----------------------------------------------------------------
+
+
}
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
index 1fdb9ad..c1d91bd 100644
--- a/app/src/main/java/org/ntlab/acanthus_client/entities/AnimationJson.java
+++ b/app/src/main/java/org/ntlab/acanthus_client/entities/AnimationJson.java
@@ -19,8 +19,24 @@
public String getAnimationName(){return this.animationName;}
+ public Integer getAid() {return this.aid;}
+
public ArrayList getEditor(){return this.editors;}
+ public void setAid(Integer aid) {
+ this.aid = aid;
+ }
+
+ public void setName(String name) {
+ this.animationName = name;
+ }
public String getCreatedDate(){ return this.createdDate; }
+ public void setOwnerUid(Integer uid) {
+ this.ownerUid = uid;
+ }
+
+ public void addEdiotrs(Editor editor) {
+ this.editors.add(editor);
+ }
}
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
index 35f411f..a8b8770 100644
--- a/app/src/main/java/org/ntlab/acanthus_client/entities/WorkJson.java
+++ b/app/src/main/java/org/ntlab/acanthus_client/entities/WorkJson.java
@@ -4,13 +4,13 @@
import java.util.Collection;
public class WorkJson {
- private ArrayList aid = new ArrayList<>();
+ private ArrayList aid = new ArrayList<>();
- public Collection getAid() {
+ public Collection getAid() {
return aid;
}
- public void setAid(ArrayList aid) {
+ public void setAid(ArrayList aid) {
this.aid = aid;
}
}
diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java
index 1bc1095..73fca5b 100644
--- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java
+++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java
@@ -17,6 +17,8 @@
import org.ntlab.acanthus_client.Acanthus;
import org.ntlab.acanthus_client.R;
import org.ntlab.acanthus_client.databinding.FragmentEditBinding;
+import org.ntlab.acanthus_client.entities.Animation;
+import org.ntlab.acanthus_client.entities.AnimationJson;
import org.ntlab.acanthus_client.entities.WorkJson;
import org.ntlab.acanthus_client.views.paint.PaintActivity;
@@ -33,8 +35,10 @@
private EditViewModel editViewModel;
private FragmentEditBinding binding;
- private ArrayList aid;
-
+ private ArrayList aidList;
+ private ArrayList AnimationJsonList;
+ private ArrayList nameList;
+ private String AnimationName;
public View onCreateView(@NonNull LayoutInflater inflater,
ViewGroup container, Bundle savedInstanceState) {
@@ -63,15 +67,27 @@
Integer uid = 1;
String token = "abc0";
editViewModel.getWorkList(uid, token);
- aid = new ArrayList<>();
+ aidList = new ArrayList<>();
+ nameList = new ArrayList<>();
+ AnimationJsonList = new ArrayList<>();
ListView listView = (ListView) getActivity().findViewById(R.id.list_view);
editViewModel.getWorkJson().observe(getViewLifecycleOwner(), new Observer() {
@Override
public void onChanged(@Nullable WorkJson workJson) {
- aid = (ArrayList) editViewModel.getWorkJson().getValue().getAid();
+ aidList = (ArrayList) editViewModel.getWorkJson().getValue().getAid();
+ AnimationJsonList = (ArrayList) acanthus.getAnimationJsonList();
+ if(AnimationJsonList != null){
+ for(int i=0; i