gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-11 14:54:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes after rebase

Browse Source 
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
This commit is contained in:
Álvaro Brey 2022-08-31 13:08:33 +02:00 committed by Andy Scherzinger
parent 704df25a6d
commit e5879eb4be
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -333,7 +333,7 @@ dependencies {
// implementation 'androidx.activity:activity-ktx:1.4.0' // implementation 'androidx.activity:activity-ktx:1.4.0'
// TODO substitute for tag after first common release // TODO substitute for tag after first common release
implementation 'com.github.nextcloud.android-common:ui:82f6da3e9638e7578a8df8f6e52884e2923b2760' implementation 'com.github.nextcloud.android-common:ui:999ac56111a93bfbedf98b4d01de286d0ed03c5b'
} }
task installGitHooks(type: Copy, group: "development") { task installGitHooks(type: Copy, group: "development") {

6
app/src/main/java/com/nextcloud/talk/conversation/info/GuestAccessHelper.kt
View File

@ -93,7 +93,7 @@ class GuestAccessHelper(
val builder = MaterialAlertDialogBuilder(activity) val builder = MaterialAlertDialogBuilder(activity)
builder.apply { builder.apply {
val dialogPassword = DialogPasswordBinding.inflate(LayoutInflater.from(context)) val dialogPassword = DialogPasswordBinding.inflate(LayoutInflater.from(context))
viewThemeUtils.colorEditText(dialogPassword.password) viewThemeUtils.platform.colorEditText(dialogPassword.password)
setView(dialogPassword.root) setView(dialogPassword.root)
setTitle(R.string.nc_guest_access_password_dialog_title) setTitle(R.string.nc_guest_access_password_dialog_title)
setPositiveButton(R.string.nc_ok) { _, _ -> setPositiveButton(R.string.nc_ok) { _, _ ->
@ -112,9 +112,9 @@ class GuestAccessHelper(
private fun createDialog(builder: MaterialAlertDialogBuilder) { private fun createDialog(builder: MaterialAlertDialogBuilder) {
builder.create() builder.create()
viewThemeUtils.colorMaterialAlertDialogBackground(binding.conversationInfoName.context, builder) viewThemeUtils.dialog.colorMaterialAlertDialogBackground(binding.conversationInfoName.context, builder)
val dialog = builder.show() val dialog = builder.show()
viewThemeUtils.colorTextButtons( viewThemeUtils.platform.colorTextButtons(
dialog.getButton(AlertDialog.BUTTON_POSITIVE), dialog.getButton(AlertDialog.BUTTON_POSITIVE),
dialog.getButton(AlertDialog.BUTTON_NEGATIVE) dialog.getButton(AlertDialog.BUTTON_NEGATIVE)
) )

3
app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt
View File

@ -195,9 +195,10 @@ class TalkSpecificViewThemeUtils @Inject constructor(
} }
private fun colorDrawable(context: Context, drawable: Drawable) { private fun colorDrawable(context: Context, drawable: Drawable) {
val scheme = getScheme(context) withScheme(context) { scheme ->
drawable.setTint(scheme.primary) drawable.setTint(scheme.primary)
} }
}
@TargetApi(Build.VERSION_CODES.O) @TargetApi(Build.VERSION_CODES.O)
fun themePlaceholderAvatar(avatar: View, @DrawableRes foreground: Int): Drawable? { fun themePlaceholderAvatar(avatar: View, @DrawableRes foreground: Int): Drawable? {