Skip to content

Commit

Permalink
Merge pull request #4043
Browse files Browse the repository at this point in the history
7954661 Android: disable simple mode (malinero)
22a1509 Android: hide local node settings (malinero)
499eeee Android: hide log tab (malinero)
8cf76cf Android: hide mining tab (malinero)
6441d99 Android: useRemoteNode default to true (malinero)
  • Loading branch information
luigi1111 committed Dec 2, 2022
2 parents 1735154 + 7954661 commit 2ade733
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -1395,7 +1395,7 @@ ApplicationWindow {
property bool historyShowAdvanced: false
property bool historyHumanDates: true
property string blockchainDataDir: ""
property bool useRemoteNode: false
property bool useRemoteNode: isAndroid
property string remoteNodeAddress: "" // TODO: drop after v0.17.2.0 release
property string remoteNodesSerialized: JSON.stringify({
selected: 0,
Expand Down
5 changes: 3 additions & 2 deletions pages/Advanced.qml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ ColumnLayout {
active: state == "Mining"
text: qsTr("Mining") + translationManager.emptyString
onSelected: state = "Mining"
visible: !isAndroid
}
MoneroComponents.NavbarItem {
active: state == "Prove"
Expand Down Expand Up @@ -81,7 +82,7 @@ ColumnLayout {
Layout.fillWidth: true
Layout.preferredHeight: panelHeight
color: "transparent"
state: "Mining"
state: isAndroid ? "Prove" : "Mining"

onCurrentViewChanged: {
if (previousView) {
Expand Down Expand Up @@ -120,7 +121,7 @@ ColumnLayout {

StackView {
id: stackView
initialItem: stateView.miningView
initialItem: isAndroid ? stateView.prooveView : stateView.miningView
anchors.fill: parent
clip: false // otherwise animation will affect left panel

Expand Down
1 change: 1 addition & 0 deletions pages/settings/Settings.qml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ ColumnLayout {
active: settingsStateView.state == "Log"
text: qsTr("Log") + translationManager.emptyString
onSelected: settingsStateView.state = "Log"
visible: !isAndroid
}
MoneroComponents.NavbarItem {
active: settingsStateView.state == "Info"
Expand Down
1 change: 1 addition & 0 deletions pages/settings/SettingsNode.qml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ Rectangle{
Layout.fillWidth: true
Layout.preferredHeight: 90
color: "transparent"
visible: !isAndroid

Rectangle {
id: localNodeDivider
Expand Down
2 changes: 1 addition & 1 deletion wizard/WizardModeSelection.qml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Rectangle {
property alias pageHeight: pageRoot.height
property string viewName: "wizardModeSelection1"
property bool portable: persistentSettings.portable
property bool simpleModeAvailable: !isTails && appWindow.persistentSettings.nettype == 0
property bool simpleModeAvailable: !isTails && appWindow.persistentSettings.nettype == 0 && !isAndroid

function applyWalletMode(mode, wizardState) {
if (!persistentSettings.setPortable(portable)) {
Expand Down

0 comments on commit 2ade733

Please sign in to comment.