Color translations
This commit is contained in:
parent
4bb42eff81
commit
704b5b6313
@ -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>
|
@ -86,11 +86,11 @@
|
|||||||
</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>
|
||||||
|
@ -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>
|
@ -91,11 +91,15 @@ 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 (fragment instanceof CalculatorDisplayFragment || fragment instanceof CalculatorEditorFragment || fragment instanceof CalculatorKeyboardFragment) {
|
||||||
|
// no ads in those fragments
|
||||||
|
} else {
|
||||||
if (adParentView != null) {
|
if (adParentView != null) {
|
||||||
adView = AdsController.getInstance().inflateAd(fragment.getActivity(), adParentView, R.id.ad_parent_view);
|
adView = AdsController.getInstance().inflateAd(fragment.getActivity(), adParentView, R.id.ad_parent_view);
|
||||||
} else if ( mainFragmentLayout != null ) {
|
} else if ( mainFragmentLayout != null ) {
|
||||||
adView = AdsController.getInstance().inflateAd(fragment.getActivity(), mainFragmentLayout, R.id.main_fragment_layout);
|
adView = AdsController.getInstance().inflateAd(fragment.getActivity(), mainFragmentLayout, R.id.main_fragment_layout);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
processButtons(fragment.getActivity(), root);
|
processButtons(fragment.getActivity(), root);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user