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

Fixes

Browse Source
This commit is contained in:
serso 2016-01-30 14:00:28 +01:00
parent 37c40001d7
commit 4a9e8bf78a
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/solovyev/android/calculator/FloatingCalculatorKeyboard.java
View File

@ -172,6 +172,7 @@ public class FloatingCalculatorKeyboard extends BaseFloatingKeyboard {
@Override @Override
public void onClick(@NonNull View v) { public void onClick(@NonNull View v) {
v.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP);
switch (v.getId()) { switch (v.getId()) {
case R.id.cpp_kb_button_divide: case R.id.cpp_kb_button_divide:
user.insertOperator('/'); user.insertOperator('/');
@ -215,7 +216,6 @@ public class FloatingCalculatorKeyboard extends BaseFloatingKeyboard {
break; break;
} }
user.getEditor().requestFocus(); user.getEditor().requestFocus();
v.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP);
} }
private void onDefaultClick(@NonNull View v) { private void onDefaultClick(@NonNull View v) {

4
app/src/main/java/org/solovyev/android/calculator/functions/FunctionsActivity.java
View File

@ -52,7 +52,9 @@ public class FunctionsActivity extends BaseActivity {
if (savedInstanceState == null) { if (savedInstanceState == null) {
final Bundle extras = getIntent().getExtras(); final Bundle extras = getIntent().getExtras();
final CppFunction function = extras != null ? (CppFunction) extras.getParcelable(EXTRA_FUNCTION) : null; final CppFunction function = extras != null ? (CppFunction) extras.getParcelable(EXTRA_FUNCTION) : null;
EditFunctionFragment.showDialog(function, this); if (function != null) {
EditFunctionFragment.showDialog(function, this);
}
} }
} }

2
app/src/main/java/org/solovyev/android/calculator/variables/GreekFloatingKeyboard.java
View File

@ -118,6 +118,7 @@ public class GreekFloatingKeyboard extends BaseFloatingKeyboard implements View.
@Override @Override
public void onClick(View v) { public void onClick(View v) {
v.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP);
switch (v.getId()) { switch (v.getId()) {
case R.id.cpp_kb_button_close: case R.id.cpp_kb_button_close:
user.done(); user.done();
@ -137,7 +138,6 @@ public class GreekFloatingKeyboard extends BaseFloatingKeyboard implements View.
break; break;
} }
user.getEditor().requestFocus(); user.getEditor().requestFocus();
v.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP);
} }
private void changeCase(@NonNull Button button) { private void changeCase(@NonNull Button button) {

4
app/src/main/java/org/solovyev/android/calculator/variables/VariablesActivity.java
View File

@ -49,7 +49,9 @@ public class VariablesActivity extends BaseActivity implements CalculatorEventLi
if (savedInstanceState == null) { if (savedInstanceState == null) {
final Bundle extras = getIntent().getExtras(); final Bundle extras = getIntent().getExtras();
final CppVariable variable = extras != null ? (CppVariable) extras.getParcelable(EXTRA_VARIABLE) : null; final CppVariable variable = extras != null ? (CppVariable) extras.getParcelable(EXTRA_VARIABLE) : null;
EditVariableFragment.showDialog(variable, this); if (variable != null) {
EditVariableFragment.showDialog(variable, this);
}
} }
} }