From 821dc397f513d0f044d0edba27600570e848da91 Mon Sep 17 00:00:00 2001 From: Philipp Bobek Date: Sun, 17 Nov 2019 11:51:02 +0100 Subject: [PATCH] Correct exceeded line lengths --- .../com/bobek/compass/sensor/SensorHandler.kt | 3 +- .../java/com/bobek/compass/view/Compass.kt | 57 ++++++++++--------- 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/app/src/main/java/com/bobek/compass/sensor/SensorHandler.kt b/app/src/main/java/com/bobek/compass/sensor/SensorHandler.kt index 8f65daf..a03036e 100644 --- a/app/src/main/java/com/bobek/compass/sensor/SensorHandler.kt +++ b/app/src/main/java/com/bobek/compass/sensor/SensorHandler.kt @@ -44,7 +44,8 @@ class SensorHandler { private fun updateAzimuth(): Float? { val rotationMatrix = FloatArray(ROTATION_MATRIX_SIZE) - val success = getRotationMatrix(rotationMatrix, null, accelerometerReading, magnetometerReading) + val success = + getRotationMatrix(rotationMatrix, null, accelerometerReading, magnetometerReading) return if (success) { calculateAzimuth(rotationMatrix) diff --git a/app/src/main/java/com/bobek/compass/view/Compass.kt b/app/src/main/java/com/bobek/compass/view/Compass.kt index 286b34b..34c82d6 100644 --- a/app/src/main/java/com/bobek/compass/view/Compass.kt +++ b/app/src/main/java/com/bobek/compass/view/Compass.kt @@ -20,6 +20,7 @@ package com.bobek.compass.view import android.content.Context import android.util.AttributeSet +import androidx.annotation.IdRes import androidx.appcompat.widget.AppCompatImageView import androidx.appcompat.widget.AppCompatTextView import androidx.constraintlayout.widget.ConstraintLayout @@ -27,15 +28,14 @@ import androidx.constraintlayout.widget.ConstraintSet import com.bobek.compass.R import kotlin.math.roundToInt -private const val NORTH_OFFSET = 0 -private const val EAST_OFFSET = 90 -private const val SOUTH_OFFSET = 180 -private const val WEST_OFFSET = 270 - private const val CARDINAL_DIRECTION_TEXT_RATIO = 0.23f private const val DEGREE_TEXT_RATIO = 0.08f -class Compass(context: Context, attributeSet: AttributeSet) : ConstraintLayout(context, attributeSet) { +class Compass(context: Context, attributeSet: AttributeSet) : + ConstraintLayout(context, attributeSet) { + + @IdRes + private val center = R.id.compass_rose_image private lateinit var statusDegreesText: AppCompatTextView private lateinit var statusCardinalDirectionText: AppCompatTextView @@ -61,7 +61,8 @@ class Compass(context: Context, attributeSet: AttributeSet) : ConstraintLayout(c statusDegreesText.text = context.getString(R.string.degrees, degrees.roundToInt()) val cardinalDirection = CompassUtils.determineCardinalDirection(degrees) - statusCardinalDirectionText.text = context.getString(cardinalDirection.abbreviationResourceId) + statusCardinalDirectionText.text = + context.getString(cardinalDirection.abbreviationResourceId) val rotation = degrees.unaryMinus() compassRoseImage.rotation = rotation @@ -81,32 +82,32 @@ class Compass(context: Context, attributeSet: AttributeSet) : ConstraintLayout(c private fun rotateCardinalDirectionTexts(constraintSet: ConstraintSet, rotation: Float) { val radius = calculateTextRadius(CARDINAL_DIRECTION_TEXT_RATIO) - val northAngle = rotation + NORTH_OFFSET - val eastAngle = rotation + EAST_OFFSET - val southAngle = rotation + SOUTH_OFFSET - val westAngle = rotation + WEST_OFFSET - - constraintSet.constrainCircle(R.id.cardinal_direction_north_text, R.id.compass_rose_image, radius, northAngle) - constraintSet.constrainCircle(R.id.cardinal_direction_east_text, R.id.compass_rose_image, radius, eastAngle) - constraintSet.constrainCircle(R.id.cardinal_direction_south_text, R.id.compass_rose_image, radius, southAngle) - constraintSet.constrainCircle(R.id.cardinal_direction_west_text, R.id.compass_rose_image, radius, westAngle) + + constraintSet + .constrainCircle(R.id.cardinal_direction_north_text, center, radius, rotation) + constraintSet + .constrainCircle(R.id.cardinal_direction_east_text, center, radius, rotation + 90) + constraintSet + .constrainCircle(R.id.cardinal_direction_south_text, center, radius, rotation + 180) + constraintSet + .constrainCircle(R.id.cardinal_direction_west_text, center, radius, rotation + 270) } private fun rotateDegreeTexts(constraintSet: ConstraintSet, rotation: Float) { val radius = calculateTextRadius(DEGREE_TEXT_RATIO) - constraintSet.constrainCircle(R.id.degree_0_text, R.id.compass_rose_image, radius, rotation) - constraintSet.constrainCircle(R.id.degree_30_text, R.id.compass_rose_image, radius, rotation + 30) - constraintSet.constrainCircle(R.id.degree_60_text, R.id.compass_rose_image, radius, rotation + 60) - constraintSet.constrainCircle(R.id.degree_90_text, R.id.compass_rose_image, radius, rotation + 90) - constraintSet.constrainCircle(R.id.degree_120_text, R.id.compass_rose_image, radius, rotation + 120) - constraintSet.constrainCircle(R.id.degree_150_text, R.id.compass_rose_image, radius, rotation + 150) - constraintSet.constrainCircle(R.id.degree_180_text, R.id.compass_rose_image, radius, rotation + 180) - constraintSet.constrainCircle(R.id.degree_210_text, R.id.compass_rose_image, radius, rotation + 210) - constraintSet.constrainCircle(R.id.degree_240_text, R.id.compass_rose_image, radius, rotation + 240) - constraintSet.constrainCircle(R.id.degree_270_text, R.id.compass_rose_image, radius, rotation + 270) - constraintSet.constrainCircle(R.id.degree_300_text, R.id.compass_rose_image, radius, rotation + 300) - constraintSet.constrainCircle(R.id.degree_330_text, R.id.compass_rose_image, radius, rotation + 330) + constraintSet.constrainCircle(R.id.degree_0_text, center, radius, rotation) + constraintSet.constrainCircle(R.id.degree_30_text, center, radius, rotation + 30) + constraintSet.constrainCircle(R.id.degree_60_text, center, radius, rotation + 60) + constraintSet.constrainCircle(R.id.degree_90_text, center, radius, rotation + 90) + constraintSet.constrainCircle(R.id.degree_120_text, center, radius, rotation + 120) + constraintSet.constrainCircle(R.id.degree_150_text, center, radius, rotation + 150) + constraintSet.constrainCircle(R.id.degree_180_text, center, radius, rotation + 180) + constraintSet.constrainCircle(R.id.degree_210_text, center, radius, rotation + 210) + constraintSet.constrainCircle(R.id.degree_240_text, center, radius, rotation + 240) + constraintSet.constrainCircle(R.id.degree_270_text, center, radius, rotation + 270) + constraintSet.constrainCircle(R.id.degree_300_text, center, radius, rotation + 300) + constraintSet.constrainCircle(R.id.degree_330_text, center, radius, rotation + 330) } private fun calculateTextRadius(ratio: Float): Int {