chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

add checkmark to verified links and better constraints to account fields (#922)

Browse source 
* add checkmark to verified links and better constraints to account fields

* address pr feedback
This commit is contained in:
Konrad Pozniak 2018-12-03 11:02:28 +01:00 • committed by GitHub
commit 8d7f879a8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/com/keylesspalace/tusky/adapter/AccountFieldAdapter.kt
View file

@ -33,9 +33,7 @@ class AccountFieldAdapter(private val linkListener: LinkListener) : RecyclerView
var emojis: List<Emoji> = emptyList()
var fields: List<Field> = emptyList()
override fun getItemCount(): Int {
return fields.size
}
override fun getItemCount() = fields.size
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AccountFieldAdapter.ViewHolder {
val view = LayoutInflater.from(parent.context).inflate(R.layout.item_account_field, parent, false)
@ -43,9 +41,17 @@ class AccountFieldAdapter(private val linkListener: LinkListener) : RecyclerView
}
override fun onBindViewHolder(viewHolder: AccountFieldAdapter.ViewHolder, position: Int) {
viewHolder.nameTextView.text = fields[position].name
val emojifiedValue = CustomEmojiHelper.emojifyText(fields[position].value, emojis, viewHolder.valueTextView)
val field = fields[position]
viewHolder.nameTextView.text = field.name
val emojifiedValue = CustomEmojiHelper.emojifyText(field.value, emojis, viewHolder.valueTextView)
LinkHelper.setClickableText(viewHolder.valueTextView, emojifiedValue, null, linkListener)
if(field.verifiedAt != null) {
viewHolder.valueTextView.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, R.drawable.ic_check_circle, 0)
} else {
viewHolder.valueTextView.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0 )
}
}
class ViewHolder(rootView: View) : RecyclerView.ViewHolder(rootView) {

4
app/src/main/java/com/keylesspalace/tusky/entity/Account.kt
View file

@ -24,6 +24,7 @@ import com.keylesspalace.tusky.util.HtmlUtils
import kotlinx.android.parcel.Parceler
import kotlinx.android.parcel.Parcelize
import kotlinx.android.parcel.WriteWith
import java.util.*
@Parcelize
data class Account(
@ -78,7 +79,8 @@ data class AccountSource(
@Parcelize
data class Field (
val name: String,
val value: @WriteWith<SpannedParceler>() Spanned
val value: @WriteWith<SpannedParceler>() Spanned,
@SerializedName("verified_at") val verifiedAt: Date?
): Parcelable
@Parcelize