Skip to content
Snippets Groups Projects
Commit fdbe7beb authored by Francesco's avatar Francesco
Browse files

code cleanup

parent 7f2385b0
No related branches found
No related tags found
No related merge requests found
...@@ -103,7 +103,7 @@ public class MainManager { ...@@ -103,7 +103,7 @@ public class MainManager {
lastCommands.add(input); lastCommands.add(input);
lastCommandIndex = lastCommands.size() - 1; lastCommandIndex = lastCommands.size() - 1;
input = Tuils.trimSpaces(input); input = input.trim();
input = Tuils.removeUnncesarySpaces(input); input = Tuils.removeUnncesarySpaces(input);
for (CmdTrigger trigger : triggers) { for (CmdTrigger trigger : triggers) {
......
...@@ -53,7 +53,7 @@ public class CommandTuils { ...@@ -53,7 +53,7 @@ public class CommandTuils {
if (types != null) { if (types != null) {
for (int type : types) { for (int type : types) {
input = Tuils.trimSpaces(input); input = input.trim();
if (input.length() <= 0) if (input.length() <= 0)
break; break;
......
...@@ -18,7 +18,7 @@ public class PreferencesManager { ...@@ -18,7 +18,7 @@ public class PreferencesManager {
public static final String SETTINGS_FILENAME = "settings.txt"; public static final String SETTINGS_FILENAME = "settings.txt";
public static final int SETTINGS = 10; public static final int SETTINGS = 10;
// skin values
public static final String DEVICE = "deviceColor"; public static final String DEVICE = "deviceColor";
public static final String INPUT = "inputColor"; public static final String INPUT = "inputColor";
public static final String OUTPUT = "outputColor"; public static final String OUTPUT = "outputColor";
...@@ -36,13 +36,13 @@ public class PreferencesManager { ...@@ -36,13 +36,13 @@ public class PreferencesManager {
public static final String SUGGESTION_BG = "suggestionBg"; public static final String SUGGESTION_BG = "suggestionBg";
public static final String SUGGESTION_COLOR = "suggestionColor"; public static final String SUGGESTION_COLOR = "suggestionColor";
public static final String TRANSPARENT_SUGGESTIONS = "transparentSuggestions"; public static final String TRANSPARENT_SUGGESTIONS = "transparentSuggestions";
// other values
public static final String DOUBLETAP = "closeOnDbTap"; public static final String DOUBLETAP = "closeOnDbTap";
public static final String SHOWSUGGESTIONS = "showSuggestions"; public static final String SHOWSUGGESTIONS = "showSuggestions";
// music values
public static final String PLAY_RANDOM = "playRandom"; public static final String PLAY_RANDOM = "playRandom";
public static final String SONGSFOLDER = "songsFolder"; public static final String SONGSFOLDER = "songsFolder";
// preload values
public static final String USE_SYSTEMWP = "useSystemWallpaper"; public static final String USE_SYSTEMWP = "useSystemWallpaper";
public static final String FULLSCREEN = "fullscreen"; public static final String FULLSCREEN = "fullscreen";
public static final String NOTIFICATION = "keepAliveWithNotification"; public static final String NOTIFICATION = "keepAliveWithNotification";
...@@ -51,7 +51,6 @@ public class PreferencesManager { ...@@ -51,7 +51,6 @@ public class PreferencesManager {
public static final String ALIAS_FILENAME = "alias.txt"; public static final String ALIAS_FILENAME = "alias.txt";
public static final int ALIAS = 11; public static final int ALIAS = 11;
// settings version
private static final String SETTINGS_VERSION = "settingsVersion"; private static final String SETTINGS_VERSION = "settingsVersion";
private List<String> settings; private List<String> settings;
private List<String> aliases; private List<String> aliases;
...@@ -84,7 +83,7 @@ public class PreferencesManager { ...@@ -84,7 +83,7 @@ public class PreferencesManager {
if (n != ALIAS) if (n != ALIAS)
line = line.replaceAll("\\s+", ""); line = line.replaceAll("\\s+", "");
else else
line = Tuils.trimSpaces(line); line = line.trim();
list.add(line); list.add(line);
} }
......
...@@ -63,7 +63,8 @@ public class TerminalAdapter { ...@@ -63,7 +63,8 @@ public class TerminalAdapter {
private OnNewInputListener mInputListener; private OnNewInputListener mInputListener;
public TerminalAdapter(TextView terminalView, EditText inputView, TextView prefixView, TextView submitView, SkinManager skinManager, String hint) { public TerminalAdapter(TextView terminalView, EditText inputView, TextView prefixView, TextView submitView, SkinManager skinManager,
String hint) {
if (terminalView == null || inputView == null || prefixView == null || skinManager == null) if (terminalView == null || inputView == null || prefixView == null || skinManager == null)
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
...@@ -169,7 +170,9 @@ public class TerminalAdapter { ...@@ -169,7 +170,9 @@ public class TerminalAdapter {
public void run() { public void run() {
mTerminalView.setText(Tuils.EMPTYSTRING); mTerminalView.setText(Tuils.EMPTYSTRING);
for(CharSequence sequence : newText) { for(CharSequence sequence : newText) {
sequence = Tuils.trimWhitespaces(sequence);
if(isInput(sequence)) { if(isInput(sequence)) {
mTerminalView.append(Tuils.NEWLINE);
mTerminalView.append(getSpannable(sequence.toString(), INPUT)); mTerminalView.append(getSpannable(sequence.toString(), INPUT));
mTerminalView.append(Tuils.NEWLINE); mTerminalView.append(Tuils.NEWLINE);
} else { } else {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment