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

Matrix support

Browse Source
This commit is contained in:
serso 2012-10-12 11:20:39 +04:00
parent 08af58b18a
commit de52ca4512
8 changed files with 496 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
calculatorpp/AndroidManifest.xml
View File

@ -37,6 +37,9 @@
<activity android:label="@string/c_plot_graph" android:name=".plot.CalculatorPlotActivity"/> <activity android:label="@string/c_plot_graph" android:name=".plot.CalculatorPlotActivity"/>
<!-- todo serso: strings-->
<activity android:label="@string/c_plot_graph" android:name=".matrix.CalculatorMatrixActivity"/>
<!-- settings must use action bar icon--> <!-- settings must use action bar icon-->
<activity android:icon="@drawable/icon_action_bar" android:label="@string/c_settings" android:name=".plot.CalculatorPlotPreferenceActivity"/> <activity android:icon="@drawable/icon_action_bar" android:label="@string/c_settings" android:name=".plot.CalculatorPlotPreferenceActivity"/>

33
calculatorpp/res/layout/calc_vars_button.xml
View File

@ -1,17 +1,18 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
~ Copyright (c) 2009-2011. Created by serso aka se.solovyev. ~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
~ For more information, please, contact se.solovyev@gmail.com ~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/varsButton" a:id="@+id/varsButton"
c:directionTextScale="0.5" c:directionTextScale="0.5"
c:textUp="+π" c:textUp="+π"
a:text="π,…" c:textDown="+m"
a:textStyle="italic" a:text="π,…"
a:onClick="varsButtonClickHandler" a:textStyle="italic"
a:onClick="varsButtonClickHandler"
style="?controlButtonStyle"/> style="?controlButtonStyle"/>

35
calculatorpp/res/layout/matrix_edit_fragment.xml Normal file
View File

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
a:layout_height="match_parent"
a:layout_width="match_parent"
style="?fragmentLayoutStyle">
<LinearLayout a:layout_height="wrap_content"
a:layout_width="match_parent"
a:gravity="center">
<TextView a:layout_height="wrap_content"
a:layout_width="wrap_content"
a:text="Rows"/>
<org.solovyev.android.view.Picker a:id="@+id/matrix_rows_count_picker"
a:layout_height="wrap_content"
a:layout_width="wrap_content"/>
<TextView a:layout_height="wrap_content"
a:layout_width="wrap_content"
a:text="Columns"/>
<org.solovyev.android.view.Picker a:id="@+id/matrix_cols_count_picker"
a:layout_height="wrap_content"
a:layout_width="wrap_content"/>
</LinearLayout>
<TableLayout a:id="@+id/matrix_layout"
a:layout_height="match_parent"
a:layout_width="match_parent"/>
</LinearLayout>

12
calculatorpp/res/layout/matrix_edit_fragment_item.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_height="match_parent"
a:layout_width="match_parent">
<EditText a:id="@+id/matrix_element_edittext"
a:layout_height="match_parent"
a:layout_width="match_parent"
a:text="test"/>
</LinearLayout>

481
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
View File

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

156
calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorFragmentType.java
View File

@ -1,76 +1,80 @@
package org.solovyev.android.calculator.about; package org.solovyev.android.calculator.about;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.solovyev.android.calculator.CalculatorEditorFragment; import org.solovyev.android.calculator.CalculatorEditorFragment;
import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.help.CalculatorHelpFaqFragment; import org.solovyev.android.calculator.help.CalculatorHelpFaqFragment;
import org.solovyev.android.calculator.help.CalculatorHelpHintsFragment; import org.solovyev.android.calculator.help.CalculatorHelpHintsFragment;
import org.solovyev.android.calculator.help.CalculatorHelpScreensFragment; import org.solovyev.android.calculator.help.CalculatorHelpScreensFragment;
import org.solovyev.android.calculator.history.CalculatorHistoryFragment; import org.solovyev.android.calculator.history.CalculatorHistoryFragment;
import org.solovyev.android.calculator.history.CalculatorSavedHistoryFragment; import org.solovyev.android.calculator.history.CalculatorSavedHistoryFragment;
import org.solovyev.android.calculator.math.edit.CalculatorFunctionsFragment; import org.solovyev.android.calculator.math.edit.CalculatorFunctionsFragment;
import org.solovyev.android.calculator.math.edit.CalculatorOperatorsFragment; import org.solovyev.android.calculator.math.edit.CalculatorOperatorsFragment;
import org.solovyev.android.calculator.math.edit.CalculatorVarsFragment; import org.solovyev.android.calculator.math.edit.CalculatorVarsFragment;
import org.solovyev.android.calculator.plot.CalculatorPlotFragment; import org.solovyev.android.calculator.matrix.CalculatorMatrixEditFragment;
import org.solovyev.android.calculator.plot.CalculatorPlotFragment;
/**
* User: Solovyev_S /**
* Date: 03.10.12 * User: Solovyev_S
* Time: 11:30 * Date: 03.10.12
*/ * Time: 11:30
public enum CalculatorFragmentType { */
public enum CalculatorFragmentType {
editor(CalculatorEditorFragment.class, R.layout.calc_editor, R.string.editor),
//display(CalculatorHistoryFragment.class, "history", R.layout.history_fragment, R.string.c_history), editor(CalculatorEditorFragment.class, R.layout.calc_editor, R.string.editor),
//keyboard(CalculatorHistoryFragment.class, "history", R.layout.history_fragment, R.string.c_history), //display(CalculatorHistoryFragment.class, "history", R.layout.history_fragment, R.string.c_history),
history(CalculatorHistoryFragment.class, R.layout.history_fragment, R.string.c_history), //keyboard(CalculatorHistoryFragment.class, "history", R.layout.history_fragment, R.string.c_history),
saved_history(CalculatorSavedHistoryFragment.class, R.layout.history_fragment, R.string.c_saved_history), history(CalculatorHistoryFragment.class, R.layout.history_fragment, R.string.c_history),
variables(CalculatorVarsFragment.class, R.layout.vars_fragment, R.string.c_vars), saved_history(CalculatorSavedHistoryFragment.class, R.layout.history_fragment, R.string.c_saved_history),
functions(CalculatorFunctionsFragment.class, R.layout.math_entities_fragment, R.string.c_functions), variables(CalculatorVarsFragment.class, R.layout.vars_fragment, R.string.c_vars),
operators(CalculatorOperatorsFragment.class, R.layout.math_entities_fragment, R.string.c_operators), functions(CalculatorFunctionsFragment.class, R.layout.math_entities_fragment, R.string.c_functions),
plotter(CalculatorPlotFragment.class, R.layout.plot_fragment, R.string.c_graph), operators(CalculatorOperatorsFragment.class, R.layout.math_entities_fragment, R.string.c_operators),
about(CalculatorAboutFragment.class, R.layout.about_fragment, R.string.c_about), plotter(CalculatorPlotFragment.class, R.layout.plot_fragment, R.string.c_graph),
faq(CalculatorHelpFaqFragment.class, R.layout.help_faq_fragment, R.string.c_faq), about(CalculatorAboutFragment.class, R.layout.about_fragment, R.string.c_about),
hints(CalculatorHelpHintsFragment.class, R.layout.help_hints_fragment, R.string.c_hints), faq(CalculatorHelpFaqFragment.class, R.layout.help_faq_fragment, R.string.c_faq),
screens(CalculatorHelpScreensFragment.class, R.layout.help_screens_fragment, R.string.c_screens), hints(CalculatorHelpHintsFragment.class, R.layout.help_hints_fragment, R.string.c_hints),
release_notes(CalculatorReleaseNotesFragment.class, R.layout.release_notes_fragment, R.string.c_release_notes); screens(CalculatorHelpScreensFragment.class, R.layout.help_screens_fragment, R.string.c_screens),
@NotNull // todo serso: strings
private Class<? extends Fragment> fragmentClass; matrix_edit(CalculatorMatrixEditFragment.class, R.layout.matrix_edit_fragment, R.string.c_screens),
release_notes(CalculatorReleaseNotesFragment.class, R.layout.release_notes_fragment, R.string.c_release_notes);
private final int defaultLayoutId;
@NotNull
private int defaultTitleResId; private Class<? extends Fragment> fragmentClass;
private CalculatorFragmentType(@NotNull Class<? extends Fragment> fragmentClass, private final int defaultLayoutId;
int defaultLayoutId,
int defaultTitleResId) { private int defaultTitleResId;
this.fragmentClass = fragmentClass;
this.defaultLayoutId = defaultLayoutId; private CalculatorFragmentType(@NotNull Class<? extends Fragment> fragmentClass,
this.defaultTitleResId = defaultTitleResId; int defaultLayoutId,
} int defaultTitleResId) {
this.fragmentClass = fragmentClass;
@NotNull this.defaultLayoutId = defaultLayoutId;
public String getFragmentTag() { this.defaultTitleResId = defaultTitleResId;
return this.name(); }
}
@NotNull
public int getDefaultTitleResId() { public String getFragmentTag() {
return defaultTitleResId; return this.name();
} }
@NotNull public int getDefaultTitleResId() {
public Class<? extends Fragment> getFragmentClass() { return defaultTitleResId;
return fragmentClass; }
}
@NotNull
public int getDefaultLayoutId() { public Class<? extends Fragment> getFragmentClass() {
return defaultLayoutId; return fragmentClass;
} }
@NotNull public int getDefaultLayoutId() {
public String createSubFragmentTag(@NotNull String subFragmentTag) { return defaultLayoutId;
return this.getFragmentTag() + "_" + subFragmentTag; }
}
} @NotNull
public String createSubFragmentTag(@NotNull String subFragmentTag) {
return this.getFragmentTag() + "_" + subFragmentTag;
}
}

23
calculatorpp/src/main/java/org/solovyev/android/calculator/matrix/CalculatorMatrixActivity.java Normal file
View File

@ -0,0 +1,23 @@
package org.solovyev.android.calculator.matrix;
import android.app.ActionBar;
import android.os.Bundle;
import org.solovyev.android.calculator.CalculatorFragmentActivity;
import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.about.CalculatorFragmentType;
/**
* User: Solovyev_S
* Date: 12.10.12
* Time: 10:56
*/
public class CalculatorMatrixActivity extends CalculatorFragmentActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
getActivityHelper().setFragment(this, CalculatorFragmentType.matrix_edit, null, R.id.main_layout);
}
}

83
calculatorpp/src/main/java/org/solovyev/android/calculator/matrix/CalculatorMatrixEditFragment.java Normal file
View File

@ -0,0 +1,83 @@
package org.solovyev.android.calculator.matrix;
import android.os.Bundle;
import android.view.View;
import android.widget.TableLayout;
import org.jetbrains.annotations.NotNull;
import org.solovyev.android.calculator.CalculatorFragment;
import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.about.CalculatorFragmentType;
import org.solovyev.android.view.IntegerRange;
import org.solovyev.android.view.Picker;
/**
* User: Solovyev_S
* Date: 12.10.12
* Time: 10:41
*/
public class CalculatorMatrixEditFragment extends CalculatorFragment implements Picker.OnChangedListener<Integer> {
/*
**********************************************************************
*
* CONSTANTS
*
**********************************************************************
*/
private static final int MAX_COUNT = 10;
private static final int MIN_COUNT = 2;
/*
**********************************************************************
*
* CONSTRUCTORS
*
**********************************************************************
*/
public CalculatorMatrixEditFragment() {
super(CalculatorFragmentType.matrix_edit);
}
@Override
public void onViewCreated(View root, Bundle savedInstanceState) {
super.onViewCreated(root, savedInstanceState);
final Picker<Integer> matrixRowsCountPicker = (Picker<Integer>) root.findViewById(R.id.matrix_rows_count_picker);
initPicker(matrixRowsCountPicker);
final Picker<Integer> matrixColsCountPicker = (Picker<Integer>) root.findViewById(R.id.matrix_cols_count_picker);
initPicker(matrixColsCountPicker);
getMatrixTable(root);
}
@NotNull
private TableLayout getMatrixTable(@NotNull View root) {
return (TableLayout) root.findViewById(R.id.matrix_layout);
}
private void initPicker(@NotNull Picker<Integer> picker) {
picker.setRange(new IntegerRange(MIN_COUNT, MAX_COUNT, 1, 2, null));
picker.setOnChangeListener(this);
}
@Override
public void onChanged(@NotNull Picker picker, @NotNull Integer value) {
switch (picker.getId()) {
case R.id.matrix_rows_count_picker:
onRowsCountChange(value);
break;
case R.id.matrix_cols_count_picker:
onColsCountChange(value);
break;
}
}
private void onColsCountChange(@NotNull Integer cols) {
final TableLayout matrixTable = getMatrixTable(getView());
}
private void onRowsCountChange(@NotNull Integer rows) {
}
}