gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 11:39:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

housekeeping to improve codacy/detekt score

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2021-06-08 23:03:59 +02:00
parent bc20e0438f
commit 7372d108a7
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
2 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
app/src/main/java/com/nextcloud/talk/ui/recyclerview/MessageSwipeCallback.kt
View File

@ -98,7 +98,9 @@ class MessageSwipeCallback(private val context: Context, private val messageSwip
return false return false
} }
override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {} override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
// unused atm
}
override fun convertToAbsoluteDirection(flags: Int, layoutDirection: Int): Int { override fun convertToAbsoluteDirection(flags: Int, layoutDirection: Int): Int {
if (swipeBack) { if (swipeBack) {
@ -185,26 +187,26 @@ class MessageSwipeCallback(private val context: Context, private val messageSwip
} else { } else {
SCALE_PROGRESS_MULTIPLIER - SCALE_PROGRESS_MULTIPLIER -
SCALE_PROGRESS_BOTTOM_THRESHOLD * SCALE_PROGRESS_BOTTOM_THRESHOLD *
((replyButtonProgress - SCALE_PROGRESS_TOP_THRESHOLD) / SCALE_PROGRESS_BOTTOM_THRESHOLD) ((replyButtonProgress - SCALE_PROGRESS_TOP_THRESHOLD) / SCALE_PROGRESS_BOTTOM_THRESHOLD)
} }
alpha = min(FULLY_OPAQUE, FULLY_OPAQUE * (replyButtonProgress / SCALE_PROGRESS_TOP_THRESHOLD)).toInt() alpha = min(FULLY_OPAQUE, FULLY_OPAQUE * (replyButtonProgress / SCALE_PROGRESS_TOP_THRESHOLD)).toInt()
} else { } else {
scale = replyButtonProgress scale = replyButtonProgress
alpha = min(FULLY_OPAQUE, FULLY_OPAQUE * replyButtonProgress).toInt() alpha = min(FULLY_OPAQUE, FULLY_OPAQUE * replyButtonProgress).toInt()
} }
shareRound.alpha = alpha
imageDrawable.alpha = alpha
if (startTracking) { if (startTracking && !isVibrate && view.translationX >= convertToDp(REPLY_POINT)) {
if (!isVibrate && view.translationX >= convertToDp(REPLY_POINT)) { view.performHapticFeedback(
view.performHapticFeedback( HapticFeedbackConstants.KEYBOARD_TAP,
HapticFeedbackConstants.KEYBOARD_TAP, HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING
HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING )
) isVibrate = true
isVibrate = true
}
} }
drawReplyIcon(alpha, scale, canvas)
}
private fun drawReplyIcon(alpha: Int, scale: Float, canvas: Canvas) {
val x: Int = if (view.translationX > convertToDp(SWIPE_LIMIT)) { val x: Int = if (view.translationX > convertToDp(SWIPE_LIMIT)) {
convertToDp(SWIPE_LIMIT) / AXIS_BASE convertToDp(SWIPE_LIMIT) / AXIS_BASE
} else { } else {
@ -212,6 +214,10 @@ class MessageSwipeCallback(private val context: Context, private val messageSwip
} }
val y = (view.top + view.measuredHeight / AXIS_BASE).toFloat() val y = (view.top + view.measuredHeight / AXIS_BASE).toFloat()
shareRound.alpha = alpha
imageDrawable.alpha = alpha
shareRound.colorFilter = PorterDuffColorFilter( shareRound.colorFilter = PorterDuffColorFilter(
ContextCompat.getColor(context, R.color.bg_message_list_incoming_bubble), ContextCompat.getColor(context, R.color.bg_message_list_incoming_bubble),
PorterDuff.Mode.SRC_IN PorterDuff.Mode.SRC_IN
@ -256,6 +262,7 @@ class MessageSwipeCallback(private val context: Context, private val messageSwip
} }
} }
@Suppress("Detekt.TooGenericExceptionCaught")
private fun checkDisplaySize(context: Context) { private fun checkDisplaySize(context: Context) {
try { try {
density = context.resources.displayMetrics.density density = context.resources.displayMetrics.density
@ -266,28 +273,28 @@ class MessageSwipeCallback(private val context: Context, private val messageSwip
companion object { companion object {
const val TAG = "MessageSwipeCallback" const val TAG = "MessageSwipeCallback"
const val NO_SWIPE_FLAG : Int = 0 const val NO_SWIPE_FLAG: Int = 0
const val FULLY_OPAQUE : Float = 255f const val FULLY_OPAQUE: Float = 255f
const val FULLY_OPAQUE_INT : Int = 255 const val FULLY_OPAQUE_INT: Int = 255
const val DENSITY_DEFAULT : Float = 1f const val DENSITY_DEFAULT: Float = 1f
const val DENSITY_ZERO : Float = 0f const val DENSITY_ZERO: Float = 0f
const val DENSITY_ZERO_INT : Int = 0 const val DENSITY_ZERO_INT: Int = 0
const val REPLY_POINT : Int = 100 const val REPLY_POINT: Int = 100
const val SWIPE_LIMIT : Int = 130 const val SWIPE_LIMIT: Int = 130
const val SHOW_REPLY_ICON_POINT : Int = 30 const val SHOW_REPLY_ICON_POINT: Int = 30
const val MIN_ANIMATION_TIME_IN_MILLIS : Long = 17 const val MIN_ANIMATION_TIME_IN_MILLIS: Long = 17
const val FULL_PROGRESS : Float = 1.0f const val FULL_PROGRESS: Float = 1.0f
const val NO_PROGRESS : Float = 0.0f const val NO_PROGRESS: Float = 0.0f
const val PROGRESS_THRESHOLD : Float = 0.1f const val PROGRESS_THRESHOLD: Float = 0.1f
const val PROGRESS_CALCULATION_TIME_BASE : Float = 180.0f const val PROGRESS_CALCULATION_TIME_BASE: Float = 180.0f
const val SCALE_PROGRESS_MULTIPLIER : Float = 1.2f const val SCALE_PROGRESS_MULTIPLIER: Float = 1.2f
const val SCALE_PROGRESS_TOP_THRESHOLD : Float = 0.8f const val SCALE_PROGRESS_TOP_THRESHOLD: Float = 0.8f
const val SCALE_PROGRESS_BOTTOM_THRESHOLD : Float = 0.2f const val SCALE_PROGRESS_BOTTOM_THRESHOLD: Float = 0.2f
const val AXIS_BASE : Int = 2 const val AXIS_BASE: Int = 2
const val BACKGROUND_BOUNDS_PIXEL : Int = 18 const val BACKGROUND_BOUNDS_PIXEL: Int = 18
const val ICON_BOUNDS_PIXEL_LEFT : Int = 12 const val ICON_BOUNDS_PIXEL_LEFT: Int = 12
const val ICON_BOUNDS_PIXEL_TOP : Int = 13 const val ICON_BOUNDS_PIXEL_TOP: Int = 13
const val ICON_BOUNDS_PIXEL_RIGHT : Int = 12 const val ICON_BOUNDS_PIXEL_RIGHT: Int = 12
const val ICON_BOUNDS_PIXEL_BOTTOM : Int = 11 const val ICON_BOUNDS_PIXEL_BOTTOM: Int = 11
} }
} }

2
detekt.yml
View File

@ -1,5 +1,5 @@
build: build:
maxIssues: 201 maxIssues: 264
weights: weights:
# complexity: 2 # complexity: 2
# LongParameterList: 1 # LongParameterList: 1