diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java index 57741c6..5e4f54c 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java @@ -26,7 +26,10 @@ public class PaintActivity extends AppCompatActivity { private PaintCanvas paintCanvas; + private PaintOnionCanvas paintOnionCanvas; + private PaintToolBar paintToolBar; + private PaintScreenShot paintScreenShot; private ActivityPaintBinding binding; private PaintViewModel paintViewModel; @@ -56,14 +59,13 @@ @Override public void onClick(View v) { //bottonタップで表示されてたら非表示にする。 - if(buttonView) { + if (buttonView) { findViewById(R.id.capture).setVisibility(View.INVISIBLE); findViewById(R.id.image).setVisibility(View.INVISIBLE); findViewById(R.id.textView3).setVisibility(View.INVISIBLE); buttonView = false; - } - else { + } else { findViewById(R.id.capture).setVisibility(View.VISIBLE); findViewById(R.id.image).setVisibility(View.VISIBLE); findViewById(R.id.textView3).setVisibility(View.VISIBLE); @@ -113,7 +115,10 @@ setContentView(binding.getRoot()); paintCanvas = (PaintCanvas) findViewById(R.id.myCanvas); - paintCanvas.setPaintViewModel(paintViewModel); + paintCanvas.init(paintViewModel); + + paintOnionCanvas = findViewById(R.id.paintOnionCanvas); + paintOnionCanvas.init(paintViewModel); paintScreenShot = new PaintScreenShot(this); paintToolBar = new PaintToolBar(this, paintCanvas); @@ -126,18 +131,18 @@ //----------------------------------------------------------------- // private void startObserve() { - paintViewModel.getPageNo().observe(this, new Observer() { - @Override - public void onChanged(Integer i) { - binding.buttonAddPage.setText(String.valueOf(i)); - } - }); - paintViewModel.getStroke().observe(this, new Observer>() { + + // 現在のStrokeに変更がある度に取得 + + + // 前のStrokeに変更がある度に取得 + paintViewModel.getPreStrokes().observe(this, new Observer>() { @Override public void onChanged(Collection strokes) { - paintCanvas.getCanvas(); + paintOnionCanvas.updateCanvas(); } }); + //1時的コメントアウトここから // paintViewModel.getmStrokeNo().observe(this, new Observer() { // @Override