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

Display refactored

Browse Source
This commit is contained in:
serso 2016-01-09 23:53:41 +01:00
parent 5e1c47963c
commit b120283adb
41 changed files with 320 additions and 709 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,13 +22,10 @@
package org.solovyev.android;
import android.os.Looper;
import java.util.Collection;
import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.Map;
import static java.lang.Thread.currentThread;
@ -51,9 +48,9 @@ public final class Check {
}
public static void isMainThread() {
if (!junit && Looper.getMainLooper() != Looper.myLooper()) {
/*if (!junit && Looper.getMainLooper() != Looper.myLooper()) {
throw new AssertionException("Should be called on the main thread");
}
}*/
}
public static void isNotNull(@Nullable Object o) {

2
app/src/main/java/org/solovyev/android/calculator/AndroidCalculator.java
View File

@ -72,7 +72,7 @@ public class AndroidCalculator implements Calculator, CalculatorEventListener, S
@Override
@Nonnull
public CalculatorEventData evaluate(@Nonnull JsclOperation operation, @Nonnull String expression, @Nonnull Long sequenceId) {
public CalculatorEventData evaluate(@Nonnull JsclOperation operation, @Nonnull String expression, long sequenceId) {
return calculator.evaluate(operation, expression, sequenceId);
}

200
app/src/main/java/org/solovyev/android/calculator/AndroidCalculatorDisplayView.java
View File

@ -1,200 +0,0 @@
/*
* Copyright 2013 serso aka se.solovyev
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Contact details
*
* Email: se.solovyev@gmail.com
* Site: http://se.solovyev.org
*/
package org.solovyev.android.calculator;
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Handler;
import android.preference.PreferenceManager;
import android.support.v4.app.FragmentActivity;
import android.util.AttributeSet;
import android.util.TypedValue;
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 javax.annotation.Nonnull;
import javax.annotation.Nullable;
/**
* User: serso
* Date: 9/17/11
* Time: 10:58 PM
*/
public class AndroidCalculatorDisplayView extends AutoResizeTextView implements CalculatorDisplayView {
/*
**********************************************************************
*
* STATIC FIELDS
*
**********************************************************************
*/
@Nonnull
private final TextProcessor<TextProcessorEditorResult, String> textHighlighter;
/*
**********************************************************************
*
* FIELDS
*
**********************************************************************
*/
@Nonnull
private final Object lock = new Object();
@Nonnull
private final Handler uiHandler = new Handler();
@Nonnull
private volatile DisplayState state = DisplayState.empty();
private volatile boolean initialized = false;
/*
**********************************************************************
*
* CONSTRUCTORS
*
**********************************************************************
*/
public AndroidCalculatorDisplayView(Context context) {
super(context);
textHighlighter = new TextHighlighter(getTextColors().getDefaultColor(), false);
}
public AndroidCalculatorDisplayView(Context context, AttributeSet attrs) {
super(context, attrs);
textHighlighter = new TextHighlighter(getTextColors().getDefaultColor(), false);
}
public AndroidCalculatorDisplayView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
textHighlighter = new TextHighlighter(getTextColors().getDefaultColor(), false);
}
/*
**********************************************************************
*
* METHODS
*
**********************************************************************
*/
private Preferences.Gui.TextColor getTextColor() {
final Context context = getContext();
return App.getThemeIn(context).getTextColor(context);
}
@Nonnull
@Override
public DisplayState getState() {
synchronized (lock) {
return this.state;
}
}
@Override
public void setState(@Nonnull final DisplayState state) {
uiHandler.post(new Runnable() {
@Override
public void run() {
synchronized (lock) {
final CharSequence text = prepareText(state.getStringResult(), state.isValid());
AndroidCalculatorDisplayView.this.state = state;
if (state.isValid()) {
setTextColor(getTextColor().normal);
setText(text);
adjustTextSize();
} else {
// update text in order to get rid of HTML tags
setText(getText().toString());
setTextColor(getTextColor().error);
// error messages are never shown -> just greyed out text (error message will be shown on click)
//setText(state.getErrorMessage());
//redraw();
}
}
}
});
}
@Nullable
private CharSequence prepareText(@Nullable String text, boolean valid) {
CharSequence result;
if (valid && text != null) {
try {
final TextProcessorEditorResult processedText = textHighlighter.process(text);
text = processedText.toString();
result = processedText.getCharSequence();
} catch (CalculatorParseException e) {
result = text;
}
} else {
result = text;
}
return result;
}
private void adjustTextSize() {
// todo serso: think where to move it (keep in mind org.solovyev.android.view.AutoResizeTextView.resetTextSize())
setAddEllipsis(false);
setMinTextSize(10);
resizeText();
}
public synchronized void init(@Nonnull Context context) {
this.init(context, true);
}
public synchronized void init(@Nonnull Context context, boolean fromApp) {
if (!initialized) {
if (fromApp) {
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
final Preferences.Gui.Layout layout = Preferences.Gui.getLayout(preferences);
if (!layout.isOptimized()) {
setTextSize(TypedValue.COMPLEX_UNIT_SP, getResources().getDimension(R.dimen.cpp_display_text_size_mobile));
}
if (context instanceof FragmentActivity) {
this.setOnClickListener(new CalculatorDisplayOnClickListener((FragmentActivity) context));
} else {
throw new IllegalArgumentException("Must be fragment activity, got " + context.getClass());
}
}
this.initialized = true;
}
}
}

7
app/src/main/java/org/solovyev/android/calculator/App.java
View File

@ -255,7 +255,7 @@ public final class App {
}
@Nonnull
public static Preferences.Gui.Theme getThemeIn(@Nonnull Context context) {
public static Preferences.Gui.Theme getThemeFor(@Nonnull Context context) {
if (context instanceof CalculatorOnscreenService) {
final SharedPreferences p = getPreferences();
final Preferences.SimpleTheme onscreenTheme = Preferences.Onscreen.getTheme(p);
@ -324,6 +324,11 @@ public final class App {
return context.checkCallingOrSelfPermission(android.Manifest.permission.DISABLE_KEYGUARD) == PackageManager.PERMISSION_GRANTED;
}
@NonNull
public static String unspan(@Nonnull CharSequence spannable) {
return spannable.toString();
}
private static class MyBus extends Bus {
@Override
public void post(final Object event) {

7
app/src/main/java/org/solovyev/android/calculator/Calculator.java
View File

@ -22,6 +22,8 @@
package org.solovyev.android.calculator;
import jscl.NumeralBase;
import jscl.math.Generic;
import org.solovyev.android.calculator.history.HistoryState;
import org.solovyev.android.calculator.jscl.JsclOperation;
import org.solovyev.common.history.HistoryControl;
@ -29,9 +31,6 @@ import org.solovyev.common.history.HistoryControl;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jscl.NumeralBase;
import jscl.math.Generic;
/**
* User: Solovyev_S
* Date: 20.09.12
@ -62,7 +61,7 @@ public interface Calculator extends CalculatorEventContainer, HistoryControl<His
@Nonnull
CalculatorEventData evaluate(@Nonnull JsclOperation operation,
@Nonnull String expression,
@Nonnull Long sequenceId);
long sequenceId);
boolean isCalculateOnFly();

12
app/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java
View File

@ -129,8 +129,8 @@ public final class CalculatorActivityLauncher implements CalculatorEventListener
}
public static void tryCreateVar(@Nonnull final Context context) {
final CalculatorDisplay display = Locator.getInstance().getDisplay();
final DisplayState viewState = display.getViewState();
final Display display = Locator.getInstance().getDisplay();
final DisplayState viewState = display.getState();
if (viewState.isValid()) {
final String varValue = viewState.getText();
if (!Strings.isEmpty(varValue)) {
@ -155,8 +155,8 @@ public final class CalculatorActivityLauncher implements CalculatorEventListener
}
public static void tryCreateFunction(@Nonnull final Context context) {
final CalculatorDisplay display = Locator.getInstance().getDisplay();
final DisplayState viewState = display.getViewState();
final Display display = Locator.getInstance().getDisplay();
final DisplayState viewState = display.getState();
if (viewState.isValid()) {
final String functionValue = viewState.getText();
@ -179,8 +179,8 @@ public final class CalculatorActivityLauncher implements CalculatorEventListener
public static void tryPlot() {
final CalculatorPlotter plotter = Locator.getInstance().getPlotter();
final CalculatorDisplay display = Locator.getInstance().getDisplay();
final DisplayState viewState = display.getViewState();
final Display display = Locator.getInstance().getDisplay();
final DisplayState viewState = display.getState();
if (viewState.isValid()) {
final String functionValue = viewState.getText();

16
app/src/main/java/org/solovyev/android/calculator/CalculatorBroadcaster.java
View File

@ -7,7 +7,6 @@ import com.squareup.otto.Bus;
import com.squareup.otto.Subscribe;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.HashMap;
import java.util.Map;
@ -17,10 +16,8 @@ public final class CalculatorBroadcaster implements SharedPreferences.OnSharedPr
public static final String ACTION_EDITOR_STATE_CHANGED = "org.solovyev.android.calculator.EDITOR_STATE_CHANGED";
public static final String ACTION_DISPLAY_STATE_CHANGED = "org.solovyev.android.calculator.DISPLAY_STATE_CHANGED";
public static final String ACTION_THEME_CHANGED = "org.solovyev.android.calculator.THEME_CHANGED";
@Nonnull
private final Context context;
@Nonnull
private final Intents intents = new Intents();
@ -36,16 +33,13 @@ public final class CalculatorBroadcaster implements SharedPreferences.OnSharedPr
}
@Subscribe
public void onCursorMoved(@Nonnull Editor.CursorMovedEvent e) {
sendBroadcastIntent(ACTION_EDITOR_STATE_CHANGED);
public void onDisplayChanged(@Nonnull Display.ChangedEvent e) {
sendBroadcastIntent(ACTION_DISPLAY_STATE_CHANGED);
}
public void onCalculatorEvent(@Nonnull CalculatorEventData calculatorEventData, @Nonnull CalculatorEventType calculatorEventType, @Nullable Object data) {
switch (calculatorEventType) {
case display_state_changed:
sendBroadcastIntent(ACTION_DISPLAY_STATE_CHANGED);
break;
}
@Subscribe
public void onCursorMoved(@Nonnull Editor.CursorMovedEvent e) {
sendBroadcastIntent(ACTION_EDITOR_STATE_CHANGED);
}
public void sendInitIntent() {

49
app/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java
View File

@ -1,49 +0,0 @@
/*
* Copyright 2013 serso aka se.solovyev
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Contact details
*
* Email: se.solovyev@gmail.com
* Site: http://se.solovyev.org
*/
package org.solovyev.android.calculator;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
/**
* User: serso
* Date: 12/17/11
* Time: 9:45 PM
*/
public interface CalculatorDisplay extends CalculatorEventListener {
void clearView(@Nonnull CalculatorDisplayView view);
@Nullable
CalculatorDisplayView getView();
void setView(@Nonnull CalculatorDisplayView view);
@Nonnull
DisplayState getViewState();
void setViewState(@Nonnull DisplayState viewState);
@Nonnull
CalculatorEventData getLastEventData();
}

31
app/src/main/java/org/solovyev/android/calculator/CalculatorDisplayChangeEventData.java
View File

@ -1,31 +0,0 @@
/*
* Copyright 2013 serso aka se.solovyev
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Contact details
*
* Email: se.solovyev@gmail.com
* Site: http://se.solovyev.org
*/
package org.solovyev.android.calculator;
/**
* User: serso
* Date: 9/21/12
* Time: 9:49 PM
*/
public interface CalculatorDisplayChangeEventData extends Change<DisplayState> {
}

56
app/src/main/java/org/solovyev/android/calculator/CalculatorDisplayChangeEventDataImpl.java
View File

@ -1,56 +0,0 @@
/*
* Copyright 2013 serso aka se.solovyev
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Contact details
*
* Email: se.solovyev@gmail.com
* Site: http://se.solovyev.org
*/
package org.solovyev.android.calculator;
import javax.annotation.Nonnull;
/**
* User: serso
* Date: 9/21/12
* Time: 9:50 PM
*/
public class CalculatorDisplayChangeEventDataImpl implements CalculatorDisplayChangeEventData {
@Nonnull
private final DisplayState oldState;
@Nonnull
private final DisplayState newState;
public CalculatorDisplayChangeEventDataImpl(@Nonnull DisplayState oldState, @Nonnull DisplayState newState) {
this.oldState = oldState;
this.newState = newState;
}
@Nonnull
@Override
public DisplayState getOldValue() {
return this.oldState;
}
@Nonnull
@Override
public DisplayState getNewValue() {
return this.newState;
}
}

5
app/src/main/java/org/solovyev/android/calculator/CalculatorDisplayFragment.java
View File

@ -42,7 +42,7 @@ public class CalculatorDisplayFragment extends Fragment {
@Nonnull
private FragmentUi fragmentUi;
@Nonnull
private AndroidCalculatorDisplayView displayView;
private DisplayView displayView;
@Override
public void onCreate(Bundle savedInstanceState) {
@ -68,8 +68,7 @@ public class CalculatorDisplayFragment extends Fragment {
public void onViewCreated(View root, Bundle savedInstanceState) {
super.onViewCreated(root, savedInstanceState);
displayView = (AndroidCalculatorDisplayView) root.findViewById(R.id.calculator_display);
displayView.init(getActivity());
displayView = (DisplayView) root.findViewById(R.id.calculator_display);
Locator.getInstance().getDisplay().setView(displayView);
fragmentUi.onViewCreated(this, root);

10
app/src/main/java/org/solovyev/android/calculator/CalculatorDisplayOnClickListener.java
View File

@ -24,15 +24,13 @@ package org.solovyev.android.calculator;
import android.support.v4.app.FragmentActivity;
import android.view.View;
import org.solovyev.android.menu.ContextMenuBuilder;
import org.solovyev.android.menu.ListContextMenu;
import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nonnull;
/**
* User: Solovyev_S
* Date: 21.09.12
@ -49,10 +47,10 @@ public class CalculatorDisplayOnClickListener implements View.OnClickListener {
@Override
public void onClick(View v) {
if (v instanceof CalculatorDisplayView) {
final CalculatorDisplay cd = Locator.getInstance().getDisplay();
if (v instanceof DisplayView) {
final Display cd = Locator.getInstance().getDisplay();
final DisplayState displayViewState = cd.getViewState();
final DisplayState displayViewState = cd.getState();
if (displayViewState.isValid()) {
final List<CalculatorDisplayMenuItem> filteredMenuItems = new ArrayList<CalculatorDisplayMenuItem>(CalculatorDisplayMenuItem.values().length);

38
app/src/main/java/org/solovyev/android/calculator/CalculatorDisplayView.java
View File

@ -1,38 +0,0 @@
/*
* Copyright 2013 serso aka se.solovyev
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Contact details
*
* Email: se.solovyev@gmail.com
* Site: http://se.solovyev.org
*/
package org.solovyev.android.calculator;
import javax.annotation.Nonnull;
/**
* User: serso
* Date: 9/20/12
* Time: 8:25 PM
*/
public interface CalculatorDisplayView {
@Nonnull
DisplayState getState();
void setState(@Nonnull DisplayState state);
}

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

@ -70,17 +70,6 @@ public enum CalculatorEventType {
conversion_finished,
/*
**********************************************************************
*
* EDITOR
*
**********************************************************************
*/
// @Nonnull CalculatorDisplayChangeEventData
display_state_changed,
/*
**********************************************************************
*

59
app/src/main/java/org/solovyev/android/calculator/CalculatorImpl.java
View File

@ -95,7 +95,7 @@ public class CalculatorImpl implements Calculator, CalculatorEventListener {
// NOTE: only one thread is responsible for events as all events must be done in order of their creating
@Nonnull
private final Executor eventExecutor = Executors.newFixedThreadPool(1);
private final Executor eventExecutor = App.getUiThreadExecutor();
private volatile boolean calculateOnFly = true;
@ -191,7 +191,7 @@ public class CalculatorImpl implements Calculator, CalculatorEventListener {
@Nonnull
@Override
public CalculatorEventData evaluate(@Nonnull final JsclOperation operation, @Nonnull final String expression, @Nonnull Long sequenceId) {
public CalculatorEventData evaluate(@Nonnull final JsclOperation operation, @Nonnull final String expression, long sequenceId) {
final CalculatorEventData eventDataId = nextEventData(sequenceId);
calculationsExecutor.execute(new Runnable() {
@ -373,7 +373,7 @@ public class CalculatorImpl implements Calculator, CalculatorEventListener {
@Nonnull final NumeralBase to) {
final CalculatorEventData eventDataId = nextEventData();
final DisplayState displayViewState = Locator.getInstance().getDisplay().getViewState();
final DisplayState displayViewState = Locator.getInstance().getDisplay().getState();
final NumeralBase from = Locator.getInstance().getEngine().getNumeralBase();
calculationsExecutor.execute(new Runnable() {
@ -483,17 +483,34 @@ public class CalculatorImpl implements Calculator, CalculatorEventListener {
if (TextUtils.equals(e.newState.text, e.oldState.text)) {
return;
}
evaluate(JsclOperation.numeric, e.newState.getTextString(), e.newState.id);
evaluate(JsclOperation.numeric, e.newState.getTextString(), e.newState.sequence);
}
@Subscribe
public void onDisplayChanged(@Nonnull Display.ChangedEvent e) {
final DisplayState newState = e.newState;
if (!newState.isValid()) {
return;
}
final String result = newState.getStringResult();
if (TextUtils.isEmpty(result)) {
return;
}
final CalculatorMathRegistry<IConstant> varsRegistry = Locator.getInstance().getEngine().getVarsRegistry();
final IConstant ansVar = varsRegistry.get(CalculatorVarsRegistry.ANS);
final Var.Builder builder = ansVar != null ? new Var.Builder(ansVar) : new Var.Builder();
builder.setName(CalculatorVarsRegistry.ANS);
builder.setValue(result);
builder.setDescription(CalculatorMessages.getBundle().getString(CalculatorMessages.ans_description));
CalculatorVarsRegistry.saveVariable(varsRegistry, builder, ansVar, this, false);
}
@Override
public void onCalculatorEvent(@Nonnull CalculatorEventData calculatorEventData, @Nonnull CalculatorEventType calculatorEventType, @Nullable Object data) {
switch (calculatorEventType) {
case display_state_changed:
onDisplayStateChanged((CalculatorDisplayChangeEventData) data);
break;
case constant_changed:
final IConstant newConstant = ((Change<IConstant>) data).getNewValue();
if (!newConstant.getName().equals(CalculatorVarsRegistry.ANS)) {
@ -531,30 +548,6 @@ public class CalculatorImpl implements Calculator, CalculatorEventListener {
}
}
private void onDisplayStateChanged(@Nonnull CalculatorDisplayChangeEventData displayChangeEventData) {
final DisplayState newState = displayChangeEventData.getNewValue();
if (newState.isValid()) {
final String result = newState.getStringResult();
if (!Strings.isEmpty(result)) {
final CalculatorMathRegistry<IConstant> varsRegistry = Locator.getInstance().getEngine().getVarsRegistry();
final IConstant ansVar = varsRegistry.get(CalculatorVarsRegistry.ANS);
final Var.Builder varBuilder;
if (ansVar != null) {
varBuilder = new Var.Builder(ansVar);
} else {
varBuilder = new Var.Builder();
}
varBuilder.setName(CalculatorVarsRegistry.ANS);
varBuilder.setValue(result);
varBuilder.setDescription(CalculatorMessages.getBundle().getString(CalculatorMessages.ans_description));
CalculatorVarsRegistry.saveVariable(varsRegistry, varBuilder, ansVar, this, false);
}
}
}
/*
**********************************************************************
*
@ -599,7 +592,7 @@ public class CalculatorImpl implements Calculator, CalculatorEventListener {
}
@Nonnull
private CalculatorDisplay getDisplay() {
private Display getDisplay() {
return Locator.getInstance().getDisplay();
}
}

2
app/src/main/java/org/solovyev/android/calculator/CalculatorKeyboard.java
View File

@ -116,7 +116,7 @@ public class CalculatorKeyboard {
}
public void copyButtonPressed() {
final DisplayState displayViewState = Locator.getInstance().getDisplay().getViewState();
final DisplayState displayViewState = Locator.getInstance().getDisplay().getState();
if (displayViewState.isValid()) {
final CharSequence text = displayViewState.getText();
if (!Strings.isEmpty(text)) {

2
app/src/main/java/org/solovyev/android/calculator/CalculatorLocator.java
View File

@ -55,7 +55,7 @@ public interface CalculatorLocator {
CalculatorEngine getEngine();
@Nonnull
CalculatorDisplay getDisplay();
Display getDisplay();
@Nonnull
Editor getEditor();

2
app/src/main/java/org/solovyev/android/calculator/CalculatorSpecialButton.java
View File

@ -115,7 +115,7 @@ public enum CalculatorSpecialButton {
return;
}
final DisplayState displayViewState = Locator.getInstance().getDisplay().getViewState();
final DisplayState displayViewState = Locator.getInstance().getDisplay().getState();
if (displayViewState.isValid()) {
final CharSequence text = displayViewState.getText();
if (!Strings.isEmpty(text)) {

118
app/src/main/java/org/solovyev/android/calculator/CalculatorDisplayImpl.java → app/src/main/java/org/solovyev/android/calculator/Display.java
View File

@ -22,97 +22,70 @@
package org.solovyev.android.calculator;
import org.solovyev.android.Check;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import static org.solovyev.android.calculator.CalculatorEventType.calculation_cancelled;
import static org.solovyev.android.calculator.CalculatorEventType.calculation_failed;
import static org.solovyev.android.calculator.CalculatorEventType.calculation_result;
import static org.solovyev.android.calculator.CalculatorEventType.conversion_failed;
import static org.solovyev.android.calculator.CalculatorEventType.conversion_result;
import static org.solovyev.android.calculator.CalculatorEventType.display_state_changed;
import static org.solovyev.android.calculator.CalculatorEventType.*;
public class CalculatorDisplayImpl implements CalculatorDisplay {
public class Display implements CalculatorEventListener {
public static class ChangedEvent {
@Nonnull
public final DisplayState oldState;
@Nonnull
public final DisplayState newState;
public ChangedEvent(@Nonnull DisplayState oldState, @Nonnull DisplayState newState) {
this.oldState = oldState;
this.newState = newState;
}
}
@Nonnull
private final CalculatorEventHolder lastEvent;
@Nonnull
private final Object viewLock = new Object();
@Nonnull
private final Calculator calculator;
@Nullable
private CalculatorDisplayView view;
private DisplayView view;
@Nonnull
private DisplayState viewState = DisplayState.empty();
private DisplayState state = DisplayState.empty();
public CalculatorDisplayImpl(@Nonnull Calculator calculator) {
this.calculator = calculator;
public Display(@Nonnull Calculator calculator) {
this.lastEvent = new CalculatorEventHolder(CalculatorUtils.createFirstEventDataId());
this.calculator.addCalculatorEventListener(this);
calculator.addCalculatorEventListener(this);
}
@Override
public void clearView(@Nonnull CalculatorDisplayView view) {
synchronized (viewLock) {
if (this.view == view) {
public void clearView(@Nonnull DisplayView view) {
Check.isMainThread();
if (this.view != view) {
return;
}
this.view = null;
}
}
}
@Nullable
@Override
public CalculatorDisplayView getView() {
return this.view;
}
@Override
public void setView(@Nonnull CalculatorDisplayView view) {
synchronized (viewLock) {
public void setView(@Nonnull DisplayView view) {
Check.isMainThread();
this.view = view;
this.view.setState(viewState);
}
this.view.setState(state);
}
@Nonnull
@Override
public DisplayState getViewState() {
return this.viewState;
public DisplayState getState() {
Check.isMainThread();
return state;
}
@Override
public void setViewState(@Nonnull DisplayState newViewState) {
synchronized (viewLock) {
final DisplayState oldViewState = setViewState0(newViewState);
public void setState(@Nonnull DisplayState newState) {
Check.isMainThread();
this.calculator.fireCalculatorEvent(display_state_changed, new CalculatorDisplayChangeEventDataImpl(oldViewState, newViewState));
final DisplayState oldState = state;
state = newState;
if (view != null) {
view.setState(newState);
}
}
private void setViewStateForSequence(@Nonnull DisplayState newViewState, @Nonnull Long sequenceId) {
synchronized (viewLock) {
final DisplayState oldViewState = setViewState0(newViewState);
this.calculator.fireCalculatorEvent(display_state_changed, new CalculatorDisplayChangeEventDataImpl(oldViewState, newViewState), sequenceId);
}
}
// must be synchronized with viewLock
@Nonnull
private DisplayState setViewState0(@Nonnull DisplayState newViewState) {
final DisplayState oldViewState = this.viewState;
this.viewState = newViewState;
if (this.view != null) {
this.view.setState(newViewState);
}
return oldViewState;
}
@Override
@Nonnull
public CalculatorEventData getLastEventData() {
return lastEvent.getLastEventData();
App.getBus().post(new ChangedEvent(oldState, newState));
}
@Override
@ -147,7 +120,7 @@ public class CalculatorDisplayImpl implements CalculatorDisplay {
private void processConversationFailed(@Nonnull CalculatorConversionEventData calculatorEventData,
@Nonnull ConversionFailure data) {
this.setViewStateForSequence(DisplayState.createError(calculatorEventData.getDisplayState().getOperation(), CalculatorMessages.getBundle().getString(CalculatorMessages.syntax_error)), calculatorEventData.getSequenceId());
setState(DisplayState.createError(calculatorEventData.getDisplayState().getOperation(), CalculatorMessages.getBundle().getString(CalculatorMessages.syntax_error), calculatorEventData.getSequenceId()));
}
@ -167,18 +140,17 @@ public class CalculatorDisplayImpl implements CalculatorDisplay {
}
}
this.setViewStateForSequence(DisplayState.createError(calculatorEventData.getOperation(), errorMessage), calculatorEventData.getSequenceId());
setState(DisplayState.createError(calculatorEventData.getOperation(), errorMessage, calculatorEventData.getSequenceId()));
}
private void processCalculationCancelled(@Nonnull CalculatorEvaluationEventData calculatorEventData) {
final String errorMessage = CalculatorMessages.getBundle().getString(CalculatorMessages.syntax_error);
this.setViewStateForSequence(DisplayState.createError(calculatorEventData.getOperation(), errorMessage), calculatorEventData.getSequenceId());
setState(DisplayState.createError(calculatorEventData.getOperation(), errorMessage, calculatorEventData.getSequenceId()));
}
private void processCalculationResult(@Nonnull CalculatorEvaluationEventData calculatorEventData, @Nonnull CalculatorOutput data) {
final String stringResult = data.getStringResult();
this.setViewStateForSequence(DisplayState.createValid(calculatorEventData.getOperation(), data.getResult(), stringResult, 0), calculatorEventData.getSequenceId());
setState(DisplayState.createValid(calculatorEventData.getOperation(), data.getResult(), stringResult, 0, calculatorEventData.getSequenceId()));
}
private void processConversationResult(@Nonnull CalculatorConversionEventData calculatorEventData, @Nonnull String result) {
@ -188,6 +160,6 @@ public class CalculatorDisplayImpl implements CalculatorDisplay {
}
final DisplayState displayState = calculatorEventData.getDisplayState();
this.setViewStateForSequence(DisplayState.createValid(displayState.getOperation(), displayState.getResult(), result, 0), calculatorEventData.getSequenceId());
setState(DisplayState.createValid(displayState.getOperation(), displayState.getResult(), result, 0, calculatorEventData.getSequenceId()));
}
}

48
app/src/main/java/org/solovyev/android/calculator/DisplayState.java
View File

@ -22,17 +22,14 @@
package org.solovyev.android.calculator;
import jscl.math.Generic;
import org.solovyev.android.calculator.jscl.JsclOperation;
import org.solovyev.common.text.Strings;
import java.io.Serializable;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jscl.math.Generic;
public class DisplayState implements Serializable {
public class DisplayState {
@Nonnull
private JsclOperation operation = JsclOperation.numeric;
@ -48,7 +45,9 @@ public class DisplayState implements Serializable {
@Nullable
private String errorMessage;
private int selection = 0;
private int selection;
private long sequence;
private DisplayState() {
}
@ -60,27 +59,30 @@ public class DisplayState implements Serializable {
@Nonnull
public static DisplayState createError(@Nonnull JsclOperation operation,
@Nonnull String errorMessage) {
final DisplayState calculatorDisplayState = new DisplayState();
calculatorDisplayState.valid = false;
calculatorDisplayState.errorMessage = errorMessage;
calculatorDisplayState.operation = operation;
return calculatorDisplayState;
@Nonnull String errorMessage,
long sequence) {
final DisplayState state = new DisplayState();
state.valid = false;
state.errorMessage = errorMessage;
state.operation = operation;
state.sequence = sequence;
return state;
}
@Nonnull
public static DisplayState createValid(@Nonnull JsclOperation operation,
@Nullable Generic result,
@Nonnull String stringResult,
int selection) {
final DisplayState calculatorDisplayState = new DisplayState();
calculatorDisplayState.valid = true;
calculatorDisplayState.result = result;
calculatorDisplayState.stringResult = stringResult;
calculatorDisplayState.operation = operation;
calculatorDisplayState.selection = selection;
return calculatorDisplayState;
int selection,
long sequence) {
final DisplayState state = new DisplayState();
state.valid = true;
state.result = result;
state.stringResult = stringResult;
state.operation = operation;
state.selection = selection;
state.sequence = sequence;
return state;
}
@Nonnull
@ -115,4 +117,8 @@ public class DisplayState implements Serializable {
public JsclOperation getOperation() {
return this.operation;
}
public long getSequence() {
return sequence;
}
}

113
app/src/main/java/org/solovyev/android/calculator/DisplayView.java Normal file
View File

@ -0,0 +1,113 @@
/*
* Copyright 2013 serso aka se.solovyev
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Contact details
*
* Email: se.solovyev@gmail.com
* Site: http://se.solovyev.org
*/
package org.solovyev.android.calculator;
import android.app.Service;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.v4.app.FragmentActivity;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.TypedValue;
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 javax.annotation.Nonnull;
public class DisplayView extends AutoResizeTextView {
@Nonnull
private final TextProcessor<TextProcessorEditorResult, String> textHighlighter = new TextHighlighter(getTextColors().getDefaultColor(), false);
@Nonnull
private DisplayState state = DisplayState.empty();
public DisplayView(Context context) {
super(context);
init(context);
}
public DisplayView(Context context, AttributeSet attrs) {
super(context, attrs);
init(context);
}
public DisplayView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
init(context);
}
private void init(@Nonnull Context context) {
setAddEllipsis(false);
setMinTextSize(10);
if (context instanceof Service) {
return;
}
final Preferences.Gui.Layout layout = Preferences.Gui.getLayout(App.getPreferences());
if (!layout.isOptimized()) {
setTextSize(TypedValue.COMPLEX_UNIT_SP, getResources().getDimension(R.dimen.cpp_display_text_size_mobile));
}
setOnClickListener(new CalculatorDisplayOnClickListener((FragmentActivity) context));
}
@Nonnull
private Preferences.Gui.TextColor getTextColor() {
final Context context = getContext();
return App.getThemeFor(context).getTextColorFor(context);
}
@Nonnull
public DisplayState getState() {
Check.isMainThread();
return state;
}
public void setState(@Nonnull final DisplayState newState) {
Check.isMainThread();
state = newState;
if (state.isValid()) {
setText(highlightText(state));
setTextColor(getTextColor().normal);
} else {
setText(App.unspan(getText()));
setTextColor(getTextColor().error);
}
}
@NonNull
private CharSequence highlightText(@Nonnull DisplayState state) {
final String text = state.getStringResult();
if (TextUtils.isEmpty(text)) {
return "";
}
try {
return textHighlighter.process(text).getCharSequence();
} catch (CalculatorParseException e) {
return text;
}
}
}

7
app/src/main/java/org/solovyev/android/calculator/EditorState.java
View File

@ -29,9 +29,10 @@ import javax.annotation.Nullable;
public class EditorState {
private static long counter;
public static final long NO_SEQUENCE = -1;
private static long counter = NO_SEQUENCE + 1;
public final long id;
public final long sequence;
@Nonnull
public final CharSequence text;
public final int selection;
@ -44,7 +45,7 @@ public class EditorState {
private EditorState(@Nonnull CharSequence text, int selection) {
Check.isMainThread();
this.id = counter++;
this.sequence = counter++;
this.text = text;
this.selection = selection;
}

8
app/src/main/java/org/solovyev/android/calculator/Locator.java
View File

@ -46,7 +46,7 @@ public class Locator implements CalculatorLocator {
@Nonnull
private Editor editor;
@Nonnull
private CalculatorDisplay calculatorDisplay;
private Display display;
@Nonnull
private CalculatorKeyboard calculatorKeyboard;
@Nonnull
@ -93,7 +93,7 @@ public class Locator implements CalculatorLocator {
this.calculatorPlotter = plotter;
editor = new Editor(this.calculator, editorTextProcessor);
calculatorDisplay = new CalculatorDisplayImpl(this.calculator);
display = new Display(this.calculator);
calculatorKeyboard = keyboard;
}
@ -111,8 +111,8 @@ public class Locator implements CalculatorLocator {
@Override
@Nonnull
public CalculatorDisplay getDisplay() {
return calculatorDisplay;
public Display getDisplay() {
return display;
}
@Nonnull

2
app/src/main/java/org/solovyev/android/calculator/Preferences.java
View File

@ -315,7 +315,7 @@ public final class Preferences {
}
@Nonnull
public TextColor getTextColor(@Nonnull Context context) {
public TextColor getTextColorFor(@Nonnull Context context) {
final int themeId = getThemeFor(context);
TextColor textColor = textColors.get(themeId);
if (textColor == null) {

36
app/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryImpl.java
View File

@ -35,7 +35,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import static org.solovyev.android.calculator.CalculatorEventType.*;
import static org.solovyev.android.calculator.CalculatorEventType.manual_calculation_requested;
public class CalculatorHistoryImpl implements CalculatorHistory {
@ -51,7 +51,7 @@ public class CalculatorHistoryImpl implements CalculatorHistory {
private final CalculatorEventHolder lastEventData = new CalculatorEventHolder(CalculatorUtils.createFirstEventDataId());
@Nullable
private volatile EditorState lastEditorViewState;
private EditorState lastEditorState;
public CalculatorHistoryImpl(@Nonnull Calculator calculator) {
calculator.addCalculatorEventListener(this);
@ -246,33 +246,31 @@ public class CalculatorHistoryImpl implements CalculatorHistory {
@Subscribe
public void onEditorChanged(@Nonnull Editor.ChangedEvent e) {
lastEditorViewState = e.newState;
lastEditorState = e.newState;
}
@Subscribe
public void onDisplayChanged(@Nonnull Display.ChangedEvent e) {
if (lastEditorState == null) {
return;
}
if (lastEditorState.sequence != e.newState.getSequence()) {
return;
}
addState(HistoryState.create(lastEditorState, e.newState));
lastEditorState = null;
}
@Override
public void onCalculatorEvent(@Nonnull CalculatorEventData calculatorEventData,
@Nonnull CalculatorEventType calculatorEventType,
@Nullable Object data) {
if (calculatorEventType.isOfType(display_state_changed, manual_calculation_requested)) {
if (calculatorEventType.isOfType(manual_calculation_requested)) {
final CalculatorEventHolder.Result result = lastEventData.apply(calculatorEventData);
if (result.isNewAfter() && result.isNewSameOrAfterSequence()) {
switch (calculatorEventType) {
case manual_calculation_requested:
lastEditorViewState = (EditorState) data;
break;
case display_state_changed:
if (result.isSameSequence()) {
if (lastEditorViewState != null) {
final EditorState editorViewState = lastEditorViewState;
final CalculatorDisplayChangeEventData displayChangeData = (CalculatorDisplayChangeEventData) data;
final DisplayState displayViewState = displayChangeData.getNewValue();
addState(HistoryState.create(editorViewState, displayViewState));
}
} else {
lastEditorViewState = null;
}
lastEditorState = (EditorState) data;
break;
}
}

18
app/src/main/java/org/solovyev/android/calculator/history/DisplayHistoryState.java
View File

@ -22,25 +22,19 @@
package org.solovyev.android.calculator.history;
import jscl.math.Generic;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
import org.simpleframework.xml.Transient;
import org.solovyev.android.calculator.CalculatorDisplay;
import org.solovyev.android.calculator.Display;
import org.solovyev.android.calculator.DisplayState;
import org.solovyev.android.calculator.EditorState;
import org.solovyev.android.calculator.jscl.JsclOperation;
import org.solovyev.common.text.Strings;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jscl.math.Generic;
/**
* User: serso
* Date: 9/17/11
* Time: 11:05 PM
*/
@Root
public class DisplayHistoryState implements Cloneable {
@ -81,11 +75,11 @@ public class DisplayHistoryState implements Cloneable {
return result;
}
public void setValuesFromHistory(@Nonnull CalculatorDisplay display) {
public void setValuesFromHistory(@Nonnull Display display) {
if (this.isValid()) {
display.setViewState(DisplayState.createValid(this.getJsclOperation(), this.getGenericResult(), Strings.getNotEmpty(this.getEditorState().getText(), ""), this.getEditorState().getCursorPosition()));
display.setState(DisplayState.createValid(this.getJsclOperation(), this.getGenericResult(), Strings.getNotEmpty(this.getEditorState().getText(), ""), this.getEditorState().getCursorPosition(), EditorState.NO_SEQUENCE));
} else {
display.setViewState(DisplayState.createError(this.getJsclOperation(), Strings.getNotEmpty(this.getErrorMessage(), "")));
display.setState(DisplayState.createError(this.getJsclOperation(), Strings.getNotEmpty(this.getErrorMessage(), ""), EditorState.NO_SEQUENCE));
}
}

8
app/src/main/java/org/solovyev/android/calculator/history/HistoryState.java
View File

@ -24,7 +24,7 @@ package org.solovyev.android.calculator.history;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
import org.solovyev.android.calculator.CalculatorDisplay;
import org.solovyev.android.calculator.Display;
import org.solovyev.android.calculator.DisplayState;
import org.solovyev.android.calculator.Editor;
import org.solovyev.android.calculator.EditorState;
@ -54,8 +54,8 @@ public class HistoryState extends BaseHistoryState {
@Nonnull
public static HistoryState create(@Nonnull Editor editor,
@Nonnull CalculatorDisplay display) {
return create(editor.getState(), display.getViewState());
@Nonnull Display display) {
return create(editor.getState(), display.getState());
}
@Nonnull
@ -106,7 +106,7 @@ public class HistoryState extends BaseHistoryState {
return result;
}
public void setValuesFromHistory(@Nonnull Editor editor, @Nonnull CalculatorDisplay display) {
public void setValuesFromHistory(@Nonnull Editor editor, @Nonnull Display display) {
this.getEditorState().setValuesFromHistory(editor);
this.getDisplayState().setValuesFromHistory(display);
}

24
app/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenService.java
View File

@ -41,12 +41,7 @@ import org.solovyev.android.calculator.*;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
/**
* User: serso
* Date: 11/20/12
* Time: 9:42 PM
*/
public class CalculatorOnscreenService extends Service implements OnscreenViewListener, CalculatorEventListener, SharedPreferences.OnSharedPreferenceChangeListener {
public class CalculatorOnscreenService extends Service implements OnscreenViewListener, SharedPreferences.OnSharedPreferenceChangeListener {
public static final Class<CalculatorOnscreenBroadcastReceiver> INTENT_LISTENER_CLASS = CalculatorOnscreenBroadcastReceiver.class;
private static final String SHOW_WINDOW_ACTION = "org.solovyev.android.calculator.onscreen.SHOW_WINDOW";
@ -107,7 +102,7 @@ public class CalculatorOnscreenService extends Service implements OnscreenViewLi
view = CalculatorOnscreenView.create(this, CalculatorOnscreenViewState.create(width, height, -1, -1), this);
view.show();
view.updateEditorState(Locator.getInstance().getEditor().getState());
view.updateDisplayState(Locator.getInstance().getDisplay().getViewState());
view.updateDisplayState(Locator.getInstance().getDisplay().getState());
App.getBus().register(this);
App.getPreferences().registerOnSharedPreferenceChangeListener(this);
@ -186,15 +181,6 @@ public class CalculatorOnscreenService extends Service implements OnscreenViewLi
nm.notify(NOTIFICATION_ID, builder.getNotification());
}
@Override
public void onCalculatorEvent(@Nonnull CalculatorEventData calculatorEventData, @Nonnull CalculatorEventType calculatorEventType, @Nullable Object data) {
switch (calculatorEventType) {
case display_state_changed:
view.updateDisplayState(((CalculatorDisplayChangeEventData) data).getNewValue());
break;
}
}
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
Check.isNotNull(view);
@ -215,5 +201,11 @@ public class CalculatorOnscreenService extends Service implements OnscreenViewLi
Check.isNotNull(view);
view.updateEditorState(e.state);
}
@Subscribe
public void onDisplayChanged(@Nonnull Display.ChangedEvent e) {
Check.isNotNull(view);
view.updateDisplayState(e.newState);
}
}

5
app/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenView.java
View File

@ -91,7 +91,7 @@ public class CalculatorOnscreenView {
private EditorView editorView;
@Nonnull
private AndroidCalculatorDisplayView displayView;
private DisplayView displayView;
@Nonnull
private Context context;
@ -215,8 +215,7 @@ public class CalculatorOnscreenView {
headerTitle.setImageDrawable(null);
content = root.findViewById(R.id.onscreen_content);
displayView = (AndroidCalculatorDisplayView) root.findViewById(R.id.calculator_display);
displayView.init(this.context, false);
displayView = (DisplayView) root.findViewById(R.id.calculator_display);
editorView = (EditorView) root.findViewById(R.id.calculator_editor);

2
app/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotFragment.java
View File

@ -71,7 +71,7 @@ public class CalculatorPlotFragment extends AbstractCalculatorPlotFragment {
graphView = new CalculatorGraph2dView(getActivity());
}
final int color = App.getTheme().getTextColor(getActivity()).normal;
final int color = App.getTheme().getTextColorFor(getActivity()).normal;
graphView.init(PlotViewDef.newInstance(color, color, Color.DKGRAY, getBgColor(d3)));
final PlotBoundaries boundaries = plotData.getBoundaries();

2
app/src/main/java/org/solovyev/android/calculator/view/EditorTextProcessor.java
View File

@ -92,6 +92,6 @@ public final class EditorTextProcessor implements TextProcessor<TextProcessorEdi
private int getTextColor(@Nonnull SharedPreferences preferences) {
final Preferences.Gui.Theme theme = Preferences.Gui.getTheme(preferences);
final Application application = App.getApplication();
return theme.getTextColor(application).normal;
return theme.getTextColorFor(application).normal;
}
}

14
app/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidget.java
View File

@ -33,7 +33,6 @@ import android.content.res.Resources;
import android.graphics.Typeface;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.content.ContextCompat;
import android.text.SpannableString;
import android.text.SpannableStringBuilder;
@ -112,7 +111,7 @@ public class CalculatorWidget extends AppWidgetProvider {
@Nonnull int[] widgetIds,
boolean partially) {
final EditorState editorState = Locator.getInstance().getEditor().getState();
final DisplayState displayState = Locator.getInstance().getDisplay().getViewState();
final DisplayState displayState = Locator.getInstance().getDisplay().getState();
final Resources resources = context.getResources();
final SimpleTheme theme = App.getWidgetTheme().resolveThemeFor(App.getTheme());
@ -222,7 +221,7 @@ public class CalculatorWidget extends AppWidgetProvider {
final CharSequence text = state.text;
final int selection = state.selection;
if (selection < 0 || selection > text.length()) {
views.setTextViewText(R.id.calculator_editor, unspan ? unspan(text) : text);
views.setTextViewText(R.id.calculator_editor, unspan ? App.unspan(text) : text);
return;
}
@ -233,9 +232,9 @@ public class CalculatorWidget extends AppWidgetProvider {
final CharSequence afterCursor = text.subSequence(selection, text.length());
result = new SpannableStringBuilder();
result.append(unspan(beforeCursor));
result.append(App.unspan(beforeCursor));
result.append(getCursorString(context));
result.append(unspan(afterCursor));
result.append(App.unspan(afterCursor));
} else {
result = new SpannableStringBuilder(text);
result.insert(selection, getCursorString(context));
@ -243,11 +242,6 @@ public class CalculatorWidget extends AppWidgetProvider {
views.setTextViewText(R.id.calculator_editor, result);
}
@NonNull
private String unspan(@Nonnull CharSequence spannable) {
return spannable.toString();
}
private static class Intents {
@Nonnull
private final EnumMap<CalculatorButton, PendingIntent> map = new EnumMap<>(CalculatorButton.class);

2
app/src/main/res/layout-large/cpp_app_display.xml
View File

@ -34,7 +34,7 @@
a:layout_width="match_parent"
a:layout_height="wrap_content" />
<org.solovyev.android.calculator.AndroidCalculatorDisplayView
<org.solovyev.android.calculator.DisplayView
a:id="@+id/calculator_display"
style="@style/CppText.Display"
a:inputType="textMultiLine"

2
app/src/main/res/layout-xlarge/cpp_app_display.xml
View File

@ -34,7 +34,7 @@
a:layout_width="match_parent"
a:layout_height="wrap_content" />
<org.solovyev.android.calculator.AndroidCalculatorDisplayView
<org.solovyev.android.calculator.DisplayView
a:id="@+id/calculator_display"
style="@style/CppText.Display"
a:inputType="textMultiLine"

2
app/src/main/res/layout/cpp_app_display.xml
View File

@ -22,7 +22,7 @@
~ Site: http://se.solovyev.org
-->
<org.solovyev.android.calculator.AndroidCalculatorDisplayView
<org.solovyev.android.calculator.DisplayView
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/calculator_display"
style="@style/CppText.Display"

2
app/src/main/res/layout/cpp_app_display_mobile.xml
View File

@ -22,7 +22,7 @@
~ Site: http://se.solovyev.org
-->
<org.solovyev.android.calculator.AndroidCalculatorDisplayView
<org.solovyev.android.calculator.DisplayView
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/calculator_display"
style="@style/CppText.Display"

2
app/src/main/res/layout/onscreen_display.xml
View File

@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org
-->
<org.solovyev.android.calculator.AndroidCalculatorDisplayView
<org.solovyev.android.calculator.DisplayView
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/calculator_display"
style="@style/CppText.Display.Onscreen"

2
app/src/main/res/layout/onscreen_display_light.xml
View File

@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org
-->
<org.solovyev.android.calculator.AndroidCalculatorDisplayView
<org.solovyev.android.calculator.DisplayView
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/calculator_display"
style="@style/CppText.Display.Onscreen.Light"

46
app/src/test/java/org/solovyev/android/calculator/CalculatorDisplayViewStateImplTest.java
View File

@ -1,46 +0,0 @@
/*
* Copyright 2013 serso aka se.solovyev
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Contact details
*
* Email: se.solovyev@gmail.com
* Site: http://se.solovyev.org
*/
package org.solovyev.android.calculator;
import org.junit.Test;
import org.solovyev.android.calculator.jscl.JsclOperation;
import jscl.math.Expression;
/**
* User: serso
* Date: 10/20/12
* Time: 12:24 PM
*/
public class CalculatorDisplayViewStateImplTest {
@Test
public void testSerializable() throws Exception {
CalculatorTestUtils.testSerialization(DisplayState.createValid(JsclOperation.numeric, null, "test", 3));
CalculatorTestUtils.testSerialization(DisplayState.createValid(JsclOperation.numeric, Expression.valueOf("3"), "test", 3));
CalculatorTestUtils.testSerialization(DisplayState.createValid(JsclOperation.simplify, Expression.valueOf("3+3"), "test", 3));
CalculatorTestUtils.testSerialization(DisplayState.empty());
CalculatorTestUtils.testSerialization(DisplayState.createError(JsclOperation.numeric, "ertert"));
}
}

36
app/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java
View File

@ -23,28 +23,20 @@
package org.solovyev.android.calculator;
import android.content.Context;
import jscl.JsclMathEngine;
import org.junit.Assert;
import org.mockito.Mockito;
import org.solovyev.android.calculator.history.CalculatorHistory;
import org.solovyev.android.calculator.jscl.JsclOperation;
import org.solovyev.android.calculator.plot.CalculatorPlotter;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.io.*;
import java.text.DecimalFormatSymbols;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jscl.JsclMathEngine;
/**
* User: serso
* Date: 10/7/12
@ -75,12 +67,8 @@ public class CalculatorTestUtils {
}
public static void initViews(@Nonnull Context context) {
final EditorView editor = new EditorView(context);
Locator.getInstance().getEditor().setView(editor);
final AndroidCalculatorDisplayView display = new AndroidCalculatorDisplayView(context);
display.init(context);
Locator.getInstance().getDisplay().setView(display);
Locator.getInstance().getEditor().setView(new EditorView(context));
Locator.getInstance().getDisplay().setView(new DisplayView(context));
}
@Nonnull
@ -104,7 +92,7 @@ public class CalculatorTestUtils {
public static void assertEval(@Nonnull String expected, @Nonnull String expression, @Nonnull JsclOperation operation) {
final Calculator calculator = Locator.getInstance().getCalculator();
Locator.getInstance().getDisplay().setViewState(DisplayState.empty());
Locator.getInstance().getDisplay().setState(DisplayState.empty());
final CountDownLatch latch = new CountDownLatch(1);
final TestCalculatorEventListener calculatorEventListener = new TestCalculatorEventListener(latch);
@ -160,7 +148,7 @@ public class CalculatorTestUtils {
public static void assertError(@Nonnull String expression, @Nonnull JsclOperation operation) {
final Calculator calculator = Locator.getInstance().getCalculator();
Locator.getInstance().getDisplay().setViewState(DisplayState.empty());
Locator.getInstance().getDisplay().setState(DisplayState.empty());
final CountDownLatch latch = new CountDownLatch(1);
final TestCalculatorEventListener calculatorEventListener = new TestCalculatorEventListener(latch);
@ -204,10 +192,10 @@ public class CalculatorTestUtils {
waitForEventData();
if (calculatorEventData.isSameSequence(this.calculatorEventData)) {
if (calculatorEventType == CalculatorEventType.display_state_changed) {
final CalculatorDisplayChangeEventData displayChange = (CalculatorDisplayChangeEventData) data;
/*if (calculatorEventType == CalculatorEventType.display_state_changed) {
final Display.ChangedEvent displayChange = (Display.ChangedEvent) data;
result = displayChange.getNewValue();
result = displayChange.newState;
try {
// need to sleep a little bit as await
@ -215,7 +203,7 @@ public class CalculatorTestUtils {
} catch (InterruptedException e) {
}
latch.countDown();
}
}*/
}
}

8
app/src/test/java/org/solovyev/android/calculator/history/HistoryUtilsTest.java
View File

@ -137,7 +137,7 @@ public class HistoryUtilsTest {
HistoryHelper<HistoryState> history = SimpleHistoryHelper.newInstance();
DisplayState calculatorDisplay = DisplayState.createError(JsclOperation.simplify, "Error");
DisplayState calculatorDisplay = DisplayState.createError(JsclOperation.simplify, "Error", EditorState.NO_SEQUENCE);
EditorState calculatorEditor = EditorState.create("1+1", 3);
@ -152,7 +152,7 @@ public class HistoryUtilsTest {
assertEquals(toXml1, createHistory(history).toXml());
calculatorDisplay = DisplayState.createValid(JsclOperation.numeric, null, "5/6", 3);
calculatorDisplay = DisplayState.createValid(JsclOperation.numeric, null, "5/6", 3, EditorState.NO_SEQUENCE);
calculatorEditor = EditorState.create("5/6", 2);
@ -161,7 +161,7 @@ public class HistoryUtilsTest {
state.setTime(date.getTime());
history.addState(state);
calculatorDisplay = DisplayState.createError(JsclOperation.elementary, "Error");
calculatorDisplay = DisplayState.createError(JsclOperation.elementary, "Error", EditorState.NO_SEQUENCE);
calculatorEditor = EditorState.create("", 1);
@ -170,7 +170,7 @@ public class HistoryUtilsTest {
state.setTime(date.getTime());
history.addState(state);
calculatorDisplay = DisplayState.createValid(JsclOperation.numeric, null, "4+5/35sin(41)+dfdsfsdfs", 1);
calculatorDisplay = DisplayState.createValid(JsclOperation.numeric, null, "4+5/35sin(41)+dfdsfsdfs", 1, EditorState.NO_SEQUENCE);
calculatorEditor = EditorState.create("4+5/35sin(41)+dfdsfsdfs", 0);