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

Editor text size

Browse Source
This commit is contained in:
serso
2016-02-22 13:19:30 +01:00
parent 8658fd9fe5
commit 282d17ad1c
17 changed files with 39 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,7 +65,10 @@ public class EditorView extends EditTextCompat {
}
private void init() {
Adjuster.adjustText(this, 0.25f);
if (!isFloatingCalculator()) {
Adjuster.adjustText(this, 0.22f,
getResources().getDimensionPixelSize(R.dimen.cpp_min_editor_text_size));
}
addTextChangedListener(new MyTextWatcher());
dontShowSoftInputOnFocusCompat();
// changes should only be reported after the view has been set up completely, i.e. now
@@ -86,7 +89,7 @@ public class EditorView extends EditTextCompat {
Check.isMainThread();
// we don't want to be notified about changes we make ourselves
reportChanges = false;
if (App.getTheme().light && getContext() instanceof FloatingCalculatorService) {
if (App.getTheme().light && isFloatingCalculator()) {
// don't need formatting
setText(state.getTextString());
} else {
@@ -96,6 +99,10 @@ public class EditorView extends EditTextCompat {
reportChanges = true;
}
private boolean isFloatingCalculator() {
return getContext() instanceof FloatingCalculatorService;
}
@Override
protected void onSelectionChanged(int start, int end) {
Check.isMainThread();

16
app/src/main/java/org/solovyev/android/views/Adjuster.java
View File

@@ -1,5 +1,7 @@
package org.solovyev.android.views;
import static android.graphics.Matrix.MSCALE_Y;
import android.graphics.drawable.Drawable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@@ -9,18 +11,20 @@ import android.view.ViewTreeObserver;
import android.widget.ImageView;
import android.widget.TextView;
import static android.graphics.Matrix.MSCALE_Y;
public class Adjuster {
private static final float[] MATRIX = new float[9];
public static void adjustText(@NonNull final TextView view, final float percentage) {
adjustText(view, percentage, 0);
}
public static void adjustText(@NonNull final TextView view, final float percentage, final float minTextSizePxs) {
ViewTreeObserver treeObserver = getTreeObserver(view);
if (treeObserver == null) {
return;
}
treeObserver.addOnPreDrawListener(new TextViewAdjuster(view, percentage));
treeObserver.addOnPreDrawListener(new TextViewAdjuster(view, percentage, minTextSizePxs));
}
@Nullable
@@ -47,11 +51,13 @@ public class Adjuster {
@NonNull
private final TextView view;
private final float percentage;
private final float minTextSizePxs;
private int lastHeight;
public TextViewAdjuster(@NonNull TextView view, float percentage) {
public TextViewAdjuster(@NonNull TextView view, float percentage, float minTextSizePxs) {
this.view = view;
this.percentage = percentage;
this.minTextSizePxs = minTextSizePxs;
}
@Override
@@ -62,7 +68,7 @@ public class Adjuster {
}
lastHeight = height;
final float oldTextSize = Math.round(view.getTextSize());
final float newTextSize = Math.round(height * percentage);
final float newTextSize = Math.max(minTextSizePxs, Math.round(height * percentage));
if (oldTextSize == newTextSize) {
return true;
}