Merge pull request #29 from Carifio24/3-2-1-go

Update version info for v3.2.1
Carifio24 · Sep 11, 2023 · 1d6ebf0 · 1d6ebf0
2 parents d78ea7c + 9cc2f1d
commit 1d6ebf0
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "dnd.jon.spellbook"
         minSdkVersion 24
         targetSdkVersion 33
-        versionCode 300200
-        versionName "3.2.0"
+        versionCode 300201
+        versionName "3.2.1"
         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
@@ -2,14 +2,16 @@
 
 class GlobalInfo {
 
-    static final Version VERSION = new Version(3,2,0);
+    static final Version VERSION = new Version(3,2,1);
     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,2,0);
+    static final Version UPDATE_LOG_VERSION = new Version(3,2,1);
     static final String UPDATE_LOG_CODE = UPDATE_LOG_VERSION.string();
+    static final int UPDATE_LOG_TITLE_ID = R.string.update_03_02_01_title;
+    static final int UPDATE_LOG_DESCRIPTION_ID = R.string.update_03_02_01_description;
 
     static final int ANDROID_VERSION = android.os.Build.VERSION.SDK_INT;
 

diff --git a/app/src/main/java/dnd/jon/spellbook/MainActivity.java b/app/src/main/java/dnd/jon/spellbook/MainActivity.java
@@ -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_02_00_title;
-            final int descriptionID = string.update_03_02_00_description;
+            final int titleID = GlobalInfo.UPDATE_LOG_TITLE_ID;
+            final int descriptionID = GlobalInfo.UPDATE_LOG_DESCRIPTION_ID;
             final Runnable onDismissAction = () -> {
                 final SharedPreferences.Editor editor = prefs.edit();
                 editor.putBoolean(key, true).apply();

diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
@@ -397,6 +397,8 @@
     <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>
+    <string name="update_03_02_01_title">Atualização da versão 3.2.1</string>
+    <string name="update_03_02_01_description">Esta atualização faz algumas alterações na interface do usuário:\n\n\u2022O botão circular de espaços mágicos agora é móvel por padrão.\n\n\u2022A caixa de diálogo de seleção de personagens agora aumentará de tamanho conforme o número de caracteres aumenta.</string>
 
     <!-- Character profile actions -->
     <string name="rename">Renomear</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -398,6 +398,8 @@
     <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>
+    <string name="update_03_02_01_title">Version 3.2.1 update</string>
+    <string name="update_03_02_01_description">This update makes some changes to the user interface:\n\n\u2022The circular spell slots button is now movable by default.\n\n\u2022The character selection dialog will now grow in size as the number of characters increases.</string>
 
     <!-- Character profile actions -->
     <string name="rename">Rename</string>