From 1c403f2801f000b19744b1ac0f0c3eb080804dea Mon Sep 17 00:00:00 2001
From: Yenaly <2021214976@stu.cqupt.edu.cn>
Date: Wed, 21 Sep 2022 18:23:44 +0800
Subject: [PATCH] bug fixes. add comment and reply function. add clear cache
 function.

---
 .idea/misc.xml                                |   7 +-
 README.md                                     |  12 +-
 app/build.gradle.kts                          |  18 +-
 .../java/com/yenaly/han1meviewer/Constants.kt |   2 +
 .../yenaly/han1meviewer/logic/NetworkRepo.kt  | 208 +++++++++++-------
 .../logic/model/VideoCommentModel.kt          |  40 ++--
 .../logic/network/HanimeNetwork.kt            |   8 +-
 .../HanimeBaseService.kt}                     |  21 +-
 .../network/service/HanimeCommentService.kt   |  44 ++++
 .../HanimeVersionService.kt}                  |   4 +-
 .../han1meviewer/ui/activity/AboutActivity.kt |   2 +-
 .../han1meviewer/ui/activity/MainActivity.kt  |   4 +-
 .../ui/activity/SearchActivity.kt             |  37 ++--
 .../ui/adapter/VideoCommentRvAdapter.kt       |  92 +++++++-
 .../ui/adapter/WatchHistoryRvAdapter.kt       |   4 +-
 .../ui/fragment/CommentFragment.kt            |  88 +++++++-
 .../ui/fragment/CommentReplyFragment.kt       |  43 +++-
 .../ui/fragment/VideoIntroductionFragment.kt  |   4 +-
 .../ui/fragment/home/MyFavVideoFragment.kt    |   7 +-
 .../ui/fragment/home/MyWatchLaterFragment.kt  |   7 +-
 .../ui/fragment/home/WatchHistoryFragment.kt  |   8 +-
 .../home/download/DownloadedFragment.kt       |  10 +-
 .../fragment/settings/HomeSettingsFragment.kt |  52 +++++
 .../han1meviewer/ui/popup/CommentPopup.kt     |  58 +++++
 .../ui/view/AdvancedMaterialSearchBar.kt      |  35 +++
 .../ui/viewmodel/CommentViewModel.kt          |  53 ++++-
 .../ui/viewmodel/MyListViewModel.kt           |   2 +
 .../res/drawable/ic_baseline_clear_all_24.xml |   5 +
 .../res/drawable/ic_baseline_reply_24.xml     |   5 +
 .../main/res/drawable/ic_baseline_send_24.xml |   5 +
 app/src/main/res/layout/fragment_comment.xml  |  10 +
 .../main/res/layout/item_video_comment.xml    |  10 +
 app/src/main/res/layout/layout_search_bar.xml |   2 +-
 app/src/main/res/layout/pop_up_comment.xml    |  27 +++
 app/src/main/res/values/strings.xml           |   7 +
 app/src/main/res/xml/settings_home.xml        |   5 +
 build.gradle.kts                              |   4 +-
 yenaly_libs/build.gradle.kts                  |  11 +-
 .../com/yenaly/yenaly_libs/utils/FileUtil.kt  |   9 +
 .../YenalyHideBottomViewOnScrollBehavior.kt   |   2 +
 40 files changed, 776 insertions(+), 196 deletions(-)
 rename app/src/main/java/com/yenaly/han1meviewer/logic/network/{HanimeService.kt => service/HanimeBaseService.kt} (78%)
 create mode 100644 app/src/main/java/com/yenaly/han1meviewer/logic/network/service/HanimeCommentService.kt
 rename app/src/main/java/com/yenaly/han1meviewer/logic/network/{VersionService.kt => service/HanimeVersionService.kt} (76%)
 create mode 100644 app/src/main/java/com/yenaly/han1meviewer/ui/popup/CommentPopup.kt
 create mode 100644 app/src/main/java/com/yenaly/han1meviewer/ui/view/AdvancedMaterialSearchBar.kt
 create mode 100644 app/src/main/res/drawable/ic_baseline_clear_all_24.xml
 create mode 100644 app/src/main/res/drawable/ic_baseline_reply_24.xml
 create mode 100644 app/src/main/res/drawable/ic_baseline_send_24.xml
 create mode 100644 app/src/main/res/layout/pop_up_comment.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8dc1cc4a..33d87503 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,6 +4,7 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="..\:/Users/wrzg8/.gradle/caches/transforms-3/5289e4e06c8c1345f256b44f2a8bf24b/transformed/jetified-about-2.5.1/res/layout/about_page_main_activity.xml" value="0.268" />
+        <entry key="..\:/Users/wrzg8/.gradle/caches/transforms-3/7db9194aba099019cadb4a1513f39d10/transformed/jetified-XPopup-2.8.3/res/layout/_xpopup_bottom_popup_view.xml" value="0.22573749465583584" />
         <entry key="..\:/Users/wrzg8/.gradle/caches/transforms-3/87e9ff2b1f11a88e5e2d5c256d23de02/transformed/jetified-MaterialSearchBar-0.8.5/res/drawable-mdpi-v4/ic_menu_animated.xml" value="0.2455" />
         <entry key="..\:/Users/wrzg8/.gradle/caches/transforms-3/87e9ff2b1f11a88e5e2d5c256d23de02/transformed/jetified-MaterialSearchBar-0.8.5/res/layout/item_last_request.xml" value="0.36" />
         <entry key="..\:/Users/wrzg8/.gradle/caches/transforms-3/87e9ff2b1f11a88e5e2d5c256d23de02/transformed/jetified-MaterialSearchBar-0.8.5/res/layout/searchbar.xml" value="0.3" />
@@ -15,6 +16,7 @@
         <entry key="..\:/Users/wrzg8/.gradle/caches/transforms-3/bc7aadf64a90ff594b2f090b0cdd700e/transformed/jetified-jiaozivideoplayer-7.7.0/res/layout/jz_layout_clarity.xml" value="0.275" />
         <entry key="..\:/Users/wrzg8/.gradle/caches/transforms-3/bc7aadf64a90ff594b2f090b0cdd700e/transformed/jetified-jiaozivideoplayer-7.7.0/res/layout/jz_layout_clarity_item.xml" value="0.275" />
         <entry key="..\:/Users/wrzg8/.gradle/caches/transforms-3/bc7aadf64a90ff594b2f090b0cdd700e/transformed/jetified-jiaozivideoplayer-7.7.0/res/layout/jz_layout_std.xml" value="0.3" />
+        <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/drawable/ic_baseline_clear_all_24.xml" value="0.139" />
         <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/drawable/ic_baseline_comment_24.xml" value="0.2455" />
         <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/drawable/ic_baseline_delete_24.xml" value="0.137" />
         <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/drawable/ic_baseline_download_24.xml" value="0.2455" />
@@ -25,7 +27,9 @@
         <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/drawable/ic_baseline_language_24.xml" value="0.137" />
         <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/drawable/ic_baseline_menu_24.xml" value="0.137" />
         <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/drawable/ic_baseline_more_time_24.xml" value="0.137" />
+        <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/drawable/ic_baseline_reply_24.xml" value="0.137" />
         <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/drawable/ic_baseline_share_24.xml" value="0.139" />
+        <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/drawable/ic_baseline_tag_24.xml" value="0.137" />
         <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/drawable/ic_baseline_update_24.xml" value="0.137" />
         <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/drawable/ic_baseline_watch_later_24.xml" value="0.139" />
         <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/drawable/ic_outline_watch_later_24.xml" value="0.2455" />
@@ -36,7 +40,7 @@
         <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/layout/activity_search.xml" value="0.268" />
         <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/layout/activity_settings.xml" value="0.22573749465583584" />
         <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/layout/activity_video.xml" value="0.10560068405301411" />
-        <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/layout/fragment_comment.xml" value="0.10389055151774262" />
+        <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/layout/fragment_comment.xml" value="0.268" />
         <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/layout/fragment_comment_reply.xml" value="0.10389055151774262" />
         <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/layout/fragment_home_page.xml" value="0.10389055151774262" />
         <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/layout/fragment_list_only.xml" value="0.1564102564102564" />
@@ -61,6 +65,7 @@
         <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/layout/layout_empty_view.xml" value="0.132" />
         <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/layout/layout_search_bar.xml" value="0.44000000000000006" />
         <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/layout/nav_header_ability.xml" value="0.22573749465583584" />
+        <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/layout/pop_up_comment.xml" value="0.4" />
         <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/layout/pop_up_hanime_search_tag.xml" value="0.10389055151774262" />
         <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/layout/widget_search_bar.xml" value="0.4378947368421053" />
         <entry key="..\:/Users/wrzg8/AndroidStudioProjects/Han1meViewer/app/src/main/res/menu/menu_main_bnv.xml" value="0.22573749465583584" />
diff --git a/README.md b/README.md
index 88e8c3fb..a63bad33 100644
--- a/README.md
+++ b/README.md
@@ -8,11 +8,11 @@ A Hanime1.me Application for Android.
 
 支持高级查询、观看（可切换分辨率与语言）、下载、历史记录以及收藏等功能。
 
-暂不支持评论等功能，且目前可能会存在一系列bug。
+支持评论但暂不支持评论点赞点踩等功能，且目前可能会存在一系列bug。
 
 Supports advanced query, watch (be able to switch resolution and language), download, history and add to favorite list.
 
-Comments and some other functions are not supported TEMPORARILY, and there may be a series of bugs at present.
+Comment is supported right now but comment like or dislike and some other functions are not supported TEMPORARILY, and there may be a series of bugs at present.
 
 ## 存在问题
 
@@ -40,6 +40,14 @@ Comments and some other functions are not supported TEMPORARILY, and there may b
 
 ## 更新内容
 
+### v0.4.0
+
+新增评论功能，包括影片评论，评论回复，子评论回复，但暂不支持点赞点踩。
+
+新增清理缓存（快取）功能。
+
+优化搜索体验，修复了一些小问题。
+
 ### v0.3.0
 
 新增更新功能，不过依赖于 Github 的 API，可能有次数限制。
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 7cd62fb2..32c2e899 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -9,14 +9,14 @@ plugins {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
 
     defaultConfig {
         applicationId = "com.yenaly.han1meviewer"
         minSdk = 24
-        targetSdk = 32
+        targetSdk = 33
         versionCode = createVersionCode()
-        versionName = createVersionName(major = 0, minor = 3, patch = 0)
+        versionName = createVersionName(major = 0, minor = 4, patch = 0)
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -48,8 +48,8 @@ dependencies {
     implementation(project(":yenaly_libs"))
 
     // android related
-    implementation("androidx.core:core-ktx:1.8.0")
-    implementation("androidx.appcompat:appcompat:1.5.0")
+    implementation("androidx.core:core-ktx:1.9.0")
+    implementation("androidx.appcompat:appcompat:1.5.1")
     implementation("com.google.android.material:material:1.6.1")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")
@@ -59,10 +59,10 @@ dependencies {
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("androidx.room:room-runtime:2.4.3")
     implementation("androidx.room:room-ktx:2.4.3")
-    implementation("androidx.navigation:navigation-fragment:2.5.1")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.5.1")
-    implementation("androidx.navigation:navigation-ui:2.5.1")
-    implementation("androidx.navigation:navigation-ui-ktx:2.5.1")
+    implementation("androidx.navigation:navigation-fragment:2.5.2")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.5.2")
+    implementation("androidx.navigation:navigation-ui:2.5.2")
+    implementation("androidx.navigation:navigation-ui-ktx:2.5.2")
     implementation("androidx.preference:preference-ktx:1.2.0")
     implementation("androidx.work:work-runtime:2.7.1")
     implementation("androidx.work:work-runtime-ktx:2.7.1")
diff --git a/app/src/main/java/com/yenaly/han1meviewer/Constants.kt b/app/src/main/java/com/yenaly/han1meviewer/Constants.kt
index b637337f..f30f81ce 100644
--- a/app/src/main/java/com/yenaly/han1meviewer/Constants.kt
+++ b/app/src/main/java/com/yenaly/han1meviewer/Constants.kt
@@ -45,6 +45,8 @@ const val COMMENT_TYPE = "COMMENT_TYPE"
 
 const val DATE_CODE = "DATE_CODE"
 
+const val CSRF_TOKEN = "CSRF_TOKEN"
+
 // Result Code
 
 const val LOGIN_TO_MAIN_ACTIVITY = 0
diff --git a/app/src/main/java/com/yenaly/han1meviewer/logic/NetworkRepo.kt b/app/src/main/java/com/yenaly/han1meviewer/logic/NetworkRepo.kt
index f2998b8a..5cf96148 100644
--- a/app/src/main/java/com/yenaly/han1meviewer/logic/NetworkRepo.kt
+++ b/app/src/main/java/com/yenaly/han1meviewer/logic/NetworkRepo.kt
@@ -471,86 +471,6 @@ object NetworkRepo {
         )
     }
 
-    fun getHanimeVideoComment(type: String, code: String) = websiteIOFlow(
-        request = { HanimeNetwork.hanimeService.getComment(type, code) }
-    ) { commentRawBody ->
-        val jsonObject = JSONObject(commentRawBody)
-        val commentBody = jsonObject.get("comments").toString()
-        val parseBody = Jsoup.parse(commentBody).body()
-        val commentList = mutableListOf<VideoCommentModel>()
-        val allCommentsClass = parseBody.getElementById("comment-start")
-        allCommentsClass?.let {
-            val avatarClasses = it.select("a > img")
-            val contentClasses = it.getElementsByClass("comment-index-text") // 偶數是日期和作者，奇數是内容
-            val replyClasses = it.select("div[id=comment-like-form-wrapper]")
-            for (i in replyClasses.indices) {
-                val avatarUrl = avatarClasses[i].absUrl("src")
-                val replyClass = replyClasses[i].select("div > div")
-                val thumbUp = try {
-                    val up = replyClass[0].child(1).text()
-                    if (up.isInt()) {
-                        up
-                    } else {
-                        throw IndexOutOfBoundsException("應該throw NumberFormatException，但這樣能統一catch")
-                    }
-                } catch (e: IndexOutOfBoundsException) {
-                    replyClasses[i].select("span[class=comment-like-btn-wrapper] > button > span")[1].text()
-                }
-                val hasMoreReplies =
-                    replyClasses[i].select("div[class~=load-replies-btn]").first() != null
-                val id = replyClasses[i].select("div[id~=reply-section-wrapper]")[0].id()
-                    .substringAfterLast('-')
-                val usernameAndDateClass = contentClasses[i * 2]
-                val username = usernameAndDateClass.select("a")[0].ownText()
-                val date = usernameAndDateClass.select("a > span")[0].ownText()
-                val content = contentClasses[i * 2 + 1].text()
-                commentList.add(
-                    VideoCommentModel(
-                        avatar = avatarUrl, username = username, date = date,
-                        content = content, thumbUp = thumbUp, hasMoreReplies = hasMoreReplies,
-                        id = id
-                    )
-                )
-            }
-        }
-        return@websiteIOFlow WebsiteState.Success(commentList)
-    }
-
-    fun getCommentReply(commentId: String) = websiteIOFlow(
-        request = { HanimeNetwork.hanimeService.getCommentReply(commentId) }
-    ) { replyRawBody ->
-        val jsonObject = JSONObject(replyRawBody)
-        val replyBody = jsonObject.get("replies").toString()
-        val replyList = mutableListOf<VideoCommentModel>()
-        val parseBody = Jsoup.parse(replyBody).body()
-        val replyStart = parseBody.select("div[id*=reply-start]").first()
-        replyStart?.let {
-            val allRepliesClass = it.children()
-            for (i in 0 until (allRepliesClass.size / 2)) {
-                val avatarUrl = allRepliesClass[i * 2].select("img")[0].absUrl("src")
-                val content =
-                    allRepliesClass[i * 2].getElementsByClass("comment-index-text")[1].text()
-                val usernameClass =
-                    allRepliesClass[i * 2].getElementsByClass("comment-index-text")[0]
-                val username = usernameClass.select("div > a")[0].ownText()
-                val date = usernameClass.select("div > a > span")[0].ownText().trim()
-                val thumbAndReplyClass = allRepliesClass[i * 2 + 1]
-                val thumbUp = with(thumbAndReplyClass.select("span")) {
-                    if (get(1).text().isInt()) get(1).text() else get(2).text()
-                }
-
-                replyList.add(
-                    VideoCommentModel(
-                        avatar = avatarUrl, username = username,
-                        date = date, content = content, thumbUp = thumbUp
-                    )
-                )
-            }
-        }
-
-        return@websiteIOFlow WebsiteState.Success(replyList)
-    }
-
     fun getHanimePreview(date: String) = websiteIOFlow(
         request = { HanimeNetwork.hanimeService.getHanimePreview(date) }
     ) { previewBody ->
@@ -697,7 +617,7 @@ object NetworkRepo {
     ) = websiteIOFlow(
         request = {
             HanimeNetwork.hanimeService.addToMyFavVideo(
-                videoCode, likeStatus.value, token, token, currentUserId
+                videoCode, likeStatus.value, token, currentUserId
             )
         }
     ) {
@@ -705,6 +625,130 @@ object NetworkRepo {
         return@websiteIOFlow WebsiteState.Success(Unit)
     }
 
+    // ------ COMMENT ------ //
+
+    fun getComment(type: String, code: String) = websiteIOFlow(
+        request = { HanimeNetwork.commentService.getComment(type, code) }
+    ) { commentRawBody ->
+        val jsonObject = JSONObject(commentRawBody)
+        val commentBody = jsonObject.get("comments").toString()
+        val parseBody = Jsoup.parse(commentBody).body()
+        val csrfToken = parseBody.select("input[name=_token]").first()?.attr("value")
+        val currentUserId = parseBody.select("input[name=comment-user-id]").first()?.attr("value")
+        val commentList = mutableListOf<VideoCommentModel.VideoComment>()
+        val allCommentsClass = parseBody.getElementById("comment-start")
+        allCommentsClass?.let {
+            val avatarClasses = it.select("a > img")
+            val contentClasses = it.getElementsByClass("comment-index-text") // 偶數是日期和作者，奇數是内容
+            val replyClasses = it.select("div[id=comment-like-form-wrapper]")
+            for (i in replyClasses.indices) {
+                val avatarUrl = avatarClasses[i * 2].absUrl("src")
+                val replyClass = replyClasses[i].select("div > div")
+                val thumbUp = try {
+                    val up = replyClass[0].child(1).text()
+                    if (up.isInt()) {
+                        up
+                    } else {
+                        throw IndexOutOfBoundsException("應該throw NumberFormatException，但這樣能統一catch")
+                    }
+                } catch (e: IndexOutOfBoundsException) {
+                    replyClasses[i].select("span[class=comment-like-btn-wrapper] > button > span")[1].text()
+                }
+                val hasMoreReplies =
+                    replyClasses[i].select("div[class~=load-replies-btn]").first() != null
+                val id = replyClasses[i].select("div[id~=reply-section-wrapper]")[0].id()
+                    .substringAfterLast('-')
+                val usernameAndDateClass = contentClasses[i * 2]
+                val username = usernameAndDateClass.select("a")[0].ownText()
+                val date = usernameAndDateClass.select("a > span")[0].ownText()
+                val content = contentClasses[i * 2 + 1].text()
+                commentList.add(
+                    VideoCommentModel.VideoComment(
+                        avatar = avatarUrl, username = username, date = date,
+                        content = content, thumbUp = thumbUp, hasMoreReplies = hasMoreReplies,
+                        id = id, isChildComment = false
+                    )
+                )
+            }
+        }
+        return@websiteIOFlow WebsiteState.Success(
+            VideoCommentModel(
+                commentList,
+                currentUserId,
+                csrfToken
+            )
+        )
+    }
+
+    fun getCommentReply(commentId: String) = websiteIOFlow(
+        request = { HanimeNetwork.commentService.getCommentReply(commentId) }
+    ) { replyRawBody ->
+        val jsonObject = JSONObject(replyRawBody)
+        val replyBody = jsonObject.get("replies").toString()
+        val replyList = mutableListOf<VideoCommentModel.VideoComment>()
+        val parseBody = Jsoup.parse(replyBody).body()
+        val replyStart = parseBody.select("div[id*=reply-start]").first()
+        replyStart?.let {
+            val allRepliesClass = it.children()
+            for (i in 0 until (allRepliesClass.size / 2)) {
+                val avatarUrl = allRepliesClass[i * 2].select("img")[0].absUrl("src")
+                val content =
+                    allRepliesClass[i * 2].getElementsByClass("comment-index-text")[1].text()
+                val usernameClass =
+                    allRepliesClass[i * 2].getElementsByClass("comment-index-text")[0]
+                val username = usernameClass.select("div > a")[0].ownText()
+                val date = usernameClass.select("div > a > span")[0].ownText().trim()
+                val thumbAndReplyClass = allRepliesClass[i * 2 + 1]
+                val thumbUp = with(thumbAndReplyClass.select("span")) {
+                    if (get(1).text().isInt()) get(1).text() else get(2).text()
+                }
+
+                replyList.add(
+                    VideoCommentModel.VideoComment(
+                        avatar = avatarUrl, username = username,
+                        date = date, content = content, thumbUp = thumbUp,
+                        isChildComment = true
+                    )
+                )
+            }
+        }
+
+        return@websiteIOFlow WebsiteState.Success(VideoCommentModel(replyList))
+    }
+
+    fun postComment(
+        csrfToken: String?,
+        currentUserId: String,
+        targetUserId: String,
+        type: String,
+        text: String
+    ) = websiteIOFlow(
+        request = {
+            HanimeNetwork.commentService.postComment(
+                csrfToken, currentUserId,
+                type, targetUserId, text
+            )
+        }
+    ) {
+        Log.d("post_comment_body", it)
+        return@websiteIOFlow WebsiteState.Success(Unit)
+    }
+
+    fun postCommentReply(
+        csrfToken: String?,
+        replyCommentId: String,
+        text: String
+    ) = websiteIOFlow(
+        request = {
+            HanimeNetwork.commentService.postCommentReply(
+                csrfToken, replyCommentId, text
+            )
+        }
+    ) {
+        Log.d("post_comment_reply_body", it)
+        return@websiteIOFlow WebsiteState.Success(Unit)
+    }
+
     // ------ VERSION ------ //
 
     fun getLatestVersion() = flow {
@@ -788,7 +832,7 @@ object NetworkRepo {
                 e.printStackTrace()
                 emit(VideoLoadingState.Error(IndexOutOfBoundsException("可能這個網址解析起來不大一樣...")))
             }
-            is Exception -> {
+            else -> {
                 e.printStackTrace()
                 emit(VideoLoadingState.Error(e))
             }
diff --git a/app/src/main/java/com/yenaly/han1meviewer/logic/model/VideoCommentModel.kt b/app/src/main/java/com/yenaly/han1meviewer/logic/model/VideoCommentModel.kt
index 4ff202c4..3df75d7e 100644
--- a/app/src/main/java/com/yenaly/han1meviewer/logic/model/VideoCommentModel.kt
+++ b/app/src/main/java/com/yenaly/han1meviewer/logic/model/VideoCommentModel.kt
@@ -6,18 +6,28 @@ package com.yenaly.han1meviewer.logic.model
  * @time 2022/06/20 020 21:56
  */
 data class VideoCommentModel(
-    // 頭像
-    val avatar: String,
-    // 作者
-    val username: String,
-    // 發佈日期
-    val date: String,
-    // 内容
-    val content: String,
-    // 點讚數量
-    val thumbUp: String,
-    // 是否有更多回覆
-    val hasMoreReplies: Boolean = false,
-    // comment代號
-    val id: String? = null
-)
+    val videoComment: MutableList<VideoComment>,
+    val currentUserId: String? = null,
+    val csrfToken: String? = null
+) {
+    data class VideoComment(
+        // 頭像
+        val avatar: String,
+        // 作者
+        val username: String,
+        // 發佈日期
+        val date: String,
+        // 内容
+        val content: String,
+        // 點讚數量
+        val thumbUp: String,
+        // 是否为子评论
+        val isChildComment: Boolean,
+        // token
+        val csrfToken: String? = null,
+        // 是否有更多回覆
+        val hasMoreReplies: Boolean = false,
+        // comment代號
+        val id: String? = null
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yenaly/han1meviewer/logic/network/HanimeNetwork.kt b/app/src/main/java/com/yenaly/han1meviewer/logic/network/HanimeNetwork.kt
index cbac727f..56920d64 100644
--- a/app/src/main/java/com/yenaly/han1meviewer/logic/network/HanimeNetwork.kt
+++ b/app/src/main/java/com/yenaly/han1meviewer/logic/network/HanimeNetwork.kt
@@ -1,6 +1,9 @@
 package com.yenaly.han1meviewer.logic.network
 
 import com.yenaly.han1meviewer.HANIME_BASE_URL
+import com.yenaly.han1meviewer.logic.network.service.HanimeCommentService
+import com.yenaly.han1meviewer.logic.network.service.HanimeBaseService
+import com.yenaly.han1meviewer.logic.network.service.HanimeVersionService
 
 /**
  * @project Hanime1
@@ -8,6 +11,7 @@ import com.yenaly.han1meviewer.HANIME_BASE_URL
  * @time 2022/06/08 008 22:35
  */
 object HanimeNetwork {
-    val hanimeService = ServiceCreator.create<HanimeService>(HANIME_BASE_URL)
-    val versionService = ServiceCreator.createVersion<VersionService>()
+    val hanimeService = ServiceCreator.create<HanimeBaseService>(HANIME_BASE_URL)
+    val versionService = ServiceCreator.createVersion<HanimeVersionService>()
+    val commentService = ServiceCreator.create<HanimeCommentService>(HANIME_BASE_URL)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/yenaly/han1meviewer/logic/network/HanimeService.kt b/app/src/main/java/com/yenaly/han1meviewer/logic/network/service/HanimeBaseService.kt
similarity index 78%
rename from app/src/main/java/com/yenaly/han1meviewer/logic/network/HanimeService.kt
rename to app/src/main/java/com/yenaly/han1meviewer/logic/network/service/HanimeBaseService.kt
index daed63c1..df45706d 100644
--- a/app/src/main/java/com/yenaly/han1meviewer/logic/network/HanimeService.kt
+++ b/app/src/main/java/com/yenaly/han1meviewer/logic/network/service/HanimeBaseService.kt
@@ -1,4 +1,4 @@
-package com.yenaly.han1meviewer.logic.network
+package com.yenaly.han1meviewer.logic.network.service
 
 import androidx.annotation.IntRange
 import okhttp3.ResponseBody
@@ -10,7 +10,7 @@ import retrofit2.http.*
  * @author Yenaly Liew
  * @time 2022/06/08 008 22:10
  */
-interface HanimeService {
+interface HanimeBaseService {
 
     @GET("/")
     suspend fun getHomePage(): Response<ResponseBody>
@@ -34,17 +34,6 @@ interface HanimeService {
         @Query("v") videoCode: String
     ): Response<ResponseBody>
 
-    @GET("loadComment")
-    suspend fun getComment(
-        @Query("type") type: String, // 類似 "video", "preview"
-        @Query("id") code: String
-    ): Response<ResponseBody>
-
-    @GET("loadReplies")
-    suspend fun getCommentReply(
-        @Query("id") commentId: String
-    ): Response<ResponseBody>
-
     @GET("previews/{date}")
     suspend fun getHanimePreview(
         @Path("date") date: String // 类似 202206. 202012
@@ -70,9 +59,9 @@ interface HanimeService {
     suspend fun addToMyFavVideo(
         @Field("like-foreign-id") videoCode: String,
         @Field("like-status") likeStatus: String,
-        @Header("X-CSRF-TOKEN") csrfToken_1: String?,
-        @Field("_token") csrfToken_2: String?,
+        @Field("_token") csrfToken: String?,
         @Field("like-user-id") userId: String?, // 這網站有點難綳，傳這種參數
-        @Field("like-is-positive") likeIsPositive: Int = 1
+        @Field("like-is-positive") likeIsPositive: Int = 1,
+        @Header("X-CSRF-TOKEN") csrfToken_1: String? = csrfToken
     ): Response<ResponseBody>
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/yenaly/han1meviewer/logic/network/service/HanimeCommentService.kt b/app/src/main/java/com/yenaly/han1meviewer/logic/network/service/HanimeCommentService.kt
new file mode 100644
index 00000000..fb1617b5
--- /dev/null
+++ b/app/src/main/java/com/yenaly/han1meviewer/logic/network/service/HanimeCommentService.kt
@@ -0,0 +1,44 @@
+package com.yenaly.han1meviewer.logic.network.service
+
+import okhttp3.ResponseBody
+import retrofit2.Response
+import retrofit2.http.*
+
+/**
+ * @project Han1meViewer
+ * @author Yenaly Liew
+ * @time 2022/09/19 019 17:44
+ */
+interface HanimeCommentService {
+    @GET("loadComment")
+    suspend fun getComment(
+        @Query("type") type: String, // 類似 "video", "preview"
+        @Query("id") code: String
+    ): Response<ResponseBody>
+
+    @GET("loadReplies")
+    suspend fun getCommentReply(
+        @Query("id") commentId: String
+    ): Response<ResponseBody>
+
+    @FormUrlEncoded
+    @POST("createComment")
+    suspend fun postComment(
+        @Field("_token") csrfToken: String?,
+        @Field("comment-user-id") currentUserId: String,
+        @Field("comment-type") type: String, // 類似 "video", "preview"
+        @Field("comment-foreign-id") targetUserId: String,
+        @Field("comment-text") text: String,
+        @Field("comment-count") count: Int = 1, // 感觉没什么用，仅前端用
+        @Header("X-CSRF-TOKEN") csrfToken_1: String? = csrfToken
+    ): Response<ResponseBody>
+
+    @FormUrlEncoded
+    @POST("replyComment")
+    suspend fun postCommentReply(
+        @Field("_token") csrfToken: String?,
+        @Field("reply-comment-id") replyCommentId: String,
+        @Field("reply-comment-text") text: String,
+        @Header("X-CSRF-TOKEN") csrfToken_1: String? = csrfToken
+    ): Response<ResponseBody>
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yenaly/han1meviewer/logic/network/VersionService.kt b/app/src/main/java/com/yenaly/han1meviewer/logic/network/service/HanimeVersionService.kt
similarity index 76%
rename from app/src/main/java/com/yenaly/han1meviewer/logic/network/VersionService.kt
rename to app/src/main/java/com/yenaly/han1meviewer/logic/network/service/HanimeVersionService.kt
index 346c8295..0e31afff 100644
--- a/app/src/main/java/com/yenaly/han1meviewer/logic/network/VersionService.kt
+++ b/app/src/main/java/com/yenaly/han1meviewer/logic/network/service/HanimeVersionService.kt
@@ -1,4 +1,4 @@
-package com.yenaly.han1meviewer.logic.network
+package com.yenaly.han1meviewer.logic.network.service
 
 import com.yenaly.han1meviewer.logic.model.VersionModel
 import retrofit2.http.GET
@@ -8,7 +8,7 @@ import retrofit2.http.GET
  * @author Yenaly Liew
  * @time 2022/09/09 009 20:04
  */
-interface VersionService {
+interface HanimeVersionService {
     @GET("repos/YenalyLiew/Han1meViewer/releases/latest")
     suspend fun getLatestVersion(): VersionModel
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/activity/AboutActivity.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/activity/AboutActivity.kt
index 9316515c..3632bc5d 100644
--- a/app/src/main/java/com/yenaly/han1meviewer/ui/activity/AboutActivity.kt
+++ b/app/src/main/java/com/yenaly/han1meviewer/ui/activity/AboutActivity.kt
@@ -95,7 +95,7 @@ class AboutActivity : AbsAboutActivity() {
                         )
                     }
                     newline(2)
-                    "暫不能進行評論回覆、點讚、點踩".span {
+                    "暫不能進行評論點讚、點踩".span {
                         quote(
                             Color.rgb(
                                 (0..255).random(),
diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/activity/MainActivity.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/activity/MainActivity.kt
index f27e2fe9..e2f06097 100644
--- a/app/src/main/java/com/yenaly/han1meviewer/ui/activity/MainActivity.kt
+++ b/app/src/main/java/com/yenaly/han1meviewer/ui/activity/MainActivity.kt
@@ -266,13 +266,13 @@ class MainActivity : YenalyActivity<ActivityMainBinding, MainViewModel>() {
             binding.nvMain.menu.findItem(R.id.nv_watch_later).setOnMenuItemClickListener(null)
         } else {
             binding.nvMain.menu.findItem(R.id.nv_fav_video).setOnMenuItemClickListener {
-                showShortToast("請先登入！")
+                showShortToast(R.string.login_first)
                 val intent = Intent(this, LoginActivity::class.java)
                 loginDataLauncher.launch(intent)
                 return@setOnMenuItemClickListener false
             }
             binding.nvMain.menu.findItem(R.id.nv_watch_later).setOnMenuItemClickListener {
-                showShortToast("請先登入！")
+                showShortToast(R.string.login_first)
                 val intent = Intent(this, LoginActivity::class.java)
                 loginDataLauncher.launch(intent)
                 return@setOnMenuItemClickListener false
diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/activity/SearchActivity.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/activity/SearchActivity.kt
index 6e22f9ec..c10a0728 100644
--- a/app/src/main/java/com/yenaly/han1meviewer/ui/activity/SearchActivity.kt
+++ b/app/src/main/java/com/yenaly/han1meviewer/ui/activity/SearchActivity.kt
@@ -298,23 +298,8 @@ class SearchActivity : YenalyActivity<ActivitySearchBinding, SearchViewModel>()
      * 初始化数据
      */
     override fun initData(savedInstanceState: Bundle?) {
-        fromVideoTag?.let {
-            binding.searchBar.searchBar.text = it
-            viewModel.query = it
-        }
-
         initSearchBar()
 
-        /*
-        binding.appBar.addOnOffsetChangedListener(object : AppBarLayoutStateChangeListener() {
-            override fun onStateChanged(appBarLayout: AppBarLayout, state: State) {
-                if (state != State.EXPANDED) {
-                    binding.searchBar.searchBar.searchEditText.hideIme(window)
-                }
-            }
-        })
-         */
-
         initChip()
 
         binding.searchRv.apply {
@@ -415,10 +400,23 @@ class SearchActivity : YenalyActivity<ActivitySearchBinding, SearchViewModel>()
     }
 
     private fun initSearchBar() {
+        binding.searchBar.searchBar.setTextListener { text ->
+            text?.let {
+                binding.searchBar.searchBar.setPlaceHolder(it.ifBlank {
+                    getString(R.string.search_placeholder)
+                })
+            }
+        }
+
+        fromVideoTag?.let {
+            binding.searchBar.searchBar.appendTextWithListener(it)
+            viewModel.query = it
+        }
+
         val searchHistoryRvAdapter = SearchHistoryRvAdapter(LayoutInflater.from(this)).apply {
             setListener(object : SearchHistoryRvAdapter.OnItemViewClickListener {
                 override fun onItemClickListener(suggestion: String, v: View?) {
-                    binding.searchBar.searchBar.searchEditText.setText(suggestion)
+                    binding.searchBar.searchBar.appendText(suggestion)
                 }
 
                 override fun onItemDeleteListener(suggestion: String, v: View?) {
@@ -469,6 +467,9 @@ class SearchActivity : YenalyActivity<ActivitySearchBinding, SearchViewModel>()
                         viewModel.query = it.ifBlank { null }?.also { query ->
                             viewModel.insertSearchHistory(SearchHistoryEntity(query))
                         }
+                        binding.searchBar.searchBar.setPlaceHolder(it.ifBlank {
+                            getString(R.string.search_placeholder)
+                        })
                     }
                     // getNewHanimeSearchResult() 下面那個方法自動幫你執行這個方法了
                     binding.searchSrl.autoRefresh()
@@ -761,7 +762,7 @@ class SearchActivity : YenalyActivity<ActivitySearchBinding, SearchViewModel>()
         isVisible = true
         animate().alpha(1f).setDuration(500).setInterpolator(defaultInterpolator)
             .setListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationEnd(animation: Animator?) {
+                override fun onAnimationEnd(animation: Animator) {
                     isVisible = true
                 }
             }).start()
@@ -770,7 +771,7 @@ class SearchActivity : YenalyActivity<ActivitySearchBinding, SearchViewModel>()
     private fun View.fadeGone() {
         animate().alpha(0f).setDuration(500).setInterpolator(defaultInterpolator)
             .setListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationEnd(animation: Animator?) {
+                override fun onAnimationEnd(animation: Animator) {
                     isVisible = false
                 }
             }).start()
diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/adapter/VideoCommentRvAdapter.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/adapter/VideoCommentRvAdapter.kt
index 7a92b789..7ec04382 100644
--- a/app/src/main/java/com/yenaly/han1meviewer/ui/adapter/VideoCommentRvAdapter.kt
+++ b/app/src/main/java/com/yenaly/han1meviewer/ui/adapter/VideoCommentRvAdapter.kt
@@ -1,33 +1,72 @@
 package com.yenaly.han1meviewer.ui.adapter
 
+import android.graphics.Typeface
 import android.util.Log
 import android.view.View
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
+import androidx.recyclerview.widget.DiffUtil
 import coil.load
 import coil.transform.CircleCropTransformation
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.itxca.spannablex.spannable
+import com.lxj.xpopup.XPopup
 import com.yenaly.han1meviewer.COMMENT_ID
+import com.yenaly.han1meviewer.CSRF_TOKEN
 import com.yenaly.han1meviewer.R
 import com.yenaly.han1meviewer.databinding.ItemVideoCommentBinding
+import com.yenaly.han1meviewer.isAlreadyLogin
 import com.yenaly.han1meviewer.logic.model.VideoCommentModel
+import com.yenaly.han1meviewer.ui.fragment.CommentFragment
 import com.yenaly.han1meviewer.ui.fragment.CommentReplyFragment
+import com.yenaly.han1meviewer.ui.popup.CommentPopup
 import com.yenaly.yenaly_libs.utils.makeBundle
+import com.yenaly.yenaly_libs.utils.showShortToast
 
 /**
  * @project Hanime1
  * @author Yenaly Liew
  * @time 2022/06/21 021 00:03
  */
-class VideoCommentRvAdapter :
-    BaseQuickAdapter<VideoCommentModel, VideoCommentRvAdapter.ViewHolder>(R.layout.item_video_comment) {
+class VideoCommentRvAdapter constructor() :
+    BaseQuickAdapter<VideoCommentModel.VideoComment, VideoCommentRvAdapter.ViewHolder>(R.layout.item_video_comment) {
+
+    private var commentFragment: CommentFragment? = null
+    private var replyFragment: CommentReplyFragment? = null
+    var commentPopup: CommentPopup? = null
+
+    constructor(commentFragment: CommentFragment) : this() {
+        this.commentFragment = commentFragment
+    }
+
+    constructor(replyFragment: CommentReplyFragment) : this() {
+        this.replyFragment = replyFragment
+    }
+
+    companion object {
+        val COMPARATOR = object : DiffUtil.ItemCallback<VideoCommentModel.VideoComment>() {
+            override fun areItemsTheSame(
+                oldItem: VideoCommentModel.VideoComment,
+                newItem: VideoCommentModel.VideoComment
+            ): Boolean {
+                return oldItem.id == newItem.id
+            }
+
+            override fun areContentsTheSame(
+                oldItem: VideoCommentModel.VideoComment,
+                newItem: VideoCommentModel.VideoComment
+            ): Boolean {
+                return oldItem == newItem
+            }
+        }
+    }
 
     inner class ViewHolder(view: View) : BaseDataBindingHolder<ItemVideoCommentBinding>(view) {
         val binding = dataBinding!!
     }
 
-    override fun convert(holder: ViewHolder, item: VideoCommentModel) {
+    override fun convert(holder: ViewHolder, item: VideoCommentModel.VideoComment) {
         holder.binding.ivAvatar.load(item.avatar) {
             crossfade(true)
             transformations(CircleCropTransformation())
@@ -45,8 +84,51 @@ class VideoCommentRvAdapter :
             val position = viewHolder.bindingAdapterPosition
             val item = getItem(position)
             item.id?.let { id ->
-                (CommentReplyFragment().makeBundle(COMMENT_ID to id) as CommentReplyFragment)
-                    .showIn(context as FragmentActivity)
+                (CommentReplyFragment().makeBundle(
+                    COMMENT_ID to id,
+                    CSRF_TOKEN to commentFragment?.viewModel?.csrfToken
+                ) as CommentReplyFragment).showIn(context as FragmentActivity)
+            }
+        }
+        viewHolder.binding.btnReply.setOnClickListener {
+            if (!isAlreadyLogin) {
+                showShortToast(R.string.login_first)
+                return@setOnClickListener
+            }
+            val position = viewHolder.bindingAdapterPosition
+            val item = getItem(position)
+
+            CommentPopup(context).also { commentPopup ->
+                this.commentPopup = commentPopup
+                if (item.isChildComment) {
+                    replyFragment?.apply {
+                        commentPopup.setOnSendListener {
+                            viewModel.postReply(
+                                viewModel.csrfToken, commentId!!, commentPopup.comment
+                            )
+                        }
+                    }
+                    commentPopup.hint = context.getString(R.string.reply_child_comment)
+                    commentPopup.initCommentPrefix(item.username)
+                } else {
+                    commentFragment?.apply {
+                        commentPopup.setOnSendListener {
+                            viewModel.postReply(
+                                viewModel.csrfToken, item.id!!, commentPopup.comment
+                            )
+                        }
+                    }
+                    commentPopup.hint = spannable {
+                        context.getString(R.string.reply).text()
+                        "@${item.username}".span {
+                            style(Typeface.BOLD)
+                        }
+                        context.getString(R.string.reply_warning).span {
+                            absoluteSize(10)
+                        }
+                    }
+                }
+                XPopup.Builder(context).autoOpenSoftInput(true).asCustom(commentPopup).show()
             }
         }
     }
diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/adapter/WatchHistoryRvAdapter.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/adapter/WatchHistoryRvAdapter.kt
index d06c7527..d07e5786 100644
--- a/app/src/main/java/com/yenaly/han1meviewer/ui/adapter/WatchHistoryRvAdapter.kt
+++ b/app/src/main/java/com/yenaly/han1meviewer/ui/adapter/WatchHistoryRvAdapter.kt
@@ -44,7 +44,9 @@ class WatchHistoryRvAdapter :
     }
 
     override fun convert(holder: ViewHolder, item: WatchHistoryEntity) {
-        holder.binding.ivCover.load(item.coverUrl)
+        holder.binding.ivCover.load(item.coverUrl) {
+            crossfade(true)
+        }
         holder.binding.tvAddedTime.text = TimeUtil.millis2String(item.watchDate, "yyyy-MM-dd HH:mm")
         holder.binding.tvReleaseDate.text = TimeUtil.millis2String(item.releaseDate, "yyyy-MM-dd")
         holder.binding.tvTitle.text = item.title
diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/CommentFragment.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/CommentFragment.kt
index 14591690..0cfb22f0 100644
--- a/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/CommentFragment.kt
+++ b/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/CommentFragment.kt
@@ -7,14 +7,21 @@ import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.whenStarted
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.lxj.xpopup.XPopup
+import com.lxj.xpopup.core.BasePopupView
+import com.lxj.xpopup.interfaces.SimpleCallback
 import com.yenaly.han1meviewer.COMMENT_TYPE
+import com.yenaly.han1meviewer.R
 import com.yenaly.han1meviewer.VIDEO_COMMENT_PREFIX
 import com.yenaly.han1meviewer.databinding.FragmentCommentBinding
+import com.yenaly.han1meviewer.isAlreadyLogin
 import com.yenaly.han1meviewer.logic.state.WebsiteState
 import com.yenaly.han1meviewer.ui.adapter.VideoCommentRvAdapter
+import com.yenaly.han1meviewer.ui.popup.CommentPopup
 import com.yenaly.han1meviewer.ui.viewmodel.CommentViewModel
 import com.yenaly.yenaly_libs.base.YenalyFragment
 import com.yenaly.yenaly_libs.utils.arguments
+import com.yenaly.yenaly_libs.utils.showShortToast
 import com.yenaly.yenaly_libs.utils.unsafeLazy
 import kotlinx.coroutines.launch
 
@@ -26,13 +33,37 @@ import kotlinx.coroutines.launch
 class CommentFragment : YenalyFragment<FragmentCommentBinding, CommentViewModel>() {
 
     private val commentTypePrefix by arguments(COMMENT_TYPE, VIDEO_COMMENT_PREFIX)
-    private val commentAdapter by unsafeLazy { VideoCommentRvAdapter() }
+    private val commentAdapter by unsafeLazy {
+        VideoCommentRvAdapter(this).apply { setDiffCallback(VideoCommentRvAdapter.COMPARATOR) }
+    }
+    private val commentPopup by unsafeLazy {
+        CommentPopup(requireContext()).also { it.hint = getString(R.string.comment) }
+    }
 
     override fun initData(savedInstanceState: Bundle?) {
         binding.rvComment.layoutManager = LinearLayoutManager(context)
         binding.rvComment.adapter = commentAdapter
         binding.srlComment.setOnRefreshListener {
-            getHanimeVideoComment(commentTypePrefix, viewModel.code)
+            viewModel.getComment(commentTypePrefix, viewModel.code)
+        }
+        binding.btnComment.isVisible = isAlreadyLogin
+        commentPopup.setOnSendListener {
+            viewModel.postComment(
+                viewModel.csrfToken, viewModel.currentUserId!!,
+                viewModel.code, commentTypePrefix, commentPopup.comment
+            )
+        }
+        binding.btnComment.setOnClickListener {
+            XPopup.Builder(context).autoOpenSoftInput(true)
+                .setPopupCallback(object : SimpleCallback() {
+                    override fun beforeShow(popupView: BasePopupView?) {
+                        binding.btnComment.hide()
+                    }
+
+                    override fun onDismiss(popupView: BasePopupView?) {
+                        binding.btnComment.show()
+                    }
+                }).asCustom(commentPopup).show()
         }
     }
 
@@ -41,7 +72,7 @@ class CommentFragment : YenalyFragment<FragmentCommentBinding, CommentViewModel>
         lifecycleScope.launch {
             whenStarted {
                 viewModel.videoCommentFlow.collect { state ->
-                    binding.rvComment.isGone = state !is WebsiteState.Success
+                    binding.rvComment.isGone = state is WebsiteState.Error
                     binding.errorTip.isVisible = state is WebsiteState.Error
                     when (state) {
                         is WebsiteState.Error -> {
@@ -53,16 +84,55 @@ class CommentFragment : YenalyFragment<FragmentCommentBinding, CommentViewModel>
                         }
                         is WebsiteState.Success -> {
                             binding.srlComment.finishRefresh()
-                            commentAdapter.setList(state.info)
-                            binding.rvComment.isGone = state.info.isEmpty()
-                            binding.tvCommentNotFound.isVisible = state.info.isEmpty()
+                            viewModel.csrfToken = state.info.csrfToken
+                            viewModel.currentUserId = state.info.currentUserId
+                            commentAdapter.setDiffNewData(state.info.videoComment)
+                            binding.rvComment.isGone = state.info.videoComment.isEmpty()
+                            binding.tvCommentNotFound.isVisible = state.info.videoComment.isEmpty()
+                        }
+                    }
+                }
+            }
+        }
+
+        lifecycleScope.launch {
+            whenStarted {
+                viewModel.postCommentFlow.collect { state ->
+                    when (state) {
+                        is WebsiteState.Error -> {
+                            showShortToast("發送失敗！")
+                        }
+                        is WebsiteState.Loading -> {
+                            showShortToast("發表評論中")
+                        }
+                        is WebsiteState.Success -> {
+                            showShortToast("發送成功！")
+                            viewModel.getComment(commentTypePrefix, viewModel.code)
+                            commentPopup.dismiss()
                         }
                     }
                 }
             }
         }
-    }
 
-    private fun getHanimeVideoComment(type: String, code: String) =
-        viewModel.getComment(type, code)
+        lifecycleScope.launch {
+            whenStarted {
+                viewModel.postReplyFlow.collect { state ->
+                    when (state) {
+                        is WebsiteState.Error -> {
+                            showShortToast("發送失敗！")
+                        }
+                        is WebsiteState.Loading -> {
+                            showShortToast("發表回覆中")
+                        }
+                        is WebsiteState.Success -> {
+                            showShortToast("發送成功！")
+                            viewModel.getComment(commentTypePrefix, viewModel.code)
+                            commentAdapter.commentPopup?.dismiss()
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/CommentReplyFragment.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/CommentReplyFragment.kt
index f3288ca5..b5c5c8a2 100644
--- a/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/CommentReplyFragment.kt
+++ b/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/CommentReplyFragment.kt
@@ -2,14 +2,16 @@ package com.yenaly.han1meviewer.ui.fragment
 
 import android.app.Dialog
 import android.os.Bundle
+import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.whenCreated
+import androidx.lifecycle.whenStarted
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.yenaly.han1meviewer.COMMENT_ID
+import com.yenaly.han1meviewer.CSRF_TOKEN
 import com.yenaly.han1meviewer.databinding.FragmentCommentReplyBinding
-import com.yenaly.han1meviewer.logic.NetworkRepo
 import com.yenaly.han1meviewer.logic.state.WebsiteState
 import com.yenaly.han1meviewer.ui.adapter.VideoCommentRvAdapter
+import com.yenaly.han1meviewer.ui.viewmodel.CommentViewModel
 import com.yenaly.yenaly_libs.base.YenalyBottomSheetDialogFragment
 import com.yenaly.yenaly_libs.utils.arguments
 import com.yenaly.yenaly_libs.utils.showShortToast
@@ -24,18 +26,25 @@ import kotlinx.coroutines.launch
 class CommentReplyFragment :
     YenalyBottomSheetDialogFragment<FragmentCommentReplyBinding>() {
 
-    private val commentId by arguments<String>(COMMENT_ID)
-    private val replyAdapter by unsafeLazy { VideoCommentRvAdapter() }
+    val commentId by arguments<String>(COMMENT_ID)
+    val csrfToken by arguments<String>(CSRF_TOKEN)
+    val viewModel by viewModels<CommentViewModel>()
+    private val replyAdapter by unsafeLazy {
+        VideoCommentRvAdapter(this).apply { setDiffCallback(VideoCommentRvAdapter.COMPARATOR) }
+    }
 
     override fun initData(savedInstanceState: Bundle?, dialog: Dialog) {
         if (commentId == null) dialog.dismiss()
 
+        viewModel.csrfToken = csrfToken
         binding.rvReply.layoutManager = LinearLayoutManager(context)
         binding.rvReply.adapter = replyAdapter
 
+        viewModel.getCommentReply(commentId!!)
+
         lifecycleScope.launch {
-            whenCreated {
-                NetworkRepo.getCommentReply(commentId!!).collect { state ->
+            whenStarted {
+                viewModel.videoReplyFlow.collect { state ->
                     when (state) {
                         is WebsiteState.Error -> {
                             showShortToast("加載回覆失敗了捏")
@@ -45,7 +54,27 @@ class CommentReplyFragment :
 
                         }
                         is WebsiteState.Success -> {
-                            replyAdapter.setList(state.info)
+                            replyAdapter.setDiffNewData(state.info.videoComment)
+                        }
+                    }
+                }
+            }
+        }
+
+        lifecycleScope.launch {
+            whenStarted {
+                viewModel.postReplyFlow.collect { state ->
+                    when (state) {
+                        is WebsiteState.Error -> {
+                            showShortToast("發送失敗！")
+                        }
+                        is WebsiteState.Loading -> {
+                            showShortToast("發表回覆中")
+                        }
+                        is WebsiteState.Success -> {
+                            showShortToast("發送成功！")
+                            viewModel.getCommentReply(commentId!!)
+                            replyAdapter.commentPopup?.dismiss()
                         }
                     }
                 }
diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/VideoIntroductionFragment.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/VideoIntroductionFragment.kt
index 38aea959..53818f85 100644
--- a/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/VideoIntroductionFragment.kt
+++ b/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/VideoIntroductionFragment.kt
@@ -87,7 +87,7 @@ class VideoIntroductionFragment :
                             relatedAdapter.setList(state.info.relatedHanimes)
                             initDownloadButton(state.info)
                         }
-                        is VideoLoadingState.NoContent -> {}
+                        is VideoLoadingState.NoContent -> Unit
                     }
                 }
             }
@@ -174,7 +174,7 @@ class VideoIntroductionFragment :
                     videoData.csrfToken
                 )
             } else {
-                showShortToast("請先登入！")
+                showShortToast(R.string.login_first)
             }
         }
         binding.btnWatchLater.clickTrigger(viewLifecycleOwner.lifecycle) {
diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/MyFavVideoFragment.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/MyFavVideoFragment.kt
index 343b691f..dc1e05af 100644
--- a/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/MyFavVideoFragment.kt
+++ b/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/MyFavVideoFragment.kt
@@ -40,7 +40,6 @@ import kotlinx.coroutines.launch
 class MyFavVideoFragment : YenalyFragment<FragmentPageListBinding, MyListViewModel>() {
 
     private var page: Int = 1
-    private var csrfToken: String? = null
 
     private val adapter by unsafeLazy { HanimeVideoRvAdapter() }
 
@@ -84,7 +83,7 @@ class MyFavVideoFragment : YenalyFragment<FragmentPageListBinding, MyListViewMod
                             if (event != DISMISS_EVENT_ACTION) {
                                 viewModel.deleteMyFavVideo(
                                     data.redirectLink.toVideoCode(),
-                                    csrfToken
+                                    viewModel.csrfToken
                                 )
                             }
                         }
@@ -126,8 +125,8 @@ class MyFavVideoFragment : YenalyFragment<FragmentPageListBinding, MyListViewMod
                             page++
                             if (binding.srlPageList.isRefreshing) binding.srlPageList.finishRefresh()
                             binding.srlPageList.finishLoadMore(true)
-                            csrfToken = state.info.csrfToken
-                            Log.d("csrf_token", csrfToken.toString())
+                            viewModel.csrfToken = state.info.csrfToken
+                            Log.d("csrf_token", viewModel.csrfToken.toString())
                             adapter.addData(state.info.hanimeInfo)
                         }
                     }
diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/MyWatchLaterFragment.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/MyWatchLaterFragment.kt
index f11bb7e0..12fc8043 100644
--- a/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/MyWatchLaterFragment.kt
+++ b/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/MyWatchLaterFragment.kt
@@ -40,7 +40,6 @@ import kotlinx.coroutines.launch
 class MyWatchLaterFragment : YenalyFragment<FragmentPageListBinding, MyListViewModel>() {
 
     private var page: Int = 1
-    private var csrfToken: String? = null
 
     private val adapter by unsafeLazy { HanimeVideoRvAdapter() }
 
@@ -84,7 +83,7 @@ class MyWatchLaterFragment : YenalyFragment<FragmentPageListBinding, MyListViewM
                             if (event != DISMISS_EVENT_ACTION) {
                                 viewModel.deleteMyFavVideo(
                                     data.redirectLink.toVideoCode(),
-                                    csrfToken
+                                    viewModel.csrfToken
                                 )
                             }
                         }
@@ -125,8 +124,8 @@ class MyWatchLaterFragment : YenalyFragment<FragmentPageListBinding, MyListViewM
                             page++
                             if (binding.srlPageList.isRefreshing) binding.srlPageList.finishRefresh()
                             binding.srlPageList.finishLoadMore(true)
-                            csrfToken = state.info.csrfToken
-                            Log.d("csrf_token", csrfToken.toString())
+                            viewModel.csrfToken = state.info.csrfToken
+                            Log.d("csrf_token", viewModel.csrfToken.toString())
                             adapter.addData(state.info.hanimeInfo)
                         }
                     }
diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/WatchHistoryFragment.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/WatchHistoryFragment.kt
index 0007e5fa..c3fc68df 100644
--- a/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/WatchHistoryFragment.kt
+++ b/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/WatchHistoryFragment.kt
@@ -77,7 +77,13 @@ class WatchHistoryFragment : YenalyFragment<FragmentListOnlyBinding, MainViewMod
         viewLifecycleOwner.lifecycleScope.launch {
             viewModel.loadAllWatchHistories()
                 .flowWithLifecycle(viewLifecycleOwner.lifecycle)
-                .collect(historyAdapter::setDiffNewData)
+                .collect {
+                    if (it.isEmpty()) {
+                        historyAdapter.setEmptyView(R.layout.layout_empty_view)
+                    } else {
+                        historyAdapter.setDiffNewData(it)
+                    }
+                }
         }
     }
 
diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/download/DownloadedFragment.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/download/DownloadedFragment.kt
index 223c7023..e48908f9 100644
--- a/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/download/DownloadedFragment.kt
+++ b/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/download/DownloadedFragment.kt
@@ -39,8 +39,14 @@ class DownloadedFragment : YenalyFragment<FragmentListOnlyBinding, DownloadViewM
 
     override fun liveDataObserve() {
         viewLifecycleOwner.lifecycleScope.launch {
-            viewModel.loadAllDownloadedHanime()
-                .flowWithLifecycle(viewLifecycleOwner.lifecycle).collect(adapter::setDiffNewData)
+            viewModel.loadAllDownloadedHanime().flowWithLifecycle(viewLifecycleOwner.lifecycle)
+                .collect {
+                    if (it.isEmpty()) {
+                        adapter.setEmptyView(R.layout.layout_empty_view)
+                    } else {
+                        adapter.setDiffNewData(it)
+                    }
+                }
         }
     }
 
diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/settings/HomeSettingsFragment.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/settings/HomeSettingsFragment.kt
index e8cffd20..29dc84fc 100644
--- a/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/settings/HomeSettingsFragment.kt
+++ b/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/settings/HomeSettingsFragment.kt
@@ -1,5 +1,6 @@
 package com.yenaly.han1meviewer.ui.fragment.settings
 
+import android.graphics.Typeface
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.activityViewModels
@@ -7,6 +8,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.whenStarted
 import androidx.preference.Preference
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.itxca.spannablex.spannable
 import com.yenaly.han1meviewer.R
 import com.yenaly.han1meviewer.checkNeedUpdate
 import com.yenaly.han1meviewer.hanimeVideoLocalFolder
@@ -20,6 +22,7 @@ import com.yenaly.yenaly_libs.base.settings.YenalySettingsFragment
 import com.yenaly.yenaly_libs.utils.*
 import kotlinx.coroutines.launch
 import rikka.preference.SimpleMenuPreference
+import kotlin.concurrent.thread
 
 /**
  * @project Han1meViewer
@@ -34,6 +37,7 @@ class HomeSettingsFragment : YenalySettingsFragment() {
     private val updatePreference by safePreference<Preference>("update")
     private val aboutPreference by safePreference<Preference>("about")
     private val downloadPath by safePreference<LongClickablePreference>("download_path")
+    private val clearCache by safePreference<Preference>("clear_cache")
 
     override fun initPreferencesResource() = R.xml.settings_home
 
@@ -51,6 +55,11 @@ class HomeSettingsFragment : YenalySettingsFragment() {
             return@setOnPreferenceChangeListener true
         }
         aboutPreference.apply {
+            title = buildString {
+                append(getString(R.string.about))
+                append(" ")
+                append(getString(R.string.hanime_app_name))
+            }
             summary = getString(R.string.current_version, "v${appLocalVersionName}")
             setOnPreferenceClickListener {
                 startActivity<AboutActivity>()
@@ -78,6 +87,39 @@ class HomeSettingsFragment : YenalySettingsFragment() {
                 return@setOnPreferenceLongClickListener true
             }
         }
+        clearCache.apply {
+            val cacheDir = context.cacheDir
+            var folderSize = cacheDir?.folderSize ?: 0L
+            summary = generateClearCacheSummary(folderSize)
+            // todo: strings.xml
+            setOnPreferenceClickListener {
+                if (folderSize != 0L) {
+                    MaterialAlertDialogBuilder(context)
+                        .setTitle("請在確認一遍")
+                        .setMessage("確定要清除快取嗎？")
+                        .setPositiveButton(R.string.confirm) { _, _ ->
+                            thread {
+                                if (cacheDir?.deleteRecursively() == true) {
+                                    folderSize = cacheDir.folderSize
+                                    activity?.runOnUiThread {
+                                        showShortToast("清除成功")
+                                        summary = generateClearCacheSummary(folderSize)
+                                    }
+                                } else {
+                                    folderSize = cacheDir.folderSize
+                                    activity?.runOnUiThread {
+                                        showShortToast("清除發生意外")
+                                        summary = generateClearCacheSummary(folderSize)
+                                    }
+                                }
+                            }
+                        }
+                        .setNegativeButton(R.string.cancel, null)
+                        .show()
+                } else showShortToast("當前快取為空，無需清理哦")
+                return@setOnPreferenceClickListener true
+            }
+        }
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -119,4 +161,14 @@ class HomeSettingsFragment : YenalySettingsFragment() {
             }
         }
     }
+
+    private fun generateClearCacheSummary(size: Long): CharSequence {
+        return spannable {
+            size.formatFileSize().span {
+                style(Typeface.BOLD)
+            }
+            " ".text()
+            getString(R.string.cache_occupy).text()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/popup/CommentPopup.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/popup/CommentPopup.kt
new file mode 100644
index 00000000..6f0dc9bb
--- /dev/null
+++ b/app/src/main/java/com/yenaly/han1meviewer/ui/popup/CommentPopup.kt
@@ -0,0 +1,58 @@
+package com.yenaly.han1meviewer.ui.popup
+
+import android.content.Context
+import android.widget.EditText
+import com.google.android.material.button.MaterialButton
+import com.lxj.xpopup.core.BottomPopupView
+import com.yenaly.han1meviewer.R
+import com.yenaly.yenaly_libs.utils.unsafeLazy
+import com.yenaly.yenaly_libs.utils.view.textString
+
+/**
+ * @project Han1meViewer
+ * @author Yenaly Liew
+ * @time 2022/09/20 020 09:48
+ */
+class CommentPopup(context: Context) : BottomPopupView(context) {
+
+    private val editText by unsafeLazy { findViewById<EditText>(R.id.et_comment) }
+    private val btnSend by unsafeLazy { findViewById<MaterialButton>(R.id.btn_send) }
+
+    private var commentPrefix: String? = null
+    private var sendListener: OnClickListener? = null
+
+    override fun getImplLayoutId() = R.layout.pop_up_comment
+
+    override fun onCreate() {
+        super.onCreate()
+        editText.hint = hint
+        commentPrefix?.let(editText::append)
+        sendListener?.let(btnSend::setOnClickListener)
+    }
+
+    /**
+     * 得到你输入的内容
+     */
+    val comment get() = editText.textString()
+
+    /**
+     * 设置提示
+     */
+    var hint: CharSequence? = null
+
+    /**
+     * 设置前缀，用于回复子评论
+     *
+     * 例如：@xxx something
+     */
+    fun initCommentPrefix(username: String) {
+        commentPrefix = "@$username "
+    }
+
+    /**
+     * 设置发送按钮监听器
+     */
+    fun setOnSendListener(listener: OnClickListener) {
+        this.sendListener = listener
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/view/AdvancedMaterialSearchBar.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/view/AdvancedMaterialSearchBar.kt
new file mode 100644
index 00000000..5fba7c81
--- /dev/null
+++ b/app/src/main/java/com/yenaly/han1meviewer/ui/view/AdvancedMaterialSearchBar.kt
@@ -0,0 +1,35 @@
+package com.yenaly.han1meviewer.ui.view
+
+import android.content.Context
+import android.util.AttributeSet
+import com.mancj.materialsearchbar.MaterialSearchBar
+
+/**
+ * @project Han1meViewer
+ * @author Yenaly Liew
+ * @time 2022/09/21 021 09:10
+ */
+class AdvancedMaterialSearchBar @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : MaterialSearchBar(context, attrs) {
+
+    private var textListener: ((String?) -> Unit)? = null
+
+    fun appendText(text: String?) {
+        text?.let(searchEditText::append)
+    }
+
+    fun appendTextWithListener(text: String?) {
+        text?.let(searchEditText::append)
+        textListener?.invoke(text)
+    }
+
+    fun setTextWithListener(text: String?) {
+        searchEditText.setText(text)
+        textListener?.invoke(text)
+    }
+
+    fun setTextListener(listener: (String?) -> Unit) {
+        this.textListener = listener
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/viewmodel/CommentViewModel.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/viewmodel/CommentViewModel.kt
index 6d8276db..c86a13dc 100644
--- a/app/src/main/java/com/yenaly/han1meviewer/ui/viewmodel/CommentViewModel.kt
+++ b/app/src/main/java/com/yenaly/han1meviewer/ui/viewmodel/CommentViewModel.kt
@@ -6,7 +6,9 @@ import com.yenaly.han1meviewer.logic.NetworkRepo
 import com.yenaly.han1meviewer.logic.model.VideoCommentModel
 import com.yenaly.han1meviewer.logic.state.WebsiteState
 import com.yenaly.yenaly_libs.base.YenalyViewModel
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 
@@ -19,15 +21,62 @@ class CommentViewModel(application: Application) : YenalyViewModel(application)
 
     lateinit var code: String
 
+    var csrfToken: String? = null
+    var currentUserId: String? = null
+
     private val _videoCommentFlow =
-        MutableStateFlow<WebsiteState<MutableList<VideoCommentModel>>>(WebsiteState.Loading())
+        MutableStateFlow<WebsiteState<VideoCommentModel>>(WebsiteState.Loading())
     val videoCommentFlow = _videoCommentFlow.asStateFlow()
 
+    private val _videoReplyFlow =
+        MutableStateFlow<WebsiteState<VideoCommentModel>>(WebsiteState.Loading())
+    val videoReplyFlow = _videoReplyFlow.asStateFlow()
+
+    private val _postCommentFlow =
+        MutableSharedFlow<WebsiteState<Unit>>(replay = 0)
+    val postCommentFlow = _postCommentFlow.asSharedFlow()
+
+    private val _postReplyFlow =
+        MutableSharedFlow<WebsiteState<Unit>>(replay = 0)
+    val postReplyFlow = _postReplyFlow.asSharedFlow()
+
     fun getComment(type: String, code: String) {
         viewModelScope.launch {
-            NetworkRepo.getHanimeVideoComment(type, code).collect { comment ->
+            NetworkRepo.getComment(type, code).collect { comment ->
                 _videoCommentFlow.value = comment
             }
         }
     }
+
+    fun getCommentReply(commentId: String) {
+        viewModelScope.launch {
+            NetworkRepo.getCommentReply(commentId).collect { reply ->
+                _videoReplyFlow.value = reply
+            }
+        }
+    }
+
+    fun postComment(
+        csrfToken: String?,
+        currentUserId: String,
+        targetUserId: String,
+        type: String,
+        text: String
+    ) {
+        viewModelScope.launch {
+            NetworkRepo.postComment(csrfToken, currentUserId, targetUserId, type, text)
+                .collect(_postCommentFlow::emit)
+        }
+    }
+
+    fun postReply(
+        csrfToken: String?,
+        replyCommentId: String,
+        text: String
+    ) {
+        viewModelScope.launch {
+            NetworkRepo.postCommentReply(csrfToken, replyCommentId, text)
+                .collect(_postReplyFlow::emit)
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/viewmodel/MyListViewModel.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/viewmodel/MyListViewModel.kt
index a03b01ee..ffdceb43 100644
--- a/app/src/main/java/com/yenaly/han1meviewer/ui/viewmodel/MyListViewModel.kt
+++ b/app/src/main/java/com/yenaly/han1meviewer/ui/viewmodel/MyListViewModel.kt
@@ -21,6 +21,8 @@ import kotlinx.coroutines.launch
  */
 class MyListViewModel(application: Application) : YenalyViewModel(application) {
 
+    var csrfToken: String? = null
+
     private val _watchLaterFlow: MutableStateFlow<PageLoadingState<MyListModel>> =
         MutableStateFlow(PageLoadingState.Loading())
     val watchLaterFlow = _watchLaterFlow.asStateFlow()
diff --git a/app/src/main/res/drawable/ic_baseline_clear_all_24.xml b/app/src/main/res/drawable/ic_baseline_clear_all_24.xml
new file mode 100644
index 00000000..54ca983a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_clear_all_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M5,13h14v-2L5,11v2zM3,17h14v-2L3,15v2zM7,7v2h14L21,7L7,7z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_reply_24.xml b/app/src/main/res/drawable/ic_baseline_reply_24.xml
new file mode 100644
index 00000000..c5fba998
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_reply_24.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_send_24.xml b/app/src/main/res/drawable/ic_baseline_send_24.xml
new file mode 100644
index 00000000..3abc6cb3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_send_24.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_comment.xml b/app/src/main/res/layout/fragment_comment.xml
index 66e5db58..b41c2762 100644
--- a/app/src/main/res/layout/fragment_comment.xml
+++ b/app/src/main/res/layout/fragment_comment.xml
@@ -57,6 +57,16 @@
 
         </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/btn_comment"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end|bottom"
+            android:layout_margin="16dp"
+            android:contentDescription="@null"
+            android:src="@drawable/ic_baseline_reply_24"
+            app:layout_behavior="@string/hide_bottom_view_on_scroll_behavior" />
+
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_video_comment.xml b/app/src/main/res/layout/item_video_comment.xml
index bfc1bb95..9d05cb40 100644
--- a/app/src/main/res/layout/item_video_comment.xml
+++ b/app/src/main/res/layout/item_video_comment.xml
@@ -89,6 +89,16 @@
                     android:minHeight="0dp"
                     app:icon="@drawable/ic_baseline_thumb_down_off_alt_24" />
 
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btn_reply"
+                    style="@style/Widget.Material3.Button.TextButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:minWidth="0dp"
+                    android:text="@string/reply"
+                    app:icon="@drawable/ic_baseline_reply_24" />
+
             </LinearLayout>
 
             <Button
diff --git a/app/src/main/res/layout/layout_search_bar.xml b/app/src/main/res/layout/layout_search_bar.xml
index 4c5ae3c0..fea91100 100644
--- a/app/src/main/res/layout/layout_search_bar.xml
+++ b/app/src/main/res/layout/layout_search_bar.xml
@@ -26,7 +26,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <com.mancj.materialsearchbar.MaterialSearchBar
+        <com.yenaly.han1meviewer.ui.view.AdvancedMaterialSearchBar
             android:id="@+id/search_bar"
             style="@style/MaterialSearchBarDark"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/pop_up_comment.xml b/app/src/main/res/layout/pop_up_comment.xml
new file mode 100644
index 00000000..39fc04e8
--- /dev/null
+++ b/app/src/main/res/layout/pop_up_comment.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:colorBackground"
+    android:orientation="horizontal"
+    android:padding="4dp">
+
+    <EditText
+        android:id="@+id/et_comment"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:layout_weight="1"
+        android:background="@null"
+        android:importantForAutofill="no"
+        android:inputType="text" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btn_send"
+        style="@style/Widget.Material3.Button.IconButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:icon="@drawable/ic_baseline_send_24" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 24fc76e0..a0d43f6f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -96,4 +96,11 @@
     <string name="local_playback">本地觀看</string>
     <string name="download_path">下載路徑</string>
     <string name="help">幫助</string>
+    <string name="reply">回覆</string>
+    <string name="reply_child_comment">回覆子評論</string>
+    <string name="comment_video">評論本影片</string>
+    <string name="login_first">請先登入</string>
+    <string name="reply_warning">（輸入欄消失後輸入文字也會消失）</string>
+    <string name="clear_cache">清除快取</string>
+    <string name="cache_occupy">快取佔用</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/settings_home.xml b/app/src/main/res/xml/settings_home.xml
index aeb23818..5a6ccbdf 100644
--- a/app/src/main/res/xml/settings_home.xml
+++ b/app/src/main/res/xml/settings_home.xml
@@ -26,6 +26,11 @@
 
     <PreferenceCategory app:title="@string/other">
 
+        <Preference
+            app:icon="@drawable/ic_baseline_clear_all_24"
+            app:key="clear_cache"
+            app:title="@string/clear_cache" />
+
         <Preference
             app:icon="@drawable/ic_baseline_update_24"
             app:key="update"
diff --git a/build.gradle.kts b/build.gradle.kts
index 5fc8d826..b45ef651 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "7.2.0" apply false
-    id("com.android.library") version "7.2.0" apply false
+    id("com.android.application") version "7.2.1" apply false
+    id("com.android.library") version "7.2.1" apply false
     id("org.jetbrains.kotlin.android") version "1.6.21" apply false
 }
 
diff --git a/yenaly_libs/build.gradle.kts b/yenaly_libs/build.gradle.kts
index afe58c37..29df9629 100644
--- a/yenaly_libs/build.gradle.kts
+++ b/yenaly_libs/build.gradle.kts
@@ -5,11 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
 
     defaultConfig {
         minSdk = 20
-        targetSdk = 32
+        targetSdk = 33
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -33,8 +33,7 @@ android {
     }
     kotlinOptions {
         jvmTarget = "1.8"
-        freeCompilerArgs =
-            listOf(*kotlinOptions.freeCompilerArgs.toTypedArray(), "-opt-in=kotlin.RequiresOptIn")
+        freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"
     }
     resourcePrefix = "yenaly_"
 }
@@ -48,8 +47,8 @@ dependencies {
     api("io.github.scwang90:refresh-layout-kernel:2.0.5") // 未添加Header，Footer
 
     // 模块内使用
-    implementation("androidx.core:core-ktx:1.8.0")
-    implementation("androidx.appcompat:appcompat:1.5.0")
+    implementation("androidx.core:core-ktx:1.9.0")
+    implementation("androidx.appcompat:appcompat:1.5.1")
     implementation("com.google.android.material:material:1.6.1")
     implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")
diff --git a/yenaly_libs/src/main/java/com/yenaly/yenaly_libs/utils/FileUtil.kt b/yenaly_libs/src/main/java/com/yenaly/yenaly_libs/utils/FileUtil.kt
index c8d16bc0..cb9926fd 100644
--- a/yenaly_libs/src/main/java/com/yenaly/yenaly_libs/utils/FileUtil.kt
+++ b/yenaly_libs/src/main/java/com/yenaly/yenaly_libs/utils/FileUtil.kt
@@ -2,6 +2,7 @@
 
 package com.yenaly.yenaly_libs.utils
 
+import java.io.File
 import java.io.InputStream
 import java.io.OutputStream
 
@@ -21,3 +22,11 @@ fun InputStream.copyTo(
     }
     return bytesCopied
 }
+
+val File?.folderSize: Long
+    get() {
+        var size = 0L
+        val files = this?.listFiles()
+        files?.forEach { file -> size += if (file.isDirectory) file.folderSize else file.length() }
+        return size
+    }
\ No newline at end of file
diff --git a/yenaly_libs/src/main/java/com/yenaly/yenaly_libs/utils/view/YenalyHideBottomViewOnScrollBehavior.kt b/yenaly_libs/src/main/java/com/yenaly/yenaly_libs/utils/view/YenalyHideBottomViewOnScrollBehavior.kt
index 6056ba6d..dcea3079 100644
--- a/yenaly_libs/src/main/java/com/yenaly/yenaly_libs/utils/view/YenalyHideBottomViewOnScrollBehavior.kt
+++ b/yenaly_libs/src/main/java/com/yenaly/yenaly_libs/utils/view/YenalyHideBottomViewOnScrollBehavior.kt
@@ -20,6 +20,8 @@ import androidx.interpolator.view.animation.LinearOutSlowInInterpolator
  * The [CoordinatorLayout.Behavior] for a View within a [CoordinatorLayout] to hide the view off the
  * bottom of the screen when scrolling down, and show it when scrolling up.
  *
+ * SPECIFICALLY FOR [BottomNavigationView][com.google.android.material.bottomnavigation.BottomNavigationView].
+ *
  * @author Yenaly Liew
  * @time 2022/07/19 019 12:18
  */