diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailActivity.java index 2d6f9b5..7ebf505 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailActivity.java @@ -17,12 +17,17 @@ import org.ntlab.acanthus_client.Acanthus; import org.ntlab.acanthus_client.R; import org.ntlab.acanthus_client.entities.Animation; +import org.ntlab.acanthus_client.entities.AnimationJson; import org.ntlab.acanthus_client.views.animation.AnimationActivity; import org.ntlab.acanthus_client.views.animation.AnimationCanvas; +import org.ntlab.acanthus_client.views.userpage.UserPageActivity; +import org.ntlab.acanthus_client.views.userpage.followerList.FollowerListActivity; import java.io.IOException; import java.io.InputStream; import java.net.URL; +import java.util.ArrayList; +import java.util.Collection; public class AnimationDetailActivity extends AppCompatActivity { @@ -33,9 +38,17 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); Acanthus acanthus = (Acanthus) getApplication(); + + Intent intent = getIntent(); + AnimationJson animationJson = (AnimationJson) intent.getSerializableExtra("AnimationJsonData"); + Animation currentAnimation = acanthus.getCurrentAnimation(); setContentView(R.layout.activity_animation_detail); + //作成者のuidとnameを保存 + ArrayList editorsUid = (ArrayList) animationJson.getEditorIds(); + ArrayList editorsNames = (ArrayList) animationJson.getEditorNames(); + //文字入力テスト EditText editText = findViewById(R.id.edit_text); TextView wordText = findViewById(R.id.word_text); @@ -49,6 +62,15 @@ wordText17.setText(currentAnimation.getCreatedDate().toString()); TextView wordText18 = findViewById(R.id.textView18); + Button editor1Button = findViewById(R.id.button_editor1); + Button editor2Button = findViewById(R.id.button_editor2); + editor1Button.setOnClickListener(new View.OnClickListener(){ + @Override + public void onClick(View v){ + + } + }); + wordButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -64,13 +86,27 @@ Button returnButton = findViewById(R.id.return_button); returnButton.setOnClickListener(v -> finish()); - //作成者のページに移動(今は仮でアニメーション画面へ) - Button buttonEditor1 = findViewById(R.id.button_editor1); - buttonEditor1.setOnClickListener((View v) -> { - Intent intent = new Intent(AnimationDetailActivity.this, AnimationActivity.class); - startActivity(intent); - } - ); + //作成者のページに移動 + editor1Button.setOnClickListener(new View.OnClickListener(){ + @Override + public void onClick(View v){ + Intent intent = new Intent(getApplication(), UserPageActivity.class); + intent.putExtra("UID", editorsUid.get(0)); + intent.putExtra("NAME", editorsNames.get(0)); + startActivity(intent); + + } + }); + editor2Button.setOnClickListener(new View.OnClickListener(){ + @Override + public void onClick(View v){ + Intent intent = new Intent(getApplication(), UserPageActivity.class); + intent.putExtra("UID", editorsUid.get(1)); + intent.putExtra("NAME", editorsNames.get(1)); + startActivity(intent); + + } + }); /* //作成者のページに移動(今は仮でアニメーション画面へ) Button buttonEditor2 = findViewById(R.id.button_editor2);