diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java index fde74de..ffdbe20 100644 --- a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java @@ -15,6 +15,7 @@ public class DrawingActivity extends AppCompatActivity implements View.OnClickListener { + private DrawingCanvas drawingCanvas; DrawingStateViewModel drawingStateViewModel = new ViewModelProvider(this).get(DrawingStateViewModel.class); @Override @@ -22,6 +23,8 @@ super.onCreate(savedInstanceState); setContentView(R.layout.activity_drawing); + drawingCanvas = (DrawingCanvas) findViewById(R.id.canvas); + //Irisから必要な情報を取得 Iris iris = (Iris) this.getApplication(); String rid = iris.getRid(); @@ -61,9 +64,10 @@ @Override public void onClick(View v){ - if(v.getId() == R.id.okButtton) { - //okButtonが押された処理 + if(v.getId() == R.id.okButtton) {//okButtonが押されたときの処理 drawingStateViewModel.putDrawing(); + }else if(v.getId() == R.id.clearButton){//clearButtonが押されたときの処理 + drawingCanvas.clearCanvas(); } } diff --git a/app/src/main/res/layout/activity_drawing.xml b/app/src/main/res/layout/activity_drawing.xml index d630771..db68bde 100644 --- a/app/src/main/res/layout/activity_drawing.xml +++ b/app/src/main/res/layout/activity_drawing.xml @@ -6,21 +6,6 @@ android:layout_height="match_parent" tools:context=".DrawingActivity"> - - - -