Merge pull request #47 from ttoklip/feat/#1_home_news_fragment

Feat/#1 home news fragment

app/build.gradle

@@ -122,6 +122,10 @@ dependencies {
     implementation "com.kakao.sdk:v2-user:2.19.0"
     //naver login
     implementation 'com.navercorp.nid:oauth:5.1.1'
+
+    implementation "androidx.room:room-runtime:2.6.1"
+    kapt "androidx.room:room-compiler:2.6.1"
+    implementation "androidx.room:room-ktx:2.6.1"
 }
 kapt {
     correctErrorTypes true

app/src/main/AndroidManifest.xml

@@ -48,6 +48,7 @@
             android:exported="false" />
         <activity
             android:name=".presentation.news.detail.ArticleActivity"
+            android:windowSoftInputMode="adjustResize"
             android:screenOrientation="portrait"
             android:exported="false" />
         <activity
@@ -154,21 +155,19 @@
             android:name=".presentation.intro.SplashActivity"
             android:screenOrientation="portrait"
             android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
         </activity>
         <activity
             android:screenOrientation="portrait"
             android:name=".presentation.MainActivity"
             android:exported="true">
-            <!--<intent-filter>
+
+            <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>-->
+            </intent-filter>
         </activity>
 
+
         <service
             android:name="com.google.android.gms.metadata.ModuleDependencies"
             android:enabled="false"
@@ -187,6 +186,11 @@
             android:screenOrientation="portrait"
             android:exported="false" />
         <activity android:name="com.umc.ttoklip.presentation.honeytip.ImageViewActivity" />
+
+        <activity android:name=".presentation.news.detail.PostImageActivity"
+            android:screenOrientation="portrait"
+            android:exported="false"/>
+
         <activity android:name=".presentation.honeytip.read.ReadQuestionActivity" />
 
     </application>

app/src/main/java/com/umc/ttoklip/data/api/NewsApi.kt

@@ -1,14 +1,72 @@
 package com.umc.ttoklip.data.api
 
+import com.umc.ttoklip.data.model.CommonResponse
 import com.umc.ttoklip.data.model.ResponseBody
-import com.umc.ttoklip.data.model.TestResponse
 import com.umc.ttoklip.data.model.news.MainNewsResponse
+import com.umc.ttoklip.data.model.news.ReportRequest
+import com.umc.ttoklip.data.model.news.comment.NewsCommentRequest
+import com.umc.ttoklip.data.model.news.detail.NewsDetailResponse
 import retrofit2.Response
+import retrofit2.http.Body
+import retrofit2.http.DELETE
 import retrofit2.http.GET
+import retrofit2.http.PATCH
+import retrofit2.http.POST
+import retrofit2.http.Path
+import retrofit2.http.Query
 
 interface NewsApi {
 
     @GET("/api/v1/newsletters/posts")
     suspend fun getNewsMainApi(): Response<ResponseBody<MainNewsResponse>>
 
+    @GET("/api/v1/newsletter/posts/{postId}")
+    suspend fun getDetailNewsApi(
+        @Path("postId") postId : Int
+    ): Response<ResponseBody<NewsDetailResponse>>
+
+    @POST("/api/v1/newsletter/comment/{postId}")
+    suspend fun postCommentNewsApi(
+        @Path("postId") postId: Int,
+        @Body request : NewsCommentRequest
+    ): Response<ResponseBody<CommonResponse>>
+
+    @POST("/api/v1/newsletter/posts/report/{postId}")
+    suspend fun postReportNewsApi(
+        @Path("postId") postId: Int,
+        @Body request : ReportRequest
+    ): Response<ResponseBody<CommonResponse>>
+
+    @POST("/api/v1/newsletter/comment/report/{commentId}")
+    suspend fun postReportCommentNewsApi(
+        @Path("commentId") commentId: Int,
+        @Body request : ReportRequest
+    ): Response<ResponseBody<CommonResponse>>
+
+
+    @DELETE("/api/v1/newsletter/comment/{commentId}")
+    suspend fun deleteCommentNewsApi(
+        @Path("commentId") commentId: Int,
+    ): Response<ResponseBody<CommonResponse>>
+
+    @POST("/api/v1/newsletter/posts/like/{postId}")
+    suspend fun postLikeNewsApi(
+        @Path("postId") postId: Int,
+    ): Response<ResponseBody<CommonResponse>>
+
+    @DELETE("/api/v1/newsletter/posts/like/{postId}")
+    suspend fun deleteLikeNewsApi(
+        @Path("postId") postId: Int,
+    ): Response<ResponseBody<CommonResponse>>
+
+    @POST("/api/v1/newsletter/posts/scrap/{postId}")
+    suspend fun postScrapNewsApi(
+        @Path("postId") postId: Int,
+    ): Response<ResponseBody<CommonResponse>>
+
+    @DELETE("/api/v1/newsletter/posts/scrap/{postId}")
+    suspend fun deleteScrapNewsApi(
+        @Path("postId") postId: Int,
+    ): Response<ResponseBody<CommonResponse>>
+
 }

app/src/main/java/com/umc/ttoklip/data/api/SearchApi.kt

@@ -0,0 +1,33 @@
+package com.umc.ttoklip.data.api
+
+import com.umc.ttoklip.data.model.ResponseBody
+import com.umc.ttoklip.data.model.news.detail.NewsDetailResponse
+import com.umc.ttoklip.data.model.search.NewsSearchResponse
+import com.umc.ttoklip.data.model.search.TipSearchResponse
+import com.umc.ttoklip.data.model.search.TownSearchResponse
+import retrofit2.Response
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+interface SearchApi {
+
+    @GET("/api/v1/search/newsletter")
+    suspend fun getSearchNewsApi(
+        @Query("title") title : String,
+        @Query("sort") sort: String
+    ): Response<ResponseBody<NewsSearchResponse>>
+
+    @GET("/api/v1/search/honeytip")
+    suspend fun getSearchTipApi(
+        @Query("title") title : String,
+        @Query("sort") sort: String
+    ): Response<ResponseBody<TipSearchResponse>>
+
+
+    @GET("/api/v1/search/our-town")
+    suspend fun getSearchTownApi(
+        @Query("title") title : String,
+        @Query("sort") sort: String
+    ): Response<ResponseBody<TownSearchResponse>>
+
+}

app/src/main/java/com/umc/ttoklip/data/db/DBUtile.kt

@@ -0,0 +1,42 @@
+package com.umc.ttoklip.data.db
+
+import androidx.room.Dao
+import androidx.room.Database
+import androidx.room.Entity
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.PrimaryKey
+import androidx.room.Query
+import androidx.room.RoomDatabase
+
+@Database(
+    entities = [HistoryEntity::class],
+    version = 1,
+    exportSchema = false
+)
+abstract class AppDatabase : RoomDatabase() {
+    abstract fun historyDao(): HistoryDao
+}
+
+@Dao
+interface HistoryDao {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun addHistory(item: HistoryEntity)
+
+    @Query("SELECT * FROM HistoryEntity")
+    suspend fun getAll(): List<HistoryEntity>
+
+    @Query("DELETE FROM HistoryEntity")
+    suspend fun deleteAll()
+}
+
+@Entity
+data class HistoryEntity(
+    @PrimaryKey(autoGenerate = true) val id: Int ,
+    val history: String
+) {
+    companion object {
+
+    }
+}

app/src/main/java/com/umc/ttoklip/data/model/CommonResponse.kt

@@ -0,0 +1,5 @@
+package com.umc.ttoklip.data.model
+
+data class CommonResponse(
+   val message : String
+)

app/src/main/java/com/umc/ttoklip/data/model/news/CategoryResponses.kt

@@ -0,0 +1,8 @@
+package com.umc.ttoklip.data.model.news
+
+data class CategoryResponses(
+    val houseWork: List<News>,
+    val recipe: List<News>,
+    val safeLiving: List<News>,
+    val welfarePolicy: List<News>
+)

app/src/main/java/com/umc/ttoklip/data/model/news/MainNewsResponse.kt

@@ -1,6 +1,6 @@
 package com.umc.ttoklip.data.model.news
 
 data class MainNewsResponse(
-    val categoryResponse: CategoryResponse,
-    val topFiveQuestions: List<TopFiveQuestion>
+    val categoryResponses: CategoryResponses,
+    val randomNews: List<Any>
 )

app/src/main/java/com/umc/ttoklip/data/model/news/News.kt

@@ -0,0 +1,10 @@
+package com.umc.ttoklip.data.model.news
+
+data class News(
+    val mainImageUrl: String,
+    val newsletterId: Int,
+    val title: String,
+    val writtenTime: String
+){
+    constructor() : this("",0,"","")
+}

app/src/main/java/com/umc/ttoklip/data/model/news/ReportRequest.kt

@@ -0,0 +1,6 @@
+package com.umc.ttoklip.data.model.news
+
+data class ReportRequest(
+    val content: String,
+    val reportType: String
+)

app/src/main/java/com/umc/ttoklip/data/model/news/comment/NewsCommentRequest.kt

@@ -0,0 +1,6 @@
+package com.umc.ttoklip.data.model.news.comment
+
+data class NewsCommentRequest(
+    val comment: String,
+    val parentCommentId: Int
+)

app/src/main/java/com/umc/ttoklip/data/model/news/comment/NewsCommentResponse.kt

@@ -0,0 +1,9 @@
+package com.umc.ttoklip.data.model.news.comment
+
+data class NewsCommentResponse(
+    val commentContent: String,
+    val commentId: Int,
+    val parentId: Int?,
+    val writer: String?,
+    val writtenTime: String
+)

app/src/main/java/com/umc/ttoklip/data/model/news/detail/ImageUrl.kt

@@ -0,0 +1,5 @@
+package com.umc.ttoklip.data.model.news.detail
+
+data class ImageUrl(
+    val imageUrl : String
+)

app/src/main/java/com/umc/ttoklip/data/model/news/detail/NewsDetailResponse.kt

@@ -0,0 +1,21 @@
+package com.umc.ttoklip.data.model.news.detail
+
+import com.umc.ttoklip.data.model.news.comment.NewsCommentResponse
+
+data class NewsDetailResponse(
+    val category: String,
+    val commentResponses: List<NewsCommentResponse>,
+    val content: String,
+    val imageUrlList: List<ImageUrl>,
+    val newsletterId: Int,
+    var likeCount: Int,
+    var scrapCount: Int,
+    val title: String?,
+    val urlList: List<Url>,
+    val writer: String?,
+    val writtenTime: String,
+    val likedByCurrentUser: Boolean,
+    val scrapedByCurrentUser: Boolean
+) {
+    constructor() : this("", listOf(), "", listOf(), 0, 0, 0, "", listOf(), "", "", false, false)
+}

app/src/main/java/com/umc/ttoklip/data/model/news/detail/Url.kt

@@ -0,0 +1,5 @@
+package com.umc.ttoklip.data.model.news.detail
+
+data class Url(
+    val url: String
+)

app/src/main/java/com/umc/ttoklip/data/model/search/NewsSearchResponse.kt

@@ -0,0 +1,9 @@
+package com.umc.ttoklip.data.model.search
+
+data class NewsSearchResponse(
+    val isFirst: Boolean,
+    val isLast: Boolean,
+    val newsletters: List<SearchResponse>,
+    val totalElements: Int,
+    val totalPage: Int
+)