version 3.2.0

Author: a.mochalov

vk-sdk-api/.gitignore renamed to api/.gitignore

@@ -36,8 +36,8 @@ configurations {
 }
 
 dependencies {
-    implementation project(':libapi-sdk-core')
-
+    implementation project(':core')
+    implementation project(":id")
     implementation sdkLibraries.kotlin
     implementation sdkLibraries.gson
 }

vk-sdk-api/README.md renamed to api/README.md

@@ -29,6 +29,8 @@ package com.vk.sdk.api
 
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
+import com.vk.dto.common.id.UserId
+import com.vk.dto.common.id.UserId.GsonSerializer
 import com.vk.sdk.api.newsfeed.dto.NewsfeedNewsfeedItem
 import com.vk.sdk.api.users.dto.UsersSubscriptionsItem
 
@@ -38,6 +40,7 @@ object GsonHolder {
         .registerTypeAdapter(UsersSubscriptionsItem::class.java,
                 UsersSubscriptionsItem.Deserializer())
         .registerTypeAdapter(NewsfeedNewsfeedItem::class.java, NewsfeedNewsfeedItem.Deserializer())
+        .registerTypeAdapter(UserId::class.java, UserId.GsonSerializer())
         .create()
     }
 

vk-sdk-api/build.gradle renamed to api/build.gradle

@@ -34,7 +34,7 @@ import kotlin.String
 internal class NewApiRequest<T> internal constructor(
     methodName: String,
     parser: ApiResponseParser<T>
-) : VKRequest<T>(methodName, requestApiVersion = "5.130"), ApiResponseParser<T> by parser {
+) : VKRequest<T>(methodName, requestApiVersion = "5.131"), ApiResponseParser<T> by parser {
     override fun parse(response: String): T {
         val responseJson = JsonParser.parseString(response).asJsonObject.get("response")
         return parseResponse(responseJson)

vk-sdk-api/src/main/AndroidManifest.xml renamed to api/src/main/AndroidManifest.xml

@@ -139,17 +139,19 @@ class AccountService {
      * Returns non-null values of user counters.
      *
      * @param filter - Counters to be returned.
+     * @param userId - User ID
      * @return [VKRequest] with [AccountAccountCounters]
      */
-    fun accountGetCounters(filter: List<FilterParam>? = null): VKRequest<AccountAccountCounters> =
-            NewApiRequest("account.getCounters") {
+    fun accountGetCounters(filter: List<FilterParam>? = null, userId: Int? = null):
+            VKRequest<AccountAccountCounters> = NewApiRequest("account.getCounters") {
         GsonHolder.gson.fromJson(it, AccountAccountCounters::class.java)
     }
     .apply {
         val filterJsonConverted = filter?.map {
             it.value
         }
         filterJsonConverted?.let { addParam("filter", it) }
+        userId?.let { addParam("user_id", it) }
     }
 
     /**

vk-sdk-api/src/main/java/com/vk/sdk/api/ApiResponseParser.kt renamed to api/src/main/java/com/vk/sdk/api/ApiResponseParser.kt

@@ -39,15 +39,14 @@ import kotlin.Int
  * @param friendsRecommendations - New friends recommendations number
  * @param gifts - New gifts number
  * @param groups - New groups number
- * @param menuDiscoverBadge - 
+ * @param menuDiscoverBadge
  * @param menuClipsBadge
  * @param messages - New messages number
  * @param memories - New memories number
  * @param notes - New notes number
  * @param notifications - New notifications number
  * @param photos - New photo tags number
  * @param sdk - New sdk number
- * @param messagesUnreadUnmuted - Unread unmuted dialogs count
  */
 data class AccountAccountCounters(
     @SerializedName("app_requests")
@@ -81,7 +80,5 @@ data class AccountAccountCounters(
     @SerializedName("photos")
     val photos: Int? = null,
     @SerializedName("sdk")
-    val sdk: Int? = null,
-    @SerializedName("messages_unread_unmuted")
-    val messagesUnreadUnmuted: Int? = null
+    val sdk: Int? = null
 )