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

fixable message removed

Browse Source
This commit is contained in:
Solovyev_S 2013-07-01 11:31:06 +04:00
parent cd2f43bb43
commit 5518a38f16
4 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android-app-core/res/values-ru/text_strings.xml
View File

@ -345,7 +345,6 @@
<string name="cpp_onscreen_remove_icon_message">Вы можете удалить вторую иконку Калькулятора++ из списка приложений <string name="cpp_onscreen_remove_icon_message">Вы можете удалить вторую иконку Калькулятора++ из списка приложений
из настроек или нажав следующую кнопку из настроек или нажав следующую кнопку
</string> </string>
<string name="cpp_onscreen_remove_icon_button_text">Удалить иконку</string>
<string name="cpp_this_change_may_require_reboot">Это изменение может потребовать перезагрузки</string> <string name="cpp_this_change_may_require_reboot">Это изменение может потребовать перезагрузки</string>
<string name="cpp_plot_2d">2D график</string> <string name="cpp_plot_2d">2D график</string>

1
android-app-core/res/values/text_strings.xml
View File

@ -336,7 +336,6 @@
<string name="cpp_onscreen_remove_icon_message">You can remove second icon in applications\' list from application <string name="cpp_onscreen_remove_icon_message">You can remove second icon in applications\' list from application
settings or by pressing next button settings or by pressing next button
</string> </string>
<string name="cpp_onscreen_remove_icon_button_text">Remove icon</string>
<string name="cpp_this_change_may_require_reboot">This change may require reboot</string> <string name="cpp_this_change_may_require_reboot">This change may require reboot</string>
<string name="cpp_plot_2d">2D plot</string> <string name="cpp_plot_2d">2D plot</string>

1
android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java
View File

@ -58,7 +58,6 @@ public final class CalculatorPreferences {
public static class OnscreenCalculator { public static class OnscreenCalculator {
public static final Preference<Boolean> startOnBoot = BooleanPreference.of("onscreen_start_on_boot", false); public static final Preference<Boolean> startOnBoot = BooleanPreference.of("onscreen_start_on_boot", false);
public static final Preference<Boolean> showAppIcon = BooleanPreference.of("onscreen_show_app_icon", true); public static final Preference<Boolean> showAppIcon = BooleanPreference.of("onscreen_show_app_icon", true);
public static final Preference<Boolean> removeIconDialogShown = BooleanPreference.of("onscreen_remove_icon_dialog_shown", false);
} }
public static class Calculations { public static class Calculations {

23
android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenStartActivity.java
View File

@ -46,31 +46,8 @@ public class CalculatorOnscreenStartActivity extends Activity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
if (Android.isComponentEnabled(this, CalculatorOnscreenStartActivity.class)) {
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
if (!CalculatorPreferences.OnscreenCalculator.removeIconDialogShown.getPreference(prefs)) {
FixableMessagesDialog.showDialog(Arrays.asList(new FixableMessage(getString(R.string.cpp_onscreen_remove_icon_message), MessageType.warning, new RemoveIconFixableError(this))), this, false);
CalculatorPreferences.OnscreenCalculator.removeIconDialogShown.putPreference(prefs, true);
}
}
CalculatorOnscreenService.showOnscreenView(this); CalculatorOnscreenService.showOnscreenView(this);
this.finish(); this.finish();
} }
public static class RemoveIconFixableError extends AbstractFixableError {
public RemoveIconFixableError(@Nonnull Context context) {
super(context.getString(R.string.cpp_onscreen_remove_icon_button_text));
}
@Override
public void fix() {
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(App.getApplication());
CalculatorPreferences.OnscreenCalculator.showAppIcon.putPreference(prefs, false);
}
}
} }