From a71b39e74909f696b918d66b24b42b25cfbeea05 Mon Sep 17 00:00:00 2001 From: Danil Nikolaev Date: Mon, 11 Oct 2021 12:16:23 +0300 Subject: [PATCH] separate urls --- .../com/meloda/fast/api/network/VkUrls.kt | 30 ------------------- .../meloda/fast/api/network/auth/AuthRepo.kt | 5 ++-- .../meloda/fast/api/network/auth/AuthUrls.kt | 10 +++++++ .../conversations/ConversationsRepo.kt | 11 ++++--- .../conversations/ConversationsUrls.kt | 13 ++++++++ .../fast/api/network/messages/MessagesRepo.kt | 17 +++++------ .../fast/api/network/messages/MessagesUrls.kt | 17 +++++++++++ .../fast/api/network/users/UsersRepo.kt | 3 +- .../fast/api/network/users/UsersUrls.kt | 9 ++++++ 9 files changed, 65 insertions(+), 50 deletions(-) create mode 100644 app/src/main/kotlin/com/meloda/fast/api/network/auth/AuthUrls.kt create mode 100644 app/src/main/kotlin/com/meloda/fast/api/network/conversations/ConversationsUrls.kt create mode 100644 app/src/main/kotlin/com/meloda/fast/api/network/messages/MessagesUrls.kt create mode 100644 app/src/main/kotlin/com/meloda/fast/api/network/users/UsersUrls.kt diff --git a/app/src/main/kotlin/com/meloda/fast/api/network/VkUrls.kt b/app/src/main/kotlin/com/meloda/fast/api/network/VkUrls.kt index dcbcb39c..8799f165 100644 --- a/app/src/main/kotlin/com/meloda/fast/api/network/VkUrls.kt +++ b/app/src/main/kotlin/com/meloda/fast/api/network/VkUrls.kt @@ -5,36 +5,6 @@ object VkUrls { const val OAUTH = "https://oauth.vk.com" const val API = "https://api.vk.com/method" - object Auth { - const val DirectAuth = "$OAUTH/token" - const val SendSms = "$API/auth.validatePhone" - } - - 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 { - const val GetById = "$API/users.get" - } - - object Messages { - const val GetHistory = "$API/messages.getHistory" - const val Send = "$API/messages.send" - const val MarkAsImportant = "$API/messages.markAsImportant" - const val GetLongPollServer = "$API/messages.getLongPollServer" - const val GetLongPollHistory = "$API/messages.getLongPollHistory" - const val Pin = "$API/messages.pin" - const val Unpin = "$API/messages.unpin" - const val Delete = "$API/messages.delete" - const val Edit = "$API/messages.edit" - } - - } diff --git a/app/src/main/kotlin/com/meloda/fast/api/network/auth/AuthRepo.kt b/app/src/main/kotlin/com/meloda/fast/api/network/auth/AuthRepo.kt index 26d3c859..0ae20561 100644 --- a/app/src/main/kotlin/com/meloda/fast/api/network/auth/AuthRepo.kt +++ b/app/src/main/kotlin/com/meloda/fast/api/network/auth/AuthRepo.kt @@ -1,17 +1,16 @@ package com.meloda.fast.api.network.auth import com.meloda.fast.api.network.Answer -import com.meloda.fast.api.network.VkUrls import retrofit2.http.GET import retrofit2.http.Query import retrofit2.http.QueryMap interface AuthRepo { - @GET(VkUrls.Auth.DirectAuth) + @GET(AuthUrls.DirectAuth) suspend fun auth(@QueryMap param: Map): Answer - @GET(VkUrls.Auth.SendSms) + @GET(AuthUrls.SendSms) suspend fun sendSms(@Query("sid") validationSid: String): Answer } \ No newline at end of file diff --git a/app/src/main/kotlin/com/meloda/fast/api/network/auth/AuthUrls.kt b/app/src/main/kotlin/com/meloda/fast/api/network/auth/AuthUrls.kt new file mode 100644 index 00000000..1a888435 --- /dev/null +++ b/app/src/main/kotlin/com/meloda/fast/api/network/auth/AuthUrls.kt @@ -0,0 +1,10 @@ +package com.meloda.fast.api.network.auth + +import com.meloda.fast.api.network.VkUrls + +object AuthUrls { + + const val DirectAuth = "${VkUrls.OAUTH}/token" + const val SendSms = "${VkUrls.API}/auth.validatePhone" + +} \ No newline at end of file diff --git a/app/src/main/kotlin/com/meloda/fast/api/network/conversations/ConversationsRepo.kt b/app/src/main/kotlin/com/meloda/fast/api/network/conversations/ConversationsRepo.kt index 1561e74d..cb007e99 100644 --- a/app/src/main/kotlin/com/meloda/fast/api/network/conversations/ConversationsRepo.kt +++ b/app/src/main/kotlin/com/meloda/fast/api/network/conversations/ConversationsRepo.kt @@ -2,7 +2,6 @@ package com.meloda.fast.api.network.conversations import com.meloda.fast.api.base.ApiResponse import com.meloda.fast.api.network.Answer -import com.meloda.fast.api.network.VkUrls import retrofit2.http.FieldMap import retrofit2.http.FormUrlEncoded import retrofit2.http.POST @@ -10,23 +9,23 @@ import retrofit2.http.POST interface ConversationsRepo { @FormUrlEncoded - @POST(VkUrls.Conversations.Get) + @POST(ConversationsUrls.Get) suspend fun get(@FieldMap params: Map): Answer> @FormUrlEncoded - @POST(VkUrls.Conversations.Delete) + @POST(ConversationsUrls.Delete) suspend fun delete(@FieldMap params: Map): Answer> @FormUrlEncoded - @POST(VkUrls.Conversations.Pin) + @POST(ConversationsUrls.Pin) suspend fun pin(@FieldMap params: Map): Answer> @FormUrlEncoded - @POST(VkUrls.Conversations.Unpin) + @POST(ConversationsUrls.Unpin) suspend fun unpin(@FieldMap params: Map): Answer> @FormUrlEncoded - @POST(VkUrls.Conversations.ReorderPinned) + @POST(ConversationsUrls.ReorderPinned) suspend fun reorderPinned(@FieldMap params: Map): Answer> } \ No newline at end of file diff --git a/app/src/main/kotlin/com/meloda/fast/api/network/conversations/ConversationsUrls.kt b/app/src/main/kotlin/com/meloda/fast/api/network/conversations/ConversationsUrls.kt new file mode 100644 index 00000000..17715d2f --- /dev/null +++ b/app/src/main/kotlin/com/meloda/fast/api/network/conversations/ConversationsUrls.kt @@ -0,0 +1,13 @@ +package com.meloda.fast.api.network.conversations + +import com.meloda.fast.api.network.VkUrls + +object ConversationsUrls { + + const val Get = "${VkUrls.API}/messages.getConversations" + const val Delete = "${VkUrls.API}/messages.deleteConversation" + const val Pin = "${VkUrls.API}/messages.pinConversation" + const val Unpin = "${VkUrls.API}/messages.unpinConversation" + const val ReorderPinned = "${VkUrls.API}/messages.reorderPinnedConversations" + +} \ No newline at end of file diff --git a/app/src/main/kotlin/com/meloda/fast/api/network/messages/MessagesRepo.kt b/app/src/main/kotlin/com/meloda/fast/api/network/messages/MessagesRepo.kt index 729414c9..c522339e 100644 --- a/app/src/main/kotlin/com/meloda/fast/api/network/messages/MessagesRepo.kt +++ b/app/src/main/kotlin/com/meloda/fast/api/network/messages/MessagesRepo.kt @@ -4,7 +4,6 @@ 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.network.Answer -import com.meloda.fast.api.network.VkUrls import retrofit2.http.FieldMap import retrofit2.http.FormUrlEncoded import retrofit2.http.POST @@ -12,35 +11,35 @@ import retrofit2.http.POST interface MessagesRepo { @FormUrlEncoded - @POST(VkUrls.Messages.GetHistory) + @POST(MessagesUrls.GetHistory) suspend fun getHistory(@FieldMap params: Map): Answer> @FormUrlEncoded - @POST(VkUrls.Messages.Send) + @POST(MessagesUrls.Send) suspend fun send(@FieldMap params: Map): Answer> @FormUrlEncoded - @POST(VkUrls.Messages.MarkAsImportant) + @POST(MessagesUrls.MarkAsImportant) suspend fun markAsImportant(@FieldMap params: Map): Answer>> @FormUrlEncoded - @POST(VkUrls.Messages.GetLongPollServer) + @POST(MessagesUrls.GetLongPollServer) suspend fun getLongPollServer(@FieldMap params: Map): Answer> @FormUrlEncoded - @POST(VkUrls.Messages.Pin) + @POST(MessagesUrls.Pin) suspend fun pin(@FieldMap params: Map): Answer> @FormUrlEncoded - @POST(VkUrls.Messages.Unpin) + @POST(MessagesUrls.Unpin) suspend fun unpin(@FieldMap params: Map): Answer> @FormUrlEncoded - @POST(VkUrls.Messages.Delete) + @POST(MessagesUrls.Delete) suspend fun delete(@FieldMap params: Map): Answer> @FormUrlEncoded - @POST(VkUrls.Messages.Edit) + @POST(MessagesUrls.Edit) suspend fun edit(@FieldMap params: Map): Answer> } \ No newline at end of file diff --git a/app/src/main/kotlin/com/meloda/fast/api/network/messages/MessagesUrls.kt b/app/src/main/kotlin/com/meloda/fast/api/network/messages/MessagesUrls.kt new file mode 100644 index 00000000..5910cfed --- /dev/null +++ b/app/src/main/kotlin/com/meloda/fast/api/network/messages/MessagesUrls.kt @@ -0,0 +1,17 @@ +package com.meloda.fast.api.network.messages + +import com.meloda.fast.api.network.VkUrls + +object MessagesUrls { + + const val GetHistory = "${VkUrls.API}/messages.getHistory" + const val Send = "${VkUrls.API}/messages.send" + const val MarkAsImportant = "${VkUrls.API}/messages.markAsImportant" + const val GetLongPollServer = "${VkUrls.API}/messages.getLongPollServer" + const val GetLongPollHistory = "${VkUrls.API}/messages.getLongPollHistory" + const val Pin = "${VkUrls.API}/messages.pin" + const val Unpin = "${VkUrls.API}/messages.unpin" + const val Delete = "${VkUrls.API}/messages.delete" + const val Edit = "${VkUrls.API}/messages.edit" + +} \ No newline at end of file diff --git a/app/src/main/kotlin/com/meloda/fast/api/network/users/UsersRepo.kt b/app/src/main/kotlin/com/meloda/fast/api/network/users/UsersRepo.kt index 7db8e122..229e13c1 100644 --- a/app/src/main/kotlin/com/meloda/fast/api/network/users/UsersRepo.kt +++ b/app/src/main/kotlin/com/meloda/fast/api/network/users/UsersRepo.kt @@ -3,7 +3,6 @@ package com.meloda.fast.api.network.users import com.meloda.fast.api.base.ApiResponse import com.meloda.fast.api.model.base.BaseVkUser import com.meloda.fast.api.network.Answer -import com.meloda.fast.api.network.VkUrls import retrofit2.http.FieldMap import retrofit2.http.FormUrlEncoded import retrofit2.http.POST @@ -11,7 +10,7 @@ import retrofit2.http.POST interface UsersRepo { @FormUrlEncoded - @POST(VkUrls.Users.GetById) + @POST(UsersUrls.GetById) suspend fun getById( @FieldMap params: Map? ): Answer>> diff --git a/app/src/main/kotlin/com/meloda/fast/api/network/users/UsersUrls.kt b/app/src/main/kotlin/com/meloda/fast/api/network/users/UsersUrls.kt new file mode 100644 index 00000000..64761573 --- /dev/null +++ b/app/src/main/kotlin/com/meloda/fast/api/network/users/UsersUrls.kt @@ -0,0 +1,9 @@ +package com.meloda.fast.api.network.users + +import com.meloda.fast.api.network.VkUrls + +object UsersUrls { + + const val GetById = "${VkUrls.API}/users.get" + +} \ No newline at end of file