TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Sergey Solovyev 2012-01-28 01:26:45 +04:00
parent 164ed250fa
commit 3a3117210e
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/calc_editor.xml
View File

@ -14,7 +14,8 @@
<org.solovyev.android.calculator.CalculatorEditor <org.solovyev.android.calculator.CalculatorEditor
a:id="@+id/calculatorEditor" a:id="@+id/calculatorEditor"
style="@style/editor_style" style="@style/editor_style"
a:inputType="textMultiLine" a:editable="false"
a:singleLine="false"
a:scrollbars="vertical" a:scrollbars="vertical"
a:hint ="@string/c_calc_editor_hint"/> a:hint ="@string/c_calc_editor_hint"/>

11
src/main/java/org/solovyev/android/calculator/CalculatorEditor.java
View File

@ -19,7 +19,6 @@ import org.solovyev.android.calculator.model.CalculatorEngine;
import org.solovyev.android.calculator.model.CalculatorParseException; import org.solovyev.android.calculator.model.CalculatorParseException;
import org.solovyev.android.calculator.model.TextProcessor; import org.solovyev.android.calculator.model.TextProcessor;
import org.solovyev.android.calculator.view.TextHighlighter; import org.solovyev.android.calculator.view.TextHighlighter;
import org.solovyev.common.utils.CollectionsUtils;
/** /**
* User: serso * User: serso
@ -52,17 +51,9 @@ public class CalculatorEditor extends EditText implements SharedPreferences.OnSh
public boolean onCheckIsTextEditor() { public boolean onCheckIsTextEditor() {
// Main goal of this implementation is to hide android soft keyboard from appearing when working with text input // Main goal of this implementation is to hide android soft keyboard from appearing when working with text input
// todo serso: refactor
// NOTE: do not copy or reuse code below, it's completely SHIT!!!
if ( Build.VERSION.SDK_INT >= 11 ) { if ( Build.VERSION.SDK_INT >= 11 ) {
// fix for missing cursor in android 3 and higher // fix for missing cursor in android 3 and higher
for (StackTraceElement stackTraceElement : CollectionsUtils.asList(Thread.currentThread().getStackTrace())) { return true;
if ( "isCursorVisible".equals(stackTraceElement.getMethodName()) ) {
return true;
}
}
return false;
} else { } else {
return false; return false;
} }