gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 03:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup themeUtils

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-08-09 19:02:23 +02:00
parent 98084a4f88
commit fc577dccdf
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
View File

@ -1437,9 +1437,11 @@ class ChatController(args: Bundle) :
val dialog = materialAlertDialogBuilder.show() val dialog = materialAlertDialogBuilder.show()
val primary = viewThemeUtils.getScheme(binding.messageInputView.context).primary viewThemeUtils.colorTextButtons(
dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(primary) dialog.getButton(AlertDialog.BUTTON_POSITIVE),
dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(primary) dialog.getButton(AlertDialog.BUTTON_NEGATIVE)
)
} catch (e: IllegalStateException) { } catch (e: IllegalStateException) {
Toast.makeText(context, context?.resources?.getString(R.string.nc_upload_failed), Toast.LENGTH_LONG) Toast.makeText(context, context?.resources?.getString(R.string.nc_upload_failed), Toast.LENGTH_LONG)
.show() .show()

28
app/src/main/java/com/nextcloud/talk/ui/theme/ViewThemeUtils.kt
View File

@ -303,17 +303,22 @@ class ViewThemeUtils @Inject constructor(private val theme: ServerTheme, private
} }
} }
fun colorButtonText(button: Button) { fun colorTextButtons(vararg buttons: Button) {
withScheme(button) { scheme -> withScheme(buttons[0]) { scheme ->
val disabledColor = ContextCompat.getColor(button.context, R.color.disabled_text) for (button in buttons) {
val colorStateList = ColorStateList( button.setTextColor(
ColorStateList(
arrayOf( arrayOf(
intArrayOf(android.R.attr.state_enabled), intArrayOf(android.R.attr.state_enabled),
intArrayOf(-android.R.attr.state_enabled) intArrayOf(-android.R.attr.state_enabled)
), ),
intArrayOf(scheme.primary, disabledColor) intArrayOf(
scheme.primary,
calculateDisabledColor(scheme.onSurface, ON_SURFACE_OPACITY_BUTTON_DISABLED)
) )
button.setTextColor(colorStateList) )
)
}
} }
} }
@ -496,7 +501,7 @@ class ViewThemeUtils @Inject constructor(private val theme: ServerTheme, private
) )
val trackColor = Color.argb( val trackColor = Color.argb(
SWITCHCOMPAT_TRACK_ALPHA, SWITCH_COMPAT_TRACK_ALPHA,
Color.red(scheme.primary), Color.red(scheme.primary),
Color.green(scheme.primary), Color.green(scheme.primary),
Color.blue(scheme.primary) Color.blue(scheme.primary)
@ -752,15 +757,8 @@ class ViewThemeUtils @Inject constructor(private val theme: ServerTheme, private
R.drawable.ic_mimetype_package_x_generic, R.drawable.ic_mimetype_package_x_generic,
R.drawable.ic_mimetype_folder R.drawable.ic_mimetype_folder
) )
private const val SWITCHCOMPAT_TRACK_ALPHA: Int = 77 private const val SWITCH_COMPAT_TRACK_ALPHA: Int = 77
private const val PROGRESS_LIGHTNESS_LIGHT_THEME: Float = 0.76f
private const val PROGRESS_LIGHTNESS_DARK_THEME: Float = 0.28f
private const val TRACK_ALPHA: Int = 77
private const val HALF_ALPHA_INT: Int = 255 / 2 private const val HALF_ALPHA_INT: Int = 255 / 2
private const val HSL_SIZE: Int = 3
private const val INDEX_LIGHTNESS: Int = 2
private const val LIGHTNESS_LIGHT_THEME: Float = 0.76f
private const val LIGHTNESS_DARK_THEME: Float = 0.28f
private const val SURFACE_OPACITY_BUTTON_DISABLED: Float = 0.12f private const val SURFACE_OPACITY_BUTTON_DISABLED: Float = 0.12f
private const val ON_SURFACE_OPACITY_BUTTON_DISABLED: Float = 0.38f private const val ON_SURFACE_OPACITY_BUTTON_DISABLED: Float = 0.38f
private const val SEARCH_TEXT_SIZE: Float = 16f private const val SEARCH_TEXT_SIZE: Float = 16f