From cca35c32af96dcc36556e774e867df6c1f422fd5 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sat, 6 Aug 2022 13:16:15 +0200 Subject: [PATCH] fixes and cleanup after rebase Signed-off-by: Andy Scherzinger --- .../nextcloud/talk/ui/theme/ViewThemeUtils.kt | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/ui/theme/ViewThemeUtils.kt b/app/src/main/java/com/nextcloud/talk/ui/theme/ViewThemeUtils.kt index 29a5065eb..97e5f07df 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/theme/ViewThemeUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/theme/ViewThemeUtils.kt @@ -50,6 +50,7 @@ import androidx.appcompat.widget.SearchView.SearchAutoComplete import androidx.appcompat.widget.SwitchCompat import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat +import androidx.core.graphics.ColorUtils import androidx.core.graphics.drawable.DrawableCompat import androidx.core.view.ViewCompat import androidx.core.view.children @@ -538,14 +539,6 @@ class ViewThemeUtils @Inject constructor(private val theme: ServerTheme, private } } - private fun progressColor(context: Context, color: Int): Int { - val lightness = when (isDarkMode(context)) { - true -> PROGRESS_LIGHTNESS_DARK_THEME - false -> PROGRESS_LIGHTNESS_LIGHT_THEME - } - return colorUtil.setLightness(color, lightness) - } - fun colorEditText(editText: EditText) { withScheme(editText) { scheme -> // TODO check API-level compatibility @@ -667,19 +660,6 @@ class ViewThemeUtils @Inject constructor(private val theme: ServerTheme, private return drawable } - private fun progressColor(context: Context, color: Int): Int { - val hsl = FloatArray(HSL_SIZE) - ColorUtils.RGBToHSL(Color.red(color), Color.green(color), Color.blue(color), hsl) - - if (isDarkMode(context)) { - hsl[INDEX_LIGHTNESS] = LIGHTNESS_DARK_THEME - } else { - hsl[INDEX_LIGHTNESS] = LIGHTNESS_LIGHT_THEME - } - - return ColorUtils.HSLToColor(hsl) - } - private fun calculateDisabledColor(color: Int, opacity: Float): Int { return Color.argb( (Color.alpha(color) * opacity).roundToInt(),