update to SDK 30 and fix deprecations (#2173)

* update to SDk 30 and fix deprecations

* remove unnecessary .run

* revert ViewMediaActivity change
This commit is contained in:
Konrad Pozniak 2021-06-01 19:46:07 +02:00 committed by GitHub
commit 3301643c1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 29 additions and 33 deletions

View file

@ -47,7 +47,7 @@ class AddPollOptionsAdapter(
binding.optionEditText.filters = arrayOf(InputFilter.LengthFilter(maxOptionLength))
binding.optionEditText.onTextChanged { s, _, _, _ ->
val pos = holder.adapterPosition
val pos = holder.bindingAdapterPosition
if(pos != RecyclerView.NO_POSITION) {
options[pos] = s.toString()
onOptionChanged(validateInput())
@ -68,8 +68,8 @@ class AddPollOptionsAdapter(
holder.binding.deleteButton.setOnClickListener {
holder.binding.optionEditText.clearFocus()
options.removeAt(holder.adapterPosition)
notifyItemRemoved(holder.adapterPosition)
options.removeAt(holder.bindingAdapterPosition)
notifyItemRemoved(holder.bindingAdapterPosition)
onOptionRemoved(validateInput())
}
}

View file

@ -21,7 +21,6 @@ import android.graphics.drawable.Drawable
import android.net.Uri
import android.text.InputFilter
import android.text.InputType
import android.util.DisplayMetrics
import android.view.WindowManager
import android.widget.EditText
import android.widget.LinearLayout
@ -54,9 +53,6 @@ fun <T> T.makeCaptionDialog(existingDescription: String?,
maximumScale = 6f
}
val displayMetrics = DisplayMetrics()
windowManager.defaultDisplay.getMetrics(displayMetrics)
val margin = Utils.dpToPx(this, 4)
dialogLayout.addView(imageView)
(imageView.layoutParams as LinearLayout.LayoutParams).weight = 1f