Skip to content

Commit

Permalink
Merge pull request #27 from Carifio24/version-320-info
Browse files Browse the repository at this point in the history
Update version information for v3.2.0
  • Loading branch information
Carifio24 authored Aug 9, 2023
2 parents 7cffc82 + 4050952 commit 1f7bcad
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ android {
applicationId "dnd.jon.spellbook"
minSdkVersion 24
targetSdkVersion 33
versionCode 300101
versionName "3.1.1"
versionCode 300200
versionName "3.2.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
signingConfig signingConfigs.release
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/dnd/jon/spellbook/GlobalInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

class GlobalInfo {

static final Version VERSION = new Version(3,1,1);
static final Version VERSION = new Version(3,2,0);
static final String VERSION_CODE = VERSION.string();

// We don't always want to show an update message
// i.e. for updates that are pure bugfixes, the old message may be
// more useful to users
static final Version UPDATE_LOG_VERSION = new Version(3,1,0);
static final Version UPDATE_LOG_VERSION = new Version(3,2,0);
static final String UPDATE_LOG_CODE = UPDATE_LOG_VERSION.string();

static final int ANDROID_VERSION = android.os.Build.VERSION.SDK_INT;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/dnd/jon/spellbook/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -1254,8 +1254,8 @@ private void showUpdateDialog(boolean checkIfNecessary) {
final boolean noCharacters = (characterNames == null) || characterNames.size() <= 0;
final boolean toShow = !checkIfNecessary || !(prefs.contains(key) || noCharacters);
if (toShow) {
final int titleID = string.update_03_01_00_title;
final int descriptionID = string.update_03_01_00_description;
final int titleID = string.update_03_02_00_title;
final int descriptionID = string.update_03_02_00_description;
final Runnable onDismissAction = () -> {
final SharedPreferences.Editor editor = prefs.edit();
editor.putBoolean(key, true).apply();
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,8 @@
<string name="update_03_00_06_description">O livro de feitiços foi atualizado para incluir o feitiço do <b>Guia do Mestre da Guilda para Ravnica</b>.\n\nUm erro no conteúdo de <b>Parede de Luz</b> foi corrigido.</string>
<string name="update_03_01_00_title">Atualização da versão 3.1</string>
<string name="update_03_01_00_description">Esta atualização adiciona a capacidade de alterar o idioma dos feitiços (atualmente inglês e português estão disponíveis).</string>
<string name="update_03_02_00_title">Atualização da versão 3.2</string>
<string name="update_03_02_00_description">Esta atualização adiciona a capacidade de mover o botão circular de espaços de feitiço.\n\nAlém disso, esta atualização corrige um bug em que o tamanho da caixa de diálogo impossibilitava a edição do número de espaços de feitiço de 3º, 6º e 9º níveis.</string>

<!-- Character profile actions -->
<string name="rename">Renomear</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@
<string name="update_03_00_06_description">The spellbook has been updated to include the spell from the <b>Guildmaster\'s Guide to Ravnica</b>.\n\nA mistake in the content of <b>Wall of Light</b> has been corrected.</string>
<string name="update_03_01_00_title">Version 3.1 update</string>
<string name="update_03_01_00_description">This update adds the ability to change the language of spells (currently English and Portuguese are available).</string>
<string name="update_03_02_00_title">Version 3.2 update</string>
<string name="update_03_02_00_description">This update adds the ability to move the circular spell slots button.\n\nAdditionally, this update fixes a bug where the size of the dialog made it impossible to edit the number of 3rd, 6th, and 9th level spell slots.</string>

<!-- Character profile actions -->
<string name="rename">Rename</string>
Expand Down

0 comments on commit 1f7bcad

Please sign in to comment.