From eeb409484172eb3a8ae5d5aac8acec255aeb1500 Mon Sep 17 00:00:00 2001 From: Kyle Horimoto Date: Thu, 22 Oct 2015 15:09:17 -0700 Subject: Don't display a nickname field when protocol is 'local.' --- app/src/main/java/org/connectbot/HostEditorFragment.java | 8 +++++++- app/src/main/res/layout/fragment_host_editor.xml | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/connectbot/HostEditorFragment.java b/app/src/main/java/org/connectbot/HostEditorFragment.java index 392e870..fd9119e 100644 --- a/app/src/main/java/org/connectbot/HostEditorFragment.java +++ b/app/src/main/java/org/connectbot/HostEditorFragment.java @@ -113,6 +113,7 @@ public class HostEditorFragment extends Fragment { private EditText mHostnameField; private View mPortContainer; private EditText mPortField; + private View mNicknameItem; private EditText mNicknameField; private View mColorItem; private TextView mColorText; @@ -259,6 +260,8 @@ public class HostEditorFragment extends Fragment { mPortField.setText(Integer.toString(mHost.getPort())); mPortField.addTextChangedListener(new HostTextFieldWatcher(HostDatabase.FIELD_HOST_PORT)); + mNicknameItem = view.findViewById(R.id.nickname_item); + setTransportType(mHost.getProtocol(), /* setDefaultPortInModel */ false); mNicknameField = (EditText) view.findViewById(R.id.nickname_field); @@ -568,16 +571,19 @@ public class HostEditorFragment extends Fragment { mHostnameContainer.setVisibility(View.VISIBLE); mPortContainer.setVisibility(View.VISIBLE); mExpandCollapseButton.setVisibility(View.VISIBLE); + mNicknameItem.setVisibility(View.VISIBLE); } else if (Telnet.getProtocolName().equals(protocol)) { mUsernameContainer.setVisibility(View.GONE); mHostnameContainer.setVisibility(View.VISIBLE); mPortContainer.setVisibility(View.VISIBLE); mExpandCollapseButton.setVisibility(View.VISIBLE); + mNicknameItem.setVisibility(View.VISIBLE); } else { // Local protocol has only one field, so no need to show the URI parts // container. setUriPartsContainerExpanded(false); - mExpandCollapseButton.setVisibility(View.INVISIBLE); + mExpandCollapseButton.setVisibility(View.GONE); + mNicknameItem.setVisibility(View.GONE); } } diff --git a/app/src/main/res/layout/fragment_host_editor.xml b/app/src/main/res/layout/fragment_host_editor.xml index faa22bc..d368d20 100644 --- a/app/src/main/res/layout/fragment_host_editor.xml +++ b/app/src/main/res/layout/fragment_host_editor.xml @@ -173,6 +173,7 @@ -- cgit v1.2.3