Skip to content

Cleanups - #61

Merged
Goooler merged 5 commits into
trunkfrom
g/20260416/cleanups
Apr 16, 2026
Merged

Goooler merged 5 commits into
trunkfrom
g/20260416/cleanups

Conversation

@Goooler

@Goooler Goooler commented Apr 16, 2026

Copy link
Copy Markdown
Owner

No description provided.

This comment was marked as duplicate.

Goooler added 4 commits April 16, 2026 16:01
# Conflicts:
#	app/src/main/java/com/github/kr328/clash/AppCrashedActivity.kt
#	app/src/main/java/com/github/kr328/clash/BaseActivity.kt
#	app/src/main/java/com/github/kr328/clash/ExternalControlActivity.kt
#	app/src/main/java/com/github/kr328/clash/LogcatActivity.kt
#	app/src/main/java/com/github/kr328/clash/LogcatService.kt
#	app/src/main/java/com/github/kr328/clash/MetaFeatureSettingsActivity.kt
#	app/src/main/java/com/github/kr328/clash/NewProfileActivity.kt
#	app/src/main/java/com/github/kr328/clash/OverrideSettingsActivity.kt
#	app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt
#	app/src/main/java/com/github/kr328/clash/SettingsActivity.kt
#	app/src/main/java/com/github/kr328/clash/TileService.kt
#	app/src/main/java/com/github/kr328/clash/log/LogcatReader.kt
#	app/src/main/java/com/github/kr328/clash/store/TipsStore.kt
#	app/src/main/java/com/github/kr328/clash/util/Content.kt
#	common/src/main/java/com/github/kr328/clash/common/compat/Html.kt
#	common/src/main/java/com/github/kr328/clash/common/compat/Resource.kt
#	common/src/main/java/com/github/kr328/clash/common/compat/View.kt
#	common/src/main/java/com/github/kr328/clash/common/constants/Metadata.kt
#	core/src/main/java/com/github/kr328/clash/core/Clash.kt
#	core/src/main/java/com/github/kr328/clash/core/model/ProxyGroup.kt
#	core/src/main/java/com/github/kr328/clash/core/model/TunnelState.kt
#	design/src/main/java/com/github/kr328/clash/design/AppSettingsDesign.kt
#	design/src/main/java/com/github/kr328/clash/design/NetworkSettingsDesign.kt
#	design/src/main/java/com/github/kr328/clash/design/OverrideSettingsDesign.kt
#	design/src/main/java/com/github/kr328/clash/design/component/ProxyPageFactory.kt
#	design/src/main/java/com/github/kr328/clash/design/store/UiStore.kt
#	service/src/main/java/com/github/kr328/clash/service/ClashService.kt
#	service/src/main/java/com/github/kr328/clash/service/ProfileManager.kt
#	service/src/main/java/com/github/kr328/clash/service/ProfileProcessor.kt
#	service/src/main/java/com/github/kr328/clash/service/StatusProvider.kt
#	service/src/main/java/com/github/kr328/clash/service/TunService.kt
#	service/src/main/java/com/github/kr328/clash/service/clash/module/NetworkObserveModule.kt
#	service/src/main/java/com/github/kr328/clash/service/store/ServiceStore.kt
#	service/src/main/java/com/github/kr328/clash/service/util/Files.kt
@Goooler
Goooler merged commit 5e85d8f into trunk Apr 16, 2026
1 check passed
@Goooler
Goooler deleted the g/20260416/cleanups branch April 16, 2026 08:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants