melod1n/fast-messenger
3
2
Fork 1
Code Issues Actions Packages Projects 1 Releases Wiki Activity

New cache system

Browse Source 
Refactoring
Separation into libraries
This commit is contained in:
Danil Nikolaev
2021-03-17 19:47:53 +03:00
parent 2004cb7c5e
commit 84d812a6d6
198 changed files with 4892 additions and 3477 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/meloda/fast/util/AndroidUtils.kt
-19
View File
@@ -93,12 +93,6 @@ object AndroidUtils {
}
fun getThemeAttrColor(context: Context, @AttrRes resId: Int): Int {
// val typedValue = TypedValue()
//
// context.theme.resolveAttribute(resId, typedValue, true)
//
// return typedValue.data
val typedValue = TypedValue()
context.theme.resolveAttribute(resId, typedValue, true)
val colorRes = typedValue.resourceId
@@ -114,17 +108,4 @@ object AndroidUtils {
}
/*
TypedValue typedValue = new TypedValue();
context.getTheme().resolveAttribute(attributeId, typedValue, true);
int colorRes = typedValue.resourceId;
int color = -1;
try {
color = context.getResources().getColor(colorRes);
} catch (Resources.NotFoundException e) {
Log.w(TAG, "Not found color resource by id: " + colorRes);
}
return color;
*/
}
app/src/main/java/com/meloda/fast/util/ArrayUtils.kt
-64
View File
@@ -1,64 +0,0 @@
package com.meloda.fast.util
import com.meloda.fast.extensions.ArrayExtensions.asArrayList
import java.util.stream.Collectors
object ArrayUtils {
@SafeVarargs
fun <T> asString(vararg array: T): String {
if (array.isEmpty()) {
return ""
}
val builder = StringBuilder(array.size * 12)
builder.append(array[0])
for (i in 1 until array.size) {
builder.append(',')
builder.append(array[i])
}
return builder.toString()
}
fun asString(array: IntArray): String {
if (array.isEmpty()) {
return ""
}
val builder = StringBuilder(array.size * 12)
builder.append(array[0])
for (i in 1 until array.size) {
builder.append(',')
builder.append(array[i])
}
return builder.toString()
}
fun <T> asString(arrayList: ArrayList<T>): String {
// if (arrayList.isEmpty()) return ""
//
// val builder = StringBuilder(arrayList.size * 12)
// builder.append(arrayList[0])
// for (i in 1 until arrayList.size) {
// builder.append(',')
// builder.append(arrayList[i])
// }
// return builder.toString()
return ArrayList<String>().apply {
arrayList.forEach { add(it.toString()) }
}.stream().collect(Collectors.joining(","))
}
fun <T> asString(list: List<T>): String = asString(list.asArrayList())
fun <T> cut(arrayList: ArrayList<T>, offset: Int, count: Int): ArrayList<T> {
if (arrayList.isEmpty()) return arrayListOf()
var lastPosition = offset + count
if (lastPosition > arrayList.size) lastPosition = arrayList.size
return ArrayList(arrayList.subList(offset, lastPosition))
}
}
app/src/main/java/com/meloda/fast/util/ImageUtils.kt
-3
View File
@@ -33,9 +33,6 @@ object ImageUtils {
.load(image)
.priority(Picasso.Priority.LOW)
// if (placeholder != null) picasso.placeholder(placeholder)
val target = object : Target {
override fun onPrepareLoad(placeHolderDrawable: Drawable?) {
app/src/main/java/com/meloda/fast/util/Utils.kt
+2 -4
View File
@@ -1,11 +1,9 @@
package com.meloda.fast.util
import android.content.Context
import android.content.res.Configuration
import com.meloda.arrayutils.ArrayUtils.isNullOrEmpty
import com.meloda.fast.R
import com.meloda.fast.common.AppGlobal
import com.meloda.fast.extensions.ArrayExtensions.isNullOrEmpty
import com.meloda.fast.io.BytesOutputStream
import com.meloda.netservices.io.BytesOutputStream
import java.io.ByteArrayInputStream
import java.io.IOException
import java.io.ObjectInputStream
app/src/main/java/com/meloda/fast/util/VKUtils.kt
+337
View File
@@ -0,0 +1,337 @@
package com.meloda.fast.util
import android.content.Context
import android.graphics.drawable.Drawable
import androidx.annotation.WorkerThread
import androidx.core.content.ContextCompat
import com.amulyakhare.textdrawable.TextDrawable
import com.meloda.concurrent.TaskManager
import com.meloda.extensions.ContextExtensions.color
import com.meloda.extensions.ContextExtensions.drawable
import com.meloda.extensions.DrawableExtensions.tint
import com.meloda.extensions.StringExtensions.lowerCase
import com.meloda.fast.R
import com.meloda.fast.common.AppGlobal
import com.meloda.vksdk.OnResponseListener
import com.meloda.vksdk.model.*
import com.meloda.vksdk.util.VKUtil
import java.text.SimpleDateFormat
import java.util.*
import kotlin.math.abs
object VKUtils {
fun getUserOnline(user: VKUser): String {
val r = AppGlobal.resources
return if (user.isOnline) {
if (user.isOnlineMobile) {
r.getString(R.string.user_online_mobile)
} else {
r.getString(R.string.user_online)
}
} else {
if (user.lastSeen == 0) {
r.getString(R.string.user_last_seen_recently)
} else {
r.getString(
R.string.user_last_seen_at,
VKUtil.getLastSeenTime(user.lastSeen * 1000L)
)
}
}
}
fun getUserOnlineIcon(
context: Context,
conversation: VKConversation?,
peerUser: VKUser?
): Drawable? {
return if (conversation != null) {
if (conversation.isUser() && peerUser != null) {
if (!peerUser.isOnline) {
null
} else {
ContextCompat.getDrawable(
context,
if (peerUser.isOnlineMobile) R.drawable.ic_online_mobile else R.drawable.ic_online_pc
)
}
} else null
} else {
if (peerUser!!.isOnline) {
ContextCompat.getDrawable(
context,
if (peerUser.isOnlineMobile) R.drawable.ic_online_mobile else R.drawable.ic_online_pc
)
} else {
null
}
}
}
fun getUserOnlineIcon(context: Context, user: VKUser): Drawable? {
return getUserOnlineIcon(context, null, user)
}
fun getAvatarPlaceholder(context: Context, dialogTitle: String): TextDrawable {
return TextDrawable.builder().buildRound(
if (dialogTitle.isEmpty()) "" else {
TextUtils.getFirstLetterFromString(dialogTitle)
},
context.color(R.color.accent)
)
}
@Deprecated("")
@WorkerThread
fun searchUser(id: Int, onResponseListener: OnResponseListener<VKUser>? = null): VKUser? {
return if (VKUtil.isGroupId(id) || VKUtil.isChatId(id)) {
null
} else {
// MemoryCache.getUserById(id)?.let { return it }
//
// if (BuildConfig.DEBUG) {
// Log.d(VKUtil.TAG, "User with id $id not found")
// }
//
// TaskManager.loadUser(VKApiKeys.UPDATE_USER, id, onResponseListener)
return null
}
}
@Deprecated("")
@WorkerThread
fun searchGroup(id: Int, onResponseListener: OnResponseListener<VKGroup>? = null): VKGroup? {
return if (!VKUtil.isGroupId(id) || VKUtil.isChatId(id)) {
null
} else {
// MemoryCache.getGroupById(abs(id))?.let { return it }
//
// if (BuildConfig.DEBUG) {
// Log.d(VKUtil.TAG, "Group with id $id not found")
// }
//
// TaskManager.loadGroup(VKApiKeys.UPDATE_GROUP, abs(id), onResponseListener)
return null
}
}
fun getAttachmentText(context: Context, attachments: List<VKModel>): String {
val resId: Int
if (attachments.isNotEmpty()) {
if (attachments.size > 1) {
var oneType = true
val firstType = attachments[0].attachmentType
// val className = attachments[0].javaClass.simpleName
for (model in attachments) {
// if (model.javaClass.simpleName != className) {
if (model.attachmentType != firstType) {
oneType = false
break
}
}
return if (oneType) {
// val objectClass: Class<VKModel> = attachments[0].javaClass
resId = when (firstType) {
VKAttachments.Type.PHOTO -> {
R.string.message_attachment_photos
}
VKAttachments.Type.VIDEO -> {
R.string.message_attachment_videos
}
VKAttachments.Type.AUDIO -> {
R.string.message_attachment_audios
}
VKAttachments.Type.DOCUMENT -> {
R.string.message_attachment_docs
}
else -> -1
}
if (resId == -1) "Unknown attachments" else context.getString(
resId,
attachments.size
).toLowerCase(Locale.getDefault())
} else {
context.getString(R.string.message_attachments_many)
}
} else {
// val objectClass: Class<VKModel> = attachments[0].javaClass
val firstType = attachments[0].attachmentType
resId = when (firstType) {
VKAttachments.Type.PHOTO -> R.string.message_attachment_photo
VKAttachments.Type.AUDIO -> R.string.message_attachment_audio
VKAttachments.Type.VIDEO -> R.string.message_attachment_video
VKAttachments.Type.DOCUMENT -> R.string.message_attachment_doc
VKAttachments.Type.GRAFFITI -> R.string.message_attachment_graffiti
VKAttachments.Type.VOICE_MESSAGE -> R.string.message_attachment_voice
VKAttachments.Type.STICKER -> R.string.message_attachment_sticker
VKAttachments.Type.GIFT -> R.string.message_attachment_gift
VKAttachments.Type.LINK -> R.string.message_attachment_link
VKAttachments.Type.POLL -> R.string.message_attachment_poll
VKAttachments.Type.CALL -> R.string.message_attachment_call
VKAttachments.Type.WALL_POST -> R.string.message_attachment_wall_post
VKAttachments.Type.WALL_REPLY -> R.string.message_attachment_wall_reply
else -> return "Unknown"
}
}
} else {
return ""
}
return context.getString(resId)
}
fun getAttachmentDrawable(context: Context, attachments: List<VKModel>): Drawable? {
if (attachments.isEmpty() || attachments.size > 1) return null
val resId = when (attachments[0].attachmentType) {
VKAttachments.Type.PHOTO -> R.drawable.ic_message_attachment_camera
VKAttachments.Type.AUDIO -> R.drawable.ic_message_attachment_audio
VKAttachments.Type.VIDEO -> R.drawable.ic_message_attachment_video
VKAttachments.Type.DOCUMENT -> R.drawable.ic_message_attachment_doc
VKAttachments.Type.GRAFFITI -> R.drawable.ic_message_attachment_graffiti
VKAttachments.Type.VOICE_MESSAGE -> R.drawable.ic_message_attachment_audio_message
VKAttachments.Type.STICKER -> R.drawable.ic_message_attachment_sticker
VKAttachments.Type.GIFT -> R.drawable.ic_message_attachment_gift
VKAttachments.Type.LINK -> R.drawable.ic_message_attachment_link
VKAttachments.Type.POLL -> R.drawable.ic_message_attachment_poll
VKAttachments.Type.CALL -> R.drawable.ic_message_attachment_call
else -> null
}
resId?.let { return context.drawable(it).tint(context.color(R.color.accent)) }
return null
}
fun getFwdText(context: Context, forwardedMessages: List<VKMessage>): String {
return if (forwardedMessages.isNotEmpty()) {
if (forwardedMessages.size > 1) {
context.getString(R.string.message_fwd_many, forwardedMessages.size).lowerCase()
} else {
context.getString(R.string.message_fwd_one)
}
} else ""
}
@Deprecated("need to rewrite")
fun getActionText(
context: Context,
lastMessage: VKMessage,
onResponseListener: OnResponseListener<String>
) {
TaskManager.execute {
lastMessage.action?.let {
var result = ""
when (it.type) {
VKMessageAction.Type.CHAT_CREATE -> result = context.getString(
R.string.message_action_created_chat,
""
)
VKMessageAction.Type.INVITE_USER -> result =
if (lastMessage.fromId == lastMessage.action!!.memberId) {
context.getString(R.string.message_action_returned_to_chat, "")
} else {
""
// val invited = MemoryCache.getUserById(lastMessage.action!!.memberId)
// context.getString(R.string.message_action_invited_user, invited)
}
VKMessageAction.Type.INVITE_USER_BY_LINK -> result = context.getString(
R.string.message_action_invited_by_link,
""
)
VKMessageAction.Type.KICK_USER -> result =
if (lastMessage.fromId == lastMessage.action!!.memberId) {
context.getString(R.string.message_action_left_from_chat, "")
} else {
""
// val kicked = MemoryCache.getUserById(lastMessage.action!!.memberId)
// context.getString(R.string.message_action_kicked_user, kicked)
}
VKMessageAction.Type.PHOTO_REMOVE -> result = context.getString(
R.string.message_action_removed_photo,
""
)
VKMessageAction.Type.PHOTO_UPDATE -> result = context.getString(
R.string.message_action_updated_photo,
""
)
VKMessageAction.Type.PIN_MESSAGE -> result = context.getString(
R.string.message_action_pinned_message,
""
)
VKMessageAction.Type.UNPIN_MESSAGE -> result = context.getString(
R.string.message_action_unpinned_message,
""
)
VKMessageAction.Type.TITLE_UPDATE -> result = context.getString(
R.string.message_action_updated_title,
""
)
}
AppGlobal.post { onResponseListener.onResponse(result) }
}
}
}
fun getTime(context: Context, lastMessage: VKMessage): String {
val then = lastMessage.date * 1000L
val now = System.currentTimeMillis()
val change = abs(now - then)
val seconds = change / 1000
if (seconds == 0L) {
return context.getString(R.string.time_format_now)
}
val minutes = seconds / 60
if (minutes == 0L) {
return context.getString(R.string.time_format_second, seconds)
}
val hours = minutes / 60
if (hours == 0L) {
return context.getString(R.string.time_format_minute, minutes)
}
val days = hours / 24
if (days == 0L) {
return context.getString(R.string.time_format_hour, hours)
}
val months = days / 30
if (months == 0L) {
return context.getString(R.string.time_format_day, days)
}
val years = months / 12
if (years == 0L) {
return context.getString(R.string.time_format_month, months)
} else if (years > 0L) {
return context.getString(R.string.time_format_year, years)
}
return SimpleDateFormat("HH:mm", Locale.getDefault()).format(then)
}
}
app/src/main/java/com/meloda/fast/util/ViewUtils.kt
+3 -3
View File
@@ -7,11 +7,11 @@ import android.view.View
import android.widget.TextView
import android.widget.Toast
import com.google.android.material.snackbar.Snackbar
import com.meloda.extensions.ContextExtensions.color
import com.meloda.fast.R
import com.meloda.fast.api.model.VKUser
import com.meloda.fast.api.util.VKUtil
import com.meloda.fast.extensions.ContextExtensions.color
import com.meloda.fast.widget.CircleImageView
import com.meloda.vksdk.model.VKUser
import com.meloda.vksdk.util.VKUtil
import com.squareup.picasso.Picasso