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 10e455e..c5f65f5 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 @@ -11,5 +11,8 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_animation); + + AnimationCanvas animation = new AnimationCanvas(this); + setContentView(animation); } } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationCanvas.java b/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationCanvas.java new file mode 100644 index 0000000..9241984 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationCanvas.java @@ -0,0 +1,54 @@ +package org.ntlab.acanthus_client.views.animation; + +import android.content.Context; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; +import android.view.View; + +import org.ntlab.acanthus_client.Acanthus; +import org.ntlab.acanthus_client.entities.Position; +import org.ntlab.acanthus_client.entities.Stroke; + +import java.util.ArrayList; + +import retrofit2.Retrofit; + +public class AnimationCanvas extends View { + private Retrofit retrofit; + private Acanthus acanthus; + private AnimationViewModel animation = new AnimationViewModel(); + private Paint paint = new Paint(); + + public AnimationCanvas(Context context) { + super(context); + } +/* + @Override + protected void onDraw(Canvas canvas) { + super.onDraw(canvas); + Stroke stroke = retrofit.create(Stroke.class); + paint.setStrokeWidth(stroke.getThickness()); + paint.setColor(stroke.getColor()); + ArrayList pts = stroke.getPositions(); + //canvas.drawLines(pts, paint); + } +*/ + //ダミーです。 + @Override + protected void onDraw(Canvas canvas) { + super.onDraw(canvas); + + //canvas.drawRect(100, 100, 200, 300, paint); + //canvas.drawRect(300, 200, 400, 400, paint); + //canvas.drawRect(500, 300, 600, 500, paint); + + //Stroke stroke = retrofit.create(Stroke.class); + paint.setStrokeWidth(20); + paint.setColor(Color.RED); + float pts[] = {100, 1000, 500, 100, 500, 100, 900, 1000, 900, 1000, 250, 450, 250, 450, 800, 450}; + canvas.drawLines(pts, paint); + + } + +} diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationViewModel.java new file mode 100644 index 0000000..69a41a1 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationViewModel.java @@ -0,0 +1,47 @@ +/*package org.ntlab.acanthus_client.views.animation; + +import androidx.lifecycle.ViewModel; + +import org.ntlab.acanthus_client.Acanthus; +import org.ntlab.acanthus_client.entities.Stroke; + +import retrofit2.Retrofit; + +public class AnimationViewModel extends ViewModel { + private Retrofit retrofit; + private Acanthus acanthus; + // getStrokes + public void getAnimationStrokes() { + Stroke stroke = retrofit.create(Stroke.class); + stroke.getPositions(); + stroke.getPen(); + stroke.getColor(); + stroke.getThickness(); + + //return stroke; + } +} +*/ +package org.ntlab.acanthus_client.views.animation; + +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 AnimationViewModel extends ViewModel { + private Retrofit retrofit; + private Acanthus acanthus; + // getStrokes + public void getAnimationStrokes() { + final StrokesRest strokesRest = retrofit.create(StrokesRest.class); + Call> call = strokesRest.getStrokes(acanthus.getAid()); + + } +}