Skip to content

Commit

Permalink
Custom server UX enhancement (#3470)
Browse files Browse the repository at this point in the history
* custom server UX enhancement

* custom server placeholder text not translatable
  • Loading branch information
VitorVieiraZ authored May 28, 2024
1 parent 1ea0050 commit c5f123c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
6 changes: 6 additions & 0 deletions app/qml/account/MMAccountController.qml
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,12 @@ Item {
}

onChangeServerClicked: function ( newServer ) {
// Ensure the newServer string ends with a '/'
// to format it as "https://my-server-app.com/"
if ( newServer && newServer.slice( -1 ) !== '/' ) {
newServer += '/';
}

__merginApi.apiRoot = newServer
}

Expand Down
1 change: 1 addition & 0 deletions app/qml/account/MMLoginPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ MMPage {
textFieldBackground.color: __style.lightGreenColor

text: root.apiRoot
placeholderText: "https://my-server-app.com/"
textField.inputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhNoAutoUppercase | Qt.ImhUrlCharactersOnly
}

Expand Down

0 comments on commit c5f123c

Please sign in to comment.