diff --git a/.idea/misc.xml b/.idea/misc.xml index 19aa6a5..d5d35ec 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + 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 ba82818..fe23182 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 @@ -1,11 +1,12 @@ package org.ntlab.acanthus_client.entities; +import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; //----------------------------------------------------------------- // アニメーション -public class AnimationJson { +public class AnimationJson implements Serializable { private Integer aid; private String animationName; private Integer owner; 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 2da8422..2d0e7b1 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 @@ -6,6 +6,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.BaseAdapter; import android.widget.Button; @@ -47,12 +48,6 @@ binding = FragmentEditBinding.inflate(inflater, container, false); View root = binding.getRoot(); - editViewModel.getWorkJson().observe(getViewLifecycleOwner(), new Observer() { - @Override - public void onChanged(@Nullable WorkJson workJson) { - - } - }); return root; } @@ -81,6 +76,7 @@ public void onChanged(@Nullable WorkJson workJson) { aidList = (ArrayList) editViewModel.getWorkJson().getValue().getAid(); AnimationJsonList = (ArrayList) acanthus.getAnimationJsonList(); + ArrayList workList = new ArrayList<>(); if(AnimationJsonList != null){ for(int i=0; i adapterView, View view, int position, long id) { + transitionPaintActivity(workList.get(position)); + } + }); } @@ -146,5 +150,12 @@ startActivity(intent); } + private void transitionPaintActivity(AnimationJson animationJson) { + Acanthus acanthus = (Acanthus) getActivity().getApplication(); + Intent intent = new Intent(acanthus, PaintActivity.class); + intent.putExtra("AnimationJsonData", animationJson); + startActivity(intent); + } + } \ No newline at end of file