Bladeren bron

Renamed methods in user interactor

Vadik Sirekanyan 7 jaren geleden
bovenliggende
commit
cc790fa321

+ 3 - 3
app/src/main/java/com/sirekanyan/knigopis/feature/user/UserActivity.kt

@@ -58,7 +58,7 @@ class UserActivity : BaseActivity() {
         toolbarImage.setElevationRes(R.dimen.image_view_elevation)
         setSupportActionBar(toolbar)
         fab.setOnClickListener { view ->
-            interactor.subscribe(userId)
+            interactor.addFriend(userId)
                 .doOnSubscribe { fab.startCollapseAnimation() }
                 .doFinally { fab.startExpandAnimation() }
                 .bind({
@@ -119,7 +119,7 @@ class UserActivity : BaseActivity() {
                 true
             }
             R.id.option_unsubscribe -> {
-                interactor.unsubscribe(userId)
+                interactor.removeFriend(userId)
                     .bind({}, {
                         logError("Cannot unsubscribe", it)
                         toast(R.string.user_error_unsubscribe)
@@ -131,7 +131,7 @@ class UserActivity : BaseActivity() {
     }
 
     private fun onBooksLoaded() {
-        interactor.isSubscribed(userId)
+        interactor.isFriend(userId)
             .bind({ isSubscribed ->
                 if (isSubscribed) {
                     unsubscribeOption.isVisible = true

+ 6 - 6
app/src/main/java/com/sirekanyan/knigopis/feature/user/UserInteractor.kt

@@ -12,11 +12,11 @@ import io.reactivex.Single
 
 interface UserInteractor {
 
-    fun subscribe(userId: String): Completable
+    fun addFriend(userId: String): Completable
 
-    fun unsubscribe(userId: String): Completable
+    fun removeFriend(userId: String): Completable
 
-    fun isSubscribed(userId: String): Single<Boolean>
+    fun isFriend(userId: String): Single<Boolean>
 
     fun getBooks(userId: String): Single<List<BookModel>>
 
@@ -28,17 +28,17 @@ class UserInteractorImpl(
     private val resources: ResourceProvider
 ) : UserInteractor {
 
-    override fun subscribe(userId: String) =
+    override fun addFriend(userId: String) =
         api.createSubscription(userId, auth.getAccessToken())
             .toCompletable()
             .io2main()
 
-    override fun unsubscribe(userId: String) =
+    override fun removeFriend(userId: String) =
         api.deleteSubscription(userId, auth.getAccessToken())
             .toCompletable()
             .io2main()
 
-    override fun isSubscribed(userId: String) =
+    override fun isFriend(userId: String) =
         api.getSubscriptions(auth.getAccessToken())
             .map { subscriptions -> subscriptions.any { it.subUser.id == userId } }
             .io2main()

+ 1 - 4
app/src/main/java/com/sirekanyan/knigopis/repository/KAuth.kt

@@ -52,10 +52,7 @@ class KAuthImpl(
                 .subscribe({
                     preferences.edit()
                         .putString(ACCESS_TOKEN_KEY, it.accessToken)
-                        .putString(
-                            USER_PROFILE,
-                            it.user.fixedProfile
-                        )
+                        .putString(USER_PROFILE, it.user.fixedProfile)
                         .apply()
                     onSuccess()
                 }, {