From 15e7b0ee50f4b8dbd8aa3ab80c82e1b630409b27 Mon Sep 17 00:00:00 2001 From: serso Date: Tue, 10 Feb 2015 23:56:26 +0100 Subject: [PATCH] VERSION_CODE constant instead of hard coded number --- .../calculator/release/ChooseThemeReleaseNoteStep.java | 2 ++ .../solovyev/android/calculator/release/ReleaseNotes.java | 7 ++++--- .../android/calculator/wizard/CalculatorWizards.java | 2 +- android-app/src/main/res/values-ru/text_strings.xml | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/android-app/src/main/java/org/solovyev/android/calculator/release/ChooseThemeReleaseNoteStep.java b/android-app/src/main/java/org/solovyev/android/calculator/release/ChooseThemeReleaseNoteStep.java index 4fe0a2d8..751cbd33 100644 --- a/android-app/src/main/java/org/solovyev/android/calculator/release/ChooseThemeReleaseNoteStep.java +++ b/android-app/src/main/java/org/solovyev/android/calculator/release/ChooseThemeReleaseNoteStep.java @@ -6,6 +6,8 @@ import android.support.v4.app.Fragment; import javax.annotation.Nonnull; public class ChooseThemeReleaseNoteStep extends ReleaseNoteStep { + public static final int VERSION_CODE = 137; + public ChooseThemeReleaseNoteStep(Integer version) { super(version); } diff --git a/android-app/src/main/java/org/solovyev/android/calculator/release/ReleaseNotes.java b/android-app/src/main/java/org/solovyev/android/calculator/release/ReleaseNotes.java index 9e07798a..d03913ae 100644 --- a/android-app/src/main/java/org/solovyev/android/calculator/release/ReleaseNotes.java +++ b/android-app/src/main/java/org/solovyev/android/calculator/release/ReleaseNotes.java @@ -13,6 +13,7 @@ import java.util.List; import static org.solovyev.android.Android.getAppVersionCode; public final class ReleaseNotes { + @Nonnull public static String getReleaseNotes(@Nonnull Context context) { return getReleaseNotesString(context, 0); @@ -54,8 +55,8 @@ public final class ReleaseNotes { final TextHelper textHelper = new TextHelper(context.getResources(), CalculatorApplication.class.getPackage().getName()); for (int versionCode = currentVersionCode; versionCode >= minVersion; versionCode--) { - if (versionCode == 136) { - releaseNotes.add(136); + if (versionCode == ChooseThemeReleaseNoteStep.VERSION_CODE) { + releaseNotes.add(ChooseThemeReleaseNoteStep.VERSION_CODE); } final String releaseNotesForVersion = textHelper.getText(makeReleaseNotesResourceId(versionCode)); if (!Strings.isEmpty(releaseNotesForVersion)) { @@ -71,7 +72,7 @@ public final class ReleaseNotes { final TextHelper textHelper = new TextHelper(context.getResources(), CalculatorApplication.class.getPackage().getName()); for (int versionCode = currentVersionCode; versionCode >= minVersion; versionCode--) { - if (versionCode == 136) { + if (versionCode == ChooseThemeReleaseNoteStep.VERSION_CODE) { return true; } String releaseNotesForVersion = textHelper.getText(makeReleaseNotesResourceId(versionCode)); diff --git a/android-app/src/main/java/org/solovyev/android/calculator/wizard/CalculatorWizards.java b/android-app/src/main/java/org/solovyev/android/calculator/wizard/CalculatorWizards.java index 83518c7e..e37c15d7 100644 --- a/android-app/src/main/java/org/solovyev/android/calculator/wizard/CalculatorWizards.java +++ b/android-app/src/main/java/org/solovyev/android/calculator/wizard/CalculatorWizards.java @@ -88,7 +88,7 @@ public class CalculatorWizards implements Wizards { for (Integer version : versions) { switch (version) { - case 136: + case ChooseThemeReleaseNoteStep.VERSION_CODE: wizardSteps.add(new ChooseThemeReleaseNoteStep(version)); break; default: diff --git a/android-app/src/main/res/values-ru/text_strings.xml b/android-app/src/main/res/values-ru/text_strings.xml index c1673164..9ad9a792 100644 --- a/android-app/src/main/res/values-ru/text_strings.xml +++ b/android-app/src/main/res/values-ru/text_strings.xml @@ -331,5 +331,5 @@ Показать греческий алфавит Скрыть греческий алфавит Новое в версии %1$s - Хотите попробовать новые темы в стиле Material? Выберите их из списка: + Хотите попробовать новые темы в стиле Матириал? Выберите их из списка: