From 493bbd2aca08d723ed6e065ff77ecd34513a84c3 Mon Sep 17 00:00:00 2001 From: Carifio24 Date: Sun, 3 Dec 2023 02:55:09 -0500 Subject: [PATCH 1/4] Start working on bookkeeping for version update. --- app/src/main/java/dnd/jon/spellbook/GlobalInfo.java | 4 ++-- app/src/main/res/values-pt/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/dnd/jon/spellbook/GlobalInfo.java b/app/src/main/java/dnd/jon/spellbook/GlobalInfo.java index 2c12355d..d5c77556 100644 --- a/app/src/main/java/dnd/jon/spellbook/GlobalInfo.java +++ b/app/src/main/java/dnd/jon/spellbook/GlobalInfo.java @@ -2,13 +2,13 @@ class GlobalInfo { - static final Version VERSION = new Version(3,4,0); + static final Version VERSION = new Version(3,5,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,4,0); + static final Version UPDATE_LOG_VERSION = new Version(3,5,0); static final String UPDATE_LOG_CODE = UPDATE_LOG_VERSION.string(); static final int UPDATE_LOG_TITLE_ID = R.string.update_03_04_00_title; static final int UPDATE_LOG_DESCRIPTION_ID = R.string.update_03_04_00_description; diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index b3afa78f..b1e23735 100755 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -409,6 +409,8 @@ Esta atualização adiciona um botão à janela de slots de feitiço para recuperar todos os slots gastos. Além disso, isso remove um bug onde a configuração para alterar o idioma ortográfico era exibida quando não era suportada. Atualização da versão 3.4.0 Esta atualização adiciona um botão à janela de feitiço que permite ao personagem lançar um feitiço. Isso usa um espaço de magia do nível apropriado, se houver algum disponível. + Atualização da versão 3.5.0 + Renomear diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5729457f..8f612a1f 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -410,6 +410,8 @@ This update adds a button to the spell slots window to regain all spent slots. Additionally, this removes a bug where the setting to change spell language was displayed when it wasn\'t supported. Version 3.4.0 update This update adds a button to the spell window allowing a character to cast a spell. This uses a spell slot of the appropriate level, if one is available. + Version 3.5.0 + The spellbook has been updated to include spells from Rename From 0e73e3de8fd115b72a8fc062c3549856ae40e129 Mon Sep 17 00:00:00 2001 From: Carifio24 Date: Tue, 5 Dec 2023 01:24:26 -0500 Subject: [PATCH 2/4] Add update text and bump version in Gradle file. --- app/build.gradle | 4 ++-- app/src/main/java/dnd/jon/spellbook/GlobalInfo.java | 4 ++-- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3d91b159..a7a5c2ff 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,8 +15,8 @@ android { applicationId "dnd.jon.spellbook" minSdkVersion 24 targetSdkVersion 33 - versionCode 3004000 - versionName "3.4.0" + versionCode 3005000 + versionName "3.5.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" signingConfig signingConfigs.release } diff --git a/app/src/main/java/dnd/jon/spellbook/GlobalInfo.java b/app/src/main/java/dnd/jon/spellbook/GlobalInfo.java index d5c77556..97ff39f8 100644 --- a/app/src/main/java/dnd/jon/spellbook/GlobalInfo.java +++ b/app/src/main/java/dnd/jon/spellbook/GlobalInfo.java @@ -10,8 +10,8 @@ class GlobalInfo { // more useful to users static final Version UPDATE_LOG_VERSION = new Version(3,5,0); static final String UPDATE_LOG_CODE = UPDATE_LOG_VERSION.string(); - static final int UPDATE_LOG_TITLE_ID = R.string.update_03_04_00_title; - static final int UPDATE_LOG_DESCRIPTION_ID = R.string.update_03_04_00_description; + static final int UPDATE_LOG_TITLE_ID = R.string.update_03_05_00_title; + static final int UPDATE_LOG_DESCRIPTION_ID = R.string.update_03_05_00_description; static final int ANDROID_VERSION = android.os.Build.VERSION.SDK_INT; diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index b1e23735..2f008314 100755 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -410,7 +410,7 @@ Atualização da versão 3.4.0 Esta atualização adiciona um botão à janela de feitiço que permite ao personagem lançar um feitiço. Isso usa um espaço de magia do nível apropriado, se houver algum disponível. Atualização da versão 3.5.0 - + O livro de feitiços foi atualizado para incluir feitiços de Cenário de Campanha Tal\'Dorei: Renascido e Sigil e as Terras Distantes. Além disso, esta atualização corrige alguns pequenos bugs de interface do usuário e erros de texto. Renomear diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8f612a1f..7c98a7cf 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -411,7 +411,7 @@ Version 3.4.0 update This update adds a button to the spell window allowing a character to cast a spell. This uses a spell slot of the appropriate level, if one is available. Version 3.5.0 - The spellbook has been updated to include spells from + The spellbook has been updated to include spells from Tal'Dorei Campaign Setting Reborn and Sigil and the Outlands. Additionally, this update corrects some minor UI bugs and text mistakes. Rename From 658af8312da2e2d355cfa5ef3422c6106d62489c Mon Sep 17 00:00:00 2001 From: Carifio24 Date: Wed, 6 Dec 2023 00:09:50 -0500 Subject: [PATCH 3/4] Replace decprecated compileSdkVersion with compileSdk. --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index a7a5c2ff..291ef18e 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ android { keyPassword System.getenv('ANDROID_KEY_PASSWORD') } } - compileSdkVersion 33 + compileSdk 33 defaultConfig { applicationId "dnd.jon.spellbook" minSdkVersion 24 From 1ac97170ae2fe9b89e925d7daca4681e1807d4d1 Mon Sep 17 00:00:00 2001 From: Carifio24 Date: Wed, 6 Dec 2023 00:19:14 -0500 Subject: [PATCH 4/4] Escape apostrophe in description string. --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7c98a7cf..26783ff4 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -411,7 +411,7 @@ Version 3.4.0 update This update adds a button to the spell window allowing a character to cast a spell. This uses a spell slot of the appropriate level, if one is available. Version 3.5.0 - The spellbook has been updated to include spells from Tal'Dorei Campaign Setting Reborn and Sigil and the Outlands. Additionally, this update corrects some minor UI bugs and text mistakes. + The spellbook has been updated to include spells from Tal\'Dorei Campaign Setting Reborn and Sigil and the Outlands. Additionally, this update corrects some minor UI bugs and text mistakes. Rename