diff --git a/app/build.gradle b/app/build.gradle index 14b2299..b424cec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,6 +21,10 @@ } } buildToolsVersion '27.0.3' + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } dependencies { diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTPad.java b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTPad.java index cb3a0b9..623c51a 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTPad.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTPad.java @@ -39,12 +39,15 @@ addListener(new SamplePadListener()); } + // TODO; 見た目の調整 @Override public void onDraw(Canvas canvas) { // super.onDraw(canvas); Paint paint = this.createRedPaint(); canvas.drawCircle(getSize().x / 2, getSize().x / 2, getSize().x / 2, paint); + // TODO: あとでいい感じになるように修正 + // このクラス内の他の部分も同様 paint.setColor(Color.BLUE); if (circlePos == null) { circlePos = new Point(getSize().x / 2, getSize().y / 2); @@ -82,7 +85,7 @@ touchInfo = event; PadEvent padEvent = new PadEvent(event, fixLen, angle); - PadSubject.getInstance().pushListeners(padEvent); + PadSubject.getInstance().notifyListeners(padEvent); if (event.getAction() == MotionEvent.ACTION_UP) { circlePos.x = getSize().x / 2; diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/subject/PadSubject.java b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/subject/PadSubject.java index f08c156..ece74d6 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/subject/PadSubject.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/subject/PadSubject.java @@ -16,7 +16,8 @@ super.addListener(listener); } - public void pushListeners(PadEvent e) { - notifyListeners(e); + @Override + public void notifyListeners(PadEvent e) { + super.notifyListeners(e); } }