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

Merge branch 'master' into feature/noid/remove-overdraw-error

Browse Source 
Signed-off-by: Tim Krüger <t@timkrueger.me>
This commit is contained in:
Tim Krüger 2021-10-19 17:30:37 +02:00
commit 7101fbc4c9
No known key found for this signature in database
GPG Key ID: FECE3A7222C52A4E
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/items/ListIconDialogAdapter.kt
View File

@ -30,7 +30,6 @@ import com.afollestad.materialdialogs.actions.hasActionButton
import com.afollestad.materialdialogs.actions.hasActionButtons import com.afollestad.materialdialogs.actions.hasActionButtons
import com.afollestad.materialdialogs.internal.list.DialogAdapter import com.afollestad.materialdialogs.internal.list.DialogAdapter
import com.afollestad.materialdialogs.internal.rtl.RtlTextView import com.afollestad.materialdialogs.internal.rtl.RtlTextView
import com.afollestad.materialdialogs.list.getItemSelector
import com.afollestad.materialdialogs.utils.MDUtil.inflate import com.afollestad.materialdialogs.utils.MDUtil.inflate
import com.afollestad.materialdialogs.utils.MDUtil.maybeSetTextColor import com.afollestad.materialdialogs.utils.MDUtil.maybeSetTextColor
import com.nextcloud.talk.R import com.nextcloud.talk.R
@ -103,7 +102,6 @@ internal class ListIconDialogAdapter<IT : ListItemWithImage>(
val currentItem = items[position] val currentItem = items[position]
holder.titleView.text = currentItem.title holder.titleView.text = currentItem.title
holder.itemView.background = dialog.getItemSelector()
currentItem.populateIcon(holder.iconView) currentItem.populateIcon(holder.iconView)
val activatedIndex = dialog.config[KEY_ACTIVATED_INDEX] as? Int val activatedIndex = dialog.config[KEY_ACTIVATED_INDEX] as? Int

2
scripts/analysis/lint-results.txt
View File

@ -1,2 +1,2 @@
DO NOT TOUCH; GENERATED BY DRONE DO NOT TOUCH; GENERATED BY DRONE
<span class="mdl-layout-title">Lint Report: 3 errors and 266 warnings</span> <span class="mdl-layout-title">Lint Report: 1 errors and 266 warnings</span>