release: 1.4.0 버전 업데이트 (to master)

.github/workflows/WSS_PR_auto_assign_and_reviewer.yml

@@ -9,4 +9,4 @@ jobs:
       - uses: hkusu/review-assign-action@v1
         with:
           assignees: ${{ github.actor }}
-          reviewers: s9hn, m6z1
+          reviewers: s9hn, m6z1, devfeijoa

README.md

@@ -1,93 +1,64 @@
-# 📗 WSS-Android
-<img src="https://github.com/Team-WSS/WSS-Android/assets/127238018/4d76ae12-f626-4f80-91c7-cefa4ef0378c" width="500">
+<div align="center">
 
-> The Genius Developer of the Academy Reincarnated as a Giraffe
-</br>
-
-## 💻 IDE
-<div><img src="https://img.shields.io/badge/kotlin-7F52FF?style=for-the-badge&logo=kotlin&logoColor=white"><img src="https://img.shields.io/badge/android-3DDC84?style=for-the-badge&logo=android&logoColor=white"><img src="https://img.shields.io/badge/Android%20Studio-3E81F2.svg?style=for-the-badge&logo=android-studio&logoColor=white"></div>
-</br>
-
-## 📁 Overview
-> Not sure what web novel to read? Websoso.</br>
-> This is the Android official repository for Websoso, a dedicated web novel tracking & community app.</br>
-```
-📦com.teamwss.websoso
-├─📂data
-│  ├─📂di
-│  ├─📂mapper
-│  ├─📂remote
-│  └─📂repository
-├─📂domain
-│  ├─📂mapper
-│  ├─📂model
-│  ├─📂usecase
-├─📂ui
-│  ├─📂common
-│  ├─📂feed
-│  ├─📂feedDetail
-│  ├─📂login
-│  ├─📂main
-│  ├─📂mapper
-│  ├─📂myPage
-│  ├─📂normalExplore
-│  ├─📂novelDetail
-│  ├─📂novelRating
-│  ├─📂onboarding
-│  └─📂splash
-└─📂util
-```
-</br>
-
-## 🏭 Libraries
-- Material Design
-- Retrofit2
-- Serialization
-- Okhttp3
-- ViewPager2
-- Coroutine
-- AndroidX
-- ViewModel
-- Coil
-- Dots Indicator
-- Hilt
-
-</br>
-
-## 🥕 Extensions
-- BindingActivity
-- BindingBottomSheetDialog
-- BindingFragment
-- BindingAdapter
-- WebsosoChip
-- WebsosoChipGroup
 
-</br>
+<h1>WSS-Android</h1> 
+<p align="center">
+  <strong>웹소설에 푹 빠지는 곳, 웹소소</strong>
+</p>
 
-## 🏭 Tech Stacks
-- Google Recommended Architecture
-- MVVM pattern
-- Static Factory Method pattern
-- Hilt
+<p align="center">
+  <img src="https://github.com/Team-WSS/WSS-Android/assets/127238018/4d76ae12-f626-4f80-91c7-cefa4ef0378c" width="500"/>
+</p>
 
+</div>
 </br>
+
+<h2>📌 Download</h2>
+
+<a href="https://play.google.com/store/apps/details?id=com.into.websoso">
+  <img
+    alt="다운로드하기 Google Play"
+    src="https://play.google.com/intl/ko/badges/static/images/badges/ko_badge_web_generic.png"
+    width="20%"
+  />
+</a>
+
+## 🛠 Tech Stack & Libraries  
+- [Kotlin](https://kotlinlang.org/)  
+- [Modularization](https://developer.android.com/topic/modularization?hl=ko)   
+- [Google App Architecture](https://developer.android.com/topic/architecture?hl=ko)   
+- [Gradle Version Catalog](https://docs.gradle.org/current/userguide/version_catalogs.html) + Precompiled Script Plugin   
+- [Kotlin Coroutines](https://kotlinlang.org/docs/coroutines-overview.html) + [Flow](https://kotlinlang.org/docs/flow.html)   
+- [Dagger-Hilt](https://dagger.dev/hilt/)
+
+Jetpack:     
+- [Compose](https://developer.android.com/compose)   
+- [Hilt Navigation Compose](https://developer.android.com/develop/ui/compose/libraries?hl=ko#hilt)
+- [Paging3](https://developer.android.com/jetpack/androidx/releases/paging?hl=ko)
+- [Room](https://developer.android.com/jetpack/androidx/releases/room?hl=ko)
+- [DataStore](https://developer.android.com/jetpack/androidx/releases/datastore?hl=ko)   
+
+Library:   
+- [Retrofit2 & OkHttp3](https://github.com/square/retrofit)   
+- [Coil](https://coil-kt.github.io/coil/getting_started/)   
+
+
+## 🏛️ Architecture(Modularization) Overview   
+<p align="start"><strong>We follow the Google App Architecture Guidelines.</strong></p>
+
+<table align="center">
+  <tr>
+    <td width="70%">
+      <img src="https://github.com/user-attachments/assets/88358876-5984-4377-b241-c777a383758d" width="100%" />
+    </td>
+    <td width="30%">
+      <img src="https://github.com/user-attachments/assets/a8517309-6c22-4032-8adb-e7742c50cc08" width="100%" />
+    </td>
+  </tr>
+</table>
 
 ## 🏷️ Convention
 - Adheres to the [WSS-Android-Convention](https://github.com/Team-WSS/WSS-Android-Convention).
 
-</br>
-
 ## ⭐️ Did you find this repository helpful?
-- Don't forget give a star.
-
-</br>
-
-## 🍴 Didn't you?
-- Then fork this repo, make it better and don't forget give a STAR.
-
-</br>
-
-## 👨‍👩‍👧‍👦 Contributers
-|<img src="https://avatars.githubusercontent.com/u/114990782?v=4" width="125" />|<img src="https://avatars.githubusercontent.com/u/127238018?v=4" width="125" />|<img src="https://avatars.githubusercontent.com/u/144861180?v=4" width="125" />|<img src="https://avatars.githubusercontent.com/u/81347125?v=4" width="125" />|
-|:---------:|:---------:|:---------:|:---------:|
-|👑손명지</br>([MoongChi](https://github.com/m6z1))|최준서</br>([GongBaek](https://github.com/junseo511))|이연진</br>([Sally](https://github.com/yeonjeen))|김세훈</br>([さんくん~☆](https://github.com/s9hn))|
+- We truly appreciate your support with a star (⭐️)!

app/build.gradle.kts

@@ -74,6 +74,9 @@ android {
     }
 }
 
+// 룸 디비 제거
+// 좋아요 기능 좀더 생각해보기
+
 dependencies {
     // 프로젝트 의존성
     implementation(projects.core.resource)
@@ -83,13 +86,16 @@ dependencies {
     implementation(projects.core.authKakao)
     implementation(projects.core.network)
     implementation(projects.core.datastore)
-    implementation(projects.core.database)
 
     implementation(projects.data.account)
     implementation(projects.data.library)
+    implementation(projects.data.feed)
+
+    implementation(projects.domain.feed)
 
     implementation(projects.feature.signin)
     implementation(projects.feature.library)
+    implementation(projects.feature.feed)
 
     // AndroidX 및 Jetpack 기본 라이브러리
     implementation(libs.androidx.core.ktx)

app/src/main/java/com/into/websoso/core/common/ui/custom/WebsosoCustomSnackBar.kt

@@ -1,12 +1,14 @@
 package com.into.websoso.core.common.ui.custom
 
 import android.R.color.transparent
+import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.View
 import androidx.core.content.ContextCompat
 import com.google.android.material.snackbar.Snackbar
 import com.into.websoso.databinding.CustomSnackBarBinding
 
+@SuppressLint("RestrictedApi")
 class WebsosoCustomSnackBar(
     view: View,
 ) {

app/src/main/java/com/into/websoso/core/common/util/BindingAdapter.kt

@@ -12,15 +12,17 @@ import jp.wasabeef.transformers.coil.BlurTransformation
 
 object BindingAdapter {
     @JvmStatic
-    @BindingAdapter("loads3ImageUrl")
+    @BindingAdapter(value = ["loads3ImageUrl", "cornerRadius"], requireAll = false)
     fun loadS3ImageUrl(
         view: ImageView,
         s3ImageKey: String,
+        cornerRadius: Float?,
     ) {
         val fullUrl: String = view.getS3ImageUrl(s3ImageKey)
 
         view.load(fullUrl) {
             error(img_loading_thumbnail)
+            if (cornerRadius != null) transformations(RoundedCornersTransformation(cornerRadius.toFloatPxFromDp()))
         }
     }
 

app/src/main/java/com/into/websoso/core/common/util/ExtentionFuction.kt

@@ -69,6 +69,18 @@ fun View.getS3ImageUrl(imageName: String): String {
     return "$baseUrl$imageName@${scale}x.png"
 }
 
+fun Context.getS3ImageUrl(imageName: String): String {
+    val baseUrl = BuildConfig.S3_BASE_URL
+    val scale = when {
+        resources.displayMetrics.density >= 4.0 -> 4
+        resources.displayMetrics.density >= 3.0 -> 3
+        resources.displayMetrics.density >= 2.0 -> 2
+        else -> 1
+    }
+
+    return "$baseUrl$imageName@${scale}x.png"
+}
+
 fun View.hideKeyboard() {
     val inputMethodManager: InputMethodManager =
         context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager

app/src/main/java/com/into/websoso/data/mapper/FeedMapper.kt

@@ -2,9 +2,10 @@ package com.into.websoso.data.mapper
 
 import com.into.websoso.data.model.CommentEntity
 import com.into.websoso.data.model.CommentsEntity
+import com.into.websoso.data.model.FeedDetailEntity
+import com.into.websoso.data.model.FeedDetailEntity.NovelEntity
+import com.into.websoso.data.model.FeedDetailEntity.UserEntity
 import com.into.websoso.data.model.FeedEntity
-import com.into.websoso.data.model.FeedEntity.NovelEntity
-import com.into.websoso.data.model.FeedEntity.UserEntity
 import com.into.websoso.data.model.FeedsEntity
 import com.into.websoso.data.model.PopularFeedsEntity
 import com.into.websoso.data.model.UserInterestFeedsEntity
@@ -25,7 +26,7 @@ fun FeedsResponseDto.toData(): FeedsEntity =
 
 fun FeedResponseDto.toData(): FeedEntity =
     FeedEntity(
-        user = UserEntity(
+        user = FeedEntity.UserEntity(
             id = userId,
             nickname = nickname,
             avatarImage = avatarImage,
@@ -43,11 +44,12 @@ fun FeedResponseDto.toData(): FeedEntity =
         isPublic = isPublic,
         images = thumbnailUrl?.let { listOf(it) } ?: emptyList(),
         imageCount = imageCount,
-        novel = NovelEntity(
+        novel = FeedEntity.NovelEntity(
             id = novelId,
             title = title,
             rating = novelRating,
             ratingCount = novelRatingCount,
+            feedWriterNovelRating = feedWriterNovelRating,
         ),
     )
 
@@ -59,7 +61,7 @@ fun CommentsResponseDto.toData(): CommentsEntity =
 
 fun CommentResponseDto.toData(): CommentEntity =
     CommentEntity(
-        user = UserEntity(
+        user = FeedEntity.UserEntity(
             id = userId,
             nickname = nickname,
             avatarImage = avatarImage,
@@ -74,8 +76,8 @@ fun CommentResponseDto.toData(): CommentEntity =
         isSpoiler = isSpoiler,
     )
 
-fun FeedDetailResponseDto.toData(): FeedEntity =
-    FeedEntity(
+fun FeedDetailResponseDto.toData(): FeedDetailEntity =
+    FeedDetailEntity(
         user = UserEntity(
             id = userId,
             nickname = nickname,
@@ -94,12 +96,19 @@ fun FeedDetailResponseDto.toData(): FeedEntity =
         isPublic = isPublic,
         images = images,
         imageCount = images.size,
-        novel = NovelEntity(
-            id = novelId,
-            title = title,
-            rating = novelRating,
-            ratingCount = novelRatingCount,
-        ),
+        novel = novelId?.let { id ->
+            NovelEntity(
+                id = id,
+                title = title.orEmpty(),
+                rating = novelRating,
+                ratingCount = novelRatingCount ?: 0,
+                thumbnail = novelThumbnailImage.orEmpty(),
+                genre = novelGenre.orEmpty(),
+                author = novelAuthor.orEmpty(),
+                description = novelDescription.orEmpty(),
+                feedWriterNovelRating = feedWriterNovelRating,
+            )
+        },
     )
 
 fun PopularFeedsResponseDto.toData(): PopularFeedsEntity =

app/src/main/java/com/into/websoso/data/mapper/UserMapper.kt

@@ -23,7 +23,7 @@ import com.into.websoso.data.remote.response.UserFeedsResponseDto.UserFeedRespon
 import com.into.websoso.data.remote.response.UserInfoDetailResponseDto
 import com.into.websoso.data.remote.response.UserInfoResponseDto
 import com.into.websoso.data.remote.response.UserNovelStatsResponseDto
-import com.into.websoso.ui.main.myPage.myActivity.model.Genres
+import com.into.websoso.ui.main.myPage.model.Genres
 
 fun UserInfoResponseDto.toData(): UserInfoEntity =
     UserInfoEntity(

app/src/main/java/com/into/websoso/data/model/FeedDetailEntity.kt

@@ -0,0 +1,41 @@
+package com.into.websoso.data.model
+
+data class FeedDetailEntity(
+    val user: UserEntity,
+    val createdDate: String,
+    val id: Long,
+    val content: String,
+    val relevantCategories: List<String>,
+    val likeCount: Int,
+    val isLiked: Boolean,
+    val commentCount: Int,
+    val isModified: Boolean,
+    val isSpoiler: Boolean,
+    val isMyFeed: Boolean,
+    val isPublic: Boolean,
+    val novel: NovelEntity?,
+    val images: List<String>,
+    val imageCount: Int,
+) {
+    data class UserEntity(
+        val id: Long,
+        val nickname: String,
+        val avatarImage: String,
+    )
+
+    data class NovelEntity(
+        val id: Long,
+        val title: String,
+        val rating: Float?,
+        val ratingCount: Int,
+        val thumbnail: String,
+        val genre: String,
+        val author: String,
+        val description: String,
+        val feedWriterNovelRating: Float?,
+    ) {
+        val isRatingNoting: Boolean = rating == null || rating == 0f
+        val isWriterRatingNoting: Boolean =
+            feedWriterNovelRating == null || feedWriterNovelRating == 0f
+    }
+}

app/src/main/java/com/into/websoso/data/model/FeedEntity.kt

@@ -28,5 +28,6 @@ data class FeedEntity(
         val title: String?,
         val rating: Float?,
         val ratingCount: Int?,
+        val feedWriterNovelRating: Float?,
     )
 }

app/src/main/java/com/into/websoso/data/remote/api/AvatarApi.kt

@@ -7,3 +7,4 @@ interface AvatarApi {
     @GET("avatar-profiles")
     suspend fun getAvatars(): AvatarsResponseDto
 }
+

app/src/main/java/com/into/websoso/data/remote/response/FeedDetailResponseDto.kt

@@ -43,4 +43,14 @@ data class FeedDetailResponseDto(
     val isPublic: Boolean,
     @SerialName("images")
     val images: List<String>,
+    @SerialName("novelThumbnailImage")
+    val novelThumbnailImage: String?,
+    @SerialName("novelGenre")
+    val novelGenre: String?,
+    @SerialName("novelAuthor")
+    val novelAuthor: String?,
+    @SerialName("feedWriterNovelRating")
+    val feedWriterNovelRating: Float?,
+    @SerialName("novelDescription")
+    val novelDescription: String?,
 )