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

Color translations

Browse Source
This commit is contained in:
Sergey Solovyev 2012-10-10 22:14:39 +04:00
parent 4bb42eff81
commit 704b5b6313
4 changed files with 124 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calculatorpp/res/values-ru/text_strings.xml
View File

@ -226,4 +226,11 @@
<string name="prefs_graph_real_color_summary">Устанавливает цвет вещественной части графика</string> <string name="prefs_graph_real_color_summary">Устанавливает цвет вещественной части графика</string>
<string name="prefs_graph_imag_color_title">Цвет мнимой части графика</string> <string name="prefs_graph_imag_color_title">Цвет мнимой части графика</string>
<string name="prefs_graph_imag_color_summary">Устанавливает цвет мнимой части графика</string> <string name="prefs_graph_imag_color_summary">Устанавливает цвет мнимой части графика</string>
<string name="p_white_line_color">Белый</string>
<string name="p_grey_line_color">Серый</string>
<string name="p_red_line_color">Красный</string>
<string name="p_blue_line_color">Синий</string>
<string name="p_green_line_color">Зелёный</string>
</resources> </resources>

204
calculatorpp/res/values/arrays.xml
View File

@ -1,103 +1,103 @@
<!-- <!--
~ 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
--> -->
<resources> <resources>
<string-array name="p_theme_names"> <string-array name="p_theme_names">
<item>@string/p_default_theme</item> <item>@string/p_default_theme</item>
<item>@string/p_violet_theme</item> <item>@string/p_violet_theme</item>
<item>@string/p_light_blue_theme</item> <item>@string/p_light_blue_theme</item>
<item>@string/p_metro_blue_theme</item> <item>@string/p_metro_blue_theme</item>
<item>@string/p_metro_green_theme</item> <item>@string/p_metro_green_theme</item>
<item>@string/p_metro_purple_theme</item> <item>@string/p_metro_purple_theme</item>
</string-array> </string-array>
<string-array name="p_theme_values"> <string-array name="p_theme_values">
<item>default_theme</item> <item>default_theme</item>
<item>violet_theme</item> <item>violet_theme</item>
<item>light_blue_theme</item> <item>light_blue_theme</item>
<item>metro_blue_theme</item> <item>metro_blue_theme</item>
<item>metro_green_theme</item> <item>metro_green_theme</item>
<item>metro_purple_theme</item> <item>metro_purple_theme</item>
</string-array> </string-array>
<string-array name="p_grouping_separator_names"> <string-array name="p_grouping_separator_names">
<item>@string/p_grouping_separator_no</item> <item>@string/p_grouping_separator_no</item>
<item>@string/p_grouping_separator_apostrophe</item> <item>@string/p_grouping_separator_apostrophe</item>
<item>@string/p_grouping_separator_space</item> <item>@string/p_grouping_separator_space</item>
</string-array> </string-array>
<string-array name="p_grouping_separator_values"> <string-array name="p_grouping_separator_values">
<item>""</item> <item>""</item>
<item>\'</item> <item>\'</item>
<item>" "</item> <item>" "</item>
</string-array> </string-array>
<string-array name="p_multiplication_sign_values"> <string-array name="p_multiplication_sign_values">
<item>"*"</item> <item>"*"</item>
<item>"×"</item> <item>"×"</item>
<item>"∙"</item> <item>"∙"</item>
</string-array> </string-array>
<string-array name="p_layout_names"> <string-array name="p_layout_names">
<item>@string/p_layout_calculator</item> <item>@string/p_layout_calculator</item>
<item>@string/p_layout_simple</item> <item>@string/p_layout_simple</item>
</string-array> </string-array>
<string-array name="p_layout_values"> <string-array name="p_layout_values">
<item>main_calculator</item> <item>main_calculator</item>
<item>simple</item> <item>simple</item>
</string-array> </string-array>
<string-array name="p_calc_haptic_feedback_duration_names"> <string-array name="p_calc_haptic_feedback_duration_names">
<item>@string/p_calc_haptic_feedback_strength_short</item> <item>@string/p_calc_haptic_feedback_strength_short</item>
<item>@string/p_calc_haptic_feedback_strength_middle</item> <item>@string/p_calc_haptic_feedback_strength_middle</item>
<item>@string/p_calc_haptic_feedback_strength_long</item> <item>@string/p_calc_haptic_feedback_strength_long</item>
</string-array> </string-array>
<string-array name="p_calc_haptic_feedback_duration_values"> <string-array name="p_calc_haptic_feedback_duration_values">
<item>30</item> <item>30</item>
<item>60</item> <item>60</item>
<item>100</item> <item>100</item>
</string-array> </string-array>
<string-array name="p_angle_units_names"> <string-array name="p_angle_units_names">
<item>@string/p_deg</item> <item>@string/p_deg</item>
<item>@string/p_rad</item> <item>@string/p_rad</item>
<item>@string/p_grad</item> <item>@string/p_grad</item>
<item>@string/p_turns</item> <item>@string/p_turns</item>
</string-array> </string-array>
<string-array name="p_angle_units"> <string-array name="p_angle_units">
<item>deg</item> <item>deg</item>
<item>rad</item> <item>rad</item>
<item>grad</item> <item>grad</item>
<item>turns</item> <item>turns</item>
</string-array> </string-array>
<string-array name="p_numeral_bases_names"> <string-array name="p_numeral_bases_names">
<item>@string/p_dec</item> <item>@string/p_dec</item>
<item>@string/p_hex</item> <item>@string/p_hex</item>
<item>@string/p_oct</item> <item>@string/p_oct</item>
<item>@string/p_bin</item> <item>@string/p_bin</item>
</string-array> </string-array>
<string-array name="p_numeral_bases"> <string-array name="p_numeral_bases">
<item>dec</item> <item>dec</item>
<item>hex</item> <item>hex</item>
<item>oct</item> <item>oct</item>
<item>bin</item> <item>bin</item>
</string-array> </string-array>
<string-array name="graph_line_color_names"> <string-array name="graph_line_color_names">
<item>White</item> <item>@string/p_white_line_color</item>
<item>Grey</item> <item>@string/p_grey_line_color</item>
<item>Red</item> <item>@string/p_red_line_color</item>
<item>Blue</item> <item>@string/p_blue_line_color</item>
<item>Green</item> <item>@string/p_green_line_color</item>
</string-array> </string-array>
<string-array name="graph_line_color_values"> <string-array name="graph_line_color_values">
<item>white</item> <item>white</item>
<item>grey</item> <item>grey</item>
<item>red</item> <item>red</item>
<item>blue</item> <item>blue</item>
<item>green</item> <item>green</item>
</string-array> </string-array>
</resources> </resources>

7
calculatorpp/res/values/text_strings.xml
View File

@ -226,4 +226,11 @@
<string name="prefs_graph_real_color_summary">Sets color of real part functions graph</string> <string name="prefs_graph_real_color_summary">Sets color of real part functions graph</string>
<string name="prefs_graph_imag_color_title">Color of imaginary part of functions graph</string> <string name="prefs_graph_imag_color_title">Color of imaginary part of functions graph</string>
<string name="prefs_graph_imag_color_summary">Sets color of imaginary part functions graph</string> <string name="prefs_graph_imag_color_summary">Sets color of imaginary part functions graph</string>
<string name="p_white_line_color">White</string>
<string name="p_grey_line_color">Grey</string>
<string name="p_red_line_color">Red</string>
<string name="p_blue_line_color">Blue</string>
<string name="p_green_line_color">Green</string>
</resources> </resources>

12
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelperImpl.java
View File

@ -91,10 +91,14 @@ public class CalculatorFragmentHelperImpl extends AbstractCalculatorHelper imple
final ViewGroup adParentView = (ViewGroup) root.findViewById(R.id.ad_parent_view); final ViewGroup adParentView = (ViewGroup) root.findViewById(R.id.ad_parent_view);
final ViewGroup mainFragmentLayout = (ViewGroup) root.findViewById(R.id.main_fragment_layout); final ViewGroup mainFragmentLayout = (ViewGroup) root.findViewById(R.id.main_fragment_layout);
if (adParentView != null) { if (fragment instanceof CalculatorDisplayFragment || fragment instanceof CalculatorEditorFragment || fragment instanceof CalculatorKeyboardFragment) {
adView = AdsController.getInstance().inflateAd(fragment.getActivity(), adParentView, R.id.ad_parent_view); // no ads in those fragments
} else if ( mainFragmentLayout != null ) { } else {
adView = AdsController.getInstance().inflateAd(fragment.getActivity(), mainFragmentLayout, R.id.main_fragment_layout); if (adParentView != null) {
adView = AdsController.getInstance().inflateAd(fragment.getActivity(), adParentView, R.id.ad_parent_view);
} else if ( mainFragmentLayout != null ) {
adView = AdsController.getInstance().inflateAd(fragment.getActivity(), mainFragmentLayout, R.id.main_fragment_layout);
}
} }
processButtons(fragment.getActivity(), root); processButtons(fragment.getActivity(), root);