Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

在 debug 模式下显示弹幕正则过滤设置 #712

Merged
merged 2 commits into from
Aug 6, 2024
Merged

Conversation

Him188
Copy link
Member

@Him188 Him188 commented Aug 6, 2024

No description provided.

@Him188 Him188 added the s: 弹幕 子系统: 弹幕 danmaku label Aug 6, 2024
rdlwicked and others added 2 commits August 7, 2024 03:49
* added DanmakuFilterConfig

* added DanmakuFilterConfig

* Revert "added DanmakuFilterConfig"

This reverts commit c370ad25c61f464d923b66bd8e316a67ce7d6010.

* add DanmukuRegexFilterGroup.kt and implemented filter list

* Fixed DanmakuHost preview

* Changed DanmakuRegexFilterGroup to using a ElevatedFilterChip

* added RegexFilterItem check when adding filter

* fixed regex detection and Uuid Import bug

* added danmaku filter in DanmakuCollection.kt

* deleted unnecessary file and fixed dependency

* Revert "deleted unnecessary file and fixed dependency"

This reverts commit 7ce4b73.

* deleted unnecessary dependency

* Update app/shared/src/commonMain/kotlin/data/repositories/SettingsRepository.kt

Co-authored-by: Him188 <Him188@mamoe.net>

* Update app/shared/src/commonMain/kotlin/ui/subject/episode/video/settings/DanmakuRegexFilterGroup.kt

Co-authored-by: Him188 <Him188@mamoe.net>

* Update app/shared/src/commonMain/kotlin/ui/subject/episode/video/settings/DanmakuRegexFilterGroup.kt

Co-authored-by: Him188 <Him188@mamoe.net>

* Update danmaku/ui/commonMain/DanmakuRegexFilterConfig.kt

Co-authored-by: Him188 <Him188@mamoe.net>

* deleted unnecessary dependency and calls according to discussion

* deleted serializer for danmukuRegexFilterConfig

* Fixed DanmakuRegexFilterGroup's display problem, fixed DanmakuRegexFilterConfig UUID default id problem

* Fixed DanmakuCollection re compiling order, fixed race condition in state.list, fixed order of update list and requestRepopulate

* Fixed unnecessary errorMessage, fixed java regex instead of kotlin, fixed remember instead of rememberSavable

* resolved unnecessary import in SettingsRepository

* added comment and tests

* fixed merge error

* Update danmaku/ui/commonMain/DanmakuRegexFilterConfig.kt

Co-authored-by: Him188 <Him188@mamoe.net>

* Update app/shared/src/commonMain/kotlin/ui/subject/episode/video/settings/DanmakuRegexFilterGroup.kt

Co-authored-by: Him188 <Him188@mamoe.net>

* turn DanmakuRegexFilterConfig on by default

* changed default danmakuconfig object

* changed all danmakuRegexConfigOn to enabled

* 修复错误的EpisodeVideoSettingsPreview

* 创建了 DanmakuRegexFilterConfigDao 和 DanmakuRegexFilterConfigEntity,将过滤设置移到datastore

* Revert "创建了 DanmakuRegexFilterConfigDao 和 DanmakuRegexFilterConfigEntity,将过滤设置移到datastore"

This reverts commit b43bd54.

* 为DanmakuFilter创建了单独的DataStore

* changed instanceID to id

Co-authored-by: Him188 <Him188@mamoe.net>

* 删除了actual, expect。在SettingStore里重新构建datastore

* 删除了多余的文件

* 新建了DanmakuRegexFilterRepository

* 适配了新的datastore,更改了DanmakuRegexFilter的attribute名称,修复了format problems

* 修复了preview

* 使用Deafault

* 提取了重复的Test object

* 删除了不必要的actual

* 将actions提取出来避免大量参数

* 写入slot,删除actions

* 删除DanmakuFilterConfig

* 更改FilterListtest

* 添加了一个简单的Filter Test

* 添加了DanmakuFilterConfig

* 删除了FilterListTest

* showConfirmDelete 改成了 rememberSaveable

* 简化了弹幕过滤UI

* 更改了filter测试

---------

Co-authored-by: Him188 <Him188@mamoe.net>
@Him188 Him188 enabled auto-merge (rebase) August 6, 2024 19:49
@Him188 Him188 merged commit 2a22306 into master Aug 6, 2024
8 checks passed
@Him188 Him188 deleted the danmaku-filter branch August 6, 2024 21:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
s: 弹幕 子系统: 弹幕 danmaku
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants