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

Numeral system converter

Browse Source
This commit is contained in:
serso
2016-04-19 22:45:37 +02:00
parent f066e84250
commit ae4c7ec11f
18 changed files with 259 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/solovyev/android/calculator/functions/BaseFunctionFragment.java
View File

@@ -25,7 +25,6 @@ package org.solovyev.android.calculator.functions;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.DialogInterface;
import android.content.res.Resources;
import android.graphics.Typeface;
import android.os.Bundle;
import android.support.annotation.LayoutRes;
@@ -352,12 +351,6 @@ public abstract class BaseFunctionFragment extends BaseDialogFragment implements
return getActivity();
}
@NonNull
@Override
public Resources getResources() {
return BaseFunctionFragment.this.getResources();
}
@NonNull
@Override
public EditText getEditor() {
@@ -475,14 +468,11 @@ public abstract class BaseFunctionFragment extends BaseDialogFragment implements
@Override
public void insertText(@NonNull CharSequence text, int selectionOffset) {
final int start = clampSelection(bodyView.getSelectionStart());
final int end = clampSelection(bodyView.getSelectionEnd());
final Editable e = bodyView.getText();
e.replace(start, end, text);
EditTextCompat.insert(text, bodyView);
if (selectionOffset != 0) {
final int selection = clampSelection(bodyView.getSelectionEnd());
final int newSelection = selection + selectionOffset;
if (newSelection >= 0 && newSelection < e.length()) {
if (newSelection >= 0 && newSelection < bodyView.getText().length()) {
bodyView.setSelection(newSelection);
}
}