[PR #2009] [MERGED] Refactor/mvvm2 #2632

New issue

Closed

opened 2026-10-14 21:03:36 +00:00 by bsakaguchi · 0 comments

bsakaguchi commented

2026-10-14 21:03:36 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/2009
Author: @vkamn
Created: 11/21/2025
Status: ✅ Merged
Merged: 4/30/2026
Merged by: @vkamn

Base: dev ← Head: refactor/mvvm2

📝 Commits (10+)

2b02c95 refactor: move business logic from servers model
a9d20c2 refactor: move containersModel initialization
2adbe38 refactor: added protocol ui controller and removed settings class from protocols model
4d6e1c6 refactor: moved cli management to separate controller
ec0f042 refactor: moved app split to separate controller
ad36e8f refactor: moved site split to separate controller
ffd3ddf refactor: moved allowed dns to separate controller
b75646f refactor: moved language logic to separate ui controller
48abcaf refactor: removed Settings from devices model
f09abef refactor: moved configs and services api logit to separate core controller

📊 Changes

469 files changed (+25960 additions, -17122 deletions)

View changed files

📝 .clang-format-ignore (+1 -1)
📝 client/CMakeLists.txt (+12 -1)
📝 client/amneziaApplication.cpp (+10 -21)
📝 client/amneziaApplication.h (+5 -3)
📝 client/android/build.gradle.kts (+0 -1)
➖ client/android/cloak/build.gradle.kts (+0 -18)
➖ client/android/cloak/src/main/kotlin/Cloak.kt (+0 -45)
📝 client/android/settings.gradle.kts (+0 -1)
📝 client/android/src/org/amnezia/vpn/VpnProto.kt (+1 -10)
📝 client/android/xray/src/main/kotlin/Xray.kt (+2 -2)
📝 client/cmake/android.cmake (+4 -4)
📝 client/cmake/macos.cmake (+2 -2)
📝 client/cmake/sources.cmake (+149 -76)
➖ client/configurators/awg_configurator.cpp (+0 -59)
➖ client/configurators/awg_configurator.h (+0 -18)
➖ client/configurators/cloak_configurator.cpp (+0 -51)
➖ client/configurators/cloak_configurator.h (+0 -20)
➖ client/configurators/configurator_base.cpp (+0 -26)
➖ client/configurators/configurator_base.h (+0 -33)
➖ client/configurators/ikev2_configurator.h (+0 -35)

...and 80 more files

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/amnezia-vpn/amnezia-client/pull/2009 **Author:** [@vkamn](https://github.com/vkamn) **Created:** 11/21/2025 **Status:** ✅ Merged **Merged:** 4/30/2026 **Merged by:** [@vkamn](https://github.com/vkamn) **Base:** `dev` ← **Head:** `refactor/mvvm2` --- ### 📝 Commits (10+) - [`2b02c95`](https://github.com/amnezia-vpn/amnezia-client/commit/2b02c95bdfd9436c27bf62426efb15df46eb1926) refactor: move business logic from servers model - [`a9d20c2`](https://github.com/amnezia-vpn/amnezia-client/commit/a9d20c2db0d89958019a14b01527f6db2dd18d28) refactor: move containersModel initialization - [`2adbe38`](https://github.com/amnezia-vpn/amnezia-client/commit/2adbe38792bdda31369d57f0c34fddfeaa737841) refactor: added protocol ui controller and removed settings class from protocols model - [`4d6e1c6`](https://github.com/amnezia-vpn/amnezia-client/commit/4d6e1c606bb498bda55592b626d53f647e2ff3e9) refactor: moved cli management to separate controller - [`ec0f042`](https://github.com/amnezia-vpn/amnezia-client/commit/ec0f042a9320daf1493adf71266cc45ed9cd84af) refactor: moved app split to separate controller - [`ad36e8f`](https://github.com/amnezia-vpn/amnezia-client/commit/ad36e8fb211cae5996a76af5ca07a0cabc6a5bf1) refactor: moved site split to separate controller - [`ffd3ddf`](https://github.com/amnezia-vpn/amnezia-client/commit/ffd3ddf10fc4e8a53028e4cfad0cc57de27285e5) refactor: moved allowed dns to separate controller - [`b75646f`](https://github.com/amnezia-vpn/amnezia-client/commit/b75646fec54c99bcb0383350dc977a0516ee4e08) refactor: moved language logic to separate ui controller - [`48abcaf`](https://github.com/amnezia-vpn/amnezia-client/commit/48abcafdbc30344ed34983b2a9c9d8a7258652ab) refactor: removed Settings from devices model - [`f09abef`](https://github.com/amnezia-vpn/amnezia-client/commit/f09abef9694e196ad3dc007d871905d08b9cc738) refactor: moved configs and services api logit to separate core controller ### 📊 Changes **469 files changed** (+25960 additions, -17122 deletions) <details> <summary>View changed files</summary> 📝 `.clang-format-ignore` (+1 -1) 📝 `client/CMakeLists.txt` (+12 -1) 📝 `client/amneziaApplication.cpp` (+10 -21) 📝 `client/amneziaApplication.h` (+5 -3) 📝 `client/android/build.gradle.kts` (+0 -1) ➖ `client/android/cloak/build.gradle.kts` (+0 -18) ➖ `client/android/cloak/src/main/kotlin/Cloak.kt` (+0 -45) 📝 `client/android/settings.gradle.kts` (+0 -1) 📝 `client/android/src/org/amnezia/vpn/VpnProto.kt` (+1 -10) 📝 `client/android/xray/src/main/kotlin/Xray.kt` (+2 -2) 📝 `client/cmake/android.cmake` (+4 -4) 📝 `client/cmake/macos.cmake` (+2 -2) 📝 `client/cmake/sources.cmake` (+149 -76) ➖ `client/configurators/awg_configurator.cpp` (+0 -59) ➖ `client/configurators/awg_configurator.h` (+0 -18) ➖ `client/configurators/cloak_configurator.cpp` (+0 -51) ➖ `client/configurators/cloak_configurator.h` (+0 -20) ➖ `client/configurators/configurator_base.cpp` (+0 -26) ➖ `client/configurators/configurator_base.h` (+0 -33) ➖ `client/configurators/ikev2_configurator.h` (+0 -35) _...and 80 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

bsakaguchi

2026-10-14 21:03:36 +00:00