Skip to content

Commit d739d80

Browse files
authored
Fix node port input field (#943)
1 parent 91384b8 commit d739d80

File tree

2 files changed

+43
-41
lines changed

2 files changed

+43
-41
lines changed

app/src/main/res/layout/prompt_editnode.xml

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -13,53 +13,44 @@
1313
android:layout_marginEnd="16dp"
1414
android:orientation="vertical">
1515

16-
<LinearLayout
16+
17+
<com.google.android.material.textfield.TextInputLayout
18+
android:id="@+id/etNodeHost"
19+
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
1720
android:layout_width="match_parent"
1821
android:layout_height="wrap_content"
19-
android:layout_marginTop="@dimen/header_top"
20-
android:orientation="horizontal"
21-
android:weightSum="10">
22+
app:errorEnabled="true">
2223

23-
<com.google.android.material.textfield.TextInputLayout
24-
android:id="@+id/etNodeHost"
25-
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
26-
android:layout_width="0dp"
24+
<com.google.android.material.textfield.TextInputEditText
25+
style="@style/MoneroEdit"
26+
android:layout_width="match_parent"
2727
android:layout_height="wrap_content"
28-
android:layout_weight="8"
29-
app:errorEnabled="true">
28+
android:hint="@string/node_address_hint"
29+
android:imeOptions="actionNext"
30+
android:inputType="text"
31+
android:maxLines="1"
32+
android:textAlignment="textStart"
33+
tools:text="node.supportxmr.com" />
34+
</com.google.android.material.textfield.TextInputLayout>
3035

31-
<com.google.android.material.textfield.TextInputEditText
32-
style="@style/MoneroEdit"
33-
android:layout_width="match_parent"
34-
android:layout_height="wrap_content"
35-
android:hint="@string/node_address_hint"
36-
android:imeOptions="actionNext"
37-
android:inputType="text"
38-
android:maxLines="1"
39-
android:textAlignment="textStart"
40-
tools:text="node.supportxmr.com" />
41-
</com.google.android.material.textfield.TextInputLayout>
36+
<com.google.android.material.textfield.TextInputLayout
37+
android:id="@+id/etNodePort"
38+
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
39+
android:layout_width="match_parent"
40+
android:layout_height="wrap_content"
41+
app:errorEnabled="true">
4242

43-
<com.google.android.material.textfield.TextInputLayout
44-
android:id="@+id/etNodePort"
45-
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
46-
android:layout_width="0dp"
43+
<com.google.android.material.textfield.TextInputEditText
44+
style="@style/MoneroEdit"
45+
android:layout_width="match_parent"
4746
android:layout_height="wrap_content"
48-
android:layout_weight="2"
49-
app:errorEnabled="true">
50-
51-
<com.google.android.material.textfield.TextInputEditText
52-
style="@style/MoneroEdit"
53-
android:layout_width="match_parent"
54-
android:layout_height="wrap_content"
55-
android:hint="@string/node_port_hint"
56-
android:imeOptions="actionNext"
57-
android:inputType="text"
58-
android:maxLines="1"
59-
android:textAlignment="textStart"
60-
tools:text="18089" />
61-
</com.google.android.material.textfield.TextInputLayout>
62-
</LinearLayout>
47+
android:hint="@string/node_port_hint"
48+
android:imeOptions="actionNext"
49+
android:inputType="text"
50+
android:maxLines="1"
51+
android:textAlignment="textStart"
52+
tools:text="18089" />
53+
</com.google.android.material.textfield.TextInputLayout>
6354

6455
<com.google.android.material.textfield.TextInputLayout
6556
android:id="@+id/etNodeName"
@@ -126,6 +117,16 @@
126117
</com.google.android.material.textfield.TextInputLayout>
127118
</LinearLayout>
128119

120+
121+
<CheckBox
122+
android:id="@+id/etNodeSSL"
123+
android:layout_marginTop="@dimen/data_top"
124+
android:layout_width="match_parent"
125+
android:layout_height="wrap_content"
126+
android:text="@string/node_use_ssl"
127+
android:checked="true"
128+
android:visibility="gone" />
129+
129130
<RelativeLayout
130131
android:layout_width="match_parent"
131132
android:layout_height="wrap_content"

app/src/main/res/values/strings.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@
331331
<string name="node_height">Last block updated: %1$s</string>
332332
<string name="label_nodes">Nodes</string>
333333
<string name="node_name_hint">Node Name (Optional)</string>
334-
<string name="node_address_hint">Hostname</string>
334+
<string name="node_address_hint">Hostname or IP</string>
335335
<string name="node_port_hint">Port</string>
336336
<string name="node_user_hint">Username (Optional)</string>
337337
<string name="node_pass_hint">Password (Optional)</string>
@@ -352,6 +352,7 @@
352352
<string name="node_pull_hint">Add nodes manually or pull down to scan</string>
353353
<string name="node_scanning">Scanning network&#8230;</string>
354354
<string name="node_nobookmark">Automatically bookmarked best %1$d nodes</string>
355+
<string name="node_use_ssl">Use SSL</string>
355356
<string name="label_test">Test</string><!--note: as in "Test a network connection"-->
356357

357358
<string name="send_address_hint">Receiver</string>

0 commit comments

Comments
 (0)