Parcourir la source

Moved main website url to constants

Vadik Sirekanyan il y a 5 ans
Parent
commit
b9ccac33f4

+ 1 - 0
app/src/main/java/com/sirekanyan/knigopis/Constants.kt

@@ -1,6 +1,7 @@
 package com.sirekanyan.knigopis
 
 const val MAIN_API = "https://api.knigopis.com"
+const val MAIN_WWW = "https://www.knigopis.com"
 const val STATIC_API = "https://static.sirekanyan.com/img"
 const val DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"
 const val MIN_BOOK_PRIORITY = 1

+ 4 - 3
app/src/main/java/com/sirekanyan/knigopis/common/functions/StringFactory.kt

@@ -1,14 +1,15 @@
 package com.sirekanyan.knigopis.common.functions
 
 import com.sirekanyan.knigopis.BuildConfig.APPLICATION_ID
+import com.sirekanyan.knigopis.MAIN_WWW
 import com.sirekanyan.knigopis.STATIC_API
 import com.sirekanyan.knigopis.common.extensions.lowercase
 
 fun extra(name: String) = "$APPLICATION_ID.extra_$name"
 
-fun createUserImageUrl(userId: String): String {
-    return "$STATIC_API/user/$userId"
-}
+fun createUserPublicUrl(userId: String) = "$MAIN_WWW/#/user/books?u=$userId"
+
+fun createUserImageUrl(userId: String) = "$STATIC_API/user/$userId"
 
 fun createBookImageUrl(bookTitle: String): String {
     val normalizedTitle = bookTitle.lowercase

+ 2 - 1
app/src/main/java/com/sirekanyan/knigopis/feature/user/UserPresenter.kt

@@ -6,6 +6,7 @@ import com.sirekanyan.knigopis.common.Presenter
 import com.sirekanyan.knigopis.common.android.ResourceProvider
 import com.sirekanyan.knigopis.common.extensions.snackbar
 import com.sirekanyan.knigopis.common.extensions.toast
+import com.sirekanyan.knigopis.common.functions.createUserPublicUrl
 import com.sirekanyan.knigopis.common.functions.logError
 import com.sirekanyan.knigopis.model.BookDataModel
 import com.sirekanyan.knigopis.model.EditBookModel
@@ -60,7 +61,7 @@ class UserPresenterImpl(
     }
 
     override fun onCopyOptionClicked() {
-        val link = "http://www.knigopis.com/#/user/books?u=$userId"
+        val link = createUserPublicUrl(userId)
         router.copyToClipboard(link)
         view.toast(R.string.user_info_copied, link)
     }

+ 0 - 1
app/src/main/java/com/sirekanyan/knigopis/model/dto/User.kt

@@ -8,7 +8,6 @@ class User(
     private val identity: String?,
     val booksCount: Int
 ) {
-    val fixedProfile get() = "http://www.knigopis.com/#/user/books?u=$id"
     val name get() = nickname ?: id
     val profiles get() = listOfNotNull(profile, identity)
 }

+ 2 - 1
app/src/main/java/com/sirekanyan/knigopis/model/mappers.kt

@@ -6,6 +6,7 @@ import android.text.style.SuperscriptSpan
 import com.sirekanyan.knigopis.MAX_BOOK_PRIORITY
 import com.sirekanyan.knigopis.MIN_BOOK_PRIORITY
 import com.sirekanyan.knigopis.common.functions.createBookImageUrl
+import com.sirekanyan.knigopis.common.functions.createUserPublicUrl
 import com.sirekanyan.knigopis.model.dto.*
 
 fun PlannedBook.toBookModel(group: BookGroupModel) =
@@ -90,7 +91,7 @@ fun EditBookModel.toFinishedBook(): FinishedBookToSend =
     )
 
 fun User.toProfileModel(): ProfileModel =
-    ProfileModel(id, name, photo, profile.orEmpty(), fixedProfile)
+    ProfileModel(id, name, photo, profile.orEmpty(), createUserPublicUrl(id))
 
 fun ProfileModel.toProfile(): Profile =
     Profile(name, profileUrl)