diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java index f7af557..e1d07d5 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(); @@ -97,9 +100,9 @@ drawingCanvas = (DrawingCanvas) findViewById(R.id.drawingCanvas); //残りのイラスト枚数の表示 - //drawingNum = 16 / 2; // 一人あたりが描く枚数(テスト部屋用,部屋作成からスタートする場合はこの行をコメントアウトして ↓ ふたつのコメントを解除) - drawingNum = 16 / memberList.size(); // 一人あたりが描く枚数 - if (16 % memberList.size() != 0) drawingNum++; // 余りが出た場合プラス1枚 + drawingNum = 16 / 2; // 一人あたりが描く枚数(テスト部屋用,部屋作成からスタートする場合はこの行をコメントアウトして ↓ ふたつのコメントを解除) + //drawingNum = 16 / memberList.size(); // 一人あたりが描く枚数 + //if (16 % memberList.size() != 0) drawingNum++; // 余りが出た場合プラス1枚 //getKeywords drawingStateViewModel.getKeywords().observe(this, new Observer>(){ @@ -114,7 +117,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..caa7bcf 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; 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..16de9e8 100644 --- a/app/src/main/res/layout/activity_drawing.xml +++ b/app/src/main/res/layout/activity_drawing.xml @@ -8,124 +8,132 @@ + app:layout_constraintVertical_bias="1" />