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_imag_color_title">Цвет мнимой части графика</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>

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

@ -86,11 +86,11 @@
</string-array>
<string-array name="graph_line_color_names">
<item>White</item>
<item>Grey</item>
<item>Red</item>
<item>Blue</item>
<item>Green</item>
<item>@string/p_white_line_color</item>
<item>@string/p_grey_line_color</item>
<item>@string/p_red_line_color</item>
<item>@string/p_blue_line_color</item>
<item>@string/p_green_line_color</item>
</string-array>
<string-array name="graph_line_color_values">
<item>white</item>

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_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="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>

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 mainFragmentLayout = (ViewGroup) root.findViewById(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);
if (fragment instanceof CalculatorDisplayFragment || fragment instanceof CalculatorEditorFragment || fragment instanceof CalculatorKeyboardFragment) {
// no ads in those fragments
} else {
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);