From 9d05d7561745df2f1fa943faccc2f3a3e1b9c927 Mon Sep 17 00:00:00 2001 From: James HN Sears Date: Sun, 17 Nov 2024 12:01:00 +0200 Subject: [PATCH] changelogs/7.txt --- .editorconfig | 7 +- .github/workflows/androidTest-codecov.yml | 6 +- .github/workflows/test-codecov.yml | 6 +- .gitignore | 1 + .idea/codeStyles/Project.xml | 3 - .idea/deploymentTargetSelector.xml | 2 +- .idea/kotlinc.xml | 5 +- .idea/misc.xml | 1 - .idea/other.xml | 6 + ...> Generate_Baseline_Profile___API_33_.xml} | 2 +- app/build.gradle.kts | 6 +- app/detekt-baseline.xml | 5 - app/lint-baseline.xml | 264 ++- .../chance/MainActivityInstrumentedTest.kt | 7 +- .../baselineProfiles/baseline-prof.txt | 1352 ++++++-------- .../baselineProfiles/startup-prof.txt | 1352 ++++++-------- .../jameshnsears/chance/MainActivity.kt | 2 +- .../MainActivityComposable.kt | 4 +- .../res/drawable/ic_launcher_foreground.xml | 66 +- ....2 => protoc-28.2-linux-x86_64_4.28.2.zip} | Bin build.gradle.kts | 2 +- detekt-baseline.xml | 1 + .../metadata/android/en-US/changelogs/7.txt | 2 + .../en-US/images/phoneScreenshots/1.png | Bin 595261 -> 603621 bytes .../en-US/images/phoneScreenshots/2.png | Bin 600740 -> 621789 bytes .../en-US/images/phoneScreenshots/3.png | Bin 494044 -> 484874 bytes .../en-US/images/phoneScreenshots/4.png | Bin 551414 -> 543636 bytes gradle/libs.versions.toml | 6 +- gradle/wrapper/gradle-wrapper.properties | 4 +- misc/images/icons/app-icon.svg | 90 +- misc/images/screenshots.xcf | Bin 5425094 -> 5393619 bytes module/baselineprofile/build.gradle.kts | 2 +- module/common/build.gradle.kts | 2 +- module/data/build.gradle.kts | 2 +- .../chance/data/domain/proto/Bag.java | 51 +- .../data/domain/proto/BagProtocolBuffer.java | 391 ++-- .../proto/BagProtocolBufferOrBuilder.java | 6 +- .../chance/data/domain/proto/Dice.java | 63 +- .../data/domain/proto/DiceProtocolBuffer.java | 1567 +++++++++-------- .../proto/DiceProtocolBufferOrBuilder.java | 6 +- .../chance/data/domain/proto/Roll.java | 57 +- .../chance/data/domain/proto/RollHistory.java | 89 +- .../proto/RollHistoryProtocolBuffer.java | 474 ++--- .../RollHistoryProtocolBufferOrBuilder.java | 14 +- .../domain/proto/RollListProtocolBuffer.java | 391 ++-- .../RollListProtocolBufferOrBuilder.java | 6 +- .../data/domain/proto/RollProtocolBuffer.java | 750 ++++---- .../proto/RollProtocolBufferOrBuilder.java | 4 +- .../chance/data/domain/proto/Settings.java | 55 +- .../domain/proto/SettingsProtocolBuffer.java | 924 +++++----- .../SettingsProtocolBufferOrBuilder.java | 11 +- .../chance/data/domain/proto/Side.java | 53 +- .../data/domain/proto/SideProtocolBuffer.java | 732 ++++---- .../proto/SideProtocolBufferOrBuilder.java | 4 +- .../core/settings/SettingsDataInterface.kt | 1 + .../core/settings/impl/SettingsDataImpl.kt | 3 +- .../testdouble/SettingsDataTestDouble.kt | 3 +- ...positorySettingsProtocolBufferInterface.kt | 1 + .../RepositorySettingsProtocolBufferImpl.kt | 3 + ...ositorySettingsProtocolBufferTestDouble.kt | 2 + module/data/src/main/proto/settings.proto | 1 + module/ui-dialog-bag/build.gradle.kts | 2 +- .../bag/card/dice/CardDiceInstrumentedTest.kt | 4 +- .../bag/card/side/CardSideInstrumentedTest.kt | 4 +- .../BagCardColourSampleComposable.kt | 2 +- .../BagCardDiceComposable.kt | 6 +- .../BagCardDicePreview.kt | 2 +- .../BagCardDiceSliderSides.kt | 2 +- .../BagCardRollComposable.kt | 2 +- .../BagCardRollDropDownComposable.kt | 2 +- .../BagCardSideComposable.kt | 6 +- .../BagCardSidePreview.kt | 2 +- .../DialogBagComposable.kt | 10 +- .../DialogBagPreview.kt | 2 +- .../DialogColourPickerComposable.kt | 2 +- .../DialogColourPickerPreview.kt | 2 +- .../DialogConfirmComposable.kt | 2 +- module/ui/build.gradle.kts | 2 +- .../DialogSettingsPreview.kt | 2 +- .../DialogSettingslComposable.kt | 14 +- .../TabBagComposable.kt | 4 +- .../{compose => composable}/TabBagPreview.kt | 2 +- .../TabRowComposable.kt | 6 +- .../{compose => composable}/TabRowPreview.kt | 2 +- .../ui/tab/roll/TabRollAndroidViewModel.kt | 36 +- .../TabRollComposable.kt | 8 +- .../{compose => composable}/TabRollPreview.kt | 2 +- .../RollSelectionComposable.kt | 2 +- .../RollSelectionPreview.kt | 2 +- .../ZoomBagComposable.kt | 10 +- .../{compose => composable}/ZoomBagPreview.kt | 2 +- .../{compose => composable}/ZoomComposable.kt | 2 +- .../ZoomRollComposable.kt | 4 +- .../ZoomRollPreview.kt | 2 +- module/ui/src/main/res/values/strings.xml | 3 +- .../tab/bag/TabBagAndroidViewModelUnitTest.kt | 5 +- 96 files changed, 4314 insertions(+), 4718 deletions(-) create mode 100644 .idea/other.xml rename .idea/runConfigurations/{Generate_Baseline_Profile.xml => Generate_Baseline_Profile___API_33_.xml} (95%) delete mode 100644 app/detekt-baseline.xml rename app/src/main/kotlin/com/github/jameshnsears/chance/{compose => composable}/MainActivityComposable.kt (96%) rename bin/{protoc-28.2-linux-x86_64.zip - 4.28.2 => protoc-28.2-linux-x86_64_4.28.2.zip} (100%) create mode 100644 fastlane/metadata/android/en-US/changelogs/7.txt rename module/ui-dialog-bag/src/main/kotlin/com/github/jameshnsears/chance/ui/dialog/bag/card/{compose => composable}/BagCardColourSampleComposable.kt (99%) rename module/ui-dialog-bag/src/main/kotlin/com/github/jameshnsears/chance/ui/dialog/bag/card/dice/{compose => composable}/BagCardDiceComposable.kt (97%) rename module/ui-dialog-bag/src/main/kotlin/com/github/jameshnsears/chance/ui/dialog/bag/card/dice/{compose => composable}/BagCardDicePreview.kt (99%) rename module/ui-dialog-bag/src/main/kotlin/com/github/jameshnsears/chance/ui/dialog/bag/card/dice/{compose => composable}/BagCardDiceSliderSides.kt (97%) rename module/ui-dialog-bag/src/main/kotlin/com/github/jameshnsears/chance/ui/dialog/bag/card/roll/{compose => composable}/BagCardRollComposable.kt (99%) rename module/ui-dialog-bag/src/main/kotlin/com/github/jameshnsears/chance/ui/dialog/bag/card/roll/{compose => composable}/BagCardRollDropDownComposable.kt (99%) rename module/ui-dialog-bag/src/main/kotlin/com/github/jameshnsears/chance/ui/dialog/bag/card/side/{compose => composable}/BagCardSideComposable.kt (98%) rename module/ui-dialog-bag/src/main/kotlin/com/github/jameshnsears/chance/ui/dialog/bag/card/side/{compose => composable}/BagCardSidePreview.kt (99%) rename module/ui-dialog-bag/src/main/kotlin/com/github/jameshnsears/chance/ui/dialog/bag/{compose => composable}/DialogBagComposable.kt (97%) rename module/ui-dialog-bag/src/main/kotlin/com/github/jameshnsears/chance/ui/dialog/bag/{compose => composable}/DialogBagPreview.kt (97%) rename module/ui-dialog-bag/src/main/kotlin/com/github/jameshnsears/chance/ui/dialog/colour/{compose => composable}/DialogColourPickerComposable.kt (98%) rename module/ui-dialog-bag/src/main/kotlin/com/github/jameshnsears/chance/ui/dialog/colour/{compose => composable}/DialogColourPickerPreview.kt (90%) rename module/ui-dialog-bag/src/main/kotlin/com/github/jameshnsears/chance/ui/dialog/confirm/{compose => composable}/DialogConfirmComposable.kt (94%) rename module/ui/src/main/kotlin/com/github/jameshnsears/chance/ui/dialog/settings/{compose => composable}/DialogSettingsPreview.kt (99%) rename module/ui/src/main/kotlin/com/github/jameshnsears/chance/ui/dialog/settings/{compose => composable}/DialogSettingslComposable.kt (95%) rename module/ui/src/main/kotlin/com/github/jameshnsears/chance/ui/tab/bag/{compose => composable}/TabBagComposable.kt (98%) rename module/ui/src/main/kotlin/com/github/jameshnsears/chance/ui/tab/bag/{compose => composable}/TabBagPreview.kt (97%) rename module/ui/src/main/kotlin/com/github/jameshnsears/chance/ui/tab/{compose => composable}/TabRowComposable.kt (92%) rename module/ui/src/main/kotlin/com/github/jameshnsears/chance/ui/tab/{compose => composable}/TabRowPreview.kt (97%) rename module/ui/src/main/kotlin/com/github/jameshnsears/chance/ui/tab/roll/{compose => composable}/TabRollComposable.kt (96%) rename module/ui/src/main/kotlin/com/github/jameshnsears/chance/ui/tab/roll/{compose => composable}/TabRollPreview.kt (97%) rename module/ui/src/main/kotlin/com/github/jameshnsears/chance/ui/tab/roll/selection/{compose => composable}/RollSelectionComposable.kt (99%) rename module/ui/src/main/kotlin/com/github/jameshnsears/chance/ui/tab/roll/selection/{compose => composable}/RollSelectionPreview.kt (99%) rename module/ui/src/main/kotlin/com/github/jameshnsears/chance/ui/zoom/bag/{compose => composable}/ZoomBagComposable.kt (91%) rename module/ui/src/main/kotlin/com/github/jameshnsears/chance/ui/zoom/bag/{compose => composable}/ZoomBagPreview.kt (95%) rename module/ui/src/main/kotlin/com/github/jameshnsears/chance/ui/zoom/{compose => composable}/ZoomComposable.kt (98%) rename module/ui/src/main/kotlin/com/github/jameshnsears/chance/ui/zoom/roll/{compose => composable}/ZoomRollComposable.kt (98%) rename module/ui/src/main/kotlin/com/github/jameshnsears/chance/ui/zoom/roll/{compose => composable}/ZoomRollPreview.kt (96%) diff --git a/.editorconfig b/.editorconfig index 187cc0f5..6a8cb95f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,12 +9,7 @@ trim_trailing_whitespace = true indent_size = 4 [*.{kt,kts}] -ij_kotlin_allow_trailing_comma = false -ij_kotlin_allow_trailing_comma_on_call_site = true - -[kotlin] -ktlint_max_line_length = 250 - +max_line_length = 120 [*.{yml,yaml}] indent_size = 2 diff --git a/.github/workflows/androidTest-codecov.yml b/.github/workflows/androidTest-codecov.yml index de59aecd..648fc6c5 100644 --- a/.github/workflows/androidTest-codecov.yml +++ b/.github/workflows/androidTest-codecov.yml @@ -105,7 +105,7 @@ jobs: - name: codecov - app.androidTest if: matrix.api-level == 34 - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: fail_ci_if_error: true files: ./app/build/reports/jacoco/androidTest.xml @@ -116,7 +116,7 @@ jobs: - name: codecov - data.androidTest if: matrix.api-level == 34 - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: fail_ci_if_error: true files: ./module/data/build/reports/jacoco/androidTest.xml @@ -127,7 +127,7 @@ jobs: - name: codecov - ui-data-dialog.androidTest if: matrix.api-level == 34 - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: fail_ci_if_error: true files: ./module/ui-data-dialog/build/reports/jacoco/androidTest.xml diff --git a/.github/workflows/test-codecov.yml b/.github/workflows/test-codecov.yml index 42d465b4..a95e95df 100755 --- a/.github/workflows/test-codecov.yml +++ b/.github/workflows/test-codecov.yml @@ -58,7 +58,7 @@ jobs: ls -al ./module/ui-dialog-bag/build/reports/jacoco/test.xml - name: codecov - data.test - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: fail_ci_if_error: true files: ./module/data/build/reports/jacoco/test.xml @@ -68,7 +68,7 @@ jobs: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - name: codecov - ui.test - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: fail_ci_if_error: true files: ./module/ui/build/reports/jacoco/test.xml @@ -78,7 +78,7 @@ jobs: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - name: codecov - ui-dialog-bag.test - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: fail_ci_if_error: true files: ./module/ui-dialog-bag/build/reports/jacoco/test.xml diff --git a/.gitignore b/.gitignore index cbe4ddc1..c9941598 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ misc/uml/chance.vpp.bak* /app/google-services.json-production /app-fdroid-release-signed.apk /app-fdroid-release-signed.apk.idsig +/bin/protoc diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 57536a0f..6187e2a9 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -4,9 +4,6 @@ - -