Merge pull request #57 from Carifio24/v3-6-0

Version 3.6.0
Carifio24 · Feb 22, 2024 · 07a32c1 · 07a32c1
2 parents 6b531bd + 322aaf8
commit 07a32c1
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 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 3005000
-        versionName "3.5.0"
+        versionCode 3006000
+        versionName "3.6.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
@@ -2,16 +2,16 @@
 
 class GlobalInfo {
 
-    static final Version VERSION = new Version(3,5,0);
+    static final Version VERSION = new Version(3,6,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,5,0);
+    static final Version UPDATE_LOG_VERSION = new Version(3,6,0);
     static final String UPDATE_LOG_CODE = UPDATE_LOG_VERSION.string();
-    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 UPDATE_LOG_TITLE_ID = R.string.update_03_06_00_title;
+    static final int UPDATE_LOG_DESCRIPTION_ID = R.string.update_03_06_00_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
@@ -919,19 +919,22 @@ private void setSideMenuTextWithCount(int menuItemId, int textId, int count) {
     }
 
     private void updateMenuFavoriteCounts() {
-        final int count = viewModel.getSpellFilterStatus().favoriteSpellIDs().size();
+        final SpellFilterStatus status = viewModel.getSpellFilterStatus();
+        final int count = status != null ? status.favoriteSpellIDs().size() : 0;
         setSideMenuTextWithCount(id.nav_favorites, string.favorites, count);
         setBottomNavTextWithCount(id.action_select_favorites, string.favorites, count);
     }
 
     private void updateMenuPreparedCounts() {
-        final int count = viewModel.getSpellFilterStatus().preparedSpellIDs().size();
+        final SpellFilterStatus status = viewModel.getSpellFilterStatus();
+        final int count = status != null ? status.preparedSpellIDs().size() : 0;
         setSideMenuTextWithCount(id.nav_prepared, string.prepared, count);
         setBottomNavTextWithCount(id.action_select_prepared, string.prepared, count);
     }
 
     private void updateMenuKnownCounts() {
-        final int count = viewModel.getSpellFilterStatus().knownSpellIDs().size();
+        final SpellFilterStatus status = viewModel.getSpellFilterStatus();
+        final int count = status != null ? status.knownSpellIDs().size() : 0;
         setSideMenuTextWithCount(id.nav_known, string.known, count);
         setBottomNavTextWithCount(id.action_select_known, string.known, count);
     }

diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
@@ -412,6 +412,8 @@
     <string name="update_03_04_00_description">Esta atualização adiciona um botão à janela de feitiço que permite ao personagem <b>lançar um feitiço</b>. Isso usa um espaço de magia do nível apropriado, se houver algum disponível.</string>
     <string name="update_03_05_00_title">Atualização da versão 3.5.0</string>
     <string name="update_03_05_00_description">O livro de feitiços foi atualizado para incluir feitiços de <b>Cenário de Campanha Tal\'Dorei: Renascido</b> e <b>Sigil e as Terras Distantes</b>. Além disso, esta atualização corrige alguns pequenos bugs de interface do usuário e erros de texto.</string>
+    <string name="update_03_06_00_title">Atualização da versão 3.6.0</string>
+    <string name="update_03_06_00_description">O livro de feitiços foi atualizado com os seguintes novos recursos:\n\n\u2022A capacidade de filtrar feitiços por royalties foi adicionada.\n\n\u2022A contagem de cada lista de feitiços agora pode ser mostrada ao lado do nome da lista em ambos os lados menu e a barra de navegação inferior. Isso pode ser ativado ou desativado na tela de configurações.\n\nAlém disso, esta atualização corrige alguns erros de digitação e erros no texto de algumas ortografias.</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
@@ -414,6 +414,8 @@
     <string name="update_03_04_00_description">This update adds a button to the spell window allowing a character to <b>cast a spell</b>. This uses a spell slot of the appropriate level, if one is available.</string>
     <string name="update_03_05_00_title">Version 3.5.0</string>
     <string name="update_03_05_00_description">The spellbook has been updated to include spells from <b>Tal\'Dorei Campaign Setting Reborn</b> and <b>Sigil and the Outlands</b>. Additionally, this update corrects some minor UI bugs and text mistakes.</string>
+    <string name="update_03_06_00_title">Version 3.6.0</string>
+    <string name="update_03_06_00_description">The spellbook has been updated with the following new features:\n\n\u2022The ability to filter spells by royalty has been added.\n\n\u2022The count for each spell list can now be shown next to the list name in both the side menu and the bottom navigation bar. This can be enabled or disabled from the settings screen.\n\nAdditionally, this update fixes some typos and mistakes in the text for a few spells.</string>
 
     <!-- Character profile actions -->
     <string name="rename">Rename</string>