Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix node port input field #797 #943

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 41 additions & 40 deletions app/src/main/res/layout/prompt_editnode.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,53 +13,44 @@
android:layout_marginEnd="16dp"
android:orientation="vertical">

<LinearLayout

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/etNodeHost"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/header_top"
android:orientation="horizontal"
android:weightSum="10">
app:errorEnabled="true">

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/etNodeHost"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="0dp"
<com.google.android.material.textfield.TextInputEditText
style="@style/MoneroEdit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="8"
app:errorEnabled="true">
android:hint="@string/node_address_hint"
android:imeOptions="actionNext"
android:inputType="text"
android:maxLines="1"
android:textAlignment="textStart"
tools:text="node.supportxmr.com" />
</com.google.android.material.textfield.TextInputLayout>

<com.google.android.material.textfield.TextInputEditText
style="@style/MoneroEdit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/node_address_hint"
android:imeOptions="actionNext"
android:inputType="text"
android:maxLines="1"
android:textAlignment="textStart"
tools:text="node.supportxmr.com" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/etNodePort"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:errorEnabled="true">

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/etNodePort"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="0dp"
<com.google.android.material.textfield.TextInputEditText
style="@style/MoneroEdit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="2"
app:errorEnabled="true">

<com.google.android.material.textfield.TextInputEditText
style="@style/MoneroEdit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/node_port_hint"
android:imeOptions="actionNext"
android:inputType="text"
android:maxLines="1"
android:textAlignment="textStart"
tools:text="18089" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
android:hint="@string/node_port_hint"
android:imeOptions="actionNext"
android:inputType="text"
android:maxLines="1"
android:textAlignment="textStart"
tools:text="18089" />
</com.google.android.material.textfield.TextInputLayout>

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/etNodeName"
Expand Down Expand Up @@ -126,6 +117,16 @@
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>


<CheckBox
android:id="@+id/etNodeSSL"
android:layout_marginTop="@dimen/data_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/node_use_ssl"
android:checked="true"
android:visibility="gone" />

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@
<string name="node_height">Last block updated: %1$s</string>
<string name="label_nodes">Nodes</string>
<string name="node_name_hint">Node Name (Optional)</string>
<string name="node_address_hint">Hostname</string>
<string name="node_address_hint">Hostname or IP</string>
<string name="node_port_hint">Port</string>
<string name="node_user_hint">Username (Optional)</string>
<string name="node_pass_hint">Password (Optional)</string>
Expand All @@ -351,6 +351,7 @@
<string name="node_pull_hint">Add nodes manually or pull down to scan</string>
<string name="node_scanning">Scanning network&#8230;</string>
<string name="node_nobookmark">Automatically bookmarked best %1$d nodes</string>
<string name="node_use_ssl">Use SSL</string>
<string name="label_test">Test</string><!--note: as in "Test a network connection"-->

<string name="send_address_hint">Receiver</string>
Expand Down