diff --git a/calculatorpp/res/drawable-hdpi/icon_action_bar_long.png b/calculatorpp/res/drawable-hdpi/icon_action_bar_long.png new file mode 100644 index 00000000..033faf52 Binary files /dev/null and b/calculatorpp/res/drawable-hdpi/icon_action_bar_long.png differ diff --git a/calculatorpp/res/drawable/metro_button_blue_shape.xml b/calculatorpp/res/drawable/metro_button_blue_shape.xml index d559802b..59553617 100644 --- a/calculatorpp/res/drawable/metro_button_blue_shape.xml +++ b/calculatorpp/res/drawable/metro_button_blue_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 e3049adf..0d3a88f4 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 62df777b..0a291ba1 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_pressed.xml b/calculatorpp/res/drawable/metro_button_pressed.xml index e3a24537..e6d88e63 100644 --- a/calculatorpp/res/drawable/metro_button_pressed.xml +++ b/calculatorpp/res/drawable/metro_button_pressed.xml @@ -15,6 +15,6 @@ --> - + \ No newline at end of file diff --git a/calculatorpp/res/drawable/metro_button_purple_shape.xml b/calculatorpp/res/drawable/metro_button_purple_shape.xml index 425aaab7..a7eac71e 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/values/colors.xml b/calculatorpp/res/values/colors.xml index 5ffabbff..9726fba0 100644 --- a/calculatorpp/res/values/colors.xml +++ b/calculatorpp/res/values/colors.xml @@ -1,18 +1,21 @@ - - - - #00ffffff - #ffffffff - #ffffff99 - #ffffffff - #ffffffff - #ff393939 - #ffffff99 - #ff000000 - #ff1f1f1f - #ff1f1f1f + + + + #00ffffff + #ffffffff + #ffffff99 + #ffffffff + #ffffffff + #ff393939 + #ffffff99 + #ff000000 + #ff1f1f1f + #ff1f1f1f + #10648c + #088e3a + #651456 \ No newline at end of file diff --git a/calculatorpp/res/values/styles-common.xml b/calculatorpp/res/values/styles-common.xml deleted file mode 100644 index cf1def55..00000000 --- a/calculatorpp/res/values/styles-common.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/calculatorpp/res/values/styles.xml b/calculatorpp/res/values/styles.xml index fbc965e5..daab2113 100644 --- a/calculatorpp/res/values/styles.xml +++ b/calculatorpp/res/values/styles.xml @@ -1,63 +1,74 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/calculatorpp/res/values/styles-common-history.xml b/calculatorpp/res/values/styles_history.xml similarity index 100% rename from calculatorpp/res/values/styles-common-history.xml rename to calculatorpp/res/values/styles_history.xml diff --git a/calculatorpp/res/values/styles-common-var.xml b/calculatorpp/res/values/styles_var.xml similarity index 50% rename from calculatorpp/res/values/styles-common-var.xml rename to calculatorpp/res/values/styles_var.xml index 91630832..0a499362 100644 --- a/calculatorpp/res/values/styles-common-var.xml +++ b/calculatorpp/res/values/styles_var.xml @@ -1,22 +1,26 @@ - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/calculatorpp/res/values/text_strings.xml b/calculatorpp/res/values/text_strings.xml index 3349f144..9564162d 100644 --- a/calculatorpp/res/values/text_strings.xml +++ b/calculatorpp/res/values/text_strings.xml @@ -1,222 +1,222 @@ - - - - - - Calculator++ - Calculator++ Free - Calc++ - Settings - Error - Result copied to clipboard! - Settings - Help - Variables And Constants - - Main settings - Calculation settings - Appearance settings - Other settings - Drag buttons settings - - - Down - Up - Restart - - undo - redo - C - clear - paste - vars - - Copy - Plot graph - Graph - - Highlight expressions - Round result - Toggles rounding of the result - Always scientific notation - If turned on forces to use only scientific notation of output (12.34E-12) - Precision of result - Maximum calculation time - If calculations exceed specified limit - calculator halts with error - Exit - Add - Cancel - Save - Remove - Yes - No - Removal confirmation - Do you really want to delete \'%s\' variable? - Name - Value - Description - Create variable - Edit variable - - Value must be either number or empty! - Variable name clashes with function name! - Variable with same name already exists! - Name of constant is not valid: name must start with letter, can contain letters, digits and underscore. - System variable cannot be changed! - - Enter new expression - Press to copy - Continue - History - M - History is empty! - History - Character \'%s\' is not accepted in variable name! - - Angle Units - Degrees - Radians - Gradians - Turns - Defines the default units for angles. - - Numeral systems - Defines the default numeral system for all input numbers. - Decimal - Hexadecimal - Octal - Binary - - Theme - Grey - Violet - Light Blue - Metro Blue (Default) - Metro Green - Metro Purple - Precision of result value (all calculations are done with maximum precision regardless of the value of this option) - Toggles colouring and styling in calculator editor - Sets the theme for calculator - Clear history - Next constants are undefined: {0}! - - No grouping separator - Apostrophe (\') - Space ( ) - Grouping separator - Sets grouping separator - Multiplication sign - Sets multiplication sign - - Layout - Scientific (cellphone) - Scientific - Simple - Sets layout of buttons - - Haptic feedback - Toggles vibration on button click - - Short - Middle - Long - - Haptic feedback duration - Duration vibration on button click - - Unable to create empty constant! - Current result is not valid! - - Graph - From - To - - Swipe distance for buttons - Sets swipe distance for buttons that support additional swipe actions - - Comment - Saved - Not saved - Expression copied to the clipboard! - Status: - Comment: - Use - Use - Copy expression - Copy result - Value - Saved (see \'Saved history\' tab) - Comment - Save history - Modify history - Modify - Saved history - - History was already saved! - History must be saved before editing! - History was successfully removed! - History was successfully saved! - - Copy description - Copy value - - Thank you for choosing Calculator++!\n\nCalculator++ is a powerful tool for making everyday calculations.\n\nTo remove the ads and support the project you can use special option from application settings.\n\nIt\'s highly recommended to read the FAQ and hints before the work to use all the features of application (press Menu button and then Help) - Welcome - - Show release notes - Defines if release notes popup window should appear after update to the new version - - Defines the behaviour of the Back button - Use Back button as history prev - - Billing information will be reloaded from the server - Clear billing information - - Warning - Error - Billing is not supported: you must have Google Checkout account linked to your Google account and must be connected to the internet. - - Support the project - And remove the advertisement - - Ad free option has been already purchased! - Purchasing… - Clearing… - - Feedback - You have been using Calculator++ for some time \n - and it\'s important for us to know your opinion about application.\n\n - Please rate Calculator++ \non Google Play,\n leave a comment or \ndiscuss application \non our forum - - - Good news - I just released new application for Android called Notes++.\n - If you\'re interesting in fast and easy way of making notes please follow the link and try Notes++! - - - Angle units changed to \'%s\'! - Numeral base changed to \'%s\'! - Conversion tool - - Convert to… - - Convert to hex - Convert to bin - Convert to dec - - Editor - Result - Other - Derivatives/Integrals - Calculator++ has been crashed… - Calculator++ crash report confirmation - - Unfortunately, Calculator++ has been crashed.\n\n - In order to fix the problem we need some information about it. It\'s highly recommended to send crash report via email (after pressing \'Ok\' button you will see all sent data in the new window).\n\n - Do you want to send crash report via email? - - + + + + + + Calculator++ + Calculator++ Free + Calc++ + Settings + Error + Result copied to clipboard! + Settings + Help + Variables And Constants + + Main settings + Calculation settings + Appearance settings + Other settings + Drag buttons settings + + + Down + Up + Restart + + undo + redo + C + clear + paste + vars + + Copy + Plot graph + Graph + + Highlight expressions + Round result + Toggles rounding of the result + Always scientific notation + If turned on forces to use only scientific notation of output (12.34E-12) + Precision of result + Maximum calculation time + If calculations exceed specified limit - calculator halts with error + Exit + Add + Cancel + Save + Remove + Yes + No + Removal confirmation + Do you really want to delete \'%s\' variable? + Name + Value + Description + Create variable + Edit variable + + Value must be either number or empty! + Variable name clashes with function name! + Variable with same name already exists! + Name of constant is not valid: name must start with letter, can contain letters, digits and underscore. + System variable cannot be changed! + + Enter new expression + Press to copy + Continue + History + M + History is empty! + History + Character \'%s\' is not accepted in variable name! + + Angle Units + Degrees + Radians + Gradians + Turns + Defines the default units for angles. + + Numeral systems + Defines the default numeral system for all input numbers. + Decimal + Hexadecimal + Octal + Binary + + Theme + Grey + Violet + Light Blue + Metro Blue (Default) + Metro Green + Metro Purple + Precision of result value (all calculations are done with maximum precision regardless of the value of this option) + Toggles colouring and styling in calculator editor + Sets the theme for calculator + Clear history + Next constants are undefined: {0}! + + No grouping separator + Apostrophe (\') + Space ( ) + Grouping separator + Sets grouping separator + Multiplication sign + Sets multiplication sign + + Layout + Scientific (cellphone) + Scientific + Simple + Sets layout of buttons + + Haptic feedback + Toggles vibration on button click + + Short + Middle + Long + + Haptic feedback duration + Duration vibration on button click + + Unable to create empty constant! + Current result is not valid! + + Graph + From + To + + Swipe distance for buttons + Sets swipe distance for buttons that support additional swipe actions + + Comment + Saved + Not saved + Expression copied to the clipboard! + Status: + Comment: + Use + Use + Copy expression + Copy result + Value + Saved (see \'Saved history\' tab) + Comment + Save history + Modify history + Modify + Saved history + + History was already saved! + History must be saved before editing! + History was successfully removed! + History was successfully saved! + + Copy description + Copy value + + Thank you for choosing Calculator++!\n\nCalculator++ is a powerful tool for making everyday calculations.\n\nTo remove the ads and support the project you can use special option from application settings.\n\nIt\'s highly recommended to read the FAQ and hints before the work to use all the features of application (press Menu button and then Help) + Welcome + + Show release notes + Defines if release notes popup window should appear after update to the new version + + Defines the behaviour of the Back button + Use Back button as history prev + + Billing information will be reloaded from the server + Clear billing information + + Warning + Error + Billing is not supported: you must have Google Checkout account linked to your Google account and must be connected to the internet. + + Support the project + And remove the advertisement + + Ad free option has been already purchased! + Purchasing… + Clearing… + + Feedback + You have been using Calculator++ for some time \n + and it\'s important for us to know your opinion about application.\n\n + Please rate Calculator++ \non Google Play,\n leave a comment or \ndiscuss application \non our forum + + + Good news - I just released new application for Android called Notes++.\n + If you\'re interesting in fast and easy way of making notes please follow the link and try Notes++! + + + Angle units changed to \'%s\'! + Numeral base changed to \'%s\'! + Conversion tool + + Convert to… + + Convert to hex + Convert to bin + Convert to dec + + Editor + Result + Other + Derivatives/Integrals + Calculator++ has been crashed… + Calculator++ crash report confirmation + + Unfortunately, Calculator++ has been crashed.\n\n + In order to fix the problem we need some information about it. It\'s highly recommended to send crash report via email (after pressing \'Ok\' button you will see all sent data in the new window).\n\n + Do you want to send crash report? + + \ No newline at end of file diff --git a/calculatorpp/res/values/styles-default-theme.xml b/calculatorpp/res/values/theme_default.xml similarity index 91% rename from calculatorpp/res/values/styles-default-theme.xml rename to calculatorpp/res/values/theme_default.xml index 7b7ccbaa..1e46c128 100644 --- a/calculatorpp/res/values/styles-default-theme.xml +++ b/calculatorpp/res/values/theme_default.xml @@ -77,6 +77,12 @@ match_parent + + + + \ No newline at end of file diff --git a/calculatorpp/res/values/styles-light-blue-theme.xml b/calculatorpp/res/values/theme_light_blue.xml similarity index 97% rename from calculatorpp/res/values/styles-light-blue-theme.xml rename to calculatorpp/res/values/theme_light_blue.xml index e449c1b1..28e7f546 100644 --- a/calculatorpp/res/values/styles-light-blue-theme.xml +++ b/calculatorpp/res/values/theme_light_blue.xml @@ -1,33 +1,33 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/calculatorpp/res/values/styles-metro-blue-theme.xml b/calculatorpp/res/values/theme_metro_blue.xml similarity index 97% rename from calculatorpp/res/values/styles-metro-blue-theme.xml rename to calculatorpp/res/values/theme_metro_blue.xml index e0eaa444..e02a8ae1 100644 --- a/calculatorpp/res/values/styles-metro-blue-theme.xml +++ b/calculatorpp/res/values/theme_metro_blue.xml @@ -1,26 +1,26 @@ - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/calculatorpp/res/values/styles-metro-green-theme.xml b/calculatorpp/res/values/theme_metro_green.xml similarity index 97% rename from calculatorpp/res/values/styles-metro-green-theme.xml rename to calculatorpp/res/values/theme_metro_green.xml index d0b03739..60923aef 100644 --- a/calculatorpp/res/values/styles-metro-green-theme.xml +++ b/calculatorpp/res/values/theme_metro_green.xml @@ -1,26 +1,26 @@ - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/calculatorpp/res/values/styles-metro-purple-theme.xml b/calculatorpp/res/values/theme_metro_purple.xml similarity index 97% rename from calculatorpp/res/values/styles-metro-purple-theme.xml rename to calculatorpp/res/values/theme_metro_purple.xml index 795f25a1..07b6e169 100644 --- a/calculatorpp/res/values/styles-metro-purple-theme.xml +++ b/calculatorpp/res/values/theme_metro_purple.xml @@ -1,26 +1,26 @@ - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/calculatorpp/res/values/styles-violet-theme.xml b/calculatorpp/res/values/theme_violet.xml similarity index 97% rename from calculatorpp/res/values/styles-violet-theme.xml rename to calculatorpp/res/values/theme_violet.xml index e421baec..bd264645 100644 --- a/calculatorpp/res/values/styles-violet-theme.xml +++ b/calculatorpp/res/values/theme_violet.xml @@ -1,31 +1,31 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java index 3962a2d4..a3212e24 100644 --- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java +++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java @@ -11,10 +11,10 @@ import android.content.Context; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.Preference; -import android.preference.PreferenceActivity; import android.preference.PreferenceManager; import android.util.Log; import android.widget.Toast; +import com.actionbarsherlock.app.SherlockPreferenceActivity; import net.robotmedia.billing.BillingController; import net.robotmedia.billing.IBillingObserver; import net.robotmedia.billing.ResponseCode; @@ -31,7 +31,7 @@ import org.solovyev.android.view.VibratorContainer; * Date: 7/16/11 * Time: 6:37 PM */ -public class CalculatorPreferencesActivity extends PreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener, IBillingObserver { +public class CalculatorPreferencesActivity extends SherlockPreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener, IBillingObserver { public static final String CLEAR_BILLING_INFO = "clear_billing_info";