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 +++++++++++++++++----- .../org/connectbot/util/PreferenceConstants.java | 3 +- app/src/main/res/values/strings.xml | 2 ++ app/src/main/res/xml-v14/preferences.xml | 9 ++++- app/src/main/res/xml/preferences.xml | 7 ++++ 5 files changed, 48 insertions(+), 11 deletions(-) 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) { diff --git a/app/src/main/java/org/connectbot/util/PreferenceConstants.java b/app/src/main/java/org/connectbot/util/PreferenceConstants.java index fe80f24..ae9ab04 100644 --- a/app/src/main/java/org/connectbot/util/PreferenceConstants.java +++ b/app/src/main/java/org/connectbot/util/PreferenceConstants.java @@ -48,7 +48,8 @@ public class PreferenceConstants { public static final String TITLEBARHIDE = "titlebarhide"; public static final String PG_UPDN_GESTURE = "pgupdngesture"; - public static final String KEYMODE = "keymode"; + public static final String KEYMODE = "keymode"; + public static final String KEY_ALWAYS_VISIVLE = "alwaysvisible"; public static final String KEYMODE_RIGHT = "Use right-side keys"; public static final String KEYMODE_LEFT = "Use left-side keys"; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e5dfeef..925f55f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -643,5 +643,7 @@ Discard Keep editing + Keyboard always visible + Always show the special keys diff --git a/app/src/main/res/xml-v14/preferences.xml b/app/src/main/res/xml-v14/preferences.xml index 9e76c36..b1eb274 100644 --- a/app/src/main/res/xml-v14/preferences.xml +++ b/app/src/main/res/xml-v14/preferences.xml @@ -114,7 +114,14 @@ - + + + + Date: Fri, 23 Oct 2015 20:28:26 +0200 Subject: Code style --- .../main/java/org/connectbot/ConsoleActivity.java | 56 +++++++++++----------- .../org/connectbot/util/PreferenceConstants.java | 4 +- app/src/main/res/xml-v14/preferences.xml | 16 +++---- app/src/main/res/xml/preferences.xml | 12 ++--- 4 files changed, 44 insertions(+), 44 deletions(-) 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() { diff --git a/app/src/main/java/org/connectbot/util/PreferenceConstants.java b/app/src/main/java/org/connectbot/util/PreferenceConstants.java index ae9ab04..3dd9aa5 100644 --- a/app/src/main/java/org/connectbot/util/PreferenceConstants.java +++ b/app/src/main/java/org/connectbot/util/PreferenceConstants.java @@ -48,8 +48,8 @@ public class PreferenceConstants { public static final String TITLEBARHIDE = "titlebarhide"; public static final String PG_UPDN_GESTURE = "pgupdngesture"; - public static final String KEYMODE = "keymode"; - public static final String KEY_ALWAYS_VISIVLE = "alwaysvisible"; + public static final String KEYMODE = "keymode"; + public static final String KEY_ALWAYS_VISIVLE = "alwaysvisible"; public static final String KEYMODE_RIGHT = "Use right-side keys"; public static final String KEYMODE_LEFT = "Use left-side keys"; diff --git a/app/src/main/res/xml-v14/preferences.xml b/app/src/main/res/xml-v14/preferences.xml index b1eb274..bd5e67c 100644 --- a/app/src/main/res/xml-v14/preferences.xml +++ b/app/src/main/res/xml-v14/preferences.xml @@ -114,14 +114,14 @@ - - - + + - + 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(-) 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 b1cda7f1e67c8d7f91c01b679d34f46f0d591955 Mon Sep 17 00:00:00 2001 From: alescdb Date: Fri, 23 Oct 2015 20:47:19 +0200 Subject: Code style (xml) spaces -> tab --- app/src/main/res/values/strings.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 925f55f..3fdb16f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -18,8 +18,7 @@ */ --> - + "Simple, powerful, open-source SSH client." @@ -643,7 +642,7 @@ Discard Keep editing - Keyboard always visible - Always show the special keys + Keyboard always visible + Always show the special keys -- cgit v1.2.3 From a67cc634407382c638267abbeab53b2e85fa8e79 Mon Sep 17 00:00:00 2001 From: alescdb Date: Fri, 23 Oct 2015 21:13:15 +0200 Subject: Remove summary and change title --- app/src/main/res/values/strings.xml | 3 +-- app/src/main/res/xml-v14/preferences.xml | 1 - app/src/main/res/xml/preferences.xml | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3fdb16f..0afd1f1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -643,6 +643,5 @@ Keep editing - Keyboard always visible - Always show the special keys + Special keys always visible diff --git a/app/src/main/res/xml-v14/preferences.xml b/app/src/main/res/xml-v14/preferences.xml index bd5e67c..7c495b1 100644 --- a/app/src/main/res/xml-v14/preferences.xml +++ b/app/src/main/res/xml-v14/preferences.xml @@ -117,7 +117,6 @@ diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index fe7e122..2774834 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -117,7 +117,6 @@ -- 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(-) 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(-) 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 From e6310a2c2a215e562d09c09483ef0fe66d832924 Mon Sep 17 00:00:00 2001 From: alescdb Date: Sat, 24 Oct 2015 08:58:07 +0200 Subject: Resource context & french translation --- app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values/strings.xml | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1203926..3c5973b 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -69,6 +69,7 @@ Comment changer l\'orientation de l\'écran suivant si le clavier est déplié Masquer automatiquement la barre de titre Appuyez sur console pour montrer la barre de titre et accèder au menu + Toujours afficher les touches spéciales Plein écran Cacher la barre de notifications lorsque la console est active Clavier diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0afd1f1..ae8302a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -222,6 +222,9 @@ "Tap console to show title bar and access menu" + + Special keys always visible + "Page up/down gesture" @@ -642,6 +645,4 @@ Discard Keep editing - - Special keys always visible -- cgit v1.2.3 From 8f792489ea758103d90d5db3c602511ef11af7f5 Mon Sep 17 00:00:00 2001 From: alescdb Date: Sat, 24 Oct 2015 09:03:28 +0200 Subject: Restore (unused) ns in string.xlm --- app/src/main/res/values/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ae8302a..72de965 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -18,7 +18,8 @@ */ --> - + "Simple, powerful, open-source SSH client." -- cgit v1.2.3 From 054e934eae5889367ce6acda8355187b6534f701 Mon Sep 17 00:00:00 2001 From: alescdb Date: Sat, 24 Oct 2015 09:06:21 +0200 Subject: Extra tabs removed --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 72de965..5d87367 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -19,7 +19,7 @@ --> + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "Simple, powerful, open-source SSH client." -- cgit v1.2.3 From 9246476694b74fce0a97cfd7945c7bba5ae18d86 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 26 Oct 2015 19:52:10 +0100 Subject: Better context for translators --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1d1f78b..e3aa67d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -219,7 +219,7 @@ "Tap console to show title bar and access menu" - + Special keys always visible -- cgit v1.2.3 From 04f13572b3cedf328c76bcdcfc61e90e2df4366b Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 26 Oct 2015 19:54:02 +0100 Subject: Better context for translators --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e3aa67d..45ef38c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -219,7 +219,7 @@ "Tap console to show title bar and access menu" - + Special keys always visible -- cgit v1.2.3