Jelajahi Sumber

Moved models to appropriate package

Vadik Sirekanyan 7 tahun lalu
induk
melakukan
b59ddd0569

+ 4 - 4
app/src/main/java/com/sirekanyan/knigopis/feature/MainPresenter.kt

@@ -9,7 +9,7 @@ import com.sirekanyan.knigopis.common.extensions.io2main
 import com.sirekanyan.knigopis.common.extensions.toUriOrNull
 import com.sirekanyan.knigopis.common.functions.logError
 import com.sirekanyan.knigopis.feature.users.MainPresenterState
-import com.sirekanyan.knigopis.feature.users.UriItem
+import com.sirekanyan.knigopis.model.ProfileItem
 import com.sirekanyan.knigopis.model.BookDataModel
 import com.sirekanyan.knigopis.model.CurrentTab
 import com.sirekanyan.knigopis.model.CurrentTab.*
@@ -216,12 +216,12 @@ class MainPresenterImpl(
     override fun onUserLongClicked(user: UserModel) {
         val uriItems = user.profiles
             .mapNotNull(String::toUriOrNull)
-            .map { UriItem(it, resources) }
-            .distinctBy(UriItem::title)
+            .map { ProfileItem(it, resources) }
+            .distinctBy(ProfileItem::title)
         view.showUserProfiles(user.name, uriItems)
     }
 
-    override fun onUserProfileClicked(uri: UriItem) {
+    override fun onUserProfileClicked(uri: ProfileItem) {
         router.openWebPage(uri.uri)
     }
 

+ 2 - 2
app/src/main/java/com/sirekanyan/knigopis/feature/MainView.kt

@@ -19,7 +19,7 @@ import com.sirekanyan.knigopis.feature.books.BooksView
 import com.sirekanyan.knigopis.feature.login.LoginView
 import com.sirekanyan.knigopis.feature.notes.NotesAdapter
 import com.sirekanyan.knigopis.feature.notes.NotesView
-import com.sirekanyan.knigopis.feature.users.UriItem
+import com.sirekanyan.knigopis.model.ProfileItem
 import com.sirekanyan.knigopis.feature.users.UsersAdapter
 import com.sirekanyan.knigopis.feature.users.UsersView
 import com.sirekanyan.knigopis.model.*
@@ -273,7 +273,7 @@ class MainViewImpl(
         context.toast(R.string.books_error_delete)
     }
 
-    override fun showUserProfiles(title: String, items: List<UriItem>) {
+    override fun showUserProfiles(title: String, items: List<ProfileItem>) {
         val dialogItems: List<DialogItem> = items.map { uriItem ->
             createDialogItem(uriItem.title, uriItem.iconRes) {
                 callbacks.onUserProfileClicked(uriItem)

+ 3 - 2
app/src/main/java/com/sirekanyan/knigopis/feature/users/UsersView.kt

@@ -1,17 +1,18 @@
 package com.sirekanyan.knigopis.feature.users
 
+import com.sirekanyan.knigopis.model.ProfileItem
 import com.sirekanyan.knigopis.model.UserModel
 
 interface UsersView {
 
     fun updateUsers(users: List<UserModel>)
     fun showUsersError(throwable: Throwable)
-    fun showUserProfiles(title: String, items: List<UriItem>)
+    fun showUserProfiles(title: String, items: List<ProfileItem>)
 
     interface Callbacks {
         fun onUserClicked(user: UserModel)
         fun onUserLongClicked(user: UserModel)
-        fun onUserProfileClicked(uri: UriItem)
+        fun onUserProfileClicked(uri: ProfileItem)
     }
 
 }

+ 2 - 2
app/src/main/java/com/sirekanyan/knigopis/feature/users/UriItem.kt → app/src/main/java/com/sirekanyan/knigopis/model/ProfileItem.kt

@@ -1,10 +1,10 @@
-package com.sirekanyan.knigopis.feature.users
+package com.sirekanyan.knigopis.model
 
 import android.net.Uri
 import com.sirekanyan.knigopis.R
 import com.sirekanyan.knigopis.common.android.ResourceProvider
 
-class UriItem(val uri: Uri, resource: ResourceProvider) {
+class ProfileItem(val uri: Uri, resource: ResourceProvider) {
     private val social = uri.toSocialNetwork()
     val title = social?.titleRes?.let { resource.getString(it) } ?: "${uri.scheme}://${uri.host}"
     val iconRes = social?.iconRes ?: R.drawable.ic_public

+ 1 - 1
app/src/main/java/com/sirekanyan/knigopis/feature/users/SocialNetwork.kt → app/src/main/java/com/sirekanyan/knigopis/model/SocialNetwork.kt

@@ -1,4 +1,4 @@
-package com.sirekanyan.knigopis.feature.users
+package com.sirekanyan.knigopis.model
 
 import android.net.Uri
 import android.support.annotation.DrawableRes