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

New architecture

Browse Source
This commit is contained in:
Sergey Solovyev 2012-09-23 19:25:05 +04:00
parent bb2bf70cc2
commit b2fe1d43c9
14 changed files with 36 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorImpl.java
View File

@ -3,7 +3,6 @@ package org.solovyev.android.calculator;
import jscl.AbstractJsclArithmeticException;
import jscl.NumeralBase;
import jscl.NumeralBaseException;
import jscl.math.Expression;
import jscl.math.Generic;
import jscl.text.ParseInterruptedException;
import org.jetbrains.annotations.NotNull;
@ -238,8 +237,7 @@ public class CalculatorImpl implements Calculator, CalculatorEventListener {
expression = expression.trim();
if (StringUtils.isEmpty(expression)) {
final CalculatorOutputImpl data = new CalculatorOutputImpl("", operation, Expression.valueOf(""));
fireCalculatorEvent(newCalculationEventData(operation, expression, sequenceId), CalculatorEventType.calculation_result, data);
fireCalculatorEvent(newCalculationEventData(operation, expression, sequenceId), CalculatorEventType.calculation_result, CalculatorOutputImpl.newEmptyOutput(operation));
} else {
preparedExpression = preprocessor.process(expression);
@ -252,7 +250,7 @@ public class CalculatorImpl implements Calculator, CalculatorEventListener {
// NOTE: toString() method must be called here as ArithmeticOperationException may occur in it (just to avoid later check!)
result.toString();
final CalculatorOutputImpl data = new CalculatorOutputImpl(operation.getFromProcessor().process(result), operation, result);
final CalculatorOutput data = CalculatorOutputImpl.newOutput(operation.getFromProcessor().process(result), operation, result);
fireCalculatorEvent(newCalculationEventData(operation, expression, sequenceId), CalculatorEventType.calculation_result, data);
} catch (AbstractJsclArithmeticException e) {

5
calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorOutput.java
View File

@ -2,6 +2,7 @@ package org.solovyev.android.calculator;
import jscl.math.Generic;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.android.calculator.jscl.JsclOperation;
/**
@ -17,6 +18,8 @@ public interface CalculatorOutput {
@NotNull
JsclOperation getOperation();
@NotNull
// null in case of empty expression
@Nullable
Generic getResult();
}

21
calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorOutputImpl.java
View File

@ -2,6 +2,7 @@ package org.solovyev.android.calculator;
import jscl.math.Generic;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.android.calculator.jscl.JsclOperation;
/**
@ -11,7 +12,7 @@ import org.solovyev.android.calculator.jscl.JsclOperation;
*/
public class CalculatorOutputImpl implements CalculatorOutput {
@NotNull
@Nullable
private Generic result;
@NotNull
@ -20,12 +21,26 @@ public class CalculatorOutputImpl implements CalculatorOutput {
@NotNull
private JsclOperation operation;
public CalculatorOutputImpl(@NotNull String stringResult, @NotNull JsclOperation operation, @NotNull Generic result) {
private CalculatorOutputImpl(@NotNull String stringResult,
@NotNull JsclOperation operation,
@Nullable Generic result) {
this.stringResult = stringResult;
this.operation = operation;
this.result = result;
}
@NotNull
public static CalculatorOutput newOutput(@NotNull String stringResult,
@NotNull JsclOperation operation,
@NotNull Generic result) {
return new CalculatorOutputImpl(stringResult, operation, result);
}
@NotNull
public static CalculatorOutput newEmptyOutput(@NotNull JsclOperation operation) {
return new CalculatorOutputImpl("", operation, null);
}
@Override
@NotNull
public String getStringResult() {
@ -39,7 +54,7 @@ public class CalculatorOutputImpl implements CalculatorOutput {
}
@Override
@NotNull
@Nullable
public Generic getResult() {
return result;
}

2
calculatorpp-service/AndroidManifest.xml
View File

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="0.1" package="org.solovyev.android.calculator"/>

44
calculatorpp-service/pom.xml
View File

@ -1,44 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp-parent</artifactId>
<version>1.3.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp-service</artifactId>
<version>1.3.2</version>
<packaging>apklib</packaging>
<name>Calculator++ Service</name>
<dependencies>
<dependency>
<groupId>com.intellij</groupId>
<artifactId>annotations</artifactId>
</dependency>
<dependency>
<groupId>com.google.android</groupId>
<artifactId>android</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<extensions>
<extension>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
</extension>
</extensions>
</build>
</project>

3
calculatorpp-service/res/values/dummy.xml
View File

@ -1,3 +0,0 @@
<resources>
<!--this file is needed only for one purpose - to save res folder as it is needed for build-->
</resources>

33
calculatorpp-service/src/main/java/org/solovyev/android/LocalBinder.java
View File

@ -1,33 +0,0 @@
package org.solovyev.android;
import android.os.Binder;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.lang.ref.WeakReference;
/**
* A generic implementation of Binder to be used for local services
*
* @param <S> The type of the service being bound
* @author Geoff Bruckner 12th December 2009
*/
public class LocalBinder<S> extends Binder {
@NotNull
private static String TAG = "LocalBinder";
@NotNull
private WeakReference<S> serviceReference;
public LocalBinder(@NotNull S service) {
serviceReference = new WeakReference<S>(service);
}
@Nullable
public S getService() {
return serviceReference.get();
}
}

78
calculatorpp-service/src/main/java/org/solovyev/android/calculator/CalculationServiceImpl.java
View File

@ -1,78 +0,0 @@
package org.solovyev.android.calculator;
import android.app.Service;
import android.content.Intent;
import android.os.*;
import android.os.Process;
import android.widget.Toast;
import org.jetbrains.annotations.NotNull;
import org.solovyev.android.LocalBinder;
/**
* User: serso
* Date: 3/5/12
* Time: 10:23 PM
*/
public class CalculationServiceImpl extends Service implements ICalculationService {
@NotNull
private ServiceHandler handler;
public CalculationServiceImpl() {
}
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
//Toast.makeText(this, ".CalculationService.onStartCommand", Toast.LENGTH_SHORT).show();
// For each start request, send a message to start a job and deliver the
// start ID so we know which request we're stopping when we finish the job
final Message msg = handler.obtainMessage();
msg.arg1 = startId;
handler.sendMessage(msg);
// If we get killed, after returning from here, restart
return START_STICKY;
}
@Override
public void onCreate() {
//Toast.makeText(this, ".CalculationService.onCreate", Toast.LENGTH_SHORT).show();
// first time initialization
// Start up the thread running the service. Note that we create a
// separate thread because the service normally runs in the process's
// main thread, which we don't want to block. We also make it
// background priority so CPU-intensive work will not disrupt our UI.
final HandlerThread thread = new HandlerThread("ServiceStartArguments", Process.THREAD_PRIORITY_BACKGROUND);
thread.start();
handler = new ServiceHandler(thread.getLooper());
}
@Override
public void onDestroy() {
// last time call
//Toast.makeText(this, ".CalculationService.onDestroy", Toast.LENGTH_SHORT).show();
}
@Override
public IBinder onBind(Intent intent) {
return new LocalBinder<ICalculationService>(this);
}
private final class ServiceHandler extends Handler {
private ServiceHandler(@NotNull Looper looper) {
super(looper);
}
@Override
public void handleMessage(@NotNull Message msg) {
//Toast.makeText(CalculationServiceImpl.this, "Doing job!", Toast.LENGTH_SHORT).show();
stopSelf(msg.arg1);
}
}
}

9
calculatorpp-service/src/main/java/org/solovyev/android/calculator/ICalculationService.java
View File

@ -1,9 +0,0 @@
package org.solovyev.android.calculator;
/**
* User: serso
* Date: 3/5/12
* Time: 10:23 PM
*/
public interface ICalculationService {
}

14
calculatorpp/pom.xml
View File

@ -26,13 +26,6 @@
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp-service</artifactId>
<version>1.3.2</version>
<type>apklib</type>
</dependency>
<dependency>
<groupId>org.solovyev</groupId>
<artifactId>common-core</artifactId>
@ -79,13 +72,6 @@
<type>apklib</type>
</dependency>
<dependency>
<groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp-service</artifactId>
<version>0.1</version>
<type>apklib</type>
</dependency>
<dependency>
<groupId>org.solovyev</groupId>
<artifactId>jscl</artifactId>

13
calculatorpp/project.properties
View File

@ -9,12 +9,11 @@
# Project target.
target=android-15
android.library.reference.1=gen-external-apklibs/org.solovyev.android_calculatorpp-service_0.1
android.library.reference.2=gen-external-apklibs/org.solovyev.android_android-common-core_1.0.0
android.library.reference.3=gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.0
android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-view_1.0.0
android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.0
android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-other_1.0.0
android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.0
android.library.reference.1=gen-external-apklibs/org.solovyev.android_android-common-core_1.0.0
android.library.reference.2=gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.0
android.library.reference.3=gen-external-apklibs/org.solovyev.android_android-common-view_1.0.0
android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.0
android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-other_1.0.0
android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.0

6
calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorDisplayView.java
View File

@ -95,8 +95,10 @@ public class AndroidCalculatorDisplayView extends AutoResizeTextView implements
redraw();
} else {
setTextColor(getResources().getColor(R.color.display_error_text_color));
setText(state.getErrorMessage());
redraw();
// error messages are never shown -> just greyed out text (error message will be shown on click)
//setText(state.getErrorMessage());
//redraw();
}
}
}

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

@ -7,11 +7,10 @@ package org.solovyev.android.calculator;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.*;
import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
import android.os.Bundle;
import android.os.IBinder;
import android.os.Vibrator;
import android.preference.PreferenceManager;
import android.text.Html;
@ -32,7 +31,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.android.AndroidUtils;
import org.solovyev.android.FontSizeAdjuster;
import org.solovyev.android.LocalBinder;
import org.solovyev.android.calculator.about.CalculatorReleaseNotesActivity;
import org.solovyev.android.calculator.history.CalculatorHistoryState;
import org.solovyev.android.calculator.model.AndroidCalculatorEngine;
@ -57,7 +55,7 @@ import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.List;
public class CalculatorActivity extends Activity implements FontSizeAdjuster, SharedPreferences.OnSharedPreferenceChangeListener, ServiceConnection {
public class CalculatorActivity extends Activity implements FontSizeAdjuster, SharedPreferences.OnSharedPreferenceChangeListener {
@NotNull
public static final String TAG = "Calculator++";
@ -67,9 +65,6 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
@Nullable
private IBillingObserver billingObserver;
@Nullable
private ICalculationService calculationService;
@NotNull
private final Announcer<DragPreferencesChangeListener> dpclRegister = new Announcer<DragPreferencesChangeListener>(DragPreferencesChangeListener.class);
@ -110,8 +105,6 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
super.onCreate(savedInstanceState);
setLayout(preferences);
bindService(new Intent(this, CalculationServiceImpl.class), this, Context.BIND_AUTO_CREATE);
if (customTitleSupported) {
try {
getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.calc_title);
@ -421,17 +414,6 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
return onDragListener;
}
@Override
public void onServiceConnected(ComponentName componentName, IBinder binder) {
if (binder instanceof LocalBinder) {
calculationService = (ICalculationService)((LocalBinder) binder).getService();
}
}
@Override
public void onServiceDisconnected(ComponentName componentName) {
}
private synchronized void setLayout(@NotNull SharedPreferences preferences) {
layout = CalculatorPreferences.Gui.layout.getPreferenceNoError(preferences);

1
pom.xml
View File

@ -13,7 +13,6 @@
<modules>
<module>calculatorpp</module>
<module>calculatorpp-service</module>
<module>calculatorpp-test</module>
<module>calculatorpp-core</module>
</modules>