diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a8a64b0..aaab359 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,6 +16,7 @@ android:theme="@style/Theme.Acanthus" android:usesCleartextTraffic="true"> + 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 a24f69d..bc85a71 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 @@ -2,12 +2,16 @@ import androidx.appcompat.app.AppCompatActivity; +import android.app.Activity; +import android.content.Intent; import android.os.Bundle; import android.view.View; import android.widget.Button; +import org.ntlab.acanthus_client.Acanthus; import org.ntlab.acanthus_client.R; import org.ntlab.acanthus_client.databinding.ActivityPaintBinding; +import org.ntlab.acanthus_client.views.animation_detail.AnimationDetailActivity; // 表示ページ public class AnimationActivity extends AppCompatActivity { @@ -54,10 +58,10 @@ buttonDetail.setOnClickListener(new View.OnClickListener(){ @Override public void onClick(View v) { - + Intent intent = new Intent(AnimationActivity.this, AnimationDetailActivity.class); + startActivity(intent); } }); } - } \ No newline at end of file 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 new file mode 100644 index 0000000..0c73651 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailActivity.java @@ -0,0 +1,47 @@ +package org.ntlab.acanthus_client.views.animation_detail; + +import androidx.appcompat.app.AppCompatActivity; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; + +import org.ntlab.acanthus_client.R; +import org.ntlab.acanthus_client.databinding.ActivityPaintBinding; +import org.ntlab.acanthus_client.views.animation.AnimationActivity; +import org.ntlab.acanthus_client.views.animation.AnimationCanvas; +import org.ntlab.acanthus_client.views.main_menu_ui.mypage.MyPageFragment; + +public class AnimationDetailActivity extends AppCompatActivity { + + private AnimationCanvas animationDetails; + private View view; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_animation_detail); + + //画面を閉じる + 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); + } + ); + + //作成者のページに移動(今は仮でアニメーション画面へ) + Button buttonEditor2 = findViewById(R.id.button_editor2); + buttonEditor2.setOnClickListener((View v) -> { + Intent intent = new Intent(AnimationDetailActivity.this, AnimationActivity.class); + startActivity(intent); + } + ); + + } +} diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailViewModel.java new file mode 100644 index 0000000..71bc703 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailViewModel.java @@ -0,0 +1,17 @@ +package org.ntlab.acanthus_client.views.animation_detail; + +import androidx.lifecycle.ViewModel; + +import org.ntlab.acanthus_client.Acanthus; +import org.ntlab.acanthus_client.entities.Stroke; +import org.ntlab.acanthus_client.resources.gallery.StrokesRest; + +import java.util.Collection; + +import retrofit2.Call; +import retrofit2.Retrofit; + +public class AnimationDetailViewModel { + private Retrofit retrofit; + private Acanthus acanthus; +} diff --git a/app/src/main/res/layout/activity_animation_detail.xml b/app/src/main/res/layout/activity_animation_detail.xml new file mode 100644 index 0000000..66148e1 --- /dev/null +++ b/app/src/main/res/layout/activity_animation_detail.xml @@ -0,0 +1,136 @@ + + + +