diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java index a4010c5..28ad776 100644 --- a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java @@ -11,6 +11,7 @@ import android.view.View; import android.view.WindowManager; import android.widget.CompoundButton; +import android.widget.ImageButton; import android.widget.SeekBar; import android.widget.TextView; import android.widget.ToggleButton; @@ -30,6 +31,8 @@ private Integer drawingNow = 0; private Integer nowTime; private ToggleButton okToggleButton; + private ImageButton blackPen; + private ImageButton eraser; @Override protected void onCreate(Bundle savedInstanceState) { @@ -46,8 +49,8 @@ drawingStateViewModel= new ViewModelProvider(this).get(DrawingStateViewModel.class); findViewById(R.id.clearButton).setOnClickListener(this);//画面クリアボタン - findViewById(R.id.eraserButton).setOnClickListener(this);//消しゴムボタン - findViewById(R.id.blackPenButton).setOnClickListener(this);//消しゴムボタン + blackPen = findViewById(R.id.blackPenButton); + eraser = findViewById(R.id.eraserButton); //完了ボタン okToggleButton = (ToggleButton) findViewById(R.id.toggleButton); @@ -79,6 +82,7 @@ TextView textAlpha =(TextView)findViewById(R.id.alphaText); textPenSize.setText("サイズ: 10%"); textAlpha.setText("透明度: 255%"); + //筆の大きさを変えるシークバー SeekBar seekbar = findViewById(R.id.seekBar); seekbar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() { @@ -120,6 +124,7 @@ TextView textMemberNum = (TextView)findViewById(R.id.drawingNowText);//残りのイラスト枚数のTextView TextView timerText = (TextView)findViewById(R.id.timerText);//TimerのTextView + drawingCanvas = (DrawingCanvas) findViewById(R.id.drawingCanvas); //残りのイラスト枚数の表示 @@ -192,8 +197,11 @@ drawingCanvas.clearCanvas(); } else if (v.getId() == R.id.eraserButton) {//eraserButtonが押されたときの処理 drawingCanvas.setColor(Color.WHITE); + eraser.setBackgroundResource(R.drawable.border); + blackPen.setBackgroundColor(Color.WHITE); } else if (v.getId() == R.id.blackPenButton) { drawingCanvas.setColor(Color.BLACK); + blackPen.setBackgroundResource(R.drawable.border); } } }