diff --git a/.idea/misc.xml b/.idea/misc.xml
index a4db526..3b4f6d8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,14 +5,6 @@
diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java
index 1410ac5..b2c9f43 100644
--- a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java
@@ -24,8 +24,6 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_drawing);
- //drawingCanvas = (DrawingCanvas) findViewById(R.id.canvas);
-
//Irisから必要な情報を取得
Iris iris = (Iris) this.getApplication();
String rid = iris.getRid();
@@ -38,7 +36,10 @@
drawingStateViewModel.setNickName(nickName);
findViewById(R.id.okButtton).setOnClickListener(this);//お絵描き終了ボタン
+ findViewById(R.id.clearButton).setOnClickListener(this);//画面クリアボタン
+
TextView textKeyword =(TextView)findViewById(R.id.textKeyword);//keywordのTextView
+ drawingCanvas = (DrawingCanvas) findViewById(R.id.drawingCanvas);
//getKeywords
//List keywords = drawingStateViewModel.getKeywords(rid);
diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingCanvas.java b/app/src/main/java/org/ntlab/irisclient/DrawingCanvas.java
index 9c11905..484798d 100644
--- a/app/src/main/java/org/ntlab/irisclient/DrawingCanvas.java
+++ b/app/src/main/java/org/ntlab/irisclient/DrawingCanvas.java
@@ -23,7 +23,7 @@
path = new Path();//線を引いたり、図形を描いたり、要するにグラフィック
paint = new Paint();//筆の種類
- paint.setColor(Color.RED);//色の指定
+ paint.setColor(Color.BLACK);//色の指定
paint.setStyle(Paint.Style.STROKE);//線をひく
paint.setStrokeWidth(20);//幅
}
diff --git a/app/src/main/res/drawable/border.xml b/app/src/main/res/drawable/border.xml
new file mode 100644
index 0000000..f7ee6d5
--- /dev/null
+++ b/app/src/main/res/drawable/border.xml
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_drawing.xml b/app/src/main/res/layout/activity_drawing.xml
index 55763c7..8850c50 100644
--- a/app/src/main/res/layout/activity_drawing.xml
+++ b/app/src/main/res/layout/activity_drawing.xml
@@ -6,6 +6,18 @@
android:layout_height="match_parent"
tools:context=".DrawingActivity">
+
+
+ app:layout_constraintVertical_bias="0.961" />
+ app:layout_constraintVertical_bias="1.0" />
+ app:layout_constraintVertical_bias="0.052" />
-
-
-
-
\ No newline at end of file