[PR #1339] [MERGED] bugfix: ui fixes after merge with android tab navigation branch #2322

Closed
opened 2026-10-13 21:20:53 +00:00 by bsakaguchi · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/1339
Author: @Nethius
Created: 1/3/2025
Status: ✅ Merged
Merged: 1/8/2025
Merged by: @Nethius

Base: dev ← Head: bugfix/ui-fixes-after-android-tab-navigation


📝 Commits (9)

  • f1c782f bugfix: ui fixes after merge with android tab navigation branch
  • 95bba6e fix crash on quit
  • ba2b674 fix typos
  • cf270d9 remove useless comment
  • a79a909 fix trigger behavior for ListViewWithRadioButtonType
  • 522e5b3 bugfix: fixed dropdown listview scrolling
  • 02bd0b8 bugfix: fixed amfree availability display
  • f8750e4 Merge branch 'bugfix/ui-fixes-after-android-tab-navigation' of github.com:amnezia-vpn/amnezia-client into bugfix/ui-fixes-after-android-tab-navigation
  • d49d951 chore: remove item existence check in triggerCurrentItem function

📊 Changes

16 files changed (+63 additions, -112 deletions)

View changed files

📝 client/ui/controllers/focusController.cpp (+8 -9)
📝 client/ui/controllers/focusController.h (+5 -5)
📝 client/ui/models/apiServicesModel.cpp (+2 -2)
📝 client/ui/qml/Controls2/DrawerType2.qml (+2 -2)
📝 client/ui/qml/Controls2/DropDownType.qml (+7 -19)
📝 client/ui/qml/Controls2/ListViewWithRadioButtonType.qml (+2 -0)
📝 client/ui/qml/Controls2/PageType.qml (+0 -1)
📝 client/ui/qml/Pages2/PageHome.qml (+4 -4)
📝 client/ui/qml/Pages2/PageProtocolAwgSettings.qml (+2 -22)
📝 client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml (+0 -2)
📝 client/ui/qml/Pages2/PageProtocolWireGuardClientSettings.qml (+0 -2)
📝 client/ui/qml/Pages2/PageProtocolWireGuardSettings.qml (+0 -20)
📝 client/ui/qml/Pages2/PageSettingsApiLanguageList.qml (+5 -5)
📝 client/ui/qml/Pages2/PageSettingsApplication.qml (+0 -7)
📝 client/ui/qml/Pages2/PageSettingsDns.qml (+0 -7)
📝 client/ui/qml/Pages2/PageShare.qml (+26 -5)

📄 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/1339 **Author:** [@Nethius](https://github.com/Nethius) **Created:** 1/3/2025 **Status:** ✅ Merged **Merged:** 1/8/2025 **Merged by:** [@Nethius](https://github.com/Nethius) **Base:** `dev` ← **Head:** `bugfix/ui-fixes-after-android-tab-navigation` --- ### 📝 Commits (9) - [`f1c782f`](https://github.com/amnezia-vpn/amnezia-client/commit/f1c782f5fc25174b46d1c0ecf5897f4e11031848) bugfix: ui fixes after merge with android tab navigation branch - [`95bba6e`](https://github.com/amnezia-vpn/amnezia-client/commit/95bba6ef052649b0811b551faf6066841fe7bc24) fix crash on quit - [`ba2b674`](https://github.com/amnezia-vpn/amnezia-client/commit/ba2b6744b90765568a62b7b808d74c9fdc0e551a) fix typos - [`cf270d9`](https://github.com/amnezia-vpn/amnezia-client/commit/cf270d98cdc78e91b15ca88ec76d2b225fdd0bc9) remove useless comment - [`a79a909`](https://github.com/amnezia-vpn/amnezia-client/commit/a79a9096e77091815595ad4e34b2b1711153e050) fix trigger behavior for `ListViewWithRadioButtonType` - [`522e5b3`](https://github.com/amnezia-vpn/amnezia-client/commit/522e5b3d2467a44809d3072d2048ccfb8b5dcf52) bugfix: fixed dropdown listview scrolling - [`02bd0b8`](https://github.com/amnezia-vpn/amnezia-client/commit/02bd0b837ca8e6a2fd0229d8c389359addc65282) bugfix: fixed amfree availability display - [`f8750e4`](https://github.com/amnezia-vpn/amnezia-client/commit/f8750e412a7730e60154d1516389215f4e68f987) Merge branch 'bugfix/ui-fixes-after-android-tab-navigation' of github.com:amnezia-vpn/amnezia-client into bugfix/ui-fixes-after-android-tab-navigation - [`d49d951`](https://github.com/amnezia-vpn/amnezia-client/commit/d49d951be77101f1cad7328422f265683b32432c) chore: remove item existence check in triggerCurrentItem function ### 📊 Changes **16 files changed** (+63 additions, -112 deletions) <details> <summary>View changed files</summary> 📝 `client/ui/controllers/focusController.cpp` (+8 -9) 📝 `client/ui/controllers/focusController.h` (+5 -5) 📝 `client/ui/models/apiServicesModel.cpp` (+2 -2) 📝 `client/ui/qml/Controls2/DrawerType2.qml` (+2 -2) 📝 `client/ui/qml/Controls2/DropDownType.qml` (+7 -19) 📝 `client/ui/qml/Controls2/ListViewWithRadioButtonType.qml` (+2 -0) 📝 `client/ui/qml/Controls2/PageType.qml` (+0 -1) 📝 `client/ui/qml/Pages2/PageHome.qml` (+4 -4) 📝 `client/ui/qml/Pages2/PageProtocolAwgSettings.qml` (+2 -22) 📝 `client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml` (+0 -2) 📝 `client/ui/qml/Pages2/PageProtocolWireGuardClientSettings.qml` (+0 -2) 📝 `client/ui/qml/Pages2/PageProtocolWireGuardSettings.qml` (+0 -20) 📝 `client/ui/qml/Pages2/PageSettingsApiLanguageList.qml` (+5 -5) 📝 `client/ui/qml/Pages2/PageSettingsApplication.qml` (+0 -7) 📝 `client/ui/qml/Pages2/PageSettingsDns.qml` (+0 -7) 📝 `client/ui/qml/Pages2/PageShare.qml` (+26 -5) </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-13 21:20:53 +00:00
Sign in to join this conversation.
No labels
pull-request
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
amnezia-vpn/amnezia-client#2322
No description provided.