diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2c6d74f..a60ca1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,6 +3,11 @@ xmlns:tools="http://schemas.android.com/tools" package="ru.panorobot.airshot"> + + + + + + if (requestCode == Activity.RESULT_OK){ + bluetoothIv.setImageResource(R.drawable.ic_bluetooth_on) // 14:14 + Toast.makeText(this, "Bluetooth is on", Toast.LENGTH_LONG).show() + } + else{ + Toast.makeText(this, "Could not on bluetooth", Toast.LENGTH_LONG).show() + } + + } + super.onActivityResult(requestCode, resultCode, data) + } + + private fun startShooting() { + val target = Target(this) + target.setOnClickListener { + target.invalidate() + } + setContentView(target) } } \ No newline at end of file diff --git a/app/src/main/java/ru/panorobot/airshot/Draw2D.kt b/app/src/main/java/ru/panorobot/airshot/Target.kt similarity index 50% rename from app/src/main/java/ru/panorobot/airshot/Draw2D.kt rename to app/src/main/java/ru/panorobot/airshot/Target.kt index 25deff8..c284564 100644 --- a/app/src/main/java/ru/panorobot/airshot/Draw2D.kt +++ b/app/src/main/java/ru/panorobot/airshot/Target.kt @@ -7,29 +7,35 @@ import android.graphics.Canvas import android.graphics.Color import android.graphics.Paint import android.view.View -import kotlin.random.Random -class Draw2D(context: Context?) : View(context) { +class Target(context: Context?) : View(context) { + private val paint: Paint = Paint() private val shots:Shots = Shots() - override fun setOnClickListener(l: OnClickListener?) { - super.setOnClickListener(l) - invalidate() - } +// override fun setOnTouchListener(l: OnTouchListener?) { +//// super.setOnTouchListener(l) +//// invalidate() +// } +// +// override fun setOnClickListener(l: OnClickListener?) { +//// super.setOnClickListener(l) +//// invalidate() +// } + + override fun onDraw(canvas: Canvas?) { super.onDraw(canvas) val screenWidth: Int = getWidth() val screenHeight: Int = getHeight() - drawTarget(canvas) + drawTarget(canvas, screenWidth, screenHeight) shots.draw(canvas,screenWidth, screenHeight) - } - private fun drawTarget(canvas: Canvas?) { + private fun drawTarget(canvas: Canvas?, screenWidth: Int, screenHeight: Int) { paint.apply { style = Paint.Style.FILL // стиль Заливка color = Color.WHITE // закрашиваем холст белым цветом @@ -41,28 +47,26 @@ class Draw2D(context: Context?) : View(context) { color = Color.BLACK } - val screenWidth: Int = getWidth() - val screenHeight: Int = getHeight() val centerX = width / 2 val centerY = height / 2 - var radiusSun: Int = (screenWidth + screenHeight) / 30 - canvas!!.drawCircle(centerX.toFloat(), centerY.toFloat(), radiusSun.toFloat(), paint) + var radiusApple: Int = (screenWidth + screenHeight) / 30 + canvas!!.drawCircle(centerX.toFloat(), centerY.toFloat(), radiusApple.toFloat(), paint) paint.apply { style = Paint.Style.STROKE } - var radius = radiusSun * 2 - canvas!!.drawCircle(centerX.toFloat(), centerY.toFloat(), radius.toFloat(), paint) + var radius = radiusApple * 2 + canvas.drawCircle(centerX.toFloat(), centerY.toFloat(), radius.toFloat(), paint) - radius = radiusSun * 3 - canvas!!.drawCircle(centerX.toFloat(), centerY.toFloat(), radius.toFloat(), paint) + radius = radiusApple * 3 + canvas.drawCircle(centerX.toFloat(), centerY.toFloat(), radius.toFloat(), paint) - radius = radiusSun * 4 - canvas!!.drawCircle(centerX.toFloat(), centerY.toFloat(), radius.toFloat(), paint) + radius = radiusApple * 4 + canvas.drawCircle(centerX.toFloat(), centerY.toFloat(), radius.toFloat(), paint) - radius = radiusSun * 5 - canvas!!.drawCircle(centerX.toFloat(), centerY.toFloat(), radius.toFloat(), paint) + radius = radiusApple * 5 + canvas.drawCircle(centerX.toFloat(), centerY.toFloat(), radius.toFloat(), paint) } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 17eab17..15e00fc 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,18 +1,63 @@ - + +