diff --git a/calculatorpp/res/drawable/metro_blue_button_shape.xml b/calculatorpp/res/drawable/metro_blue_button_shape.xml
index 59553617..656da4fb 100644
--- a/calculatorpp/res/drawable/metro_blue_button_shape.xml
+++ b/calculatorpp/res/drawable/metro_blue_button_shape.xml
@@ -15,6 +15,6 @@
-->
-
+
\ No newline at end of file
diff --git a/calculatorpp/res/drawable/metro_blue_list_item.xml b/calculatorpp/res/drawable/metro_blue_list_item.xml
index 7eb23dca..2180338c 100644
--- a/calculatorpp/res/drawable/metro_blue_list_item.xml
+++ b/calculatorpp/res/drawable/metro_blue_list_item.xml
@@ -4,18 +4,18 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/calculatorpp/res/drawable/metro_button_dark_shape.xml b/calculatorpp/res/drawable/metro_button_dark_shape.xml
index 9778eeb8..65f7f671 100644
--- a/calculatorpp/res/drawable/metro_button_dark_shape.xml
+++ b/calculatorpp/res/drawable/metro_button_dark_shape.xml
@@ -15,6 +15,6 @@
-->
-
+
\ No newline at end of file
diff --git a/calculatorpp/res/drawable/metro_button_green_shape.xml b/calculatorpp/res/drawable/metro_button_green_shape.xml
index 0d3a88f4..247e25e9 100644
--- a/calculatorpp/res/drawable/metro_button_green_shape.xml
+++ b/calculatorpp/res/drawable/metro_button_green_shape.xml
@@ -15,6 +15,6 @@
-->
-
+
\ No newline at end of file
diff --git a/calculatorpp/res/drawable/metro_button_light_shape.xml b/calculatorpp/res/drawable/metro_button_light_shape.xml
index b0b8e3a7..2de2e09f 100644
--- a/calculatorpp/res/drawable/metro_button_light_shape.xml
+++ b/calculatorpp/res/drawable/metro_button_light_shape.xml
@@ -15,6 +15,6 @@
-->
-
+
diff --git a/calculatorpp/res/drawable/metro_button_purple_shape.xml b/calculatorpp/res/drawable/metro_button_purple_shape.xml
index a7eac71e..343112fc 100644
--- a/calculatorpp/res/drawable/metro_button_purple_shape.xml
+++ b/calculatorpp/res/drawable/metro_button_purple_shape.xml
@@ -15,6 +15,6 @@
-->
-
+
\ No newline at end of file
diff --git a/calculatorpp/res/drawable/metro_green_list_item.xml b/calculatorpp/res/drawable/metro_green_list_item.xml
index ee9aa3f8..a46d60e8 100644
--- a/calculatorpp/res/drawable/metro_green_list_item.xml
+++ b/calculatorpp/res/drawable/metro_green_list_item.xml
@@ -4,19 +4,19 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/calculatorpp/res/drawable/metro_purple_list_item.xml b/calculatorpp/res/drawable/metro_purple_list_item.xml
index 4820331b..d966445e 100644
--- a/calculatorpp/res/drawable/metro_purple_list_item.xml
+++ b/calculatorpp/res/drawable/metro_purple_list_item.xml
@@ -4,18 +4,18 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/calculatorpp/res/drawable/pane_background.xml b/calculatorpp/res/drawable/pane_background.xml
index 832b331b..763272f3 100644
--- a/calculatorpp/res/drawable/pane_background.xml
+++ b/calculatorpp/res/drawable/pane_background.xml
@@ -15,6 +15,6 @@
-->
-
+
\ No newline at end of file
diff --git a/calculatorpp/res/layout-land/main_first_pane.xml b/calculatorpp/res/layout-land/main_first_pane.xml
index 6170d972..347683a7 100644
--- a/calculatorpp/res/layout-land/main_first_pane.xml
+++ b/calculatorpp/res/layout-land/main_first_pane.xml
@@ -22,13 +22,13 @@
a:layout_height="0dp">
@@ -37,16 +37,16 @@
a:layout_height="match_parent"
a:layout_width="0dp"
a:layout_weight="4"
- a:layout_margin="@dimen/display_margin_land"/>
+ a:layout_margin="@dimen/cpp_display_margin_land"/>
diff --git a/calculatorpp/res/layout-land/main_first_pane_mobile.xml b/calculatorpp/res/layout-land/main_first_pane_mobile.xml
index 936335be..2ea340af 100644
--- a/calculatorpp/res/layout-land/main_first_pane_mobile.xml
+++ b/calculatorpp/res/layout-land/main_first_pane_mobile.xml
@@ -22,13 +22,13 @@
a:layout_height="0dp">
@@ -37,16 +37,16 @@
a:layout_height="match_parent"
a:layout_width="0dp"
a:layout_weight="4"
- a:layout_margin="@dimen/display_margin_land"/>
+ a:layout_margin="@dimen/cpp_display_margin_land"/>
diff --git a/calculatorpp/res/layout-large/calc_display.xml b/calculatorpp/res/layout-large/calc_display.xml
index ee842a17..5e0d8bb4 100644
--- a/calculatorpp/res/layout-large/calc_display.xml
+++ b/calculatorpp/res/layout-large/calc_display.xml
@@ -19,7 +19,7 @@
+ style="@style/cpp_about_style"/>
- #00ffffff
- #ffffffff
- #ffffff99
- #ffffffff
- #ffffffff
- #ff393939
- #ff707070
- #ffffff99
- #ff000000
- #ff1f1f1f
- #ff1f1f1f
- #10648c
- #088e3a
- #651456
- #393939
+ #ffffffff
+ #ffffff99
+ #ffffffff
+ #ffffffff
+ #ff393939
+ #ff707070
+ #ffffff99
+ #ff000000
+ #ff1f1f1f
+ #ff1f1f1f
+ #10648c
+ #088e3a
+ #651456
+ #393939
\ No newline at end of file
diff --git a/calculatorpp/res/values/dimens.xml b/calculatorpp/res/values/dimens.xml
index ecbe19f3..e0332951 100644
--- a/calculatorpp/res/values/dimens.xml
+++ b/calculatorpp/res/values/dimens.xml
@@ -1,27 +1,27 @@
- 20sp
- 0.5dp
- 2.5dp
+ 20sp
+ 0.5dp
+ 2.5dp
- 15sp
- 20sp
+ 15sp
+ 20sp
- 30dp
- 20dp
- 25dp
- 25sp
- 25sp
- 5dp
- 5dp
- 20sp
- 15sp
+ 30dp
+ 20dp
+ 25dp
+ 25sp
+ 25sp
+ 5dp
+ 5dp
+ 20sp
+ 15sp
- 25sp
- 20dp
- 25sp
- 6dp
+ 25sp
+ 20dp
+ 25sp
+ 6dp
- 5dp
- 3dp
+ 5dp
+ 3dp
\ No newline at end of file
diff --git a/calculatorpp/res/values/styles.xml b/calculatorpp/res/values/styles.xml
index b851918f..325ae46a 100644
--- a/calculatorpp/res/values/styles.xml
+++ b/calculatorpp/res/values/styles.xml
@@ -6,77 +6,77 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/calculatorpp/res/values/styles_var.xml b/calculatorpp/res/values/styles_var.xml
index 0a499362..cd5edec9 100644
--- a/calculatorpp/res/values/styles_var.xml
+++ b/calculatorpp/res/values/styles_var.xml
@@ -10,12 +10,12 @@
@@ -14,10 +14,10 @@
- 6dp
-
+
-
-
-
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorDisplayView.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorDisplayView.java
index fa55c232..997eea5a 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorDisplayView.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorDisplayView.java
@@ -106,7 +106,7 @@ public class AndroidCalculatorDisplayView extends AutoResizeTextView implements
AndroidCalculatorDisplayView.this.state = state;
if (state.isValid()) {
- setTextColor(getResources().getColor(R.color.default_text_color));
+ setTextColor(getResources().getColor(R.color.cpp_default_text_color));
setText(text);
adjustTextSize();
@@ -114,7 +114,7 @@ public class AndroidCalculatorDisplayView extends AutoResizeTextView implements
} else {
// update text in order to get rid of HTML tags
setText(getText().toString());
- setTextColor(getResources().getColor(R.color.display_error_text_color));
+ setTextColor(getResources().getColor(R.color.cpp_display_error_text_color));
// error messages are never shown -> just greyed out text (error message will be shown on click)
//setText(state.getErrorMessage());
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
index b401210a..835500b2 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
@@ -39,7 +39,7 @@ public final class CalculatorButtons {
@NotNull View root) {
if ( layout == CalculatorPreferences.Gui.Layout.main_calculator_mobile ) {
- final float textSize = root.getResources().getDimension(R.dimen.button_text_size_mobile);
+ final float textSize = root.getResources().getDimension(R.dimen.cpp_button_text_size_mobile);
AndroidUtils.processViewsOfType(root, DragButton.class, new AndroidUtils.ViewProcessor() {
@Override
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorMessagesDialog.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorMessagesDialog.java
index 88f5ea01..23f63413 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorMessagesDialog.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorMessagesDialog.java
@@ -49,8 +49,8 @@ public class CalculatorMessagesDialog extends SherlockActivity {
final CheckBox doNotShowCalculationMessagesCheckbox = (CheckBox) findViewById(R.id.do_not_show_calculation_messages_checkbox);
- final Button okButton = (Button) findViewById(R.id.ok_button);
- okButton.setOnClickListener(new View.OnClickListener() {
+ final Button closeButton = (Button) findViewById(R.id.close_button);
+ closeButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (doNotShowCalculationMessagesCheckbox.isChecked()) {
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java
index 2c75846c..7805a5d7 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java
@@ -183,11 +183,11 @@ public final class CalculatorPreferences {
applyDefaultPreference(preferences, Calculations.calculateOnFly);
applyDefaultPreference(preferences, Calculations.preferredAngleUnits);
applyDefaultPreference(preferences, Calculations.preferredNumeralBase);
- applyDefaultPreference(preferences, Calculations.lastPreferredPreferencesCheck);
// renew value after each application start
Calculations.showCalculationMessagesDialog.putDefault(preferences);
+ Calculations.lastPreferredPreferencesCheck.putDefault(preferences);
if (!VibratorContainer.Preferences.hapticFeedbackEnabled.isSet(preferences)) {
VibratorContainer.Preferences.hapticFeedbackEnabled.putPreference(preferences, true);
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotFragment.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotFragment.java
index 208c92e9..9fe26403 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotFragment.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotFragment.java
@@ -108,7 +108,7 @@ public class CalculatorPlotFragment extends CalculatorFragment implements Calcul
}
if (input == null) {
- this.bgColor = getResources().getColor(R.color.pane_background);
+ this.bgColor = getResources().getColor(R.color.cpp_pane_background);
} else {
this.bgColor = getResources().getColor(android.R.color.transparent);
}
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java
index 2287fa90..1af61666 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java
@@ -35,9 +35,9 @@ public class AngleUnitsButton extends DirectionDragButton {
final TextPaint directionTextPaint = directionTextData.getPaint();
if (CalculatorLocatorImpl.getInstance().getEngine().getAngleUnits().name().equals(directionTextData.getText())) {
- directionTextPaint.setColor(resources.getColor(R.color.selected_angle_unit_text_color));
+ directionTextPaint.setColor(resources.getColor(R.color.cpp_selected_angle_unit_text_color));
} else {
- directionTextPaint.setColor(resources.getColor(R.color.default_text_color));
+ directionTextPaint.setColor(resources.getColor(R.color.cpp_default_text_color));
directionTextPaint.setAlpha(getDirectionTextAlpha());
}
}
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java
index 8f05386b..c009706b 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java
@@ -35,9 +35,9 @@ public class NumeralBasesButton extends DirectionDragButton {
final TextPaint directionTextPaint = directionTextData.getPaint();
if (CalculatorLocatorImpl.getInstance().getEngine().getNumeralBase().name().equals(directionTextData.getText())) {
- directionTextPaint.setColor(resources.getColor(R.color.selected_angle_unit_text_color));
+ directionTextPaint.setColor(resources.getColor(R.color.cpp_selected_angle_unit_text_color));
} else {
- directionTextPaint.setColor(resources.getColor(R.color.default_text_color));
+ directionTextPaint.setColor(resources.getColor(R.color.cpp_default_text_color));
directionTextPaint.setAlpha(getDirectionTextAlpha());
}
}
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java
index d7302d69..03f01d4a 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java
@@ -94,7 +94,7 @@ abstract class AbstractCalculatorWidgetProvider extends AppWidgetProvider {
@NotNull
private String getCursorColor(@NotNull Context context) {
if (cursorColor == null) {
- cursorColor = Integer.toHexString(context.getResources().getColor(R.color.widget_cursor_color)).substring(2);
+ cursorColor = Integer.toHexString(context.getResources().getColor(R.color.cpp_widget_cursor_color)).substring(2);
}
return cursorColor;
}
@@ -205,9 +205,9 @@ abstract class AbstractCalculatorWidgetProvider extends AppWidgetProvider {
private void updateDisplayState(@NotNull Context context, @NotNull RemoteViews views, @NotNull CalculatorDisplayViewState displayState) {
if (displayState.isValid()) {
views.setTextViewText(R.id.calculatorDisplay, displayState.getText());
- views.setTextColor(R.id.calculatorDisplay, context.getResources().getColor(R.color.default_text_color));
+ views.setTextColor(R.id.calculatorDisplay, context.getResources().getColor(R.color.cpp_default_text_color));
} else {
- views.setTextColor(R.id.calculatorDisplay, context.getResources().getColor(R.color.display_error_text_color));
+ views.setTextColor(R.id.calculatorDisplay, context.getResources().getColor(R.color.cpp_display_error_text_color));
}
}