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

deps versions update

Browse Source
This commit is contained in:
Sergey Solovyev
2013-06-12 23:08:44 +04:00
parent 0b902355e0
commit a00a2ac684
31 changed files with 310 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ import android.content.SharedPreferences;
import android.graphics.Color;
import android.os.Handler;
import android.preference.PreferenceManager;
import android.support.v4.app.FragmentActivity;
import android.text.Html;
import android.util.AttributeSet;
import android.util.TypedValue;
@@ -183,7 +184,11 @@ public class AndroidCalculatorDisplayView extends AutoResizeTextView implements
setTextSize(TypedValue.COMPLEX_UNIT_SP, getResources().getDimension(R.dimen.cpp_display_text_size_mobile));
}
this.setOnClickListener(new CalculatorDisplayOnClickListener(context));
if (context instanceof FragmentActivity) {
this.setOnClickListener(new CalculatorDisplayOnClickListener((FragmentActivity) context));
} else {
throw new IllegalArgumentException("Must be fragment activity, got " + context.getClass());
}
}
this.initialized = true;

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

@@ -15,7 +15,7 @@ import jscl.AngleUnit;
import jscl.NumeralBase;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.android.AViews;
import org.solovyev.android.Views;
import org.solovyev.android.calculator.core.R;
import org.solovyev.android.calculator.model.AndroidCalculatorEngine;
import org.solovyev.android.calculator.view.AngleUnitsButton;
@@ -43,7 +43,7 @@ public final class CalculatorButtons {
final float textSize = root.getContext().getResources().getDimension(R.dimen.cpp_keyboard_button_text_size_mobile);
AViews.processViewsOfType(root, DragButton.class, new AViews.ViewProcessor<DragButton>() {
Views.processViewsOfType(root, DragButton.class, new Views.ViewProcessor<DragButton>() {
@Override
public void process(@NotNull DragButton button) {
button.setTextSize(TypedValue.COMPLEX_UNIT_DIP, textSize);
@@ -68,11 +68,11 @@ public final class CalculatorButtons {
@NotNull Activity activity) {
preferences = preferences == null ? PreferenceManager.getDefaultSharedPreferences(activity) : preferences;
final boolean large = AViews.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE, activity.getResources().getConfiguration()) &&
final boolean large = Views.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE, activity.getResources().getConfiguration()) &&
CalculatorPreferences.Gui.getLayout(preferences) != CalculatorPreferences.Gui.Layout.main_calculator_mobile;
if (!large) {
if (AViews.getScreenOrientation(activity) == Configuration.ORIENTATION_PORTRAIT
if (Views.getScreenOrientation(activity) == Configuration.ORIENTATION_PORTRAIT
|| !CalculatorPreferences.Gui.autoOrientation.getPreference(preferences)) {
final DragButton equalsButton = (DragButton)activity.findViewById(R.id.cpp_button_equals);

12
android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayOnClickListener.java
View File

@@ -1,6 +1,6 @@
package org.solovyev.android.calculator;
import android.content.Context;
import android.support.v4.app.FragmentActivity;
import android.view.View;
import org.jetbrains.annotations.NotNull;
import org.solovyev.android.menu.ContextMenuBuilder;
@@ -17,10 +17,10 @@ import java.util.List;
public class CalculatorDisplayOnClickListener implements View.OnClickListener {
@NotNull
private final Context context;
private final FragmentActivity activity;
public CalculatorDisplayOnClickListener(@NotNull Context context) {
this.context = context;
public CalculatorDisplayOnClickListener(@NotNull FragmentActivity activity) {
this.activity = activity;
}
@Override
@@ -39,13 +39,13 @@ public class CalculatorDisplayOnClickListener implements View.OnClickListener {
}
if (!filteredMenuItems.isEmpty()) {
ContextMenuBuilder.newInstance(context, ListContextMenu.newInstance(filteredMenuItems)).create(displayViewState).show();
ContextMenuBuilder.newInstance(activity, "display-menu", ListContextMenu.newInstance(filteredMenuItems)).build(displayViewState).show();
}
} else {
final String errorMessage = displayViewState.getErrorMessage();
if (errorMessage != null) {
Locator.getInstance().getCalculator().fireCalculatorEvent(CalculatorEventType.show_evaluation_error, errorMessage, context);
Locator.getInstance().getCalculator().fireCalculatorEvent(CalculatorEventType.show_evaluation_error, errorMessage, activity);
}
}
}

9
android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java
View File

@@ -4,7 +4,8 @@ import android.content.SharedPreferences;
import jscl.AngleUnit;
import jscl.NumeralBase;
import org.jetbrains.annotations.NotNull;
import org.solovyev.android.AndroidUtils;
import org.solovyev.android.Android;
import org.solovyev.android.DeviceModel;
import org.solovyev.android.calculator.math.MathType;
import org.solovyev.android.calculator.model.AndroidCalculatorEngine;
import org.solovyev.android.calculator.plot.PlotLineColor;
@@ -19,6 +20,10 @@ import org.solovyev.android.view.VibratorContainer;
import java.text.DecimalFormatSymbols;
import java.util.Locale;
import static org.solovyev.android.Android.isPhoneModel;
import static org.solovyev.android.DeviceModel.samsung_galaxy_s;
import static org.solovyev.android.DeviceModel.samsung_galaxy_s_2;
/**
* User: serso
* Date: 4/20/12
@@ -166,7 +171,7 @@ public final class CalculatorPreferences {
}
if (!AndroidCalculatorEngine.Preferences.multiplicationSign.isSet(preferences)) {
if (AndroidUtils.isPhoneModel(AndroidUtils.PhoneModel.samsung_galaxy_s) || AndroidUtils.isPhoneModel(AndroidUtils.PhoneModel.samsung_galaxy_s_2)) {
if (isPhoneModel(samsung_galaxy_s) || isPhoneModel(samsung_galaxy_s_2)) {
// workaround ofr samsung galaxy s phones
AndroidCalculatorEngine.Preferences.multiplicationSign.putPreference(preferences, "*");
}