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

fix for simple layout

Browse Source
This commit is contained in:
Sergey Solovyev
2013-06-25 13:26:45 +04:00
parent 334470bce4
commit 9399172ff1
6 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android-app-core/src/main/java/org/solovyev/android/calculator/AndroidCalculatorDisplayView.java
View File

@@ -180,7 +180,7 @@ public class AndroidCalculatorDisplayView extends AutoResizeTextView implements
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
final CalculatorPreferences.Gui.Layout layout = CalculatorPreferences.Gui.getLayout(preferences);
if (layout == CalculatorPreferences.Gui.Layout.main_calculator_mobile) {
if (!layout.isOptimized()) {
setTextSize(TypedValue.COMPLEX_UNIT_SP, getResources().getDimension(R.dimen.cpp_display_text_size_mobile));
}

4
android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
View File

@@ -40,7 +40,7 @@ public final class CalculatorButtons {
public static void processButtons(@Nonnull CalculatorPreferences.Gui.Theme theme,
@Nonnull CalculatorPreferences.Gui.Layout layout,
@Nonnull View root) {
if (layout == CalculatorPreferences.Gui.Layout.main_calculator_mobile) {
if (!layout.isOptimized()) {
final float textSize = root.getContext().getResources().getDimension(R.dimen.cpp_keyboard_button_text_size_mobile);
@@ -70,7 +70,7 @@ public final class CalculatorButtons {
preferences = preferences == null ? PreferenceManager.getDefaultSharedPreferences(activity) : preferences;
final boolean large = Views.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE, activity.getResources().getConfiguration()) &&
CalculatorPreferences.Gui.getLayout(preferences) != CalculatorPreferences.Gui.Layout.main_calculator_mobile;
CalculatorPreferences.Gui.getLayout(preferences).isOptimized();
if (!large) {
if (Views.getScreenOrientation(activity) == Configuration.ORIENTATION_PORTRAIT