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

Translations

Browse Source
This commit is contained in:
serso
2016-02-26 23:28:29 +01:00
parent 922b9d7d2a
commit 6d1357e15d
36 changed files with 215 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,27 +26,19 @@ import android.app.Activity;
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.annotation.LayoutRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
import android.support.v7.app.AlertDialog;
import android.view.ContextMenu;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.*;
import android.widget.TextView;
import com.squareup.otto.Bus;
import org.solovyev.android.calculator.converter.ConverterFragment;
import org.solovyev.android.calculator.jscl.JsclOperation;
import butterknife.Bind;
import butterknife.ButterKnife;
import com.squareup.otto.Bus;
import jscl.NumeralBase;
import jscl.math.Generic;
import org.solovyev.android.calculator.converter.ConverterFragment;
import org.solovyev.android.calculator.jscl.JsclOperation;
import javax.annotation.Nonnull;
import javax.inject.Inject;
@@ -182,7 +174,7 @@ public class DisplayFragment extends BaseFragment implements View.OnClickListene
final AlertDialog.Builder builder =
new AlertDialog.Builder(context, App.getTheme().alertDialogTheme)
.setPositiveButton(R.string.c_cancel, null)
.setPositiveButton(R.string.cpp_cancel, null)
.setView(errorMessageView);
builder.create().show();

32
app/src/main/java/org/solovyev/android/calculator/converter/ConverterFragment.java
View File

@@ -17,33 +17,10 @@ import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
import org.solovyev.android.calculator.App;
import org.solovyev.android.calculator.AppComponent;
import org.solovyev.android.calculator.BaseDialogFragment;
import org.solovyev.android.calculator.Clipboard;
import org.solovyev.android.calculator.Editor;
import org.solovyev.android.calculator.R;
import android.widget.*;
import butterknife.Bind;
import butterknife.ButterKnife;
import java.text.DecimalFormat;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.solovyev.android.calculator.*;
import javax.annotation.Nonnull;
import javax.inject.Inject;
@@ -51,6 +28,9 @@ import javax.measure.unit.Dimension;
import javax.measure.unit.NonSI;
import javax.measure.unit.SI;
import javax.measure.unit.Unit;
import java.text.DecimalFormat;
import java.text.ParseException;
import java.util.*;
public class ConverterFragment extends BaseDialogFragment
implements AdapterView.OnItemSelectedListener, View.OnFocusChangeListener, TextView.OnEditorActionListener, View.OnClickListener, TextWatcher {
@@ -143,7 +123,7 @@ public class ConverterFragment extends BaseDialogFragment
@Override
protected void onPrepareDialog(@NonNull AlertDialog.Builder builder) {
builder.setPositiveButton(R.string.c_use, null);
builder.setNegativeButton(R.string.c_cancel, null);
builder.setNegativeButton(R.string.cpp_cancel, null);
builder.setNeutralButton(R.string.c_copy, null);
}

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

@@ -47,7 +47,7 @@ public class FloatingCalculatorActivity extends AppCompatActivity {
final String permission = getString(R.string.cpp_permission_overlay);
builder.setMessage(getString(R.string.cpp_missing_permission_msg, permission));
builder.setTitle(R.string.cpp_missing_permission_title);
builder.setPositiveButton(R.string.ok, null);
builder.setPositiveButton(android.R.string.ok, null);
}
@Override

36
app/src/main/java/org/solovyev/android/calculator/functions/BaseFunctionFragment.java
View File

@@ -33,42 +33,20 @@ import android.support.design.widget.TextInputLayout;
import android.support.v7.app.AlertDialog;
import android.text.Editable;
import android.text.TextUtils;
import android.view.ContextMenu;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewParent;
import android.view.*;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import org.solovyev.android.calculator.AppComponent;
import org.solovyev.android.calculator.BaseDialogFragment;
import org.solovyev.android.calculator.Calculator;
import org.solovyev.android.calculator.Engine;
import org.solovyev.android.calculator.FloatingCalculatorKeyboard;
import org.solovyev.android.calculator.Keyboard;
import org.solovyev.android.calculator.ParseException;
import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.VariablesRegistry;
import butterknife.Bind;
import butterknife.ButterKnife;
import org.solovyev.android.calculator.*;
import org.solovyev.android.calculator.keyboard.FloatingKeyboardWindow;
import org.solovyev.android.calculator.view.EditTextCompat;
import org.solovyev.common.math.MathRegistry;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.inject.Inject;
import butterknife.Bind;
import butterknife.ButterKnife;
import java.util.*;
import static org.solovyev.android.calculator.functions.CppFunction.NO_ID;
@@ -132,8 +110,8 @@ public abstract class BaseFunctionFragment extends BaseDialogFragment implements
@Override
protected void onPrepareDialog(@NonNull AlertDialog.Builder builder) {
builder.setNegativeButton(R.string.c_cancel, null);
builder.setPositiveButton(R.string.ok, null);
builder.setNegativeButton(R.string.cpp_cancel, null);
builder.setPositiveButton(R.string.cpp_done, null);
builder.setTitle(isNewFunction() ? R.string.function_create_function :
R.string.function_edit_function);
}

6
app/src/main/java/org/solovyev/android/calculator/functions/EditFunctionFragment.java
View File

@@ -8,7 +8,7 @@ import android.support.annotation.NonNull;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.support.v7.app.AlertDialog;
import jscl.math.function.Function;
import org.solovyev.android.Activities;
import org.solovyev.android.Check;
import org.solovyev.android.calculator.App;
@@ -19,8 +19,6 @@ import org.solovyev.android.calculator.entities.EntityRemovalDialog;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jscl.math.function.Function;
public class EditFunctionFragment extends BaseFunctionFragment {
public EditFunctionFragment() {
@@ -61,7 +59,7 @@ public class EditFunctionFragment extends BaseFunctionFragment {
protected void onPrepareDialog(@NonNull AlertDialog.Builder builder) {
super.onPrepareDialog(builder);
if (!isNewFunction()) {
builder.setNeutralButton(R.string.c_remove, null);
builder.setNeutralButton(R.string.cpp_delete, null);
}
}

26
app/src/main/java/org/solovyev/android/calculator/functions/FunctionsFragment.java
View File

@@ -26,15 +26,11 @@ import android.content.DialogInterface;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.FragmentActivity;
import android.view.ContextMenu;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.*;
import com.squareup.otto.Bus;
import com.squareup.otto.Subscribe;
import jscl.math.function.Function;
import jscl.math.function.IFunction;
import org.solovyev.android.Check;
import org.solovyev.android.calculator.AppComponent;
import org.solovyev.android.calculator.Calculator;
@@ -43,15 +39,11 @@ import org.solovyev.android.calculator.entities.BaseEntitiesFragment;
import org.solovyev.android.calculator.entities.Category;
import org.solovyev.android.calculator.entities.EntityRemovalDialog;
import jscl.math.function.Function;
import jscl.math.function.IFunction;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.inject.Inject;
import java.util.ArrayList;
import java.util.List;
public class FunctionsFragment extends BaseEntitiesFragment<Function> {
@@ -79,8 +71,8 @@ public class FunctionsFragment extends BaseEntitiesFragment<Function> {
protected void onCreateContextMenu(@Nonnull ContextMenu menu, @Nonnull Function function, @NonNull MenuItem.OnMenuItemClickListener listener) {
addMenu(menu, R.string.c_use, listener);
if (!function.isSystem()) {
addMenu(menu, R.string.c_edit, listener);
addMenu(menu, R.string.c_remove, listener);
addMenu(menu, R.string.cpp_edit, listener);
addMenu(menu, R.string.cpp_delete, listener);
}
}
@@ -91,13 +83,13 @@ public class FunctionsFragment extends BaseEntitiesFragment<Function> {
case R.string.c_use:
onClick(function);
return true;
case R.string.c_edit:
case R.string.cpp_edit:
if (function instanceof IFunction) {
EditFunctionFragment.show(CppFunction.builder((IFunction) function).build(),
activity.getSupportFragmentManager());
}
return true;
case R.string.c_remove:
case R.string.cpp_delete:
EntityRemovalDialog.showForFunction(getActivity(), function.getName(), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {

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

@@ -186,8 +186,8 @@ public abstract class BaseHistoryFragment extends BaseFragment {
if (shouldHaveCopyResult(state)) {
addMenu(menu, R.string.c_copy_result, this);
}
addMenu(menu, R.string.c_edit, this);
addMenu(menu, R.string.c_remove, this);
addMenu(menu, R.string.cpp_edit, this);
addMenu(menu, R.string.cpp_delete, this);
}
}
@@ -210,13 +210,13 @@ public abstract class BaseHistoryFragment extends BaseFragment {
case R.string.c_copy_result:
copyResult(state);
return true;
case R.string.c_edit:
case R.string.cpp_edit:
EditHistoryFragment.show(state, false, getFragmentManager());
return true;
case R.string.c_save:
EditHistoryFragment.show(state, true, getFragmentManager());
return true;
case R.string.c_remove:
case R.string.cpp_delete:
history.removeSaved(state);
return true;
}

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

@@ -71,7 +71,7 @@ public class EditHistoryFragment extends BaseDialogFragment {
@Override
protected void onPrepareDialog(@NonNull AlertDialog.Builder builder) {
builder.setNegativeButton(R.string.c_cancel, null);
builder.setNegativeButton(R.string.cpp_cancel, null);
builder.setPositiveButton(R.string.c_save, null);
}

13
app/src/main/java/org/solovyev/android/calculator/history/HistoryActivity.java
View File

@@ -22,8 +22,6 @@
package org.solovyev.android.calculator.history;
import static org.solovyev.android.calculator.FragmentTab.saved_history;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
@@ -31,17 +29,14 @@ import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import android.support.v7.app.AlertDialog;
import android.view.View;
import org.solovyev.android.calculator.App;
import org.solovyev.android.calculator.AppComponent;
import org.solovyev.android.calculator.BaseActivity;
import org.solovyev.android.calculator.FragmentTab;
import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.*;
import org.solovyev.android.calculator.view.Tabs;
import javax.annotation.Nonnull;
import javax.inject.Inject;
import static org.solovyev.android.calculator.FragmentTab.saved_history;
public class HistoryActivity extends BaseActivity {
public static class Dialog extends HistoryActivity {
@@ -96,7 +91,7 @@ public class HistoryActivity extends BaseActivity {
}
}
})
.setNegativeButton(R.string.c_cancel, null)
.setNegativeButton(R.string.cpp_cancel, null)
.create()
.show();
}

27
app/src/main/java/org/solovyev/android/calculator/plot/PlotFunctionsFragment.java
View File

@@ -11,13 +11,10 @@ import android.support.annotation.Nullable;
import android.support.v4.app.FragmentManager;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.RecyclerView;
import android.view.ContextMenu;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.*;
import android.widget.TextView;
import butterknife.Bind;
import butterknife.ButterKnife;
import org.solovyev.android.calculator.App;
import org.solovyev.android.calculator.AppComponent;
import org.solovyev.android.calculator.BaseDialogFragment;
@@ -29,13 +26,9 @@ import org.solovyev.android.plotter.Plotter;
import org.solovyev.android.views.llm.DividerItemDecoration;
import org.solovyev.android.views.llm.LinearLayoutManager;
import java.util.List;
import javax.annotation.Nonnull;
import javax.inject.Inject;
import butterknife.Bind;
import butterknife.ButterKnife;
import java.util.List;
import static android.support.v7.widget.LinearLayoutManager.VERTICAL;
import static android.view.Menu.NONE;
@@ -71,7 +64,7 @@ public class PlotFunctionsFragment extends BaseDialogFragment {
@NonNull
protected RecyclerView onCreateDialogView(@NonNull Context context, @NonNull LayoutInflater inflater, Bundle savedInstanceState) {
@SuppressLint("InflateParams") final RecyclerView view = (RecyclerView) inflater.inflate(R.layout.dialog_functions, null);
@SuppressLint("InflateParams") final RecyclerView view = (RecyclerView) inflater.inflate(R.layout.fragment_functions, null);
final LinearLayoutManager layoutManager = new LinearLayoutManager(context, VERTICAL, false);
final int itemHeight = context.getResources().getDimensionPixelSize(R.dimen.list_item_height);
@@ -99,8 +92,8 @@ public class PlotFunctionsFragment extends BaseDialogFragment {
}
protected void onPrepareDialog(@NonNull AlertDialog.Builder builder) {
builder.setPositiveButton(android.R.string.ok, null);
builder.setNeutralButton("Add", null);
builder.setPositiveButton(R.string.cpp_close, null);
builder.setNeutralButton(R.string.cpp_add, null);
}
@Override
@@ -144,12 +137,12 @@ public class PlotFunctionsFragment extends BaseDialogFragment {
@Override
public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
menu.add(NONE, R.string.c_remove, NONE, R.string.c_remove).setOnMenuItemClickListener(this);
menu.add(NONE, R.string.cpp_delete, NONE, R.string.cpp_delete).setOnMenuItemClickListener(this);
}
@Override
public boolean onMenuItemClick(MenuItem item) {
if (function != null && item.getItemId() == R.string.c_remove) {
if (function != null && item.getItemId() == R.string.cpp_delete) {
plotter.remove(function);
return true;
}
@@ -168,7 +161,7 @@ public class PlotFunctionsFragment extends BaseDialogFragment {
@Override
public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
final LayoutInflater inflater = LayoutInflater.from(parent.getContext());
return new ViewHolder(inflater.inflate(R.layout.dialog_functions_function, parent, false));
return new ViewHolder(inflater.inflate(R.layout.fragment_functions_function, parent, false));
}
@Override

32
app/src/main/java/org/solovyev/android/calculator/variables/EditVariableFragment.java
View File

@@ -22,8 +22,6 @@
package org.solovyev.android.calculator.variables;
import static org.solovyev.android.calculator.variables.CppVariable.NO_ID;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.DialogInterface;
@@ -43,17 +41,12 @@ import android.view.inputmethod.InputMethodManager;
import android.widget.Button;
import android.widget.EditText;
import android.widget.PopupWindow;
import butterknife.Bind;
import butterknife.ButterKnife;
import jscl.math.function.IConstant;
import org.solovyev.android.Activities;
import org.solovyev.android.Check;
import org.solovyev.android.calculator.App;
import org.solovyev.android.calculator.AppComponent;
import org.solovyev.android.calculator.BaseDialogFragment;
import org.solovyev.android.calculator.Calculator;
import org.solovyev.android.calculator.Engine;
import org.solovyev.android.calculator.Keyboard;
import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.VariablesRegistry;
import org.solovyev.android.calculator.*;
import org.solovyev.android.calculator.entities.EntityRemovalDialog;
import org.solovyev.android.calculator.functions.FunctionsRegistry;
import org.solovyev.android.calculator.keyboard.FloatingKeyboard;
@@ -62,16 +55,13 @@ import org.solovyev.android.calculator.math.MathType;
import org.solovyev.android.calculator.view.EditTextCompat;
import org.solovyev.common.text.Strings;
import butterknife.Bind;
import butterknife.ButterKnife;
import jscl.math.function.IConstant;
import java.util.Arrays;
import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.inject.Inject;
import java.util.Arrays;
import java.util.List;
import static org.solovyev.android.calculator.variables.CppVariable.NO_ID;
public class EditVariableFragment extends BaseDialogFragment implements View.OnFocusChangeListener, View.OnKeyListener, View.OnClickListener {
@@ -160,11 +150,11 @@ public class EditVariableFragment extends BaseDialogFragment implements View.OnF
@Override
protected void onPrepareDialog(@NonNull AlertDialog.Builder builder) {
builder.setNegativeButton(R.string.c_cancel, null);
builder.setPositiveButton(R.string.ok, null);
builder.setNegativeButton(R.string.cpp_cancel, null);
builder.setPositiveButton(R.string.cpp_done, null);
builder.setTitle(isNewVariable() ? R.string.c_var_create_var : R.string.c_var_edit_var);
if (!isNewVariable()) {
builder.setNeutralButton(R.string.c_remove, null);
builder.setNeutralButton(R.string.cpp_delete, null);
}
}

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

@@ -107,12 +107,12 @@ public class VariablesFragment extends BaseEntitiesFragment<IConstant> {
protected void onCreateContextMenu(@Nonnull ContextMenu menu, @Nonnull IConstant variable, @Nonnull MenuItem.OnMenuItemClickListener listener) {
addMenu(menu, R.string.c_use, listener);
if (!variable.isSystem()) {
addMenu(menu, R.string.c_edit, listener);
addMenu(menu, R.string.c_remove, listener);
addMenu(menu, R.string.cpp_edit, listener);
addMenu(menu, R.string.cpp_delete, listener);
}
if (!Strings.isEmpty(variable.getValue())) {
addMenu(menu, R.string.c_copy_value, listener);
addMenu(menu, R.string.cpp_copy_text, listener);
}
}
@@ -123,10 +123,10 @@ public class VariablesFragment extends BaseEntitiesFragment<IConstant> {
case R.string.c_use:
onClick(variable);
return true;
case R.string.c_edit:
case R.string.cpp_edit:
EditVariableFragment.showDialog(CppVariable.builder(variable).build(), activity);
return true;
case R.string.c_remove:
case R.string.cpp_delete:
EntityRemovalDialog.showForVariable(getActivity(), variable.getName(), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
@@ -135,7 +135,7 @@ public class VariablesFragment extends BaseEntitiesFragment<IConstant> {
}
});
return true;
case R.string.c_copy_value:
case R.string.cpp_copy_text:
copyText(variable.getValue());
return true;
}