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

Fix text auto resizing in DisplayView

Browse Source
This commit is contained in:
serso
2016-02-06 23:57:00 +01:00
parent 667583f95f
commit 191feb6044
17 changed files with 38 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/solovyev/android/calculator/DisplayView.java
View File

@@ -24,18 +24,23 @@ package org.solovyev.android.calculator;
import android.app.Service;
import android.content.Context;
import android.content.res.Resources;
import android.support.annotation.NonNull;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.TypedValue;
import hugo.weaving.DebugLog;
import org.solovyev.android.Check;
import org.solovyev.android.calculator.text.TextProcessor;
import org.solovyev.android.calculator.text.TextProcessorEditorResult;
import org.solovyev.android.calculator.view.TextHighlighter;
import org.solovyev.android.view.AutoResizeTextView;
import org.solovyev.android.views.AutoResizeTextView;
import javax.annotation.Nonnull;
import static android.util.TypedValue.COMPLEX_UNIT_SP;
import static android.util.TypedValue.applyDimension;
@DebugLog
public class DisplayView extends AutoResizeTextView {
@Nonnull
@@ -59,15 +64,15 @@ public class DisplayView extends AutoResizeTextView {
}
private void init(@Nonnull Context context) {
final Resources resources = getResources();
setAddEllipsis(false);
setMinTextSize(10);
setMinTextSize(applyDimension(COMPLEX_UNIT_SP, 10, resources.getDisplayMetrics()));
if (context instanceof Service) {
return;
}
final Preferences.Gui.Layout layout = Preferences.Gui.getLayout(App.getPreferences());
if (!layout.optimized) {
setTextSize(TypedValue.COMPLEX_UNIT_SP, getResources().getDimension(R.dimen.cpp_display_text_size_mobile));
setTextSize(resources.getDimensionPixelSize(R.dimen.cpp_display_text_size_mobile));
}
}