From 301d4f6798f54b2b302638a0d67699cc7351adfb Mon Sep 17 00:00:00 2001 From: alescdb Date: Fri, 23 Oct 2015 20:16:57 +0200 Subject: Add a setting options to always show the virtual keyboard (special keys) --- .../main/java/org/connectbot/ConsoleActivity.java | 38 +++++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) (limited to 'app/src/main/java/org/connectbot/ConsoleActivity.java') diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java index 9cdb4a5..5cc9773 100644 --- a/app/src/main/java/org/connectbot/ConsoleActivity.java +++ b/app/src/main/java/org/connectbot/ConsoleActivity.java @@ -146,6 +146,7 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne @Nullable private ActionBar actionBar; private boolean inActionBarMenu = false; private boolean titleBarHide; + private boolean keyboardAlwaysVisible = false; private ServiceConnection connection = new ServiceConnection() { public void onServiceConnected(ComponentName className, IBinder service) { @@ -436,8 +437,10 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne if (keyboardGroup.getVisibility() == View.GONE || inActionBarMenu) return; - keyboardGroup.startAnimation(keyboard_fade_out); - keyboardGroup.setVisibility(View.GONE); + if(keyboardAlwaysVisible == false) { + keyboardGroup.startAnimation(keyboard_fade_out); + keyboardGroup.setVisibility(View.GONE); + } hideActionBarIfRequested(); keyboardGroupHider = null; } @@ -445,12 +448,14 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne handler.postDelayed(keyboardGroupHider, KEYBOARD_DISPLAY_TIME); } - private void hideEmulatedKeys() { - if (keyboardGroupHider != null) - handler.removeCallbacks(keyboardGroupHider); - keyboardGroup.setVisibility(View.GONE); - hideActionBarIfRequested(); - } + private void hideEmulatedKeys() { + if(keyboardAlwaysVisible == false) { + if (keyboardGroupHider != null) + handler.removeCallbacks(keyboardGroupHider); + keyboardGroup.setVisibility(View.GONE); + } + hideActionBarIfRequested(); + } @TargetApi(11) private void requestActionBar() { @@ -504,7 +509,6 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne toolbar = (Toolbar) findViewById(R.id.toolbar); pager = (TerminalViewPager) findViewById(R.id.console_flip); - pager.addOnPageChangeListener( new TerminalViewPager.SimpleOnPageChangeListener() { @Override @@ -574,6 +578,22 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne keyboardGroup = (LinearLayout) findViewById(R.id.keyboard_group); + keyboardAlwaysVisible = prefs.getBoolean(PreferenceConstants.KEY_ALWAYS_VISIVLE, false); + if(keyboardAlwaysVisible) { + // equivalent to android:layout_above=keyboard_group + RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT); + layoutParams.addRule(RelativeLayout.ABOVE, R.id.keyboard_group); + pager.setLayoutParams(layoutParams); + + // Show virtual keyboard + keyboardGroup.setVisibility(View.VISIBLE); + + // We don't need the show keyboard button + findViewById(R.id.button_keyboard).setVisibility(View.GONE); + } + mKeyboardButton = (ImageView) findViewById(R.id.button_keyboard); mKeyboardButton.setOnClickListener(new OnClickListener() { public void onClick(View view) { -- cgit v1.2.3 From ff2eddae4a1b319b45404ce301e9d24c6f252020 Mon Sep 17 00:00:00 2001 From: alescdb Date: Fri, 23 Oct 2015 20:28:26 +0200 Subject: Code style --- .../main/java/org/connectbot/ConsoleActivity.java | 56 +++++++++++----------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'app/src/main/java/org/connectbot/ConsoleActivity.java') diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java index 5cc9773..dc77e6e 100644 --- a/app/src/main/java/org/connectbot/ConsoleActivity.java +++ b/app/src/main/java/org/connectbot/ConsoleActivity.java @@ -146,7 +146,7 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne @Nullable private ActionBar actionBar; private boolean inActionBarMenu = false; private boolean titleBarHide; - private boolean keyboardAlwaysVisible = false; + private boolean keyboardAlwaysVisible = false; private ServiceConnection connection = new ServiceConnection() { public void onServiceConnected(ComponentName className, IBinder service) { @@ -437,10 +437,10 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne if (keyboardGroup.getVisibility() == View.GONE || inActionBarMenu) return; - if(keyboardAlwaysVisible == false) { - keyboardGroup.startAnimation(keyboard_fade_out); - keyboardGroup.setVisibility(View.GONE); - } + if(keyboardAlwaysVisible == false) { + keyboardGroup.startAnimation(keyboard_fade_out); + keyboardGroup.setVisibility(View.GONE); + } hideActionBarIfRequested(); keyboardGroupHider = null; } @@ -448,14 +448,14 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne handler.postDelayed(keyboardGroupHider, KEYBOARD_DISPLAY_TIME); } - private void hideEmulatedKeys() { - if(keyboardAlwaysVisible == false) { - if (keyboardGroupHider != null) - handler.removeCallbacks(keyboardGroupHider); - keyboardGroup.setVisibility(View.GONE); - } - hideActionBarIfRequested(); - } + private void hideEmulatedKeys() { + if(keyboardAlwaysVisible == false) { + if (keyboardGroupHider != null) + handler.removeCallbacks(keyboardGroupHider); + keyboardGroup.setVisibility(View.GONE); + } + hideActionBarIfRequested(); + } @TargetApi(11) private void requestActionBar() { @@ -578,21 +578,21 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne keyboardGroup = (LinearLayout) findViewById(R.id.keyboard_group); - keyboardAlwaysVisible = prefs.getBoolean(PreferenceConstants.KEY_ALWAYS_VISIVLE, false); - if(keyboardAlwaysVisible) { - // equivalent to android:layout_above=keyboard_group - RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, - ViewGroup.LayoutParams.MATCH_PARENT); - layoutParams.addRule(RelativeLayout.ABOVE, R.id.keyboard_group); - pager.setLayoutParams(layoutParams); - - // Show virtual keyboard - keyboardGroup.setVisibility(View.VISIBLE); - - // We don't need the show keyboard button - findViewById(R.id.button_keyboard).setVisibility(View.GONE); - } + keyboardAlwaysVisible = prefs.getBoolean(PreferenceConstants.KEY_ALWAYS_VISIVLE, false); + if(keyboardAlwaysVisible) { + // equivalent to android:layout_above=keyboard_group + RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT); + layoutParams.addRule(RelativeLayout.ABOVE, R.id.keyboard_group); + pager.setLayoutParams(layoutParams); + + // Show virtual keyboard + keyboardGroup.setVisibility(View.VISIBLE); + + // We don't need the show keyboard button + findViewById(R.id.button_keyboard).setVisibility(View.GONE); + } mKeyboardButton = (ImageView) findViewById(R.id.button_keyboard); mKeyboardButton.setOnClickListener(new OnClickListener() { -- cgit v1.2.3 From 7e429b1121c6080d6dd37dd459dd89b16c2b42cd Mon Sep 17 00:00:00 2001 From: alescdb Date: Fri, 23 Oct 2015 20:32:36 +0200 Subject: Code style --- .../main/java/org/connectbot/ConsoleActivity.java | 33 +++++++++++----------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'app/src/main/java/org/connectbot/ConsoleActivity.java') diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java index dc77e6e..334c2d2 100644 --- a/app/src/main/java/org/connectbot/ConsoleActivity.java +++ b/app/src/main/java/org/connectbot/ConsoleActivity.java @@ -17,19 +17,6 @@ package org.connectbot; -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.List; - -import org.connectbot.bean.HostBean; -import org.connectbot.service.BridgeDisconnectedListener; -import org.connectbot.service.PromptHelper; -import org.connectbot.service.TerminalBridge; -import org.connectbot.service.TerminalKeyListener; -import org.connectbot.service.TerminalManager; -import org.connectbot.util.PreferenceConstants; -import org.connectbot.util.TerminalViewPager; - import android.annotation.TargetApi; import android.app.AlertDialog; import android.app.Dialog; @@ -87,6 +74,20 @@ import android.widget.ListView; import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; + +import org.connectbot.bean.HostBean; +import org.connectbot.service.BridgeDisconnectedListener; +import org.connectbot.service.PromptHelper; +import org.connectbot.service.TerminalBridge; +import org.connectbot.service.TerminalKeyListener; +import org.connectbot.service.TerminalManager; +import org.connectbot.util.PreferenceConstants; +import org.connectbot.util.TerminalViewPager; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + import de.mud.terminal.vt320; public class ConsoleActivity extends AppCompatActivity implements BridgeDisconnectedListener { @@ -437,7 +438,7 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne if (keyboardGroup.getVisibility() == View.GONE || inActionBarMenu) return; - if(keyboardAlwaysVisible == false) { + if (keyboardAlwaysVisible == false) { keyboardGroup.startAnimation(keyboard_fade_out); keyboardGroup.setVisibility(View.GONE); } @@ -449,7 +450,7 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne } private void hideEmulatedKeys() { - if(keyboardAlwaysVisible == false) { + if (keyboardAlwaysVisible == false) { if (keyboardGroupHider != null) handler.removeCallbacks(keyboardGroupHider); keyboardGroup.setVisibility(View.GONE); @@ -579,7 +580,7 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne keyboardGroup = (LinearLayout) findViewById(R.id.keyboard_group); keyboardAlwaysVisible = prefs.getBoolean(PreferenceConstants.KEY_ALWAYS_VISIVLE, false); - if(keyboardAlwaysVisible) { + if (keyboardAlwaysVisible) { // equivalent to android:layout_above=keyboard_group RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, -- cgit v1.2.3 From 21b1de2b81a40fffa2498a107874aab11da1cf03 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 24 Oct 2015 00:13:11 +0200 Subject: Update ConsoleActivity.java --- app/src/main/java/org/connectbot/ConsoleActivity.java | 3 --- 1 file changed, 3 deletions(-) (limited to 'app/src/main/java/org/connectbot/ConsoleActivity.java') diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java index 334c2d2..f36f4ce 100644 --- a/app/src/main/java/org/connectbot/ConsoleActivity.java +++ b/app/src/main/java/org/connectbot/ConsoleActivity.java @@ -590,9 +590,6 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne // Show virtual keyboard keyboardGroup.setVisibility(View.VISIBLE); - - // We don't need the show keyboard button - findViewById(R.id.button_keyboard).setVisibility(View.GONE); } mKeyboardButton = (ImageView) findViewById(R.id.button_keyboard); -- cgit v1.2.3 From 45322cfb06b7f45c1978d8ad120b099b0cef5e4a Mon Sep 17 00:00:00 2001 From: alescdb Date: Sat, 24 Oct 2015 08:51:06 +0200 Subject: Restore imports order --- .../main/java/org/connectbot/ConsoleActivity.java | 27 +++++++++++----------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'app/src/main/java/org/connectbot/ConsoleActivity.java') diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java index f36f4ce..5df0488 100644 --- a/app/src/main/java/org/connectbot/ConsoleActivity.java +++ b/app/src/main/java/org/connectbot/ConsoleActivity.java @@ -17,6 +17,19 @@ package org.connectbot; +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import org.connectbot.bean.HostBean; +import org.connectbot.service.BridgeDisconnectedListener; +import org.connectbot.service.PromptHelper; +import org.connectbot.service.TerminalBridge; +import org.connectbot.service.TerminalKeyListener; +import org.connectbot.service.TerminalManager; +import org.connectbot.util.PreferenceConstants; +import org.connectbot.util.TerminalViewPager; + import android.annotation.TargetApi; import android.app.AlertDialog; import android.app.Dialog; @@ -74,20 +87,6 @@ import android.widget.ListView; import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; - -import org.connectbot.bean.HostBean; -import org.connectbot.service.BridgeDisconnectedListener; -import org.connectbot.service.PromptHelper; -import org.connectbot.service.TerminalBridge; -import org.connectbot.service.TerminalKeyListener; -import org.connectbot.service.TerminalManager; -import org.connectbot.util.PreferenceConstants; -import org.connectbot.util.TerminalViewPager; - -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.List; - import de.mud.terminal.vt320; public class ConsoleActivity extends AppCompatActivity implements BridgeDisconnectedListener { -- cgit v1.2.3