diff --git a/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt b/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt index 07c0b6110..62ca953c4 100644 --- a/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt +++ b/app/src/main/java/de/dreier/mytargets/features/statistics/DispersionPatternActivity.kt @@ -15,11 +15,11 @@ package de.dreier.mytargets.features.statistics -import android.annotation.TargetApi import android.content.Intent import android.databinding.DataBindingUtil import android.os.Build import android.os.Bundle +import android.support.annotation.RequiresApi import android.support.design.widget.Snackbar import android.support.v4.print.PrintHelper import android.view.Menu @@ -78,7 +78,7 @@ class DispersionPatternActivity : ChildActivityBase() { override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { R.id.action_share -> shareImage() - R.id.action_print -> print() + R.id.action_print -> if(Utils.isKitKat) print() R.id.action_settings -> navigationController.navigateToSettings(ESettingsScreens.STATISTICS) else -> return super.onOptionsItemSelected(item) } @@ -110,7 +110,7 @@ class DispersionPatternActivity : ChildActivityBase() { }.start() } - @TargetApi(Build.VERSION_CODES.KITKAT) + @RequiresApi(Build.VERSION_CODES.KITKAT) private fun print() { val printHelper = PrintHelper(this) printHelper.scaleMode = PrintHelper.SCALE_MODE_FIT diff --git a/app/src/main/java/de/dreier/mytargets/utils/transitions/NoPauseAnimator.kt b/app/src/main/java/de/dreier/mytargets/utils/transitions/NoPauseAnimator.kt index 005526187..f7891a221 100644 --- a/app/src/main/java/de/dreier/mytargets/utils/transitions/NoPauseAnimator.kt +++ b/app/src/main/java/de/dreier/mytargets/utils/transitions/NoPauseAnimator.kt @@ -17,8 +17,8 @@ package de.dreier.mytargets.utils.transitions import android.animation.Animator import android.animation.TimeInterpolator -import android.annotation.TargetApi import android.os.Build +import android.support.annotation.RequiresApi import android.support.v4.util.ArrayMap import java.util.* @@ -29,7 +29,7 @@ import java.util.* * Interrupting Activity transitions can yield an OperationNotSupportedException when the * transition tries to pause the animator. Yikes! We can fix this by wrapping the Animator: */ -@TargetApi(Build.VERSION_CODES.KITKAT) +@RequiresApi(Build.VERSION_CODES.KITKAT) class NoPauseAnimator(private val mAnimator: Animator) : Animator() { private val mListeners = ArrayMap() diff --git a/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt b/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt index 49f9fd201..8988c7289 100644 --- a/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt +++ b/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.kt @@ -70,7 +70,7 @@ abstract class TargetViewBase : View, View.OnTouchListener { protected lateinit var shots: List protected var round: RoundTemplate? = null protected var setListener: OnEndFinishedListener? = null - open protected var inputMethod = EInputMethod.KEYBOARD + protected open var inputMethod = EInputMethod.KEYBOARD protected var density: Float = 0.toFloat() protected lateinit var selectableZones: List protected lateinit var target: Target