Browse Source

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

Signed-off-by: Tim Krüger <t@timkrueger.me>
Tim Krüger 3 years ago
parent
commit
7101fbc4c9

+ 0 - 2
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/items/ListIconDialogAdapter.kt

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

+ 1 - 1
scripts/analysis/lint-results.txt

@@ -1,2 +1,2 @@
 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>