merging
This commit is contained in:
parent
87254f5335
commit
a130a581a2
@ -133,10 +133,10 @@ public final class CalculatorButtons {
|
|||||||
boolean result = false;
|
boolean result = false;
|
||||||
|
|
||||||
if (dragDirection == DragDirection.up) {
|
if (dragDirection == DragDirection.up) {
|
||||||
Locator.getInstance().getCalculator().fireCalculatorEvent(CalculatorEventType.show_create_var_dialog, null);
|
Locator.getInstance().getCalculator().fireCalculatorEvent(CalculatorEventType.show_create_var_dialog, null, context);
|
||||||
result = true;
|
result = true;
|
||||||
} else if ( dragDirection == DragDirection.down ) {
|
} else if ( dragDirection == DragDirection.down ) {
|
||||||
Locator.getInstance().getCalculator().fireCalculatorEvent(CalculatorEventType.show_create_matrix_dialog, null);
|
Locator.getInstance().getCalculator().fireCalculatorEvent(CalculatorEventType.show_create_matrix_dialog, null, context);
|
||||||
result = true;
|
result = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -251,7 +251,7 @@ public final class CalculatorButtons {
|
|||||||
boolean result = false;
|
boolean result = false;
|
||||||
|
|
||||||
if (dragDirection == DragDirection.up) {
|
if (dragDirection == DragDirection.up) {
|
||||||
Locator.getInstance().getCalculator().fireCalculatorEvent(CalculatorEventType.show_create_function_dialog, null);
|
Locator.getInstance().getCalculator().fireCalculatorEvent(CalculatorEventType.show_create_function_dialog, null, context);
|
||||||
result = true;
|
result = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
package org.solovyev.android;
|
package org.solovyev.android;
|
||||||
|
|
||||||
|
import android.app.Activity;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* User: Solovyev_S
|
* User: Solovyev_S
|
||||||
* Date: 03.10.12
|
* Date: 03.10.12
|
||||||
@ -11,4 +16,18 @@ public final class AndroidUtils2 {
|
|||||||
throw new AssertionError();
|
throw new AssertionError();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void addFlags(@NotNull Intent intent, boolean detached, @NotNull Context context) {
|
||||||
|
int flags = 0;
|
||||||
|
|
||||||
|
if (!(context instanceof Activity)) {
|
||||||
|
flags = flags | Intent.FLAG_ACTIVITY_NEW_TASK;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (detached) {
|
||||||
|
flags = flags | Intent.FLAG_ACTIVITY_NO_HISTORY;
|
||||||
|
}
|
||||||
|
|
||||||
|
intent.setFlags(flags);
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,6 @@ package org.solovyev.android.calculator;
|
|||||||
|
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.app.AlertDialog;
|
import android.app.AlertDialog;
|
||||||
import android.app.Application;
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
@ -17,6 +16,7 @@ import jscl.math.function.Constant;
|
|||||||
import org.achartengine.ChartFactory;
|
import org.achartengine.ChartFactory;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
import org.solovyev.android.AndroidUtils2;
|
||||||
import org.solovyev.android.calculator.about.CalculatorAboutActivity;
|
import org.solovyev.android.calculator.about.CalculatorAboutActivity;
|
||||||
import org.solovyev.android.calculator.function.FunctionEditDialogFragment;
|
import org.solovyev.android.calculator.function.FunctionEditDialogFragment;
|
||||||
import org.solovyev.android.calculator.help.CalculatorHelpActivity;
|
import org.solovyev.android.calculator.help.CalculatorHelpActivity;
|
||||||
@ -48,7 +48,7 @@ public final class CalculatorActivityLauncher implements CalculatorEventListener
|
|||||||
|
|
||||||
public static void showHistory(@NotNull final Context context, boolean detached) {
|
public static void showHistory(@NotNull final Context context, boolean detached) {
|
||||||
final Intent intent = new Intent(context, CalculatorHistoryActivity.class);
|
final Intent intent = new Intent(context, CalculatorHistoryActivity.class);
|
||||||
addFlags(intent, detached);
|
AndroidUtils2.addFlags(intent, detached, context);
|
||||||
context.startActivity(intent);
|
context.startActivity(intent);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -61,21 +61,10 @@ public final class CalculatorActivityLauncher implements CalculatorEventListener
|
|||||||
}
|
}
|
||||||
public static void showSettings(@NotNull final Context context, boolean detached) {
|
public static void showSettings(@NotNull final Context context, boolean detached) {
|
||||||
final Intent intent = new Intent(context, CalculatorPreferencesActivity.class);
|
final Intent intent = new Intent(context, CalculatorPreferencesActivity.class);
|
||||||
addFlags(intent, detached);
|
AndroidUtils2.addFlags(intent, detached, context);
|
||||||
context.startActivity(intent);
|
context.startActivity(intent);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void addFlags(@NotNull Intent intent, boolean detached) {
|
|
||||||
int flags = Intent.FLAG_ACTIVITY_NEW_TASK;
|
|
||||||
|
|
||||||
if (detached) {
|
|
||||||
flags = flags | Intent.FLAG_ACTIVITY_NO_HISTORY;
|
|
||||||
}
|
|
||||||
|
|
||||||
intent.setFlags(flags);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void showAbout(@NotNull final Context context) {
|
public static void showAbout(@NotNull final Context context) {
|
||||||
context.startActivity(new Intent(context, CalculatorAboutActivity.class));
|
context.startActivity(new Intent(context, CalculatorAboutActivity.class));
|
||||||
}
|
}
|
||||||
@ -86,7 +75,7 @@ public final class CalculatorActivityLauncher implements CalculatorEventListener
|
|||||||
|
|
||||||
public static void showFunctions(@NotNull final Context context, boolean detached) {
|
public static void showFunctions(@NotNull final Context context, boolean detached) {
|
||||||
final Intent intent = new Intent(context, CalculatorFunctionsActivity.class);
|
final Intent intent = new Intent(context, CalculatorFunctionsActivity.class);
|
||||||
addFlags(intent, detached);
|
AndroidUtils2.addFlags(intent, detached, context);
|
||||||
context.startActivity(intent);
|
context.startActivity(intent);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -96,7 +85,7 @@ public final class CalculatorActivityLauncher implements CalculatorEventListener
|
|||||||
|
|
||||||
public static void showOperators(@NotNull final Context context, boolean detached) {
|
public static void showOperators(@NotNull final Context context, boolean detached) {
|
||||||
final Intent intent = new Intent(context, CalculatorOperatorsActivity.class);
|
final Intent intent = new Intent(context, CalculatorOperatorsActivity.class);
|
||||||
addFlags(intent, detached);
|
AndroidUtils2.addFlags(intent, detached, context);
|
||||||
context.startActivity(intent);
|
context.startActivity(intent);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -106,7 +95,7 @@ public final class CalculatorActivityLauncher implements CalculatorEventListener
|
|||||||
|
|
||||||
public static void showVars(@NotNull final Context context, boolean detached) {
|
public static void showVars(@NotNull final Context context, boolean detached) {
|
||||||
final Intent intent = new Intent(context, CalculatorVarsActivity.class);
|
final Intent intent = new Intent(context, CalculatorVarsActivity.class);
|
||||||
addFlags(intent, detached);
|
AndroidUtils2.addFlags(intent, detached, context);
|
||||||
context.startActivity(intent);
|
context.startActivity(intent);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -115,7 +104,7 @@ public final class CalculatorActivityLauncher implements CalculatorEventListener
|
|||||||
intent.putExtra(ChartFactory.TITLE, context.getString(R.string.c_graph));
|
intent.putExtra(ChartFactory.TITLE, context.getString(R.string.c_graph));
|
||||||
intent.putExtra(CalculatorPlotFragment.INPUT, new CalculatorPlotFragment.Input(generic.toString(), constant.getName()));
|
intent.putExtra(CalculatorPlotFragment.INPUT, new CalculatorPlotFragment.Input(generic.toString(), constant.getName()));
|
||||||
intent.setClass(context, CalculatorPlotActivity.class);
|
intent.setClass(context, CalculatorPlotActivity.class);
|
||||||
addFlags(intent, false);
|
AndroidUtils2.addFlags(intent, false, context);
|
||||||
context.startActivity(intent);
|
context.startActivity(intent);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -130,7 +119,7 @@ public final class CalculatorActivityLauncher implements CalculatorEventListener
|
|||||||
} else {
|
} else {
|
||||||
final Intent intent = new Intent(context, CalculatorVarsActivity.class);
|
final Intent intent = new Intent(context, CalculatorVarsActivity.class);
|
||||||
intent.putExtra(CalculatorVarsFragment.CREATE_VAR_EXTRA_STRING, varValue);
|
intent.putExtra(CalculatorVarsFragment.CREATE_VAR_EXTRA_STRING, varValue);
|
||||||
addFlags(intent, false);
|
AndroidUtils2.addFlags(intent, false, context);
|
||||||
context.startActivity(intent);
|
context.startActivity(intent);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -169,7 +158,7 @@ public final class CalculatorActivityLauncher implements CalculatorEventListener
|
|||||||
|
|
||||||
public static void likeButtonPressed(@NotNull final Context context) {
|
public static void likeButtonPressed(@NotNull final Context context) {
|
||||||
final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(CalculatorApplication.FACEBOOK_APP_URL));
|
final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(CalculatorApplication.FACEBOOK_APP_URL));
|
||||||
addFlags(intent, false);
|
AndroidUtils2.addFlags(intent, false, context);
|
||||||
context.startActivity(intent);
|
context.startActivity(intent);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -183,16 +172,23 @@ public final class CalculatorActivityLauncher implements CalculatorEventListener
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCalculatorEvent(@NotNull CalculatorEventData calculatorEventData, @NotNull CalculatorEventType calculatorEventType, @Nullable Object data) {
|
public void onCalculatorEvent(@NotNull CalculatorEventData calculatorEventData, @NotNull CalculatorEventType calculatorEventType, @Nullable Object data) {
|
||||||
final Application application = App.getInstance().getApplication();
|
final Context context;
|
||||||
|
|
||||||
|
final Object source = calculatorEventData.getSource();
|
||||||
|
if ( source instanceof Context ) {
|
||||||
|
context = ((Context) source);
|
||||||
|
} else {
|
||||||
|
context = App.getInstance().getApplication();
|
||||||
|
}
|
||||||
|
|
||||||
switch (calculatorEventType){
|
switch (calculatorEventType){
|
||||||
case show_create_matrix_dialog:
|
case show_create_matrix_dialog:
|
||||||
App.getInstance().getUiThreadExecutor().execute(new Runnable() {
|
App.getInstance().getUiThreadExecutor().execute(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
final Intent intent = new Intent(application, CalculatorMatrixActivity.class);
|
final Intent intent = new Intent(context, CalculatorMatrixActivity.class);
|
||||||
addFlags(intent, false);
|
AndroidUtils2.addFlags(intent, false, context);
|
||||||
application.startActivity(intent);
|
context.startActivity(intent);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
@ -200,7 +196,7 @@ public final class CalculatorActivityLauncher implements CalculatorEventListener
|
|||||||
App.getInstance().getUiThreadExecutor().execute(new Runnable() {
|
App.getInstance().getUiThreadExecutor().execute(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
CalculatorActivityLauncher.createVar(application, Locator.getInstance().getDisplay());
|
CalculatorActivityLauncher.createVar(context, Locator.getInstance().getDisplay());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
@ -208,7 +204,7 @@ public final class CalculatorActivityLauncher implements CalculatorEventListener
|
|||||||
App.getInstance().getUiThreadExecutor().execute(new Runnable() {
|
App.getInstance().getUiThreadExecutor().execute(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
CalculatorActivityLauncher.createFunction(application, Locator.getInstance().getDisplay());
|
CalculatorActivityLauncher.createFunction(context, Locator.getInstance().getDisplay());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
@ -218,7 +214,7 @@ public final class CalculatorActivityLauncher implements CalculatorEventListener
|
|||||||
App.getInstance().getUiThreadExecutor().execute(new Runnable() {
|
App.getInstance().getUiThreadExecutor().execute(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
plotGraph(application, plotInput.getFunction(), plotInput.getConstant());
|
plotGraph(context, plotInput.getFunction(), plotInput.getConstant());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
@ -228,7 +224,7 @@ public final class CalculatorActivityLauncher implements CalculatorEventListener
|
|||||||
App.getInstance().getUiThreadExecutor().execute(new Runnable() {
|
App.getInstance().getUiThreadExecutor().execute(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
showEvaluationError(application, errorMessage);
|
showEvaluationError(context, errorMessage);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user