diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java
index f7af557..a4010c5 100644
--- a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java
@@ -9,6 +9,7 @@
import android.graphics.Color;
import android.os.Bundle;
import android.view.View;
+import android.view.WindowManager;
import android.widget.CompoundButton;
import android.widget.SeekBar;
import android.widget.TextView;
@@ -35,6 +36,8 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_drawing);
+ //getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);//ステータスバー非表示
+
//Irisから必要な情報を取得
Iris iris = (Iris) this.getApplication();
Boolean bMaster = iris.isMaster();
@@ -72,12 +75,35 @@
}
});
+ TextView textPenSize =(TextView)findViewById(R.id.penSizeText);
+ TextView textAlpha =(TextView)findViewById(R.id.alphaText);
+ textPenSize.setText("サイズ: 10%");
+ textAlpha.setText("透明度: 255%");
//筆の大きさを変えるシークバー
SeekBar seekbar = findViewById(R.id.seekBar);
seekbar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
@Override
public void onProgressChanged(SeekBar seekBar, int i, boolean b) {//変更中
drawingCanvas.setPenWidth(i);
+ textPenSize.setText("サイズ: "+ i + "%");
+ }
+
+ @Override
+ public void onStartTrackingTouch(SeekBar seekBar) {//変更開始時
+ }
+
+ @Override
+ public void onStopTrackingTouch(SeekBar seekBar) {//変更終了時
+ }
+ });
+
+ //筆の透明度を変えるシークバー
+ SeekBar seekbar2 = findViewById(R.id.seekBar2);
+ seekbar2.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+ @Override
+ public void onProgressChanged(SeekBar seekBar, int i, boolean b) {//変更中
+ drawingCanvas.setAlpha(i);
+ textAlpha.setText("透明度: "+ i + "%");
}
@Override
@@ -114,7 +140,7 @@
@Override
public void onChanged(Integer dno) {
String keyword = keywordList.get(dno);
- textKeyword.setText("Dno: " + dno + ", Keyword: " + keyword);
+ textKeyword.setText(keyword);
drawingNow++;
textMemberNum.setText(""+drawingNow+"/"+drawingNum);
drawingCanvas.clearCanvas();
diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingCanvas.java b/app/src/main/java/org/ntlab/irisclient/DrawingCanvas.java
index 4467a44..a5e7a4d 100644
--- a/app/src/main/java/org/ntlab/irisclient/DrawingCanvas.java
+++ b/app/src/main/java/org/ntlab/irisclient/DrawingCanvas.java
@@ -14,6 +14,8 @@
import androidx.annotation.Nullable;
+import java.util.ArrayList;
+
public class DrawingCanvas extends View {
private Canvas canvas;
@@ -102,6 +104,11 @@
paint.setColor(color);
}
+ //筆の透明度を変更
+ public void setAlpha(int alpha){
+ paint.setAlpha(alpha);
+ }
+
//筆の幅を変更
public void setPenWidth(int size){
paint.setStrokeWidth(size);
diff --git a/app/src/main/res/drawable/eraser.png b/app/src/main/res/drawable/eraser.png
new file mode 100644
index 0000000..2632152
--- /dev/null
+++ b/app/src/main/res/drawable/eraser.png
Binary files differ
diff --git a/app/src/main/res/drawable/pen.png b/app/src/main/res/drawable/pen.png
new file mode 100644
index 0000000..b904578
--- /dev/null
+++ b/app/src/main/res/drawable/pen.png
Binary files differ
diff --git a/app/src/main/res/layout/activity_drawing.xml b/app/src/main/res/layout/activity_drawing.xml
index 8c19528..42d07cf 100644
--- a/app/src/main/res/layout/activity_drawing.xml
+++ b/app/src/main/res/layout/activity_drawing.xml
@@ -8,124 +8,170 @@
+ app:layout_constraintVertical_bias="1" />
-
-
+ app:layout_constraintVertical_bias="0.933" />
+ app:layout_constraintVertical_bias="0.84" />
+ app:layout_constraintVertical_bias="0.86" />
+ app:layout_constraintVertical_bias="0.843" />
-
-
+ app:layout_constraintVertical_bias="0.933" />
+ app:layout_constraintTop_toTopOf="@+id/drawingCanvas"
+ app:layout_constraintVertical_bias="1.0" />
+ app:layout_constraintVertical_bias="0.578" />
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file