diff --git a/.idea/misc.xml b/.idea/misc.xml index 3f8399f..6ac97c8 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -60,6 +60,9 @@ + + + diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PenDetailsFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PenDetailsFragment.java index 51a3d0d..58a20ca 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PenDetailsFragment.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PenDetailsFragment.java @@ -2,7 +2,6 @@ import android.graphics.Color; import android.os.Bundle; -import android.util.Log; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; @@ -49,6 +48,9 @@ edtBlue = root.findViewById(R.id.edtBlue); edtThickness = root.findViewById(R.id.edtThickness); + strokeCanvasView = root.findViewById(R.id.strokeCanvasView); + strokeCanvasView.setStrokeWidth(paintCanvas.getPen().getThickness()); + //seekBarとEditTextの初期値 sbAlpha.setProgress(paintCanvas.getPen().getAlpha()); edtAlpha.setText(String.format("%1$d", sbAlpha.getProgress())); @@ -130,7 +132,8 @@ case R.id.seekBarThickness: edtThickness.setText(String.format("%1$d", progress)); paintCanvas.getPen().setThickness(progress); - //strokeCanvasView.setStrokeWidth(progress,paintCanvas); + strokeCanvasView.setStrokeWidth(progress); + strokeCanvasView.clearCanvas(); break; default: return; @@ -146,6 +149,7 @@ @Override public void onStopTrackingTouch(SeekBar seekBar) { + } @@ -185,7 +189,8 @@ case R.id.edtThickness: sbThickness.setProgress(value); value = Math.max(0, Math.min(50, value)); - //strokeCanvasView.setStrokeWidth(value,paintCanvas); + strokeCanvasView.setStrokeWidth(value); + strokeCanvasView.clearCanvas(); break; default: return; @@ -225,7 +230,8 @@ case R.id.edtThickness: value = Math.max(0, Math.min(50, value)); sbThickness.setProgress(value); - //strokeCanvasView.setStrokeWidth(value,paintCanvas); + strokeCanvasView.setStrokeWidth(value); + strokeCanvasView.clearCanvas(); break; default: return false; diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/StrokeCanvasView.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/StrokeCanvasView.java index 59b596c..c57eb39 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/StrokeCanvasView.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/StrokeCanvasView.java @@ -13,7 +13,7 @@ public class StrokeCanvasView extends View{ private Paint paint; private PaintCanvas paintCanvas; - private Integer strokeWidth=20; + private Integer strokeWidth; private boolean viewflg; public StrokeCanvasView(Context context, AttributeSet attrs) { @@ -23,25 +23,19 @@ } @Override protected void onDraw(Canvas canvas){ - //this.strokeWidth = this.paintCanvas.getPen().getThickness(); - if(viewflg) { - paint.setStrokeWidth(this.strokeWidth); - paint.setColor(Color.argb(255, 0, 0, 0)); - canvas.drawLine(0, 25, 150, 25, paint); - }else - canvas.drawColor(0, PorterDuff.Mode.CLEAR); + paint.setStrokeWidth(this.strokeWidth); + paint.setColor(Color.argb(255, 0, 0, 0)); + canvas.drawLine(0, 60, 200, 60, paint); } - public void setStrokeWidth(Integer width ,PaintCanvas paintCanvas){ + public void setStrokeWidth(Integer width ){ this.strokeWidth = width; - this.paintCanvas = paintCanvas; } - public void showCanvas(boolean flg){ - viewflg = flg; + public void clearCanvas(){ // 再描画 invalidate(); } diff --git a/app/src/main/res/drawable/shape_style.xml b/app/src/main/res/drawable/shape_style.xml index d1dd42d..902cb50 100644 --- a/app/src/main/res/drawable/shape_style.xml +++ b/app/src/main/res/drawable/shape_style.xml @@ -1,7 +1,8 @@ - + android:width="5dp" + android:color="#FF9900" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_pen_detail.xml b/app/src/main/res/layout/fragment_pen_detail.xml index 887445f..42d9f40 100644 --- a/app/src/main/res/layout/fragment_pen_detail.xml +++ b/app/src/main/res/layout/fragment_pen_detail.xml @@ -5,6 +5,7 @@ android:id="@+id/PenDetailFragment" android:layout_width="match_parent" android:layout_height="match_parent" + android:padding="10dp" android:background="@drawable/shape_style"> - - - - - - - - - - + app:layout_constraintVertical_bias="0.147"> + + + + + + + + + + + + + \ No newline at end of file