diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java index faeaa29..afde09f 100644 --- a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider; import android.content.Intent; +import android.graphics.Bitmap; import android.os.Bundle; import android.view.View; import android.widget.TextView; @@ -17,8 +18,6 @@ private DrawingCanvas drawingCanvas; private DrawingStateViewModel drawingStateViewModel; - private String rid; - private Integer nowDno; @Override protected void onCreate(Bundle savedInstanceState) { @@ -29,7 +28,7 @@ //Irisから必要な情報を取得 Iris iris = (Iris) this.getApplication(); - rid = iris.getRid(); + String rid = iris.getRid(); String nickName = iris.getNickname(); drawingStateViewModel= new ViewModelProvider(this).get(DrawingStateViewModel.class); @@ -48,7 +47,6 @@ @Override public void onChanged(Integer dno) { //String keyword = keywords.get(dno); - nowDno = dno; textKeyword.setText(dno); } }); @@ -70,8 +68,8 @@ @Override public void onClick(View v){ if(v.getId() == R.id.okButtton) {//okButtonが押されたときの処理 - String drawingStr = "test"; - drawingStateViewModel.putDrawing(rid, nowDno, drawingStr); + Bitmap bitmap = null; + drawingStateViewModel.putDrawing(bitmap); }else if(v.getId() == R.id.clearButton){//clearButtonが押されたときの処理 drawingCanvas.clearCanvas(); }