fix avatar on conversations screen

refactoring
removing unused classes
This commit is contained in:
2021-10-10 17:27:04 +03:00
parent 3e0bf30b0f
commit ff5d449b3b
46 changed files with 113 additions and 899 deletions
@@ -8,11 +8,9 @@ open class VKException(
var code: Int = -1,
var description: String = "",
var error: String
) :
IOException(description) {
) : IOException(description) {
var captcha: Pair<String, String>? = null
var validationSid: String? = null
// TODO: 10-Oct-21 remove this
var json: JSONObject? = null
override fun toString(): String {
@@ -1,2 +0,0 @@
package com.meloda.fast.api.model.response
@@ -13,6 +13,9 @@ object VkUrls {
object Conversations {
const val Get = "$API/messages.getConversations"
const val Delete = "$API/messages.deleteConversation"
const val Pin = "$API/messages.pinConversation"
const val Unpin = "$API/messages.unpinConversation"
const val ReorderPinned = "$API/messages.reorderPinnedConversations"
}
object Users {
@@ -1,7 +1,5 @@
package com.meloda.fast.api.network.datasource
package com.meloda.fast.api.network.auth
import com.meloda.fast.api.network.repo.AuthRepo
import com.meloda.fast.api.model.request.RequestAuthDirect
import javax.inject.Inject
class AuthDataSource @Inject constructor(
@@ -1,10 +1,10 @@
package com.meloda.fast.api.network.repo
package com.meloda.fast.api.network.auth
import com.meloda.fast.api.network.VkUrls
import com.meloda.fast.api.model.response.ResponseAuthDirect
import com.meloda.fast.api.network.Answer
import com.meloda.fast.api.model.response.ResponseSendSms
import retrofit2.http.*
import com.meloda.fast.api.network.VkUrls
import retrofit2.http.GET
import retrofit2.http.Query
import retrofit2.http.QueryMap
interface AuthRepo {
@@ -1,4 +1,4 @@
package com.meloda.fast.api.model.request
package com.meloda.fast.api.network.auth
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
@@ -1,4 +1,4 @@
package com.meloda.fast.api.model.response
package com.meloda.fast.api.network.auth
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
@@ -1,9 +1,6 @@
package com.meloda.fast.api.network.datasource
package com.meloda.fast.api.network.conversations
import com.meloda.fast.api.model.VkConversation
import com.meloda.fast.api.model.request.ConversationsDeleteRequest
import com.meloda.fast.api.model.request.ConversationsGetRequest
import com.meloda.fast.api.network.repo.ConversationsRepo
import com.meloda.fast.database.dao.ConversationsDao
import javax.inject.Inject
@@ -16,6 +13,8 @@ class ConversationsDataSource @Inject constructor(
suspend fun delete(params: ConversationsDeleteRequest) = repo.delete(params.map)
suspend fun store(conversations: List<VkConversation>) = dao.insert(conversations)
}
@@ -1,7 +1,6 @@
package com.meloda.fast.api.network.repo
package com.meloda.fast.api.network.conversations
import com.meloda.fast.api.base.ApiResponse
import com.meloda.fast.api.model.response.ConversationsGetResponse
import com.meloda.fast.api.network.Answer
import com.meloda.fast.api.network.VkUrls
import retrofit2.http.FieldMap
@@ -18,4 +17,16 @@ interface ConversationsRepo {
@POST(VkUrls.Conversations.Delete)
suspend fun delete(@FieldMap params: Map<String, String>): Answer<ApiResponse<Any>>
@FormUrlEncoded
@POST(VkUrls.Conversations.Pin)
suspend fun pin(@FieldMap params: Map<String, String>): Answer<ApiResponse<Any>>
@FormUrlEncoded
@POST(VkUrls.Conversations.Unpin)
suspend fun unpin(@FieldMap params: Map<String, String>): Answer<ApiResponse<Any>>
@FormUrlEncoded
@POST(VkUrls.Conversations.ReorderPinned)
suspend fun reorderPinned(@FieldMap params: Map<String, String>): Answer<ApiResponse<Any>>
}
@@ -1,4 +1,4 @@
package com.meloda.fast.api.model.request
package com.meloda.fast.api.network.conversations
import android.os.Parcelable
import kotlinx.parcelize.Parcelize
@@ -1,4 +1,4 @@
package com.meloda.fast.api.model.response
package com.meloda.fast.api.network.conversations
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
@@ -1,4 +1,4 @@
package com.meloda.fast.api.network.repo
package com.meloda.fast.api.network.longpoll
import com.meloda.fast.api.base.ApiResponse
import com.meloda.fast.api.network.Answer
@@ -1,8 +1,6 @@
package com.meloda.fast.api.network.datasource
package com.meloda.fast.api.network.messages
import com.meloda.fast.api.model.VkMessage
import com.meloda.fast.api.model.request.*
import com.meloda.fast.api.network.repo.MessagesRepo
import com.meloda.fast.database.dao.MessagesDao
import javax.inject.Inject
@@ -1,9 +1,8 @@
package com.meloda.fast.api.network.repo
package com.meloda.fast.api.network.messages
import com.meloda.fast.api.base.ApiResponse
import com.meloda.fast.api.model.base.BaseVkLongPoll
import com.meloda.fast.api.model.base.BaseVkMessage
import com.meloda.fast.api.model.response.MessagesGetHistoryResponse
import com.meloda.fast.api.network.Answer
import com.meloda.fast.api.network.VkUrls
import retrofit2.http.FieldMap
@@ -1,4 +1,4 @@
package com.meloda.fast.api.model.request
package com.meloda.fast.api.network.messages
import android.os.Parcelable
import com.meloda.fast.api.ApiExtensions.intString
@@ -1,4 +1,4 @@
package com.meloda.fast.api.model.response
package com.meloda.fast.api.network.messages
import android.os.Parcelable
import com.meloda.fast.api.model.base.BaseVkConversation
@@ -1,8 +1,6 @@
package com.meloda.fast.api.network.datasource
package com.meloda.fast.api.network.users
import com.meloda.fast.api.model.VkUser
import com.meloda.fast.api.network.repo.UsersRepo
import com.meloda.fast.api.model.request.UsersGetRequest
import com.meloda.fast.database.dao.UsersDao
import javax.inject.Inject
@@ -1,4 +1,4 @@
package com.meloda.fast.api.network.repo
package com.meloda.fast.api.network.users
import com.meloda.fast.api.base.ApiResponse
import com.meloda.fast.api.model.base.BaseVkUser
@@ -1,4 +1,4 @@
package com.meloda.fast.api.model.request
package com.meloda.fast.api.network.users
import android.os.Parcelable
import kotlinx.parcelize.Parcelize
@@ -0,0 +1,2 @@
package com.meloda.fast.api.network.users