diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java index 8027d98..8ffae7c 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java @@ -170,15 +170,17 @@ //----------------------------------------------------------------- // 描画クリア public void clearCanvas() { - //paintViewModel.deleteStrokesRequest(); - for (int i = 0; i < paths.toArray().length; i++) { - paths.get(i).reset(); - //paints.clear(); - } + paintViewModel.deleteStrokesRequest(); + paths.clear(); path.reset(); + paints.clear(); + clonepaths.clear(); + clonepaints.clear(); + clonepath.reset(); + invalidate(); //clonepath.reset(); //latestpath.reset(); - invalidate(); + //invalidate(); } //----------------------------------------------------------------- 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 16e77d4..51a3d0d 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 @@ -20,49 +20,48 @@ import org.ntlab.acanthus_client.R; import org.ntlab.acanthus_client.databinding.FragmentPenDetailBinding; -public class PenDetailsFragment extends Fragment implements TextView.OnEditorActionListener,View.OnFocusChangeListener, SeekBar.OnSeekBarChangeListener { +public class PenDetailsFragment extends Fragment implements TextView.OnEditorActionListener, View.OnFocusChangeListener, SeekBar.OnSeekBarChangeListener { private PaintCanvas paintCanvas; private FragmentPenDetailBinding binding; - private SeekBar sbAlpha,sbRed,sbGreen,sbBlue, sbThickness; - private EditText edtAlpha,edtRed,edtGreen,edtBlue, edtThickness; + private SeekBar sbAlpha, sbRed, sbGreen, sbBlue, sbThickness; + private EditText edtAlpha, edtRed, edtGreen, edtBlue, edtThickness; private TextView txtColor; private StrokeCanvasView strokeCanvasView; - @Override public View onCreateView(@NonNull LayoutInflater inflater, - ViewGroup container, Bundle savedInstanceState){ - binding = FragmentPenDetailBinding.inflate(inflater,container,false); + ViewGroup container, Bundle savedInstanceState) { + binding = FragmentPenDetailBinding.inflate(inflater, container, false); View root = binding.getRoot(); //SeekBarやEditText、txtColorの紐づけ txtColor = root.findViewById(R.id.txtColor); - sbAlpha = root.findViewById(R.id.seekBarAlpha); - sbRed = root.findViewById(R.id.seekBarRed); - sbGreen = root.findViewById(R.id.seekBarGreen); - sbBlue = root.findViewById(R.id.seekBarBlue); + sbAlpha = root.findViewById(R.id.seekBarAlpha); + sbRed = root.findViewById(R.id.seekBarRed); + sbGreen = root.findViewById(R.id.seekBarGreen); + sbBlue = root.findViewById(R.id.seekBarBlue); sbThickness = root.findViewById(R.id.seekBarThickness); edtAlpha = root.findViewById(R.id.edtAlpha); - edtRed = root.findViewById(R.id.edtRed); + edtRed = root.findViewById(R.id.edtRed); edtGreen = root.findViewById(R.id.edtGreen); - edtBlue = root.findViewById(R.id.edtBlue); + edtBlue = root.findViewById(R.id.edtBlue); edtThickness = root.findViewById(R.id.edtThickness); //seekBarとEditTextの初期値 sbAlpha.setProgress(paintCanvas.getPen().getAlpha()); - edtAlpha.setText(String.format("%1$d",sbAlpha.getProgress())); + edtAlpha.setText(String.format("%1$d", sbAlpha.getProgress())); sbRed.setProgress(paintCanvas.getPen().getRed()); - edtRed.setText(String.format("%1$d",sbRed.getProgress())); + edtRed.setText(String.format("%1$d", sbRed.getProgress())); sbGreen.setProgress(paintCanvas.getPen().getGreen()); - edtGreen.setText(String.format("%1$d",sbGreen.getProgress())); + edtGreen.setText(String.format("%1$d", sbGreen.getProgress())); sbBlue.setProgress(paintCanvas.getPen().getBlue()); - edtBlue.setText(String.format("%1$d",sbBlue.getProgress())); + edtBlue.setText(String.format("%1$d", sbBlue.getProgress())); changeColor(); sbThickness.setProgress(paintCanvas.getPen().getThickness()); - edtThickness.setText(String.format("%1$d",sbThickness.getProgress())); + edtThickness.setText(String.format("%1$d", sbThickness.getProgress())); //strokeCanvasView.setStrokeWidth(sbThickness.getProgress(),paintCanvas); //SeekBarやEditTextの処理 @@ -88,10 +87,9 @@ edtThickness.setOnFocusChangeListener(this); - //cancelボタンを押したときの処理。 - View button =root.findViewById(R.id.PenDetailCancel); - button.setOnClickListener(view ->{ + View button = root.findViewById(R.id.PenDetailCancel); + button.setOnClickListener(view -> { FragmentManager fragmentManager = getActivity().getSupportFragmentManager(); FragmentTransaction transaction = fragmentManager.beginTransaction(); transaction.remove(this).commit(); @@ -101,19 +99,18 @@ } //PaintToolBarから最初に呼び出されるメソッド - public void init(AppCompatActivity appCompatActivity,PaintCanvas paintCanvas,Fragment fragment){ - FragmentManager fragmentManager=appCompatActivity.getSupportFragmentManager(); + public void init(AppCompatActivity appCompatActivity, PaintCanvas paintCanvas, Fragment fragment) { + FragmentManager fragmentManager = appCompatActivity.getSupportFragmentManager(); FragmentTransaction transaction = fragmentManager.beginTransaction(); - transaction.replace(R.id.dummyFragment,fragment).commit(); + transaction.replace(R.id.dummyFragment, fragment).commit(); setPaintCanvas(paintCanvas); } - //SeekBarの具体的処理 @Override - public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser){ - switch (seekBar.getId()){ + public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { + switch (seekBar.getId()) { case R.id.seekBarAlpha: edtAlpha.setText(String.format("%1$d", progress)); paintCanvas.getPen().setAlpha(progress); @@ -123,7 +120,7 @@ paintCanvas.getPen().setRed(progress); break; case R.id.seekBarGreen: - edtGreen.setText(String.format("%1$d" , progress)); + edtGreen.setText(String.format("%1$d", progress)); paintCanvas.getPen().setGreen(progress); break; case R.id.seekBarBlue: @@ -135,10 +132,12 @@ paintCanvas.getPen().setThickness(progress); //strokeCanvasView.setStrokeWidth(progress,paintCanvas); break; - default: return; + default: + return; } changeColor(); } + @Override public void onStartTrackingTouch(SeekBar seekBar) { @@ -158,18 +157,18 @@ int value = 0; //Log.d("strong", v.getText().toString()); try { - value = Integer.parseInt(((TextView)v).getText().toString()); - }catch(NumberFormatException ex) { + value = Integer.parseInt(((TextView) v).getText().toString()); + } catch (NumberFormatException ex) { ((TextView) v).setText("0"); } - value = Math.max(0,Math.min(255,value)); + value = Math.max(0, Math.min(255, value)); // 何も入力していないときの処理 // String txt = ((TextView)v).getText().toString(); // if(txt.equals("")) Toast.makeText(getActivity(), "入力してください", Toast.LENGTH_LONG).show(); - switch(v.getId()){ + switch (v.getId()) { case R.id.edtAlpha: sbAlpha.setProgress(value); break; @@ -185,10 +184,11 @@ case R.id.edtThickness: sbThickness.setProgress(value); - value = Math.max(0,Math.min(50,value)); + value = Math.max(0, Math.min(50, value)); //strokeCanvasView.setStrokeWidth(value,paintCanvas); break; - default:return; + default: + return; } changeColor(); @@ -200,16 +200,16 @@ //Log.d("strong", v.getText().toString()); try { value = Integer.parseInt(v.getText().toString()); - }catch(NumberFormatException ex) { + } catch (NumberFormatException ex) { v.setText("20"); } - value = Math.max(0,Math.min(255,value)); + value = Math.max(0, Math.min(255, value)); // 何も入力していないときの処理 - // if(v.getText().toString().equals("")) Toast.makeText(getActivity(), "入力してください", Toast.LENGTH_LONG).show(); + // if(v.getText().toString().equals("")) Toast.makeText(getActivity(), "入力してください", Toast.LENGTH_LONG).show(); - switch(v.getId()){ + switch (v.getId()) { case R.id.edtAlpha: sbAlpha.setProgress(value); break; @@ -223,30 +223,31 @@ sbBlue.setProgress(value); break; case R.id.edtThickness: - value = Math.max(0,Math.min(50,value)); + value = Math.max(0, Math.min(50, value)); sbThickness.setProgress(value); //strokeCanvasView.setStrokeWidth(value,paintCanvas); break; - default:return false; + default: + return false; } changeColor(); return false; } - private void changeColor(){ - int a,r,g,b; + private void changeColor() { + int a, r, g, b; a = Integer.parseInt(edtAlpha.getText().toString()); r = Integer.parseInt(edtRed.getText().toString()); g = Integer.parseInt(edtGreen.getText().toString()); b = Integer.parseInt(edtBlue.getText().toString()); - txtColor.setBackgroundColor(Color.argb(a ,r , g, b)); + txtColor.setBackgroundColor(Color.argb(a, r, g, b)); } //setter - private void setPaintCanvas(PaintCanvas paintCanvas){ - this.paintCanvas=paintCanvas; + private void setPaintCanvas(PaintCanvas paintCanvas) { + this.paintCanvas = paintCanvas; } }