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

Buttons

Browse Source
This commit is contained in:
Sergey Solovyev 2012-09-28 00:45:03 +04:00
parent 8882cb32ee
commit c8440e18a5
14 changed files with 986 additions and 869 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

225
calculatorpp/src/main/java/org/solovyev/android/calculator/AbstractCalculatorHelper.java Normal file
View File

@ -0,0 +1,225 @@
package org.solovyev.android.calculator;
import android.app.Activity;
import android.content.SharedPreferences;
import android.os.Vibrator;
import android.preference.PreferenceManager;
import android.util.Log;
import android.view.MotionEvent;
import android.view.View;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.android.calculator.history.CalculatorHistoryState;
import org.solovyev.android.calculator.view.AngleUnitsButton;
import org.solovyev.android.calculator.view.NumeralBasesButton;
import org.solovyev.android.calculator.view.OnDragListenerVibrator;
import org.solovyev.android.history.HistoryDragProcessor;
import org.solovyev.android.view.drag.*;
import org.solovyev.common.Announcer;
import org.solovyev.common.math.Point2d;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.List;
/**
* User: serso
* Date: 9/28/12
* Time: 12:12 AM
*/
public abstract class AbstractCalculatorHelper implements SharedPreferences.OnSharedPreferenceChangeListener {
@NotNull
private CalculatorPreferences.Gui.Layout layout;
@Nullable
private Vibrator vibrator;
@NotNull
private final Announcer<DragPreferencesChangeListener> dpclRegister = new Announcer<DragPreferencesChangeListener>(DragPreferencesChangeListener.class);
@NotNull
private String logTag = "CalculatorActivity";
protected AbstractCalculatorHelper() {
}
protected AbstractCalculatorHelper(@NotNull String logTag) {
this.logTag = logTag;
}
protected void onCreate(@NotNull Activity activity) {
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
vibrator = (Vibrator) activity.getSystemService(Activity.VIBRATOR_SERVICE);
layout = CalculatorPreferences.Gui.layout.getPreferenceNoError(preferences);
preferences.registerOnSharedPreferenceChangeListener(this);
}
public void logDebug(@NotNull String message) {
Log.d(logTag, message);
}
public void processButtons(@NotNull final Activity activity, @NotNull View root) {
dpclRegister.clear();
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
final SimpleOnDragListener.Preferences dragPreferences = SimpleOnDragListener.getPreferences(preferences, activity);
setOnDragListeners(root, dragPreferences, preferences);
final OnDragListener historyOnDragListener = new OnDragListenerVibrator(newOnDragListener(new HistoryDragProcessor<CalculatorHistoryState>(getCalculator()), dragPreferences), vibrator, preferences);
final DragButton historyButton = getButton(root, R.id.historyButton);
if (historyButton != null) {
historyButton.setOnDragListener(historyOnDragListener);
}
final DragButton subtractionButton = getButton(root, R.id.subtractionButton);
if (subtractionButton != null) {
subtractionButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new SimpleOnDragListener.DragProcessor() {
@Override
public boolean processDragEvent(@NotNull DragDirection dragDirection, @NotNull DragButton dragButton, @NotNull Point2d startPoint2d, @NotNull MotionEvent motionEvent) {
if (dragDirection == DragDirection.down) {
CalculatorActivity.operatorsButtonClickHandler(activity);
return true;
}
return false;
}
}, dragPreferences), vibrator, preferences));
}
final OnDragListener toPositionOnDragListener = new OnDragListenerVibrator(new SimpleOnDragListener(new CursorDragProcessor(), dragPreferences), vibrator, preferences);
final DragButton rightButton = getButton(root, R.id.rightButton);
if (rightButton != null) {
rightButton.setOnDragListener(toPositionOnDragListener);
}
final DragButton leftButton = getButton(root, R.id.leftButton);
if (leftButton != null) {
leftButton.setOnDragListener(toPositionOnDragListener);
}
final DragButton equalsButton = getButton(root, R.id.equalsButton);
if (equalsButton != null) {
equalsButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new EvalDragProcessor(), dragPreferences), vibrator, preferences));
}
final AngleUnitsButton angleUnitsButton = (AngleUnitsButton) getButton(root, R.id.sixDigitButton);
if (angleUnitsButton != null) {
angleUnitsButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new CalculatorButtons.AngleUnitsChanger(activity), dragPreferences), vibrator, preferences));
}
final NumeralBasesButton clearButton = (NumeralBasesButton) getButton(root, R.id.clearButton);
if (clearButton != null) {
clearButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new CalculatorButtons.NumeralBasesChanger(activity), dragPreferences), vibrator, preferences));
}
final DragButton varsButton = getButton(root, R.id.varsButton);
if (varsButton != null) {
varsButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new CalculatorButtons.VarsDragProcessor(activity), dragPreferences), vibrator, preferences));
}
final DragButton roundBracketsButton = getButton(root, R.id.roundBracketsButton);
if (roundBracketsButton != null) {
roundBracketsButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new CalculatorButtons.RoundBracketsDragProcessor(), dragPreferences), vibrator, preferences));
}
if (layout == CalculatorPreferences.Gui.Layout.simple) {
toggleButtonDirectionText(root, R.id.oneDigitButton, false, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.twoDigitButton, false, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.threeDigitButton, false, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.sixDigitButton, false, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.sevenDigitButton, false, DragDirection.left, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.eightDigitButton, false, DragDirection.left, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.clearButton, false, DragDirection.left, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.fourDigitButton, false, DragDirection.down);
toggleButtonDirectionText(root, R.id.fiveDigitButton, false, DragDirection.down);
toggleButtonDirectionText(root, R.id.nineDigitButton, false, DragDirection.left);
toggleButtonDirectionText(root, R.id.multiplicationButton, false, DragDirection.left);
toggleButtonDirectionText(root, R.id.plusButton, false, DragDirection.down, DragDirection.up);
}
}
private void toggleButtonDirectionText(@NotNull View root, int id, boolean showDirectionText, @NotNull DragDirection... dragDirections) {
final View v = getButton(root, id);
if (v instanceof DirectionDragButton ) {
final DirectionDragButton button = (DirectionDragButton)v;
for (DragDirection dragDirection : dragDirections) {
button.showDirectionText(showDirectionText, dragDirection);
}
}
}
@NotNull
private Calculator getCalculator() {
return CalculatorLocatorImpl.getInstance().getCalculator();
}
private void setOnDragListeners(@NotNull View root, @NotNull SimpleOnDragListener.Preferences dragPreferences, @NotNull SharedPreferences preferences) {
final OnDragListener onDragListener = new OnDragListenerVibrator(newOnDragListener(new DigitButtonDragProcessor(getKeyboard()), dragPreferences), vibrator, preferences);
final List<Integer> dragButtonIds = new ArrayList<Integer>();
for (Field field : R.id.class.getDeclaredFields()) {
int modifiers = field.getModifiers();
if (Modifier.isFinal(modifiers) && Modifier.isStatic(modifiers)) {
try {
int viewId = field.getInt(R.id.class);
final View view = root.findViewById(viewId);
if (view instanceof DragButton) {
dragButtonIds.add(viewId);
}
} catch (IllegalAccessException e) {
Log.e(R.id.class.getName(), e.getMessage());
}
}
}
for (Integer dragButtonId : dragButtonIds) {
final DragButton button = getButton(root, dragButtonId);
if (button != null) {
button.setOnDragListener(onDragListener);
}
}
}
@NotNull
private CalculatorKeyboard getKeyboard() {
return CalculatorLocatorImpl.getInstance().getKeyboard();
}
@Nullable
private <T extends DragButton> T getButton(@NotNull View root, int buttonId) {
return (T) root.findViewById(buttonId);
}
@NotNull
private SimpleOnDragListener newOnDragListener(@NotNull SimpleOnDragListener.DragProcessor dragProcessor,
@NotNull SimpleOnDragListener.Preferences dragPreferences) {
final SimpleOnDragListener onDragListener = new SimpleOnDragListener(dragProcessor, dragPreferences);
dpclRegister.addListener(onDragListener);
return onDragListener;
}
@Override
public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
if (key != null && key.startsWith("org.solovyev.android.calculator.DragButtonCalibrationActivity")) {
dpclRegister.announce().onDragPreferencesChange(SimpleOnDragListener.getPreferences(preferences, CalculatorApplication.getInstance()));
}
}
public void onDestroy(@NotNull Activity activity) {
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
preferences.unregisterOnSharedPreferenceChangeListener(this);
}
}

11
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
View File

@ -84,7 +84,7 @@ public class CalculatorActivity extends SherlockFragmentActivity implements Shar
getSupportActionBar().hide(); getSupportActionBar().hide();
} }
CalculatorKeyboardFragment.fixThemeParameters(true, activityHelper.getTheme(), this.getWindow().getDecorView()); CalculatorButtons.processButtons(true, activityHelper.getTheme(), this.getWindow().getDecorView());
FragmentUtils.createFragment(this, CalculatorEditorFragment.class, R.id.editorContainer, "editor"); FragmentUtils.createFragment(this, CalculatorEditorFragment.class, R.id.editorContainer, "editor");
FragmentUtils.createFragment(this, CalculatorDisplayFragment.class, R.id.displayContainer, "display"); FragmentUtils.createFragment(this, CalculatorDisplayFragment.class, R.id.displayContainer, "display");
@ -113,7 +113,7 @@ public class CalculatorActivity extends SherlockFragmentActivity implements Shar
toggleOrientationChange(preferences); toggleOrientationChange(preferences);
CalculatorKeyboardFragment.toggleEqualsButton(preferences, this, activityHelper.getTheme(), findViewById(R.id.main_layout)); CalculatorButtons.toggleEqualsButton(preferences, this, activityHelper.getTheme(), findViewById(R.id.main_layout));
preferences.registerOnSharedPreferenceChangeListener(this); preferences.registerOnSharedPreferenceChangeListener(this);
} }
@ -210,13 +210,6 @@ public class CalculatorActivity extends SherlockFragmentActivity implements Shar
getCalculator().evaluate(); getCalculator().evaluate();
} }
@Override
protected void onPause() {
super.onPause();
activityHelper.onPause(this);
}
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();

4
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityHelper.java
View File

@ -3,6 +3,7 @@ package org.solovyev.android.calculator;
import android.app.Activity; import android.app.Activity;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.view.View;
import com.actionbarsherlock.app.SherlockFragmentActivity; import com.actionbarsherlock.app.SherlockFragmentActivity;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@ -29,6 +30,7 @@ public interface CalculatorActivityHelper {
void onResume(@NotNull Activity activity); void onResume(@NotNull Activity activity);
void onDestroy(@NotNull SherlockFragmentActivity activity); void onDestroy(@NotNull SherlockFragmentActivity activity);
void onDestroy(@NotNull Activity activity);
void addTab(@NotNull SherlockFragmentActivity activity, void addTab(@NotNull SherlockFragmentActivity activity,
@NotNull String tag, @NotNull String tag,
@ -40,5 +42,5 @@ public interface CalculatorActivityHelper {
void logDebug(@NotNull String message); void logDebug(@NotNull String message);
void onPause(@NotNull SherlockFragmentActivity activity); void processButtons(@NotNull Activity activity, @NotNull View root);
} }

19
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityHelperImpl.java
View File

@ -5,7 +5,6 @@ import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.util.Log;
import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockFragmentActivity; import com.actionbarsherlock.app.SherlockFragmentActivity;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -21,7 +20,7 @@ import java.util.List;
* Date: 9/25/12 * Date: 9/25/12
* Time: 10:32 PM * Time: 10:32 PM
*/ */
public class CalculatorActivityHelperImpl implements CalculatorActivityHelper { public class CalculatorActivityHelperImpl extends AbstractCalculatorHelper implements CalculatorActivityHelper {
/* /*
********************************************************************** **********************************************************************
@ -51,12 +50,10 @@ public class CalculatorActivityHelperImpl implements CalculatorActivityHelper {
private CalculatorPreferences.Gui.Theme theme; private CalculatorPreferences.Gui.Theme theme;
private int navPosition = 0; private int navPosition = 0;
@NotNull
private String logTag = "CalculatorActivity";
public CalculatorActivityHelperImpl(int layoutId, @NotNull String logTag) { public CalculatorActivityHelperImpl(int layoutId, @NotNull String logTag) {
super(logTag);
this.layoutId = layoutId; this.layoutId = layoutId;
this.logTag = logTag;
} }
public CalculatorActivityHelperImpl(int layoutId, boolean homeIcon) { public CalculatorActivityHelperImpl(int layoutId, boolean homeIcon) {
@ -66,7 +63,7 @@ public class CalculatorActivityHelperImpl implements CalculatorActivityHelper {
@Override @Override
public void onCreate(@NotNull Activity activity, @Nullable Bundle savedInstanceState) { public void onCreate(@NotNull Activity activity, @Nullable Bundle savedInstanceState) {
Log.d(logTag + ": helper", "onCreate"); super.onCreate(activity);
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity); final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
@ -99,11 +96,6 @@ public class CalculatorActivityHelperImpl implements CalculatorActivityHelper {
} }
} }
@Override
public void logDebug(@NotNull String message) {
Log.d(logTag, message);
}
@Override @Override
public void onSaveInstanceState(@NotNull SherlockFragmentActivity activity, @NotNull Bundle outState) { public void onSaveInstanceState(@NotNull SherlockFragmentActivity activity, @NotNull Bundle outState) {
onSaveInstanceState((Activity) activity, outState); onSaveInstanceState((Activity) activity, outState);
@ -126,10 +118,7 @@ public class CalculatorActivityHelperImpl implements CalculatorActivityHelper {
@Override @Override
public void onDestroy(@NotNull SherlockFragmentActivity activity) { public void onDestroy(@NotNull SherlockFragmentActivity activity) {
} super.onDestroy(activity);
@Override
public void onPause(@NotNull SherlockFragmentActivity activity) {
} }
@Override @Override

244
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java Normal file
View File

@ -0,0 +1,244 @@
package org.solovyev.android.calculator;
import android.app.Activity;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.preference.PreferenceManager;
import android.util.Log;
import android.view.Display;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.Toast;
import jscl.AngleUnit;
import jscl.NumeralBase;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.android.AndroidUtils;
import org.solovyev.android.calculator.model.AndroidCalculatorEngine;
import org.solovyev.android.calculator.view.AngleUnitsButton;
import org.solovyev.android.calculator.view.NumeralBasesButton;
import org.solovyev.android.view.ColorButton;
import org.solovyev.android.view.drag.DragButton;
import org.solovyev.android.view.drag.DragDirection;
import org.solovyev.android.view.drag.SimpleOnDragListener;
import org.solovyev.common.math.Point2d;
/**
* User: serso
* Date: 9/28/12
* Time: 12:06 AM
*/
public final class CalculatorButtons {
private CalculatorButtons () {
}
public static void processButtons(boolean fixMagicFlames,
@NotNull CalculatorPreferences.Gui.Theme theme,
@NotNull View root) {
if (theme.getThemeType() == CalculatorPreferences.Gui.ThemeType.metro) {
if (fixMagicFlames) {
// for metro themes we should turn off magic flames
AndroidUtils.processViewsOfType(root, ColorButton.class, new AndroidUtils.ViewProcessor<ColorButton>() {
@Override
public void process(@NotNull ColorButton colorButton) {
colorButton.setDrawMagicFlame(false);
}
});
}
}
}
static void initMultiplicationButton(@NotNull View root) {
final View multiplicationButton = root.findViewById(R.id.multiplicationButton);
if ( multiplicationButton instanceof Button) {
((Button) multiplicationButton).setText(CalculatorLocatorImpl.getInstance().getEngine().getMultiplicationSign());
}
}
public static void toggleEqualsButton(@Nullable SharedPreferences preferences,
@NotNull Activity activity,
@NotNull CalculatorPreferences.Gui.Theme theme,
@NotNull View root) {
preferences = preferences == null ? PreferenceManager.getDefaultSharedPreferences(activity) : preferences;
if (AndroidUtils.getScreenOrientation(activity) == Configuration.ORIENTATION_PORTRAIT || !CalculatorPreferences.Gui.autoOrientation.getPreference(preferences)) {
final Display display = activity.getWindowManager().getDefaultDisplay();
final DragButton button = (DragButton)activity.findViewById(R.id.equalsButton);
if (CalculatorPreferences.Gui.showEqualsButton.getPreference(preferences)) {
button.setLayoutParams(new LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.FILL_PARENT, 1f));
if (display.getWidth() <= 480) {
// mobile phones
final AndroidCalculatorDisplayView calculatorDisplayView = getCalculatorDisplayView();
if (calculatorDisplayView != null) {
calculatorDisplayView.setBackgroundDrawable(null);
}
}
} else {
button.setLayoutParams(new LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.FILL_PARENT, 0f));
if (display.getWidth() <= 480) {
// mobile phones
final AndroidCalculatorDisplayView calculatorDisplayView = getCalculatorDisplayView();
if (calculatorDisplayView != null) {
calculatorDisplayView.setBackgroundDrawable(activity.getResources().getDrawable(R.drawable.equals9));
}
}
}
processButtons(false, theme, root);
}
}
@Nullable
private static AndroidCalculatorDisplayView getCalculatorDisplayView() {
return (AndroidCalculatorDisplayView) CalculatorLocatorImpl.getInstance().getDisplay().getView();
}
/*
**********************************************************************
*
* STATIC CLASSES
*
**********************************************************************
*/
static class RoundBracketsDragProcessor implements SimpleOnDragListener.DragProcessor {
@Override
public boolean processDragEvent(@NotNull DragDirection dragDirection, @NotNull DragButton dragButton, @NotNull Point2d startPoint2d, @NotNull MotionEvent motionEvent) {
final boolean result;
if (dragDirection == DragDirection.left) {
getKeyboard().roundBracketsButtonPressed();
result = true;
} else {
result = new DigitButtonDragProcessor(getKeyboard()).processDragEvent(dragDirection, dragButton, startPoint2d, motionEvent);
}
return result;
}
}
@NotNull
private static CalculatorKeyboard getKeyboard() {
return CalculatorLocatorImpl.getInstance().getKeyboard();
}
static class VarsDragProcessor implements SimpleOnDragListener.DragProcessor {
@NotNull
private Context context;
VarsDragProcessor(Context context) {
this.context = context;
}
@Override
public boolean processDragEvent(@NotNull DragDirection dragDirection,
@NotNull DragButton dragButton,
@NotNull Point2d startPoint2d,
@NotNull MotionEvent motionEvent) {
boolean result = false;
if (dragDirection == DragDirection.up) {
CalculatorActivityLauncher.createVar(context, CalculatorLocatorImpl.getInstance().getDisplay());
result = true;
}
return result;
}
}
static class AngleUnitsChanger implements SimpleOnDragListener.DragProcessor {
@NotNull
private final DigitButtonDragProcessor processor;
@NotNull
private final Context context;
AngleUnitsChanger(@NotNull Context context) {
this.context = context;
this.processor = new DigitButtonDragProcessor(CalculatorLocatorImpl.getInstance().getKeyboard());
}
@Override
public boolean processDragEvent(@NotNull DragDirection dragDirection,
@NotNull DragButton dragButton,
@NotNull Point2d startPoint2d,
@NotNull MotionEvent motionEvent) {
boolean result = false;
if (dragButton instanceof AngleUnitsButton) {
if (dragDirection != DragDirection.left) {
final String directionText = ((AngleUnitsButton) dragButton).getText(dragDirection);
if (directionText != null) {
try {
final AngleUnit angleUnits = AngleUnit.valueOf(directionText);
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
AndroidCalculatorEngine.Preferences.angleUnit.putPreference(preferences, angleUnits);
Toast.makeText(context, context.getString(R.string.c_angle_units_changed_to, angleUnits.name()), Toast.LENGTH_LONG).show();
result = true;
} catch (IllegalArgumentException e) {
Log.d(this.getClass().getName(), "Unsupported angle units: " + directionText);
}
}
} else if (dragDirection == DragDirection.left) {
result = processor.processDragEvent(dragDirection, dragButton, startPoint2d, motionEvent);
}
}
return result;
}
}
static class NumeralBasesChanger implements SimpleOnDragListener.DragProcessor {
@NotNull
private final Context context;
NumeralBasesChanger(@NotNull Context context) {
this.context = context;
}
@Override
public boolean processDragEvent(@NotNull DragDirection dragDirection,
@NotNull DragButton dragButton,
@NotNull Point2d startPoint2d,
@NotNull MotionEvent motionEvent) {
boolean result = false;
if (dragButton instanceof NumeralBasesButton) {
final String directionText = ((NumeralBasesButton) dragButton).getText(dragDirection);
if (directionText != null) {
try {
final NumeralBase numeralBase = NumeralBase.valueOf(directionText);
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
AndroidCalculatorEngine.Preferences.numeralBase.putPreference(preferences, numeralBase);
Toast.makeText(context, context.getString(R.string.c_numeral_base_changed_to, numeralBase.name()), Toast.LENGTH_LONG).show();
result = true;
} catch (IllegalArgumentException e) {
Log.d(this.getClass().getName(), "Unsupported numeral base: " + directionText);
}
}
}
return result;
}
}
}

7
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelper.java
View File

@ -1,6 +1,7 @@
package org.solovyev.android.calculator; package org.solovyev.android.calculator;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.view.View;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
/** /**
@ -13,4 +14,10 @@ public interface CalculatorFragmentHelper {
boolean isPane(@NotNull Fragment fragment); boolean isPane(@NotNull Fragment fragment);
void setPaneTitle(@NotNull Fragment fragment, int titleResId); void setPaneTitle(@NotNull Fragment fragment, int titleResId);
void processButtons(@NotNull Fragment fragment, @NotNull View root);
void onCreate(@NotNull Fragment fragment);
void onDestroy(@NotNull Fragment fragment);
} }

75
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelperImpl.java
View File

@ -1,30 +1,45 @@
package org.solovyev.android.calculator; package org.solovyev.android.calculator;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
/** /**
* User: serso * User: serso
* Date: 9/26/12 * Date: 9/26/12
* Time: 10:14 PM * Time: 10:14 PM
*/ */
public class CalculatorFragmentHelperImpl implements CalculatorFragmentHelper { public class CalculatorFragmentHelperImpl extends AbstractCalculatorHelper implements CalculatorFragmentHelper {
@Override @Override
public boolean isPane(@NotNull Fragment fragment) { public boolean isPane(@NotNull Fragment fragment) {
return fragment.getActivity() instanceof CalculatorActivity; return fragment.getActivity() instanceof CalculatorActivity;
} }
public void setPaneTitle(@NotNull Fragment fragment, int titleResId) { public void setPaneTitle(@NotNull Fragment fragment, int titleResId) {
final TextView fragmentTitle = (TextView) fragment.getView().findViewById(R.id.fragmentTitle); final TextView fragmentTitle = (TextView) fragment.getView().findViewById(R.id.fragmentTitle);
if (fragmentTitle != null) { if (fragmentTitle != null) {
if (!isPane(fragment)) { if (!isPane(fragment)) {
fragmentTitle.setVisibility(View.GONE); fragmentTitle.setVisibility(View.GONE);
} else { } else {
fragmentTitle.setText(fragment.getString(titleResId).toUpperCase()); fragmentTitle.setText(fragment.getString(titleResId).toUpperCase());
} }
} }
} }
}
@Override
public void processButtons(@NotNull Fragment fragment, @NotNull View root) {
super.processButtons(fragment.getActivity(), root);
}
@Override
public void onCreate(@NotNull Fragment fragment) {
super.onCreate(fragment.getActivity());
}
@Override
public void onDestroy(@NotNull Fragment fragment) {
super.onDestroy(fragment.getActivity());
}
}

611
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardFragment.java
View File

@ -1,492 +1,119 @@
package org.solovyev.android.calculator; package org.solovyev.android.calculator;
import android.app.Activity; import android.content.SharedPreferences;
import android.content.Context; import android.os.Bundle;
import android.content.SharedPreferences; import android.preference.PreferenceManager;
import android.content.res.Configuration; import android.view.LayoutInflater;
import android.os.Bundle; import android.view.View;
import android.os.Vibrator; import android.view.ViewGroup;
import android.preference.PreferenceManager; import com.actionbarsherlock.app.SherlockFragment;
import android.support.v4.app.Fragment; import org.jetbrains.annotations.NotNull;
import android.util.Log; import org.jetbrains.annotations.Nullable;
import android.view.*; import org.solovyev.android.calculator.model.AndroidCalculatorEngine;
import android.widget.Button;
import android.widget.LinearLayout; /**
import android.widget.Toast; * User: Solovyev_S
import com.actionbarsherlock.app.SherlockFragment; * Date: 25.09.12
import jscl.AngleUnit; * Time: 12:25
import jscl.NumeralBase; */
import org.jetbrains.annotations.NotNull; public class CalculatorKeyboardFragment extends SherlockFragment implements SharedPreferences.OnSharedPreferenceChangeListener {
import org.jetbrains.annotations.Nullable;
import org.solovyev.android.AndroidUtils; @NotNull
import org.solovyev.android.calculator.history.CalculatorHistoryState; private NumeralBaseButtons numeralBaseButtons = new NumeralBaseButtons();
import org.solovyev.android.calculator.model.AndroidCalculatorEngine;
import org.solovyev.android.calculator.view.AngleUnitsButton; @NotNull
import org.solovyev.android.calculator.view.NumeralBasesButton; private CalculatorPreferences.Gui.Theme theme;
import org.solovyev.android.calculator.view.OnDragListenerVibrator;
import org.solovyev.android.history.HistoryDragProcessor; @NotNull
import org.solovyev.android.view.ColorButton; private CalculatorFragmentHelper fragmentHelper;
import org.solovyev.android.view.drag.*;
import org.solovyev.common.Announcer; @Override
import org.solovyev.common.math.Point2d; public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
import java.lang.reflect.Field;
import java.lang.reflect.Modifier; final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this.getActivity());
import java.util.ArrayList;
import java.util.List; fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper();
fragmentHelper.onCreate(this);
/**
* User: Solovyev_S preferences.registerOnSharedPreferenceChangeListener(this);
* Date: 25.09.12
* Time: 12:25 theme = CalculatorPreferences.Gui.theme.getPreferenceNoError(preferences);
*/
public class CalculatorKeyboardFragment extends SherlockFragment implements SharedPreferences.OnSharedPreferenceChangeListener { }
@Nullable @Override
private Vibrator vibrator; public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
return inflater.inflate(R.layout.calc_keyboard, container, false);
@NotNull }
private final Announcer<DragPreferencesChangeListener> dpclRegister = new Announcer<DragPreferencesChangeListener>(DragPreferencesChangeListener.class);
@Override
@NotNull public void onViewCreated(View root, Bundle savedInstanceState) {
private NumeralBaseButtons numeralBaseButtons = new NumeralBaseButtons(); super.onViewCreated(root, savedInstanceState);
@NotNull fragmentHelper.processButtons(this, root);
private CalculatorPreferences.Gui.Theme theme; }
@NotNull @Override
private CalculatorPreferences.Gui.Layout layout; public void onDestroy() {
super.onDestroy();
@Override
public void onCreate(Bundle savedInstanceState) { fragmentHelper.onDestroy(this);
super.onCreate(savedInstanceState);
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this.getActivity());
vibrator = (Vibrator) this.getActivity().getSystemService(Activity.VIBRATOR_SERVICE); preferences.unregisterOnSharedPreferenceChangeListener(this);
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this.getActivity()); }
preferences.registerOnSharedPreferenceChangeListener(this); /* private static void setMarginsForView(@Nullable View view, int marginLeft, int marginBottom, @NotNull Context context) {
// IMPORTANT: this is workaround for probably android bug
layout = CalculatorPreferences.Gui.layout.getPreferenceNoError(preferences); // currently margin values set in styles are not applied for some reasons to the views (using include tag) => set them manually
theme = CalculatorPreferences.Gui.theme.getPreferenceNoError(preferences);
if (view != null) {
} final DisplayMetrics dm = context.getResources().getDisplayMetrics();
if (view.getLayoutParams() instanceof LinearLayout.LayoutParams) {
@Override final LinearLayout.LayoutParams oldParams = (LinearLayout.LayoutParams) view.getLayoutParams();
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { final LinearLayout.LayoutParams newParams = new LinearLayout.LayoutParams(oldParams.width, oldParams.height, oldParams.weight);
return inflater.inflate(R.layout.calc_keyboard, container, false); newParams.setMargins(AndroidUtils.toPixels(dm, marginLeft), 0, 0, AndroidUtils.toPixels(dm, marginBottom));
} view.setLayoutParams(newParams);
}
@Override }
public void onViewCreated(View root, Bundle savedInstanceState) { }*/
super.onViewCreated(root, savedInstanceState);
@Override
dpclRegister.clear(); public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this.getActivity()); }
final SimpleOnDragListener.Preferences dragPreferences = SimpleOnDragListener.getPreferences(preferences, this.getActivity());
@Override
setOnDragListeners(root, dragPreferences, preferences); public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
if (AndroidCalculatorEngine.Preferences.numeralBase.getKey().equals(key)) {
final OnDragListener historyOnDragListener = new OnDragListenerVibrator(newOnDragListener(new HistoryDragProcessor<CalculatorHistoryState>(getCalculator()), dragPreferences), vibrator, preferences); numeralBaseButtons.toggleNumericDigits(this.getActivity(), preferences);
final DragButton historyButton = getButton(root, R.id.historyButton); }
if (historyButton != null) {
historyButton.setOnDragListener(historyOnDragListener); if ( CalculatorPreferences.Gui.showEqualsButton.getKey().equals(key) ) {
} CalculatorButtons.toggleEqualsButton(preferences, this.getActivity(), theme, getView());
}
final DragButton subtractionButton = getButton(root, R.id.subtractionButton);
if (subtractionButton != null) { if ( AndroidCalculatorEngine.Preferences.multiplicationSign.getKey().equals(key) ) {
subtractionButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new SimpleOnDragListener.DragProcessor() { CalculatorButtons.initMultiplicationButton(getView());
@Override }
public boolean processDragEvent(@NotNull DragDirection dragDirection, @NotNull DragButton dragButton, @NotNull Point2d startPoint2d, @NotNull MotionEvent motionEvent) { }
if (dragDirection == DragDirection.down) {
CalculatorActivity.operatorsButtonClickHandler(getActivity());
return true; @Nullable
} private static AndroidCalculatorDisplayView getCalculatorDisplayView() {
return false; return (AndroidCalculatorDisplayView) CalculatorLocatorImpl.getInstance().getDisplay().getView();
} }
}, dragPreferences), vibrator, preferences));
} @NotNull
private Calculator getCalculator() {
return CalculatorLocatorImpl.getInstance().getCalculator();
final OnDragListener toPositionOnDragListener = new OnDragListenerVibrator(new SimpleOnDragListener(new CursorDragProcessor(), dragPreferences), vibrator, preferences); }
final DragButton rightButton = getButton(root, R.id.rightButton); @NotNull
if (rightButton != null) { private static CalculatorKeyboard getKeyboard() {
rightButton.setOnDragListener(toPositionOnDragListener); return CalculatorLocatorImpl.getInstance().getKeyboard();
} }
}
final DragButton leftButton = getButton(root, R.id.leftButton);
if (leftButton != null) {
leftButton.setOnDragListener(toPositionOnDragListener);
}
final DragButton equalsButton = getButton(root, R.id.equalsButton);
if (equalsButton != null) {
equalsButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new EvalDragProcessor(), dragPreferences), vibrator, preferences));
}
final AngleUnitsButton angleUnitsButton = (AngleUnitsButton) getButton(root, R.id.sixDigitButton);
if (angleUnitsButton != null) {
angleUnitsButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new AngleUnitsChanger(this.getActivity()), dragPreferences), vibrator, preferences));
}
final NumeralBasesButton clearButton = (NumeralBasesButton) getButton(root, R.id.clearButton);
if (clearButton != null) {
clearButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new NumeralBasesChanger(this.getActivity()), dragPreferences), vibrator, preferences));
}
final DragButton varsButton = getButton(root, R.id.varsButton);
if (varsButton != null) {
varsButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new VarsDragProcessor(this.getActivity()), dragPreferences), vibrator, preferences));
}
final DragButton roundBracketsButton = getButton(root, R.id.roundBracketsButton);
if (roundBracketsButton != null) {
roundBracketsButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new RoundBracketsDragProcessor(), dragPreferences), vibrator, preferences));
}
if (layout == CalculatorPreferences.Gui.Layout.simple) {
toggleButtonDirectionText(root, R.id.oneDigitButton, false, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.twoDigitButton, false, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.threeDigitButton, false, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.sixDigitButton, false, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.sevenDigitButton, false, DragDirection.left, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.eightDigitButton, false, DragDirection.left, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.clearButton, false, DragDirection.left, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.fourDigitButton, false, DragDirection.down);
toggleButtonDirectionText(root, R.id.fiveDigitButton, false, DragDirection.down);
toggleButtonDirectionText(root, R.id.nineDigitButton, false, DragDirection.left);
toggleButtonDirectionText(root, R.id.multiplicationButton, false, DragDirection.left);
toggleButtonDirectionText(root, R.id.plusButton, false, DragDirection.down, DragDirection.up);
}
numeralBaseButtons.toggleNumericDigits(this.getActivity(), preferences);
fixThemeParameters(true, theme, this.getView());
toggleEqualsButton(preferences, this.getActivity(), theme, root);
initMultiplicationButton();
}
@Nullable
private <T extends DragButton> T getButton(@NotNull View root, int buttonId) {
return (T) root.findViewById(buttonId);
}
@Override
public void onDestroy() {
super.onDestroy();
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this.getActivity());
preferences.unregisterOnSharedPreferenceChangeListener(this);
}
public static void fixThemeParameters(boolean fixMagicFlames,
@NotNull CalculatorPreferences.Gui.Theme theme,
@NotNull View root) {
if (theme.getThemeType() == CalculatorPreferences.Gui.ThemeType.metro) {
if (fixMagicFlames) {
// for metro themes we should turn off magic flames
AndroidUtils.processViewsOfType(root, ColorButton.class, new AndroidUtils.ViewProcessor<ColorButton>() {
@Override
public void process(@NotNull ColorButton colorButton) {
colorButton.setDrawMagicFlame(false);
}
});
}
}
}
private void initMultiplicationButton() {
final View multiplicationButton = getView().findViewById(R.id.multiplicationButton);
if ( multiplicationButton instanceof Button) {
((Button) multiplicationButton).setText(CalculatorLocatorImpl.getInstance().getEngine().getMultiplicationSign());
}
}
/* private static void setMarginsForView(@Nullable View view, int marginLeft, int marginBottom, @NotNull Context context) {
// IMPORTANT: this is workaround for probably android bug
// currently margin values set in styles are not applied for some reasons to the views (using include tag) => set them manually
if (view != null) {
final DisplayMetrics dm = context.getResources().getDisplayMetrics();
if (view.getLayoutParams() instanceof LinearLayout.LayoutParams) {
final LinearLayout.LayoutParams oldParams = (LinearLayout.LayoutParams) view.getLayoutParams();
final LinearLayout.LayoutParams newParams = new LinearLayout.LayoutParams(oldParams.width, oldParams.height, oldParams.weight);
newParams.setMargins(AndroidUtils.toPixels(dm, marginLeft), 0, 0, AndroidUtils.toPixels(dm, marginBottom));
view.setLayoutParams(newParams);
}
}
}*/
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
}
private synchronized void setOnDragListeners(@NotNull View root, @NotNull SimpleOnDragListener.Preferences dragPreferences, @NotNull SharedPreferences preferences) {
final OnDragListener onDragListener = new OnDragListenerVibrator(newOnDragListener(new DigitButtonDragProcessor(getKeyboard()), dragPreferences), vibrator, preferences);
final List<Integer> dragButtonIds = new ArrayList<Integer>();
final List<Integer> buttonIds = new ArrayList<Integer>();
for (Field field : R.id.class.getDeclaredFields()) {
int modifiers = field.getModifiers();
if (Modifier.isFinal(modifiers) && Modifier.isStatic(modifiers)) {
try {
int viewId = field.getInt(R.id.class);
final View view = root.findViewById(viewId);
if (view instanceof DragButton) {
dragButtonIds.add(viewId);
}
if (view instanceof Button) {
buttonIds.add(viewId);
}
} catch (IllegalAccessException e) {
Log.e(R.id.class.getName(), e.getMessage());
}
}
}
for (Integer dragButtonId : dragButtonIds) {
final DragButton button = getButton(root, dragButtonId);
if (button != null) {
button.setOnDragListener(onDragListener);
}
}
}
@NotNull
private SimpleOnDragListener newOnDragListener(@NotNull SimpleOnDragListener.DragProcessor dragProcessor,
@NotNull SimpleOnDragListener.Preferences dragPreferences) {
final SimpleOnDragListener onDragListener = new SimpleOnDragListener(dragProcessor, dragPreferences);
dpclRegister.addListener(onDragListener);
return onDragListener;
}
@Override
public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
if (key != null && key.startsWith("org.solovyev.android.calculator.DragButtonCalibrationActivity")) {
dpclRegister.announce().onDragPreferencesChange(SimpleOnDragListener.getPreferences(preferences, this.getActivity()));
}
if (AndroidCalculatorEngine.Preferences.numeralBase.getKey().equals(key)) {
numeralBaseButtons.toggleNumericDigits(this.getActivity(), preferences);
}
if ( CalculatorPreferences.Gui.showEqualsButton.getKey().equals(key) ) {
toggleEqualsButton(preferences, this.getActivity(), theme, getView());
}
if ( AndroidCalculatorEngine.Preferences.multiplicationSign.getKey().equals(key) ) {
initMultiplicationButton();
}
}
private void toggleButtonDirectionText(@NotNull View root, int id, boolean showDirectionText, @NotNull DragDirection... dragDirections) {
final View v = getButton(root, id);
if (v instanceof DirectionDragButton ) {
final DirectionDragButton button = (DirectionDragButton)v;
for (DragDirection dragDirection : dragDirections) {
button.showDirectionText(showDirectionText, dragDirection);
}
}
}
public static void toggleEqualsButton(@Nullable SharedPreferences preferences,
@NotNull Activity activity,
@NotNull CalculatorPreferences.Gui.Theme theme,
@NotNull View root) {
preferences = preferences == null ? PreferenceManager.getDefaultSharedPreferences(activity) : preferences;
if (AndroidUtils.getScreenOrientation(activity) == Configuration.ORIENTATION_PORTRAIT || !CalculatorPreferences.Gui.autoOrientation.getPreference(preferences)) {
final Display display = activity.getWindowManager().getDefaultDisplay();
final DragButton button = (DragButton)activity.findViewById(R.id.equalsButton);
if (CalculatorPreferences.Gui.showEqualsButton.getPreference(preferences)) {
button.setLayoutParams(new LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.FILL_PARENT, 1f));
if (display.getWidth() <= 480) {
// mobile phones
final AndroidCalculatorDisplayView calculatorDisplayView = getCalculatorDisplayView();
if (calculatorDisplayView != null) {
calculatorDisplayView.setBackgroundDrawable(null);
}
}
} else {
button.setLayoutParams(new LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.FILL_PARENT, 0f));
if (display.getWidth() <= 480) {
// mobile phones
final AndroidCalculatorDisplayView calculatorDisplayView = getCalculatorDisplayView();
if (calculatorDisplayView != null) {
calculatorDisplayView.setBackgroundDrawable(activity.getResources().getDrawable(R.drawable.equals9));
}
}
}
fixThemeParameters(false, theme, root);
}
}
@Nullable
private static AndroidCalculatorDisplayView getCalculatorDisplayView() {
return (AndroidCalculatorDisplayView) CalculatorLocatorImpl.getInstance().getDisplay().getView();
}
@NotNull
private Calculator getCalculator() {
return CalculatorLocatorImpl.getInstance().getCalculator();
}
@NotNull
private static CalculatorKeyboard getKeyboard() {
return CalculatorLocatorImpl.getInstance().getKeyboard();
}
/*
**********************************************************************
*
* STATIC CLASSES
*
**********************************************************************
*/
private static class RoundBracketsDragProcessor implements SimpleOnDragListener.DragProcessor {
@Override
public boolean processDragEvent(@NotNull DragDirection dragDirection, @NotNull DragButton dragButton, @NotNull Point2d startPoint2d, @NotNull MotionEvent motionEvent) {
final boolean result;
if (dragDirection == DragDirection.left) {
getKeyboard().roundBracketsButtonPressed();
result = true;
} else {
result = new DigitButtonDragProcessor(getKeyboard()).processDragEvent(dragDirection, dragButton, startPoint2d, motionEvent);
}
return result;
}
}
private static class VarsDragProcessor implements SimpleOnDragListener.DragProcessor {
@NotNull
private Context context;
private VarsDragProcessor(Context context) {
this.context = context;
}
@Override
public boolean processDragEvent(@NotNull DragDirection dragDirection,
@NotNull DragButton dragButton,
@NotNull Point2d startPoint2d,
@NotNull MotionEvent motionEvent) {
boolean result = false;
if (dragDirection == DragDirection.up) {
CalculatorActivityLauncher.createVar(context, CalculatorLocatorImpl.getInstance().getDisplay());
result = true;
}
return result;
}
}
private static class AngleUnitsChanger implements SimpleOnDragListener.DragProcessor {
@NotNull
private final DigitButtonDragProcessor processor;
@NotNull
private final Context context;
private AngleUnitsChanger(@NotNull Context context) {
this.context = context;
this.processor = new DigitButtonDragProcessor(CalculatorLocatorImpl.getInstance().getKeyboard());
}
@Override
public boolean processDragEvent(@NotNull DragDirection dragDirection,
@NotNull DragButton dragButton,
@NotNull Point2d startPoint2d,
@NotNull MotionEvent motionEvent) {
boolean result = false;
if (dragButton instanceof AngleUnitsButton) {
if (dragDirection != DragDirection.left) {
final String directionText = ((AngleUnitsButton) dragButton).getText(dragDirection);
if (directionText != null) {
try {
final AngleUnit angleUnits = AngleUnit.valueOf(directionText);
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
AndroidCalculatorEngine.Preferences.angleUnit.putPreference(preferences, angleUnits);
Toast.makeText(context, context.getString(R.string.c_angle_units_changed_to, angleUnits.name()), Toast.LENGTH_LONG).show();
result = true;
} catch (IllegalArgumentException e) {
Log.d(this.getClass().getName(), "Unsupported angle units: " + directionText);
}
}
} else if (dragDirection == DragDirection.left) {
result = processor.processDragEvent(dragDirection, dragButton, startPoint2d, motionEvent);
}
}
return result;
}
}
private static class NumeralBasesChanger implements SimpleOnDragListener.DragProcessor {
@NotNull
private final Context context;
private NumeralBasesChanger(@NotNull Context context) {
this.context = context;
}
@Override
public boolean processDragEvent(@NotNull DragDirection dragDirection,
@NotNull DragButton dragButton,
@NotNull Point2d startPoint2d,
@NotNull MotionEvent motionEvent) {
boolean result = false;
if (dragButton instanceof NumeralBasesButton) {
final String directionText = ((NumeralBasesButton) dragButton).getText(dragDirection);
if (directionText != null) {
try {
final NumeralBase numeralBase = NumeralBase.valueOf(directionText);
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
AndroidCalculatorEngine.Preferences.numeralBase.putPreference(preferences, numeralBase);
Toast.makeText(context, context.getString(R.string.c_numeral_base_changed_to, numeralBase.name()), Toast.LENGTH_LONG).show();
result = true;
} catch (IllegalArgumentException e) {
Log.d(this.getClass().getName(), "Unsupported numeral base: " + directionText);
}
}
}
return result;
}
}
}

2
calculatorpp/src/main/java/org/solovyev/android/calculator/NumeralBaseButtons.java
View File

@ -13,7 +13,7 @@ import org.solovyev.android.calculator.model.AndroidCalculatorEngine;
*/ */
public class NumeralBaseButtons { public class NumeralBaseButtons {
private synchronized void toggleNumericDigits(@NotNull Activity activity, @NotNull NumeralBase currentNumeralBase) { public synchronized void toggleNumericDigits(@NotNull Activity activity, @NotNull NumeralBase currentNumeralBase) {
for (NumeralBase numeralBase : NumeralBase.values()) { for (NumeralBase numeralBase : NumeralBase.values()) {
if ( currentNumeralBase != numeralBase ) { if ( currentNumeralBase != numeralBase ) {
AndroidNumeralBase.valueOf(numeralBase).toggleButtons(false, activity); AndroidNumeralBase.valueOf(numeralBase).toggleButtons(false, activity);

4
calculatorpp/src/main/java/org/solovyev/android/calculator/history/AbstractCalculatorHistoryFragment.java
View File

@ -92,6 +92,7 @@ public abstract class AbstractCalculatorHistoryFragment extends SherlockListFrag
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(); fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper();
fragmentHelper.onCreate(this);
logDebug("onCreate"); logDebug("onCreate");
} }
@ -175,6 +176,9 @@ public abstract class AbstractCalculatorHistoryFragment extends SherlockListFrag
if ( this.adView != null ) { if ( this.adView != null ) {
this.adView.destroy(); this.adView.destroy();
} }
fragmentHelper.onDestroy(this);
super.onDestroy(); super.onDestroy();
} }

2
calculatorpp/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryFragmentActivity.java
View File

@ -52,6 +52,8 @@ public class CalculatorHistoryFragmentActivity extends SherlockFragmentActivity
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
activityHelper.onDestroy(this);
CalculatorLocatorImpl.getInstance().getCalculator().removeCalculatorEventListener(this); CalculatorLocatorImpl.getInstance().getCalculator().removeCalculatorEventListener(this);
} }

647
calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListFragment.java
View File

@ -1,321 +1,326 @@
/* /*
* Copyright (c) 2009-2011. Created by serso aka se.solovyev. * Copyright (c) 2009-2011. Created by serso aka se.solovyev.
* For more information, please, contact se.solovyev@gmail.com * For more information, please, contact se.solovyev@gmail.com
* or visit http://se.solovyev.org * or visit http://se.solovyev.org
*/ */
package org.solovyev.android.calculator.math.edit; package org.solovyev.android.calculator.math.edit;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.*; import android.widget.*;
import com.actionbarsherlock.app.SherlockListFragment; import com.actionbarsherlock.app.SherlockListFragment;
import com.google.ads.AdView; import com.google.ads.AdView;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.solovyev.android.ads.AdsController; import org.solovyev.android.ads.AdsController;
import org.solovyev.android.calculator.*; import org.solovyev.android.calculator.*;
import org.solovyev.android.menu.AMenuBuilder; import org.solovyev.android.menu.AMenuBuilder;
import org.solovyev.android.menu.LabeledMenuItem; import org.solovyev.android.menu.LabeledMenuItem;
import org.solovyev.android.menu.MenuImpl; import org.solovyev.android.menu.MenuImpl;
import org.solovyev.common.equals.EqualsTool; import org.solovyev.common.equals.EqualsTool;
import org.solovyev.common.filter.Filter; import org.solovyev.common.filter.Filter;
import org.solovyev.common.filter.FilterRule; import org.solovyev.common.filter.FilterRule;
import org.solovyev.common.math.MathEntity; import org.solovyev.common.math.MathEntity;
import org.solovyev.common.text.StringUtils; import org.solovyev.common.text.StringUtils;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
/** /**
* User: serso * User: serso
* Date: 12/21/11 * Date: 12/21/11
* Time: 9:24 PM * Time: 9:24 PM
*/ */
public abstract class AbstractMathEntityListFragment<T extends MathEntity> extends SherlockListFragment { public abstract class AbstractMathEntityListFragment<T extends MathEntity> extends SherlockListFragment {
/* /*
********************************************************************** **********************************************************************
* *
* CONSTANTS * CONSTANTS
* *
********************************************************************** **********************************************************************
*/ */
public static final String MATH_ENTITY_CATEGORY_EXTRA_STRING = "org.solovyev.android.calculator.CalculatorVarsActivity_math_entity_category"; public static final String MATH_ENTITY_CATEGORY_EXTRA_STRING = "org.solovyev.android.calculator.CalculatorVarsActivity_math_entity_category";
protected final static List<Character> acceptableChars = Arrays.asList(StringUtils.toObject("1234567890abcdefghijklmnopqrstuvwxyzйцукенгшщзхъфывапролджэячсмитьбюё_".toCharArray())); protected final static List<Character> acceptableChars = Arrays.asList(StringUtils.toObject("1234567890abcdefghijklmnopqrstuvwxyzйцукенгшщзхъфывапролджэячсмитьбюё_".toCharArray()));
/* /*
********************************************************************** **********************************************************************
* *
* FIELDS * FIELDS
* *
********************************************************************** **********************************************************************
*/ */
@Nullable @Nullable
private MathEntityArrayAdapter<T> adapter; private MathEntityArrayAdapter<T> adapter;
@Nullable @Nullable
private String category; private String category;
@Nullable @Nullable
private AdView adView; private AdView adView;
@NotNull @NotNull
private CalculatorFragmentHelper fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(); private CalculatorFragmentHelper fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper();
protected int getLayoutResId() { protected int getLayoutResId() {
return R.layout.math_entities; return R.layout.math_entities;
} }
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
final Bundle bundle = getArguments(); final Bundle bundle = getArguments();
if ( bundle != null ) { if ( bundle != null ) {
category = bundle.getString(MATH_ENTITY_CATEGORY_EXTRA_STRING); category = bundle.getString(MATH_ENTITY_CATEGORY_EXTRA_STRING);
} }
}
fragmentHelper.onCreate(this);
@Override }
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
return inflater.inflate(getLayoutResId(), container, false); @Override
} public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
return inflater.inflate(getLayoutResId(), container, false);
@Override }
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState); @Override
public void onViewCreated(View view, Bundle savedInstanceState) {
this.fragmentHelper.setPaneTitle(this, getTitleResId()); super.onViewCreated(view, savedInstanceState);
final ListView lv = getListView(); this.fragmentHelper.setPaneTitle(this, getTitleResId());
lv.setTextFilterEnabled(true);
final ListView lv = getListView();
lv.setOnItemClickListener(new AdapterView.OnItemClickListener() { lv.setTextFilterEnabled(true);
public void onItemClick(final AdapterView<?> parent,
final View view, lv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
final int position, public void onItemClick(final AdapterView<?> parent,
final long id) { final View view,
final int position,
CalculatorLocatorImpl.getInstance().getKeyboard().digitButtonPressed(((MathEntity) parent.getItemAtPosition(position)).getName()); final long id) {
}
}); CalculatorLocatorImpl.getInstance().getKeyboard().digitButtonPressed(((MathEntity) parent.getItemAtPosition(position)).getName());
}
getListView().setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() { });
@Override
public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) { getListView().setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
final T item = (T) parent.getItemAtPosition(position); @Override
public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
final List<LabeledMenuItem<T>> menuItems = getMenuItemsOnLongClick(item); final T item = (T) parent.getItemAtPosition(position);
if (!menuItems.isEmpty()) { final List<LabeledMenuItem<T>> menuItems = getMenuItemsOnLongClick(item);
final AMenuBuilder<LabeledMenuItem<T>, T> menuBuilder = AMenuBuilder.newInstance(AbstractMathEntityListFragment.this.getActivity(), MenuImpl.newInstance(menuItems));
menuBuilder.create(item).show(); if (!menuItems.isEmpty()) {
} final AMenuBuilder<LabeledMenuItem<T>, T> menuBuilder = AMenuBuilder.newInstance(AbstractMathEntityListFragment.this.getActivity(), MenuImpl.newInstance(menuItems));
menuBuilder.create(item).show();
return true; }
}
}); return true;
}
adView = AdsController.getInstance().inflateAd(this.getActivity(), (ViewGroup)view.findViewById(R.id.ad_parent_view), R.id.ad_parent_view); });
}
adView = AdsController.getInstance().inflateAd(this.getActivity(), (ViewGroup)view.findViewById(R.id.ad_parent_view), R.id.ad_parent_view);
protected abstract int getTitleResId(); }
@Override protected abstract int getTitleResId();
public void onDestroy() {
if (this.adView != null) { @Override
this.adView.destroy(); public void onDestroy() {
} if (this.adView != null) {
super.onDestroy(); this.adView.destroy();
} }
@NotNull fragmentHelper.onDestroy(this);
protected abstract List<LabeledMenuItem<T>> getMenuItemsOnLongClick(@NotNull T item);
super.onDestroy();
@Override }
public void onResume() {
super.onResume(); @NotNull
protected abstract List<LabeledMenuItem<T>> getMenuItemsOnLongClick(@NotNull T item);
adapter = new MathEntityArrayAdapter<T>(getDescriptionGetter(), this.getActivity(), R.layout.math_entity, R.id.math_entity_text, getMathEntitiesByCategory());
setListAdapter(adapter); @Override
public void onResume() {
sort(); super.onResume();
}
adapter = new MathEntityArrayAdapter<T>(getDescriptionGetter(), this.getActivity(), R.layout.math_entity, R.id.math_entity_text, getMathEntitiesByCategory());
@NotNull setListAdapter(adapter);
private List<T> getMathEntitiesByCategory() {
final List<T> result = getMathEntities(); sort();
}
new Filter<T>(new FilterRule<T>() {
@Override @NotNull
public boolean isFiltered(T t) { private List<T> getMathEntitiesByCategory() {
return !isInCategory(t); final List<T> result = getMathEntities();
}
}).filter(result.iterator()); new Filter<T>(new FilterRule<T>() {
@Override
return result; public boolean isFiltered(T t) {
} return !isInCategory(t);
}
protected boolean isInCategory(@Nullable T t) { }).filter(result.iterator());
return t != null && (category == null || EqualsTool.areEqual(getMathEntityCategory(t), category));
} return result;
}
@NotNull
protected abstract MathEntityDescriptionGetter getDescriptionGetter(); protected boolean isInCategory(@Nullable T t) {
return t != null && (category == null || EqualsTool.areEqual(getMathEntityCategory(t), category));
@NotNull }
protected abstract List<T> getMathEntities();
@NotNull
@Nullable protected abstract MathEntityDescriptionGetter getDescriptionGetter();
abstract String getMathEntityCategory(@NotNull T t);
@NotNull
protected void sort() { protected abstract List<T> getMathEntities();
final MathEntityArrayAdapter<T> localAdapter = adapter;
if (localAdapter != null) { @Nullable
localAdapter.sort(new Comparator<T>() { abstract String getMathEntityCategory(@NotNull T t);
@Override
public int compare(T function1, T function2) { protected void sort() {
return function1.getName().compareTo(function2.getName()); final MathEntityArrayAdapter<T> localAdapter = adapter;
} if (localAdapter != null) {
}); localAdapter.sort(new Comparator<T>() {
@Override
localAdapter.notifyDataSetChanged(); public int compare(T function1, T function2) {
} return function1.getName().compareTo(function2.getName());
} }
});
protected static class MathEntityArrayAdapter<T extends MathEntity> extends ArrayAdapter<T> {
localAdapter.notifyDataSetChanged();
@NotNull }
private final MathEntityDescriptionGetter descriptionGetter; }
private MathEntityArrayAdapter(@NotNull MathEntityDescriptionGetter descriptionGetter, protected static class MathEntityArrayAdapter<T extends MathEntity> extends ArrayAdapter<T> {
@NotNull Context context,
int resource, @NotNull
int textViewResourceId, private final MathEntityDescriptionGetter descriptionGetter;
@NotNull List<T> objects) {
private MathEntityArrayAdapter(@NotNull MathEntityDescriptionGetter descriptionGetter,
super(context, resource, textViewResourceId, objects); @NotNull Context context,
this.descriptionGetter = descriptionGetter; int resource,
} int textViewResourceId,
@NotNull List<T> objects) {
@Override
public View getView(int position, View convertView, ViewGroup parent) { super(context, resource, textViewResourceId, objects);
final ViewGroup result = (ViewGroup) super.getView(position, convertView, parent); this.descriptionGetter = descriptionGetter;
}
final T mathEntity = getItem(position);
@Override
final String mathEntityDescription = descriptionGetter.getDescription(getContext(), mathEntity.getName()); public View getView(int position, View convertView, ViewGroup parent) {
if (!StringUtils.isEmpty(mathEntityDescription)) { final ViewGroup result = (ViewGroup) super.getView(position, convertView, parent);
TextView description = (TextView) result.findViewById(R.id.math_entity_description);
if (description == null) { final T mathEntity = getItem(position);
final LayoutInflater layoutInflater = (LayoutInflater) getContext().getSystemService(Activity.LAYOUT_INFLATER_SERVICE);
final ViewGroup itemView = (ViewGroup) layoutInflater.inflate(R.layout.math_entity, null); final String mathEntityDescription = descriptionGetter.getDescription(getContext(), mathEntity.getName());
description = (TextView) itemView.findViewById(R.id.math_entity_description); if (!StringUtils.isEmpty(mathEntityDescription)) {
itemView.removeView(description); TextView description = (TextView) result.findViewById(R.id.math_entity_description);
result.addView(description); if (description == null) {
} final LayoutInflater layoutInflater = (LayoutInflater) getContext().getSystemService(Activity.LAYOUT_INFLATER_SERVICE);
description.setText(mathEntityDescription); final ViewGroup itemView = (ViewGroup) layoutInflater.inflate(R.layout.math_entity, null);
} else { description = (TextView) itemView.findViewById(R.id.math_entity_description);
TextView description = (TextView) result.findViewById(R.id.math_entity_description); itemView.removeView(description);
if (description != null) { result.addView(description);
result.removeView(description); }
} description.setText(mathEntityDescription);
} } else {
TextView description = (TextView) result.findViewById(R.id.math_entity_description);
if (description != null) {
return result; result.removeView(description);
} }
} }
protected static class MathEntityDescriptionGetterImpl implements MathEntityDescriptionGetter {
return result;
@NotNull }
private final CalculatorMathRegistry<?> mathRegistry; }
public MathEntityDescriptionGetterImpl(@NotNull CalculatorMathRegistry<?> mathRegistry) { protected static class MathEntityDescriptionGetterImpl implements MathEntityDescriptionGetter {
this.mathRegistry = mathRegistry;
} @NotNull
private final CalculatorMathRegistry<?> mathRegistry;
@Override
public String getDescription(@NotNull Context context, @NotNull String mathEntityName) { public MathEntityDescriptionGetterImpl(@NotNull CalculatorMathRegistry<?> mathRegistry) {
return this.mathRegistry.getDescription(mathEntityName); this.mathRegistry = mathRegistry;
} }
}
@Override
protected static interface MathEntityDescriptionGetter { public String getDescription(@NotNull Context context, @NotNull String mathEntityName) {
return this.mathRegistry.getDescription(mathEntityName);
@Nullable }
String getDescription(@NotNull Context context, @NotNull String mathEntityName); }
}
protected static interface MathEntityDescriptionGetter {
public void addToAdapter(@NotNull T mathEntity) {
if (this.adapter != null) { @Nullable
this.adapter.add(mathEntity); String getDescription(@NotNull Context context, @NotNull String mathEntityName);
} }
}
public void addToAdapter(@NotNull T mathEntity) {
public void removeFromAdapter(@NotNull T mathEntity) { if (this.adapter != null) {
if (this.adapter != null) { this.adapter.add(mathEntity);
this.adapter.remove(mathEntity); }
} }
}
public void removeFromAdapter(@NotNull T mathEntity) {
public void notifyAdapter() { if (this.adapter != null) {
if (this.adapter != null) { this.adapter.remove(mathEntity);
this.adapter.notifyDataSetChanged(); }
} }
}
public void notifyAdapter() {
/* if (this.adapter != null) {
********************************************************************** this.adapter.notifyDataSetChanged();
* }
* STATIC }
*
********************************************************************** /*
*/ **********************************************************************
*
static void createTab(@NotNull Context context, * STATIC
@NotNull TabHost tabHost, *
@NotNull String tabId, **********************************************************************
@NotNull String categoryId, */
int tabCaptionId,
@NotNull Class<? extends Activity> activityClass, static void createTab(@NotNull Context context,
@Nullable Intent parentIntent) { @NotNull TabHost tabHost,
@NotNull String tabId,
TabHost.TabSpec spec; @NotNull String categoryId,
int tabCaptionId,
final Intent intent; @NotNull Class<? extends Activity> activityClass,
if (parentIntent != null) { @Nullable Intent parentIntent) {
intent = new Intent(parentIntent);
} else { TabHost.TabSpec spec;
intent = new Intent();
} final Intent intent;
intent.setClass(context, activityClass); if (parentIntent != null) {
intent.putExtra(MATH_ENTITY_CATEGORY_EXTRA_STRING, categoryId); intent = new Intent(parentIntent);
} else {
// Initialize a TabSpec for each tab and add it to the TabHost intent = new Intent();
spec = tabHost.newTabSpec(tabId).setIndicator(context.getString(tabCaptionId)).setContent(intent); }
intent.setClass(context, activityClass);
tabHost.addTab(spec); intent.putExtra(MATH_ENTITY_CATEGORY_EXTRA_STRING, categoryId);
}
// Initialize a TabSpec for each tab and add it to the TabHost
@NotNull spec = tabHost.newTabSpec(tabId).setIndicator(context.getString(tabCaptionId)).setContent(intent);
public static Bundle createBundleFor(@NotNull String categoryId) {
final Bundle result = new Bundle(1); tabHost.addTab(spec);
result.putString(MATH_ENTITY_CATEGORY_EXTRA_STRING, categoryId); }
return result;
} @NotNull
} public static Bundle createBundleFor(@NotNull String categoryId) {
final Bundle result = new Bundle(1);
result.putString(MATH_ENTITY_CATEGORY_EXTRA_STRING, categoryId);
return result;
}
}

2
calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsFragmentActivity.java
View File

@ -57,6 +57,8 @@ public class CalculatorFunctionsFragmentActivity extends SherlockFragmentActivit
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
this.activityHelper.onDestroy(this);
CalculatorLocatorImpl.getInstance().getCalculator().removeCalculatorEventListener(this); CalculatorLocatorImpl.getInstance().getCalculator().removeCalculatorEventListener(this);
} }

2
calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsFragmentActivity.java
View File

@ -70,6 +70,8 @@ public class CalculatorVarsFragmentActivity extends SherlockFragmentActivity imp
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
this.activityHelper.onDestroy(this);
CalculatorLocatorImpl.getInstance().getCalculator().removeCalculatorEventListener(this); CalculatorLocatorImpl.getInstance().getCalculator().removeCalculatorEventListener(this);
} }