diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java
index b3ad02c..81a4051 100644
--- a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java
@@ -5,17 +5,33 @@
 import androidx.lifecycle.ViewModelProvider;
 
 import android.os.Bundle;
+import android.view.View;
 
 import org.ntlab.irisclient.viewmodels.DrawingStateViewModel;
 
-public class DrawingActivity extends AppCompatActivity {
+public class DrawingActivity extends AppCompatActivity implements View.OnClickListener {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_drawing);
+
         DrawingStateViewModel drawingStateViewModel = new ViewModelProvider(this).get(DrawingStateViewModel.class);
 
+        //Irisから必要な情報を取得
+        Iris iris = (Iris) this.getApplication();
+        String rid = iris.getRid();
+        String nickName = iris.getNickname();
+
+        //viewModelに必用な情報をセット
+        drawingStateViewModel.setRid(rid);
+        drawingStateViewModel.setNickName(nickName);
+
+        //タイマースタート呼び出し
+        //drawingStateViewModel.start(100ms);
+
+        findViewById(R.id.okButtton).setOnClickListener(this);//お絵描き終了ボタン
+
         drawingStateViewModel.getDno().observe(this, new Observer<Integer>() {
             private Integer dno;
             @Override
@@ -31,6 +47,15 @@
                 this.state = state;
             }
         });
-
     }
+
+    @Override
+    public void onClick(View v){
+        DrawingStateViewModel drawingStateViewModel = new ViewModelProvider(this).get(DrawingStateViewModel.class);
+        if(v.getId() == R.id.okButtton) {
+            //okButtonが押された処理
+            drawingStateViewModel.putDrawing();
+        }
+    }
+
 }
\ No newline at end of file