diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java index fd13098..b746a12 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java @@ -18,6 +18,7 @@ import org.ntlab.acanthus_client.Acanthus; import org.ntlab.acanthus_client.R; +import org.ntlab.acanthus_client.entities.AnimationJson; import org.ntlab.acanthus_client.views.animation_detail.AnimationDetailActivity; import org.ntlab.acanthus_client.views.paint.PaintCanvas; import org.ntlab.acanthus_client.views.paint.PaintToolBar; @@ -62,6 +63,10 @@ //animationCanvas = this.findViewById(R.id.animationMyCanvas); init(); + //intentでHomeFragmentから渡されたanimation情報を取得 + Intent intent = getIntent(); + AnimationJson animationJson = (AnimationJson) intent.getSerializableExtra("AnimationJsonData"); + //wecView初期設定 webView = this.findViewById(R.id.animationWebview); webView .getSettings().setLoadWithOverviewMode(true); @@ -126,6 +131,7 @@ buttonDetail.setOnClickListener(new View.OnClickListener(){ public void onClick(View v) { Intent intent = new Intent(AnimationActivity.this, AnimationDetailActivity.class); + intent.putExtra("AnimationJsonData", animationJson); startActivity(intent); } });