diff --git a/README.md b/README.md index 33a4a36..510b0a8 100644 --- a/README.md +++ b/README.md @@ -36,3 +36,17 @@ an empty string. ## Text string format The logic will replace **'[\d\]'** in the text strings with random values according to the number of dice and die type. + +# Releasing + +1. In `app/build.gradle` update the following values. + Major step when doing non-backwards compatible changes or major extensions, e.g. changing json file formats, adding new tabs + Minor step when doing something smaller, e.g. adding monsters or fixing bugs + +> versionCode 3 +> versionName "3.0" + +2. In Android Studio select `Build->Generate Signed Bundle/APK` +3. Select APK +4. Create a folder for the release in `app\release\` +5. Put the generated APK there diff --git a/app/build.gradle b/app/build.gradle index 230f18b..3954c82 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "my.tablelogic.ruinmasters" minSdk 26 targetSdk 31 - versionCode 2 - versionName "2.0" + versionCode 3 + versionName "3.0" archivesBaseName = "RuinMastersTables" + "-" + versionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" minSdkVersion 26 @@ -39,9 +39,9 @@ android { dependencies { implementation 'androidx.core:core-ktx:1.7.0' - implementation 'androidx.appcompat:appcompat:1.4.0' - implementation 'com.google.android.material:material:1.4.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.2' + implementation 'androidx.appcompat:appcompat:1.4.1' + implementation 'com.google.android.material:material:1.5.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.3' implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.13.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' diff --git a/app/src/main/assets/monsters/goblins.json b/app/src/main/assets/monsters/goblins.json index 249bcc3..fb25828 100644 --- a/app/src/main/assets/monsters/goblins.json +++ b/app/src/main/assets/monsters/goblins.json @@ -30,7 +30,7 @@ "name":"Goblin (random)", "tags": [ ], "stats": { - "traits": { "phy": "2d10+2", "min": "2d10", "int": "2d10", "cha": "2d10" }, + "traits": { "phy": "[2d10+2]", "min": "[2d10]", "int": "[2d10]", "cha": "[2d10]" }, "skills": { "bur": 69, "kno": 17, "mag": 15, "mel": 49, "soc": 38, "sur": 58 }, "other": { "siz": 0.5, "hp": "14", "car": "12", "db": "0", "act": "2", "arm": "0" }, "move": { "land": 10, "air": -1 } diff --git a/app/src/main/assets/monsters/orcs.json b/app/src/main/assets/monsters/orcs.json index 74ffe59..430e3c1 100644 --- a/app/src/main/assets/monsters/orcs.json +++ b/app/src/main/assets/monsters/orcs.json @@ -55,7 +55,7 @@ "name":"Orc (random)", "tags": [ ], "stats": { - "traits": { "phy": "5d10+5", "min": "3d10", "int": "2d10+5", "cha": "1d10" }, + "traits": { "phy": "[5d10+5]", "min": "[3d10]", "int": "[2d10+5]", "cha": "[1d10]" }, "skills": { "bur": 39, "kno": 27, "mag": 25, "mel": 60, "soc": 28, "sur": 52 }, "other": { "siz": 1, "hp": "", "car": "", "db": "", "act": "2", "arm": "1" }, "move": { "land": 12, "air": -1 } diff --git a/app/src/main/res/mipmap-hdpi/logo.png b/app/src/main/res/mipmap-hdpi/logo.png new file mode 100644 index 0000000..656223c Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/logo.png differ diff --git a/app/src/main/res/mipmap-mdpi/logo.png b/app/src/main/res/mipmap-mdpi/logo.png new file mode 100644 index 0000000..656223c Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/logo.png differ diff --git a/app/src/main/res/mipmap-xhdpi/logo.png b/app/src/main/res/mipmap-xhdpi/logo.png new file mode 100644 index 0000000..656223c Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/logo.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/logo.png b/app/src/main/res/mipmap-xxhdpi/logo.png new file mode 100644 index 0000000..656223c Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/logo.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/logo.png b/app/src/main/res/mipmap-xxxhdpi/logo.png new file mode 100644 index 0000000..656223c Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/logo.png differ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml deleted file mode 100644 index 1845397..0000000 --- a/app/src/main/res/values-night/themes.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 21d0753..e0956e8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -45,7 +45,7 @@ 1D20 BpP Armor - %d+%d + %1$d+%2$d Attacks Attack diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index a52f30d..b797a30 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,6 +1,6 @@ -