Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/osmandapp/Osmand into CoordinateInputImprovements

Browse source
This commit is contained in:
Chumva 2018-06-25 10:54:48 +03:00
commit fef53c2322
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
OsmAnd-telegram/src/net/osmand/telegram/ui/LiveNowTabFragment.kt
View file

@ -132,20 +132,7 @@ class LiveNowTabFragment : Fragment(), TelegramListener {
val nextItemIsContact = !lastItem && items[position + 1] is TdApi.User val nextItemIsContact = !lastItem && items[position + 1] is TdApi.User
val chatTitle = item.title val chatTitle = item.title
var drawable: Drawable? = null setupIcon(holder.icon, item.photo?.small?.local?.path)
var bitmap: Bitmap? = null
val chatPhoto = item.photo?.small
if (chatPhoto != null && chatPhoto.local.path.isNotEmpty()) {
bitmap = app.uiUtils.getCircleBitmap(chatPhoto.local.path)
}
if (bitmap == null) {
drawable = app.uiUtils.getThemedIcon(R.drawable.ic_group)
}
if (bitmap != null) {
holder.icon?.setImageBitmap(bitmap)
} else {
holder.icon?.setImageDrawable(drawable)
}
holder.title?.text = chatTitle holder.title?.text = chatTitle
holder.description?.text = "Chat description" // FIXME holder.description?.text = "Chat description" // FIXME
holder.imageButton?.setImageDrawable(app.uiUtils.getThemedIcon(R.drawable.ic_overflow_menu_white)) holder.imageButton?.setImageDrawable(app.uiUtils.getThemedIcon(R.drawable.ic_overflow_menu_white))
@ -184,8 +171,7 @@ class LiveNowTabFragment : Fragment(), TelegramListener {
holder.bottomDivider?.visibility = if (nextItemIsContact) View.VISIBLE else View.GONE holder.bottomDivider?.visibility = if (nextItemIsContact) View.VISIBLE else View.GONE
holder.bottomShadow?.visibility = if (lastItem) View.VISIBLE else View.GONE holder.bottomShadow?.visibility = if (lastItem) View.VISIBLE else View.GONE
} else if (item is TdApi.User && holder is ContactViewHolder) { } else if (item is TdApi.User && holder is ContactViewHolder) {
// telegramHelper.getUserPhotoPath(user) setupIcon(holder.icon, telegramHelper.getUserPhotoPath(item))
holder.icon?.setImageDrawable(app.uiUtils.getThemedIcon(R.drawable.ic_group)) // FIXME
holder.title?.text = "${item.firstName} ${item.lastName}" holder.title?.text = "${item.firstName} ${item.lastName}"
holder.description?.text = "User description" // FIXME holder.description?.text = "User description" // FIXME
holder.bottomShadow?.visibility = if (lastItem) View.VISIBLE else View.GONE holder.bottomShadow?.visibility = if (lastItem) View.VISIBLE else View.GONE
@ -194,6 +180,22 @@ class LiveNowTabFragment : Fragment(), TelegramListener {
override fun getItemCount() = items.size override fun getItemCount() = items.size
private fun setupIcon(iv: ImageView?, photoPath: String?) {
var drawable: Drawable? = null
var bitmap: Bitmap? = null
if (photoPath != null && photoPath.isNotEmpty()) {
bitmap = app.uiUtils.getCircleBitmap(photoPath)
}
if (bitmap == null) {
drawable = app.uiUtils.getThemedIcon(R.drawable.ic_group)
}
if (bitmap != null) {
iv?.setImageBitmap(bitmap)
} else {
iv?.setImageDrawable(drawable)
}
}
inner class ContactViewHolder(val view: View) : RecyclerView.ViewHolder(view) { inner class ContactViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
val icon: ImageView? = view.findViewById(R.id.icon) val icon: ImageView? = view.findViewById(R.id.icon)
val title: TextView? = view.findViewById(R.id.title) val title: TextView? = view.findViewById(R.id.title)