diff --git a/.github/workflows/call-create-baseline.yml b/.github/workflows/call-create-baseline.yml index 887a3bca64..4140c8488b 100644 --- a/.github/workflows/call-create-baseline.yml +++ b/.github/workflows/call-create-baseline.yml @@ -25,7 +25,7 @@ jobs: BASELINE_FILE_PATH: ${{ steps.create_baseline_file_path.outputs.BASELINE_FILE_PATH }} steps: - name: Checkout Git repo - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: submodules: 'recursive' diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index 6c2862e98e..14b8216589 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -6,5 +6,5 @@ jobs: name: "Validation" runs-on: [self-hosted, AndroidShell] steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 - - uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3 \ No newline at end of file + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 + - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3 \ No newline at end of file diff --git a/.github/workflows/internal.yml b/.github/workflows/internal.yml index 9be2410488..e140ac3265 100644 --- a/.github/workflows/internal.yml +++ b/.github/workflows/internal.yml @@ -13,7 +13,7 @@ jobs: name: Update gradle cache runs-on: [ self-hosted, AndroidShell ] steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: submodules: 'recursive' - name: Set up JDK 1.17 @@ -22,7 +22,7 @@ jobs: distribution: 'temurin' java-version: '17' - name: Build internal - uses: gradle/gradle-build-action@4c39dd82cd5e1ec7c6fa0173bb41b4b6bb3b86ff # v3 + uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 # v3 with: cache-read-only: false arguments: testDebugUnitTest desktopTest detekt lint @@ -65,7 +65,7 @@ jobs: matrix: target: [ "gh_gms", "gh_nogms", "googleplay" ] steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: submodules: 'recursive' - uses: actions/download-artifact@master @@ -125,7 +125,7 @@ jobs: cp instances/android/app/build/outputs/mapping/internal/mapping.txt artifacts/mapping-${{ matrix.target }}.txt echo "path=artifacts/" >> $GITHUB_OUTPUT - name: Upload Artifacts - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4 + uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4 with: name: artifacts-${{ matrix.target }} path: ${{ steps.artifacts_copy.outputs.path }} @@ -134,7 +134,7 @@ jobs: runs-on: [ self-hosted, AndroidShell ] needs: build_number steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: submodules: 'recursive' - name: Set up JDK 1.17 @@ -187,7 +187,7 @@ jobs: cp instances/wearable/build/outputs/mapping/internal/mapping.txt artifacts/mapping-wearos.txt echo "path=artifacts/" >> $GITHUB_OUTPUT - name: Upload Artifacts - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4 + uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4 with: name: artifacts-wearos path: ${{ steps.artifacts_copy.outputs.path }} @@ -196,25 +196,25 @@ jobs: runs-on: [ self-hosted, AndroidShell ] needs: [ build_internal_release, build_internal_release_gms_wearos, build_number ] steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: submodules: 'recursive' - - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4 + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4 id: download-gh_gms with: name: artifacts-gh_gms path: download/gh_gms - - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4 + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4 id: download-gh_nogms with: name: artifacts-gh_nogms path: download/gh_nogms - - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4 + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4 id: download-googleplay with: name: artifacts-googleplay path: download/googleplay - - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4 + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4 id: download-wearos with: name: artifacts-wearos @@ -260,7 +260,7 @@ jobs: mv ${{ steps.artifacts_copy.outputs.path }}/flipper-zero-gh_nogms.apk ${{ steps.artifacts_copy.outputs.path }}/flipper-zero-nogms-${{ steps.vars.outputs.major_version }}.${{ steps.vars.outputs.minor_version }}.apk - name: Create internal Release id: create_internal_release - uses: softprops/action-gh-release@69320dbe05506a9a39fc8ae11030b214ec2d1f87 # v2 + uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: @@ -278,7 +278,7 @@ jobs: runs-on: [ self-hosted, AndroidShell ] needs: [ build_internal_release ] steps: - - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4 + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4 id: download-googleplay with: name: artifacts-googleplay @@ -295,7 +295,7 @@ jobs: runs-on: [ self-hosted, AndroidShell ] needs: [ build_internal_release_gms_wearos ] steps: - - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4 + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4 id: download-wearos with: name: artifacts-wearos diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 4ba8b6c024..3a21e8a5b9 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -34,7 +34,7 @@ jobs: name: "Run unit tests" runs-on: [self-hosted, AndroidShell] steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: submodules: 'recursive' - name: Set up JDK 1.17 @@ -43,14 +43,14 @@ jobs: distribution: 'temurin' java-version: '17' - name: Unit test - uses: gradle/gradle-build-action@4c39dd82cd5e1ec7c6fa0173bb41b4b6bb3b86ff # v3 + uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 # v3 with: arguments: testDebugUnitTest desktopTest detekt: name: "Check project by detekt" runs-on: [self-hosted, AndroidShell] steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: submodules: 'recursive' - name: Set up JDK 1.17 @@ -59,14 +59,14 @@ jobs: distribution: 'temurin' java-version: '17' - name: detekt - uses: gradle/gradle-build-action@4c39dd82cd5e1ec7c6fa0173bb41b4b6bb3b86ff # v3 + uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 # v3 with: arguments: detektMain android_lint: name: "Check project by android`s lint" runs-on: [self-hosted, AndroidShell] steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: submodules: 'recursive' - name: Set up JDK 1.17 @@ -75,6 +75,6 @@ jobs: distribution: 'temurin' java-version: '17' - name: Android lint - uses: gradle/gradle-build-action@4c39dd82cd5e1ec7c6fa0173bb41b4b6bb3b86ff # v3 + uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 # v3 with: arguments: lint \ No newline at end of file diff --git a/.github/workflows/pr_changelog.yml b/.github/workflows/pr_changelog.yml index 0cb4053f26..415cb8b150 100644 --- a/.github/workflows/pr_changelog.yml +++ b/.github/workflows/pr_changelog.yml @@ -23,7 +23,7 @@ jobs: name: "Checking that changelog has changed" runs-on: [self-hosted, AndroidShell] steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: submodules: 'recursive' - name: Get change status for CHANGELOG.md diff --git a/.github/workflows/pr_gradle.yml b/.github/workflows/pr_gradle.yml index 2f3a4c559e..c00ac2c080 100644 --- a/.github/workflows/pr_gradle.yml +++ b/.github/workflows/pr_gradle.yml @@ -27,7 +27,7 @@ jobs: name: "Build release" runs-on: [self-hosted, AndroidShell] steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: submodules: 'recursive' - name: Set up JDK 1.17 @@ -36,14 +36,14 @@ jobs: distribution: 'temurin' java-version: '17' - name: Build release - uses: gradle/gradle-build-action@4c39dd82cd5e1ec7c6fa0173bb41b4b6bb3b86ff # v3 + uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 # v3 with: arguments: assembleRelease bundleRelease debug_build: name: "Build debug" runs-on: [self-hosted, AndroidShell] steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: submodules: 'recursive' - name: Set up JDK 1.17 @@ -52,14 +52,14 @@ jobs: distribution: 'temurin' java-version: '17' - name: Build debug - uses: gradle/gradle-build-action@4c39dd82cd5e1ec7c6fa0173bb41b4b6bb3b86ff # v3 + uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 # v3 with: arguments: assembleDebug bundleDebug internal_build: name: "Build internal" runs-on: [self-hosted, AndroidShell] steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: submodules: 'recursive' - name: Set up JDK 1.17 @@ -68,6 +68,6 @@ jobs: distribution: 'temurin' java-version: '17' - name: Build internal - uses: gradle/gradle-build-action@4c39dd82cd5e1ec7c6fa0173bb41b4b6bb3b86ff # v3 + uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 # v3 with: arguments: assembleInternal bundleInternal \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e532af1098..fc11e058df 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,7 +46,7 @@ jobs: matrix: target: [ "gh_gms", "gh_nogms", "googleplay" ] steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: submodules: 'recursive' - name: Set up JDK 1.17 @@ -106,7 +106,7 @@ jobs: cp instances/android/app/build/outputs/mapping/release/mapping.txt artifacts/mapping-${{ matrix.target }}.txt echo "path=artifacts/" >> $GITHUB_OUTPUT - name: Upload Artifacts - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4 + uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4 with: name: artifacts-${{ matrix.target }} path: ${{ steps.artifacts_copy.outputs.path }} @@ -115,7 +115,7 @@ jobs: runs-on: [self-hosted, AndroidShell] needs: build_number steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: submodules: 'recursive' - name: Set up JDK 1.17 @@ -168,7 +168,7 @@ jobs: cp instances/wearable/build/outputs/mapping/release/mapping.txt artifacts/mapping-wearos.txt echo "path=artifacts/" >> $GITHUB_OUTPUT - name: Upload Artifacts - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4 + uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4 with: name: artifacts-wearos path: ${{ steps.artifacts_copy.outputs.path }} @@ -178,25 +178,25 @@ jobs: if: ${{ github.ref == 'refs/heads/master' }} needs: [ build_release, build_release_gms_wearos, build_number ] steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: submodules: 'recursive' - - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4 + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4 id: download-gh_gms with: name: artifacts-gh_gms path: download/gh_gms - - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4 + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4 id: download-gh_nogms with: name: artifacts-gh_nogms path: download/gh_nogms - - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4 + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4 id: download-googleplay with: name: artifacts-googleplay path: download/googleplay - - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4 + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4 id: download-wearos with: name: artifacts-wearos @@ -243,7 +243,7 @@ jobs: mv ${{ steps.artifacts_copy.outputs.path }}/flipper-zero-gh_nogms.apk ${{ steps.artifacts_copy.outputs.path }}/flipper-zero-nogms-${{ steps.vars.outputs.major_version }}.${{ steps.vars.outputs.minor_version }}.apk - name: Create Release id: create_release - uses: softprops/action-gh-release@69320dbe05506a9a39fc8ae11030b214ec2d1f87 # v2 + uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: @@ -262,10 +262,10 @@ jobs: needs: [ build_release ] if: ${{ github.ref == 'refs/heads/master' }} steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: submodules: 'recursive' - - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4 + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4 id: download-googleplay with: name: artifacts-googleplay @@ -285,10 +285,10 @@ jobs: needs: [ build_release_gms_wearos ] if: ${{ github.ref == 'refs/heads/master' }} steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: submodules: 'recursive' - - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4 + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4 id: download-wearos with: name: artifacts-wearos diff --git a/.gitignore b/.gitignore index ccb7bf1441..99680680e3 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /captures .externalNativeBuild .cxx +.kotlin \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 250ae94f9e..a166007ccd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - [CI] Add https://github.com/LionZXY/detekt-decompose-rule - [CI] Enabling detekt module for android and kmp modules - [CI] Bump target SDK to 34 +- [CI] Update deps - [Feature] Infrared controls - [Feature] Remove bond on retry pair - [Feature] Add onetap widget diff --git a/components/analytics/shake2report/impl/src/main/java/com/flipperdevices/analytics/shake2report/impl/composable/components/ComposableCheckBox.kt b/components/analytics/shake2report/impl/src/main/java/com/flipperdevices/analytics/shake2report/impl/composable/components/ComposableCheckBox.kt index 5b4e4e2598..d4713f5d60 100644 --- a/components/analytics/shake2report/impl/src/main/java/com/flipperdevices/analytics/shake2report/impl/composable/components/ComposableCheckBox.kt +++ b/components/analytics/shake2report/impl/src/main/java/com/flipperdevices/analytics/shake2report/impl/composable/components/ComposableCheckBox.kt @@ -22,7 +22,7 @@ import com.flipperdevices.core.ui.theme.LocalPallet @Composable internal fun ComposableCheckBox( checked: Boolean, - onCheckedChange: (Boolean) -> Unit + onCheckChange: (Boolean) -> Unit ) { /* Disable padding for checkbox @@ -31,7 +31,7 @@ internal fun ComposableCheckBox( CompositionLocalProvider(LocalMinimumInteractiveComponentEnforcement provides false) { Checkbox( checked = checked, - onCheckedChange = onCheckedChange, + onCheckedChange = onCheckChange, colors = CheckboxColors( checkedCheckmarkColor = LocalPallet.current.accent, checkedBorderColor = LocalPallet.current.reportBorder, diff --git a/components/analytics/shake2report/impl/src/main/java/com/flipperdevices/analytics/shake2report/impl/composable/states/ComposableReportPending.kt b/components/analytics/shake2report/impl/src/main/java/com/flipperdevices/analytics/shake2report/impl/composable/states/ComposableReportPending.kt index a188b7299d..a7e824e35f 100644 --- a/components/analytics/shake2report/impl/src/main/java/com/flipperdevices/analytics/shake2report/impl/composable/states/ComposableReportPending.kt +++ b/components/analytics/shake2report/impl/src/main/java/com/flipperdevices/analytics/shake2report/impl/composable/states/ComposableReportPending.kt @@ -48,7 +48,7 @@ internal fun ComposableReportPending( checked = checked, onChangeName = { name = it.take(MAX_TITLE) }, onChangeDescription = { description = it }, - onChangeChecked = { checked = it } + onChangeCheck = { checked = it } ) ComposableFlipperButton( @@ -69,7 +69,7 @@ private fun ComposableReportPendingFields( checked: Boolean, onChangeName: (String) -> Unit, onChangeDescription: (String) -> Unit, - onChangeChecked: (Boolean) -> Unit, + onChangeCheck: (Boolean) -> Unit, modifier: Modifier = Modifier ) = Column( modifier = modifier @@ -120,13 +120,13 @@ private fun ComposableReportPendingFields( textFieldModifier = Modifier.height(250.dp) ) - ComposableReportAddLog(checked = checked, onCheckedChange = onChangeChecked) + ComposableReportAddLog(checked = checked, onCheckChange = onChangeCheck) } @Composable private fun ComposableReportAddLog( checked: Boolean, - onCheckedChange: (Boolean) -> Unit + onCheckChange: (Boolean) -> Unit ) { Row( horizontalArrangement = Arrangement.spacedBy(8.dp), @@ -134,7 +134,7 @@ private fun ComposableReportAddLog( ) { ComposableCheckBox( checked = checked, - onCheckedChange = onCheckedChange + onCheckChange = onCheckChange ) Text( text = stringResource(R.string.shake2report_add_log), diff --git a/components/archive/category/src/main/java/com/flipperdevices/archive/category/composable/ComposableCategory.kt b/components/archive/category/src/main/java/com/flipperdevices/archive/category/composable/ComposableCategory.kt index a1d5d49417..a48140009b 100644 --- a/components/archive/category/src/main/java/com/flipperdevices/archive/category/composable/ComposableCategory.kt +++ b/components/archive/category/src/main/java/com/flipperdevices/archive/category/composable/ComposableCategory.kt @@ -10,7 +10,6 @@ import androidx.compose.foundation.lazy.items import androidx.compose.material.CircularProgressIndicator import androidx.compose.material.Text import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource @@ -115,7 +114,7 @@ private fun CategoryList( is CategoryType.ByFileType -> colorByFlipperKeyType(categoryType.fileType) CategoryType.Deleted -> LocalPallet.current.keyDeleted }, - onCardClicked = { + onCardClick = { onOpenKeyScreen(flipperKey.getKeyPath()) } ) diff --git a/components/archive/search/src/main/java/com/flipperdevices/archive/search/composable/ComposableSearchContent.kt b/components/archive/search/src/main/java/com/flipperdevices/archive/search/composable/ComposableSearchContent.kt index 1946675a28..dc58e51f1a 100644 --- a/components/archive/search/src/main/java/com/flipperdevices/archive/search/composable/ComposableSearchContent.kt +++ b/components/archive/search/src/main/java/com/flipperdevices/archive/search/composable/ComposableSearchContent.kt @@ -75,7 +75,7 @@ private fun CategoryList( ) }, flipperKeyParsed = flipperKeyParsed, - onCardClicked = { + onCardClick = { onOpenKeyScreen(flipperKey.getKeyPath()) } ) diff --git a/components/archive/shared/src/main/java/com/flipperdevices/archive/shared/composable/ComposableKeyCard.kt b/components/archive/shared/src/main/java/com/flipperdevices/archive/shared/composable/ComposableKeyCard.kt index 0c2ba4ec21..093b825e73 100644 --- a/components/archive/shared/src/main/java/com/flipperdevices/archive/shared/composable/ComposableKeyCard.kt +++ b/components/archive/shared/src/main/java/com/flipperdevices/archive/shared/composable/ComposableKeyCard.kt @@ -27,7 +27,7 @@ import com.flipperdevices.keyparser.api.model.FlipperKeyParsed fun ComposableKeyCard( synchronizationContent: (@Composable () -> Unit)?, flipperKeyParsed: FlipperKeyParsed, - onCardClicked: () -> Unit, + onCardClick: () -> Unit, modifier: Modifier = Modifier, typeColor: Color = colorByFlipperKeyType(flipperKeyParsed.fileType), ) { @@ -36,7 +36,7 @@ fun ComposableKeyCard( .padding(horizontal = 14.dp) .fillMaxWidth() ) { - Column(Modifier.clickableRipple(onClick = onCardClicked).padding(bottom = 8.dp)) { + Column(Modifier.clickableRipple(onClick = onCardClick).padding(bottom = 8.dp)) { ComposableKeyCardContent( flipperKeyParsed, typeColor, diff --git a/components/bottombar/impl/src/main/java/com/flipperdevices/bottombar/impl/composable/ComposableInAppNotification.kt b/components/bottombar/impl/src/main/java/com/flipperdevices/bottombar/impl/composable/ComposableInAppNotification.kt index 83b725b8f8..d547f949cf 100644 --- a/components/bottombar/impl/src/main/java/com/flipperdevices/bottombar/impl/composable/ComposableInAppNotification.kt +++ b/components/bottombar/impl/src/main/java/com/flipperdevices/bottombar/impl/composable/ComposableInAppNotification.kt @@ -10,7 +10,7 @@ import com.flipperdevices.inappnotification.api.model.InAppNotification fun ComposableInAppNotification( notificationRenderer: InAppNotificationRenderer, notificationState: InAppNotificationState, - onNotificationHidden: (notification: InAppNotification) -> Unit, + onNotificationHide: (notification: InAppNotification) -> Unit, modifier: Modifier = Modifier ) { if (notificationState !is InAppNotificationState.ShownNotification) { @@ -20,6 +20,6 @@ fun ComposableInAppNotification( notification = notificationState.notification, modifier = modifier ) { - onNotificationHidden(notificationState.notification) + onNotificationHide(notificationState.notification) } } diff --git a/components/bottombar/impl/src/main/java/com/flipperdevices/bottombar/impl/composable/ComposableMainScreen.kt b/components/bottombar/impl/src/main/java/com/flipperdevices/bottombar/impl/composable/ComposableMainScreen.kt index 08f93d1201..9f59146876 100644 --- a/components/bottombar/impl/src/main/java/com/flipperdevices/bottombar/impl/composable/ComposableMainScreen.kt +++ b/components/bottombar/impl/src/main/java/com/flipperdevices/bottombar/impl/composable/ComposableMainScreen.kt @@ -63,7 +63,7 @@ fun ComposableMainScreen( modifier = Modifier.align(Alignment.BottomCenter), notificationRenderer = notificationRenderer, notificationState = notificationState, - onNotificationHidden = notificationViewModel::onNotificationHidden + onNotificationHide = notificationViewModel::onNotificationHide ) } } diff --git a/components/bottombar/impl/src/main/java/com/flipperdevices/bottombar/impl/viewmodel/InAppNotificationViewModel.kt b/components/bottombar/impl/src/main/java/com/flipperdevices/bottombar/impl/viewmodel/InAppNotificationViewModel.kt index 5e6a153c31..9fafe09501 100644 --- a/components/bottombar/impl/src/main/java/com/flipperdevices/bottombar/impl/viewmodel/InAppNotificationViewModel.kt +++ b/components/bottombar/impl/src/main/java/com/flipperdevices/bottombar/impl/viewmodel/InAppNotificationViewModel.kt @@ -39,7 +39,7 @@ class InAppNotificationViewModel @AssistedInject constructor( fun state(): StateFlow = notificationState - fun onNotificationHidden(notification: InAppNotification) { + fun onNotificationHide(notification: InAppNotification) { notificationState.update { if (it is InAppNotificationState.ShownNotification && it.notification == notification diff --git a/components/bridge/connection/sample/src/main/kotlin/com/flipperdevices/bridge/connection/screens/search/ConnectionSearchDecomposeComponent.kt b/components/bridge/connection/sample/src/main/kotlin/com/flipperdevices/bridge/connection/screens/search/ConnectionSearchDecomposeComponent.kt index 5021691aa9..446684387d 100644 --- a/components/bridge/connection/sample/src/main/kotlin/com/flipperdevices/bridge/connection/screens/search/ConnectionSearchDecomposeComponent.kt +++ b/components/bridge/connection/sample/src/main/kotlin/com/flipperdevices/bridge/connection/screens/search/ConnectionSearchDecomposeComponent.kt @@ -59,7 +59,7 @@ class ConnectionSearchDecomposeComponent @AssistedInject constructor( Icon( modifier = Modifier - .clickableRipple { searchViewModel.onDeviceClicked(searchItem) } + .clickableRipple { searchViewModel.onDeviceClick(searchItem) } .padding(16.dp) .size(24.dp), painter = painterResourceByKey( diff --git a/components/bridge/connection/sample/src/main/kotlin/com/flipperdevices/bridge/connection/screens/search/ConnectionSearchViewModel.kt b/components/bridge/connection/sample/src/main/kotlin/com/flipperdevices/bridge/connection/screens/search/ConnectionSearchViewModel.kt index 1d50d8a085..894fa2a08e 100644 --- a/components/bridge/connection/sample/src/main/kotlin/com/flipperdevices/bridge/connection/screens/search/ConnectionSearchViewModel.kt +++ b/components/bridge/connection/sample/src/main/kotlin/com/flipperdevices/bridge/connection/screens/search/ConnectionSearchViewModel.kt @@ -59,7 +59,7 @@ class ConnectionSearchViewModel @Inject constructor( fun getDevicesFlow() = devicesFlow.asStateFlow() - fun onDeviceClicked(searchItem: ConnectionSearchItem) { + fun onDeviceClick(searchItem: ConnectionSearchItem) { viewModelScope.launch { if (searchItem.savedDeviceModel == null) { persistedStorage.addDevice(searchItem.device.toFDeviceFlipperZeroBleModel()) diff --git a/components/faphub/appcard/composable/src/main/java/com/flipperdevices/faphub/appcard/composable/AppCard.kt b/components/faphub/appcard/composable/src/main/java/com/flipperdevices/faphub/appcard/composable/AppCard.kt index 1f821a4e02..bca312fd22 100644 --- a/components/faphub/appcard/composable/src/main/java/com/flipperdevices/faphub/appcard/composable/AppCard.kt +++ b/components/faphub/appcard/composable/src/main/java/com/flipperdevices/faphub/appcard/composable/AppCard.kt @@ -56,8 +56,8 @@ fun AppCard( ) AppCardScreenshots( screenshots = fapItem?.screenshots, - onScreenshotClicked = onScreenshotClicked@{ index -> - val requireFapItem = fapItem ?: return@onScreenshotClicked + onScreenshotClick = onScreenshotClick@{ index -> + val requireFapItem = fapItem ?: return@onScreenshotClick val param = ScreenshotsPreviewParam( title = requireFapItem.name, screenshotsUrls = requireFapItem.screenshots, diff --git a/components/faphub/appcard/composable/src/main/java/com/flipperdevices/faphub/appcard/composable/components/AppCardScreenshots.kt b/components/faphub/appcard/composable/src/main/java/com/flipperdevices/faphub/appcard/composable/components/AppCardScreenshots.kt index 9034361dfe..91b7f31b0e 100644 --- a/components/faphub/appcard/composable/src/main/java/com/flipperdevices/faphub/appcard/composable/components/AppCardScreenshots.kt +++ b/components/faphub/appcard/composable/src/main/java/com/flipperdevices/faphub/appcard/composable/components/AppCardScreenshots.kt @@ -12,7 +12,7 @@ private const val DEFAULT_SCREENSHOT_SIZE = 6 @Composable fun AppCardScreenshots( screenshots: ImmutableList?, - onScreenshotClicked: (index: Int) -> Unit, + onScreenshotClick: (index: Int) -> Unit, modifier: Modifier = Modifier, screenshotModifier: Modifier = Modifier, ) { @@ -32,7 +32,7 @@ fun AppCardScreenshots( val screenshotUrl = screenshots[index] ComposableAppScreenshot( modifier = screenshotModifier.clickable { - onScreenshotClicked.invoke(index) + onScreenshotClick.invoke(index) }, url = screenshotUrl ) diff --git a/components/faphub/fapscreen/impl/src/main/java/com/flipperdevices/faphub/fapscreen/impl/composable/ComposableFapScreen.kt b/components/faphub/fapscreen/impl/src/main/java/com/flipperdevices/faphub/fapscreen/impl/composable/ComposableFapScreen.kt index 0ca79b4bff..4bd3f2a9f5 100644 --- a/components/faphub/fapscreen/impl/src/main/java/com/flipperdevices/faphub/fapscreen/impl/composable/ComposableFapScreen.kt +++ b/components/faphub/fapscreen/impl/src/main/java/com/flipperdevices/faphub/fapscreen/impl/composable/ComposableFapScreen.kt @@ -128,8 +128,8 @@ private fun ComposableFapScreenInternal( AppCardScreenshots( screenshots = fapItem?.screenshots, modifier = Modifier.padding(top = 18.dp, start = 14.dp), - onScreenshotClicked = onScreenshotClicked@{ index -> - val requireFapItem = fapItem ?: return@onScreenshotClicked + onScreenshotClick = onScreenshotClick@{ index -> + val requireFapItem = fapItem ?: return@onScreenshotClick val param = ScreenshotsPreviewParam( title = requireFapItem.name, screenshotsUrls = requireFapItem.screenshots, diff --git a/components/faphub/screenshotspreview/impl/src/main/kotlin/com/flipperdevices/faphub/screenshotspreview/impl/composable/ComposableFullScreenshotScreen.kt b/components/faphub/screenshotspreview/impl/src/main/kotlin/com/flipperdevices/faphub/screenshotspreview/impl/composable/ComposableFullScreenshotScreen.kt index b64d615ea2..7b3d7d7f7d 100644 --- a/components/faphub/screenshotspreview/impl/src/main/kotlin/com/flipperdevices/faphub/screenshotspreview/impl/composable/ComposableFullScreenshotScreen.kt +++ b/components/faphub/screenshotspreview/impl/src/main/kotlin/com/flipperdevices/faphub/screenshotspreview/impl/composable/ComposableFullScreenshotScreen.kt @@ -51,7 +51,7 @@ internal fun ComposableFullScreenshotScreen( screenshots = screenshots, currentPage = pagerState.currentPage, modifier = Modifier.align(Alignment.BottomCenter), - onImageSelected = imageSelectViewModel::onImageSelected + onImageSelect = imageSelectViewModel::onImageSelected ) ComposableFullScreenshotAppBar( @@ -60,7 +60,7 @@ internal fun ComposableFullScreenshotScreen( itemsAmount = screenshots.size, selectedItemIndex = pagerState.currentPage, modifier = Modifier.align(Alignment.TopCenter), - onSaveClicked = { + onSaveClick = { val url = screenshots[pagerState.currentPage].let(::URL) urlImageShareViewModel.shareUrlImage(url) } diff --git a/components/faphub/screenshotspreview/impl/src/main/kotlin/com/flipperdevices/faphub/screenshotspreview/impl/composable/content/ComposableFullScreenshotAppBar.kt b/components/faphub/screenshotspreview/impl/src/main/kotlin/com/flipperdevices/faphub/screenshotspreview/impl/composable/content/ComposableFullScreenshotAppBar.kt index 74629bb244..13f6c6e260 100644 --- a/components/faphub/screenshotspreview/impl/src/main/kotlin/com/flipperdevices/faphub/screenshotspreview/impl/composable/content/ComposableFullScreenshotAppBar.kt +++ b/components/faphub/screenshotspreview/impl/src/main/kotlin/com/flipperdevices/faphub/screenshotspreview/impl/composable/content/ComposableFullScreenshotAppBar.kt @@ -29,7 +29,7 @@ import com.flipperdevices.core.ui.res.R as DesignSystem @Composable internal fun ComposableFullScreenshotAppBar( onBack: () -> Unit, - onSaveClicked: () -> Unit, + onSaveClick: () -> Unit, title: String, itemsAmount: Int, selectedItemIndex: Int, @@ -81,7 +81,7 @@ internal fun ComposableFullScreenshotAppBar( Icon( modifier = Modifier .size(24.dp) - .clickableRipple(bounded = false, onClick = onSaveClicked), + .clickableRipple(bounded = false, onClick = onSaveClick), tint = LocalPallet.current.text100, painter = painterResource(R.drawable.ic_share), contentDescription = null @@ -101,7 +101,7 @@ private fun FullScreenshotAppBar() { """.trimIndent(), itemsAmount = 5, selectedItemIndex = 2, - onSaveClicked = {} + onSaveClick = {} ) } } diff --git a/components/faphub/screenshotspreview/impl/src/main/kotlin/com/flipperdevices/faphub/screenshotspreview/impl/composable/content/ComposableScreenshotsList.kt b/components/faphub/screenshotspreview/impl/src/main/kotlin/com/flipperdevices/faphub/screenshotspreview/impl/composable/content/ComposableScreenshotsList.kt index 268dbebb01..c01464257d 100644 --- a/components/faphub/screenshotspreview/impl/src/main/kotlin/com/flipperdevices/faphub/screenshotspreview/impl/composable/content/ComposableScreenshotsList.kt +++ b/components/faphub/screenshotspreview/impl/src/main/kotlin/com/flipperdevices/faphub/screenshotspreview/impl/composable/content/ComposableScreenshotsList.kt @@ -29,7 +29,7 @@ private val CARD_WIDTH = 65.dp private fun IndicatorItem( screenshotUrl: String, isSelected: Boolean, - onClicked: () -> Unit + onClick: () -> Unit ) { val scale by animateFloatAsState( targetValue = if (isSelected) MAX_SCALE else MIN_SCALE, @@ -45,7 +45,7 @@ private fun IndicatorItem( modifier = Modifier .width(CARD_WIDTH * scale) .height(CARD_HEIGHT * scale) - .clickableRipple(onClick = onClicked), + .clickableRipple(onClick = onClick), ) } } @@ -55,7 +55,7 @@ internal fun ComposableScreenshotsList( screenshots: ImmutableList, currentPage: Int, modifier: Modifier = Modifier, - onImageSelected: (Int) -> Unit + onImageSelect: (Int) -> Unit ) { val lazyRowState = rememberLazyListState() LaunchedEffect(currentPage) { @@ -81,9 +81,9 @@ internal fun ComposableScreenshotsList( IndicatorItem( screenshotUrl = item, isSelected = isSelected, - onClicked = onClicked@{ - if (isSelected) return@onClicked - onImageSelected.invoke(index) + onClick = onClick@{ + if (isSelected) return@onClick + onImageSelect(index) } ) } diff --git a/components/filemanager/impl/src/main/java/com/flipperdevices/filemanager/impl/composable/ComposableFileManagerScreen.kt b/components/filemanager/impl/src/main/java/com/flipperdevices/filemanager/impl/composable/ComposableFileManagerScreen.kt index c0df93a462..e83b653431 100644 --- a/components/filemanager/impl/src/main/java/com/flipperdevices/filemanager/impl/composable/ComposableFileManagerScreen.kt +++ b/components/filemanager/impl/src/main/java/com/flipperdevices/filemanager/impl/composable/ComposableFileManagerScreen.kt @@ -53,7 +53,7 @@ fun ComposableFileManagerScreen( R.string.filemanager_open_dialog_download ) } - ComposableSelectDialog(chooseOptions, onSelected = { + ComposableSelectDialog(chooseOptions, onSelect = { when (it) { R.string.filemanager_open_dialog_edit -> onOpenEditor(localFileItem) R.string.filemanager_open_dialog_download -> onDownloadAndShareFile(localFileItem) @@ -121,7 +121,7 @@ private fun ComposableCreateActionDialog( R.string.filemanager_add_dialog_file, R.string.filemanager_add_dialog_folder ), - onSelected = { + onSelect = { when (it) { R.string.filemanager_add_dialog_file -> createFileManagerAction = CreateFileManagerAction.FILE diff --git a/components/filemanager/impl/src/main/java/com/flipperdevices/filemanager/impl/composable/dialog/ComposableSelectDialog.kt b/components/filemanager/impl/src/main/java/com/flipperdevices/filemanager/impl/composable/dialog/ComposableSelectDialog.kt index cc5edd58df..691196ce8d 100644 --- a/components/filemanager/impl/src/main/java/com/flipperdevices/filemanager/impl/composable/dialog/ComposableSelectDialog.kt +++ b/components/filemanager/impl/src/main/java/com/flipperdevices/filemanager/impl/composable/dialog/ComposableSelectDialog.kt @@ -19,10 +19,10 @@ import com.flipperdevices.core.ui.theme.LocalTypography @Composable fun ComposableSelectDialog( options: IntArray, - onSelected: (Int?) -> Unit, + onSelect: (Int?) -> Unit, modifier: Modifier = Modifier ) { - Dialog(onDismissRequest = { onSelected(null) }) { + Dialog(onDismissRequest = { onSelect(null) }) { Column(modifier = modifier.background(LocalPallet.current.backgroundDialog)) { options.forEachIndexed { index, elementTextId -> ComposableDialogOption( @@ -31,7 +31,7 @@ fun ComposableSelectDialog( .fillMaxWidth(), textId = elementTextId, onClick = { - onSelected(elementTextId) + onSelect(elementTextId) } ) if (index != options.lastIndex) { diff --git a/components/inappnotification/api/src/main/java/com/flipperdevices/inappnotification/api/InAppNotificationRenderer.kt b/components/inappnotification/api/src/main/java/com/flipperdevices/inappnotification/api/InAppNotificationRenderer.kt index 60f692b879..ea4bd59158 100644 --- a/components/inappnotification/api/src/main/java/com/flipperdevices/inappnotification/api/InAppNotificationRenderer.kt +++ b/components/inappnotification/api/src/main/java/com/flipperdevices/inappnotification/api/InAppNotificationRenderer.kt @@ -9,6 +9,6 @@ interface InAppNotificationRenderer { fun InAppNotification( notification: InAppNotification, modifier: Modifier, - onNotificationHidden: () -> Unit + onNotificationHide: () -> Unit ) } diff --git a/components/inappnotification/impl/src/main/java/com/flipperdevices/inappnotification/impl/api/InAppNotificationRendererImpl.kt b/components/inappnotification/impl/src/main/java/com/flipperdevices/inappnotification/impl/api/InAppNotificationRendererImpl.kt index cab4b5d950..0d67be3fe8 100644 --- a/components/inappnotification/impl/src/main/java/com/flipperdevices/inappnotification/impl/api/InAppNotificationRendererImpl.kt +++ b/components/inappnotification/impl/src/main/java/com/flipperdevices/inappnotification/impl/api/InAppNotificationRendererImpl.kt @@ -15,11 +15,11 @@ class InAppNotificationRendererImpl @Inject constructor() : InAppNotificationRen override fun InAppNotification( notification: InAppNotification, modifier: Modifier, - onNotificationHidden: () -> Unit, + onNotificationHide: () -> Unit, ) { ComposableInAppNotification( notification = notification, - onNotificationHidden = onNotificationHidden, + onNotificationHide = onNotificationHide, modifier = modifier ) } diff --git a/components/inappnotification/impl/src/main/java/com/flipperdevices/inappnotification/impl/composable/ComposableInAppNotification.kt b/components/inappnotification/impl/src/main/java/com/flipperdevices/inappnotification/impl/composable/ComposableInAppNotification.kt index 62369356f1..6f29c2eea6 100644 --- a/components/inappnotification/impl/src/main/java/com/flipperdevices/inappnotification/impl/composable/ComposableInAppNotification.kt +++ b/components/inappnotification/impl/src/main/java/com/flipperdevices/inappnotification/impl/composable/ComposableInAppNotification.kt @@ -36,12 +36,12 @@ const val VISIBLE_ANIMATION_MS = 1000 @Composable fun ComposableInAppNotification( notification: InAppNotification, - onNotificationHidden: () -> Unit, + onNotificationHide: () -> Unit, modifier: Modifier = Modifier ) { ComposableInAppNotificationCard( notification = notification, - onNotificationHidden = onNotificationHidden, + onNotificationHide = onNotificationHide, modifier = modifier ) } @@ -50,20 +50,20 @@ fun ComposableInAppNotification( @Suppress("LongMethod") private fun ComposableInAppNotificationCard( notification: InAppNotification, - onNotificationHidden: () -> Unit, + onNotificationHide: () -> Unit, modifier: Modifier = Modifier ) { var visibleState by remember { mutableStateOf(false) } - var actionClicked by remember { mutableStateOf(false) } + var actionClick by remember { mutableStateOf(false) } LaunchedEffect(notification) { visibleState = true } - val onClickAction = remember(onNotificationHidden) { + val onClickAction = remember(onNotificationHide) { { visibleState = false - actionClicked = true - onNotificationHidden() + actionClick = true + onNotificationHide() } } AnimatedVisibility( @@ -108,15 +108,15 @@ private fun ComposableInAppNotificationCard( } } } - DisposableEffect(notification, onNotificationHidden) { + DisposableEffect(notification, onNotificationHide) { val handler = Handler(Looper.getMainLooper()) val fadeOutRunnable = { visibleState = false } val hiddenRunnable = { - if (!actionClicked) { - onNotificationHidden() + if (!actionClick) { + onNotificationHide() } } diff --git a/components/info/impl/src/main/java/com/flipperdevices/info/impl/compose/screens/ComposableDeviceInfoScreen.kt b/components/info/impl/src/main/java/com/flipperdevices/info/impl/compose/screens/ComposableDeviceInfoScreen.kt index 348ef16358..b99ac18c97 100644 --- a/components/info/impl/src/main/java/com/flipperdevices/info/impl/compose/screens/ComposableDeviceInfoScreen.kt +++ b/components/info/impl/src/main/java/com/flipperdevices/info/impl/compose/screens/ComposableDeviceInfoScreen.kt @@ -74,7 +74,7 @@ fun ComposableDeviceInfoScreen( modifier = Modifier.padding(top = 14.dp), onStartUpdateRequest = onStartUpdateRequest, requestRefresh = refreshRequested, - onRefreshRequestExecuted = { refreshRequested = false }, + onRefreshRequestExecute = { refreshRequested = false }, deeplink = deeplink, componentContext = componentContext ) diff --git a/components/keyemulate/impl/src/main/java/com/flipperdevices/keyemulate/composable/common/ComposableHoldToSendInternal.kt b/components/keyemulate/impl/src/main/java/com/flipperdevices/keyemulate/composable/common/ComposableHoldToSendInternal.kt index ee6710480a..19e699779f 100644 --- a/components/keyemulate/impl/src/main/java/com/flipperdevices/keyemulate/composable/common/ComposableHoldToSendInternal.kt +++ b/components/keyemulate/impl/src/main/java/com/flipperdevices/keyemulate/composable/common/ComposableHoldToSendInternal.kt @@ -68,7 +68,7 @@ fun ComposableBubbleHoldToSend( enter = fadeIn(animationSpec = tween(DELAY_ANIMATION)), exit = fadeOut(animationSpec = tween(DELAY_ANIMATION)) ) { - ComposableHoldToSendInternal(onBubbleSizeChanged = { + ComposableHoldToSendInternal(onBubbleSizeChange = { positionBubble = it }) } @@ -91,13 +91,13 @@ private fun calculateBubblePosition( @Composable fun ComposableHoldToSendInternal( - onBubbleSizeChanged: (IntSize) -> Unit, + onBubbleSizeChange: (IntSize) -> Unit, modifier: Modifier = Modifier ) { val bubbleColor = LocalPallet.current.bubbleEmulateBackground.copy(alpha = 0.8f) Column( modifier = modifier.onGloballyPositioned { - onBubbleSizeChanged(it.size) + onBubbleSizeChange(it.size) }, horizontalAlignment = Alignment.End ) { @@ -144,6 +144,6 @@ fun ComposableHoldToSendInternal( @Composable private fun ComposableHoldToSendPreview() { FlipperThemeInternal { - ComposableHoldToSendInternal(onBubbleSizeChanged = {}) + ComposableHoldToSendInternal(onBubbleSizeChange = {}) } } diff --git a/components/nfc/mfkey32/screen/src/main/java/com/flipperdevices/nfc/mfkey32/screen/composable/progressbar/CompleteAttackScreen.kt b/components/nfc/mfkey32/screen/src/main/java/com/flipperdevices/nfc/mfkey32/screen/composable/progressbar/CompleteAttackScreen.kt index 71f7a6bb34..8aede8c28c 100644 --- a/components/nfc/mfkey32/screen/src/main/java/com/flipperdevices/nfc/mfkey32/screen/composable/progressbar/CompleteAttackScreen.kt +++ b/components/nfc/mfkey32/screen/src/main/java/com/flipperdevices/nfc/mfkey32/screen/composable/progressbar/CompleteAttackScreen.kt @@ -29,7 +29,7 @@ import com.flipperdevices.core.ui.res.R as DesignSystem @Composable fun CompleteAttack( keysCollected: ImmutableList, - onDone: () -> Unit, + onComplete: () -> Unit, modifier: Modifier = Modifier, ) = Column( modifier.fillMaxWidth(), @@ -74,7 +74,7 @@ fun CompleteAttack( .fillMaxWidth(), text = stringResource(R.string.mfkey32_complete_btn), textPadding = PaddingValues(vertical = 14.dp), - onClick = onDone + onClick = onComplete ) } diff --git a/components/nfc/mfkey32/screen/src/main/java/com/flipperdevices/nfc/mfkey32/screen/composable/progressbar/NotFoundCompleteAttack.kt b/components/nfc/mfkey32/screen/src/main/java/com/flipperdevices/nfc/mfkey32/screen/composable/progressbar/NotFoundCompleteAttack.kt index 2447e9794b..aba4750704 100644 --- a/components/nfc/mfkey32/screen/src/main/java/com/flipperdevices/nfc/mfkey32/screen/composable/progressbar/NotFoundCompleteAttack.kt +++ b/components/nfc/mfkey32/screen/src/main/java/com/flipperdevices/nfc/mfkey32/screen/composable/progressbar/NotFoundCompleteAttack.kt @@ -23,7 +23,7 @@ import com.flipperdevices.nfc.mfkey32.screen.R @Composable fun NotFoundCompleteAttack( - onDone: () -> Unit, + onComplete: () -> Unit, modifier: Modifier = Modifier, ) = Column( modifier.fillMaxWidth(), @@ -52,7 +52,7 @@ fun NotFoundCompleteAttack( .fillMaxWidth(), text = stringResource(R.string.mfkey32_complete_btn), textPadding = PaddingValues(vertical = 14.dp), - onClick = onDone + onClick = onComplete ) } diff --git a/components/remote-controls/brands/api/src/main/kotlin/com/flipperdevices/remotecontrols/api/BrandsScreenDecomposeComponent.kt b/components/remote-controls/brands/api/src/main/kotlin/com/flipperdevices/remotecontrols/api/BrandsScreenDecomposeComponent.kt index f1ea9d473e..a4a81e8ecc 100644 --- a/components/remote-controls/brands/api/src/main/kotlin/com/flipperdevices/remotecontrols/api/BrandsScreenDecomposeComponent.kt +++ b/components/remote-controls/brands/api/src/main/kotlin/com/flipperdevices/remotecontrols/api/BrandsScreenDecomposeComponent.kt @@ -11,8 +11,8 @@ abstract class BrandsScreenDecomposeComponent( fun createBrandsComponent( componentContext: ComponentContext, categoryId: Long, - onBackClicked: () -> Unit, - onBrandClicked: (brandId: Long) -> Unit + onBackClick: () -> Unit, + onBrandClick: (brandId: Long) -> Unit ): BrandsScreenDecomposeComponent } } diff --git a/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/composable/BrandsScreen.kt b/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/composable/BrandsScreen.kt index 54cfb8005b..a3c3761f48 100644 --- a/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/composable/BrandsScreen.kt +++ b/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/composable/BrandsScreen.kt @@ -32,7 +32,7 @@ fun BrandsScreen( SharedTopBar( title = stringResource(BrandsR.string.brands_title), subtitle = stringResource(BrandsR.string.brands_subtitle), - onBackClicked = brandsDecomposeComponent::onBackClicked + onBackClick = brandsDecomposeComponent::onBackClick ) } ) { scaffoldPaddings -> @@ -46,7 +46,7 @@ fun BrandsScreen( BrandsLoadedContent( model = model, modifier = Modifier.padding(scaffoldPaddings), - onBrandClicked = brandsDecomposeComponent::onBrandClicked + onBrandClick = brandsDecomposeComponent::onBrandClick ) } diff --git a/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/composable/composable/BrandsList.kt b/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/composable/composable/BrandsList.kt index 33e08094b6..8c7c87d996 100644 --- a/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/composable/composable/BrandsList.kt +++ b/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/composable/composable/BrandsList.kt @@ -28,7 +28,7 @@ import kotlinx.collections.immutable.ImmutableList @Composable fun BrandsList( brands: ImmutableList, - onBrandClicked: (BrandModel) -> Unit, + onBrandClick: (BrandModel) -> Unit, modifier: Modifier = Modifier, listState: LazyListState = rememberLazyListState(), ) { @@ -57,7 +57,7 @@ fun BrandsList( modifier = Modifier .fillMaxWidth() .clip(RoundedCornerShape(8.dp)) - .clickable { onBrandClicked.invoke(brand) } + .clickable { onBrandClick.invoke(brand) } .padding(vertical = 12.dp) ) Spacer( diff --git a/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/composable/composable/BrandsLoadedContent.kt b/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/composable/composable/BrandsLoadedContent.kt index 806da1b81a..65db7d413b 100644 --- a/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/composable/composable/BrandsLoadedContent.kt +++ b/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/composable/composable/BrandsLoadedContent.kt @@ -10,7 +10,7 @@ import com.flipperdevices.remotecontrols.impl.brands.presentation.decompose.Bran @Composable fun BrandsLoadedContent( model: BrandsDecomposeComponent.Model.Loaded, - onBrandClicked: (BrandModel) -> Unit, + onBrandClick: (BrandModel) -> Unit, modifier: Modifier = Modifier, ) { val listState = rememberLazyListState() @@ -25,7 +25,7 @@ fun BrandsLoadedContent( modifier = Modifier.weight(1f), listState = listState, brands = model.sortedBrands, - onBrandClicked = onBrandClicked + onBrandClick = onBrandClick ) } ) diff --git a/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/composable/composable/alphabet/HeadersComposable.kt b/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/composable/composable/alphabet/HeadersComposable.kt index 1e739efcbc..71cf6e62f3 100644 --- a/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/composable/composable/alphabet/HeadersComposable.kt +++ b/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/composable/composable/alphabet/HeadersComposable.kt @@ -29,7 +29,7 @@ import kotlinx.coroutines.launch internal fun HeaderComposable( isSelected: Boolean, text: String, - onGloballyPositioned: (LayoutCoordinates) -> Unit, + onGloballyPosition: (LayoutCoordinates) -> Unit, modifier: Modifier = Modifier ) { val scale by animateFloatAsState( @@ -47,7 +47,7 @@ internal fun HeaderComposable( Text( text = text, modifier = modifier - .onGloballyPositioned(onGloballyPositioned) + .onGloballyPositioned(onGloballyPosition) .scale(scale), textAlign = TextAlign.Center, style = LocalTypography.current.subtitleM12, @@ -88,7 +88,7 @@ internal fun HeadersComposable( HeaderComposable( isSelected = i == selectedHeaderIndex, text = header.toString(), - onGloballyPositioned = { + onGloballyPosition = { scrollState.updateOffset(i, it.boundsInParent().center.y) } ) diff --git a/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/presentation/decompose/BrandsDecomposeComponent.kt b/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/presentation/decompose/BrandsDecomposeComponent.kt index 2533e25f6d..23d6ee3e0f 100644 --- a/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/presentation/decompose/BrandsDecomposeComponent.kt +++ b/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/presentation/decompose/BrandsDecomposeComponent.kt @@ -17,9 +17,9 @@ interface BrandsDecomposeComponent { fun clearQuery() - fun onBackClicked() + fun onBackClick() - fun onBrandClicked(brandModel: BrandModel) + fun onBrandClick(brandModel: BrandModel) fun tryLoad() @@ -50,8 +50,8 @@ interface BrandsDecomposeComponent { fun createBrandsComponent( componentContext: ComponentContext, categoryId: Long, - onBackClicked: DecomposeOnBackParameter, - onBrandClicked: (brandId: Long) -> Unit + onBackClick: DecomposeOnBackParameter, + onBrandClick: (brandId: Long) -> Unit ): BrandsDecomposeComponent } } diff --git a/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/presentation/decompose/internal/BrandsDecomposeComponentImpl.kt b/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/presentation/decompose/internal/BrandsDecomposeComponentImpl.kt index df98864dd5..8597168c97 100644 --- a/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/presentation/decompose/internal/BrandsDecomposeComponentImpl.kt +++ b/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/presentation/decompose/internal/BrandsDecomposeComponentImpl.kt @@ -24,8 +24,8 @@ import javax.inject.Provider @ContributesAssistedFactory(AppGraph::class, BrandsDecomposeComponent.Factory::class) class BrandsDecomposeComponentImpl @AssistedInject constructor( @Assisted componentContext: ComponentContext, - @Assisted private val onBackClicked: DecomposeOnBackParameter, - @Assisted private val onBrandClicked: (brandId: Long) -> Unit, + @Assisted private val onBackClick: DecomposeOnBackParameter, + @Assisted private val onBrandClick: (brandId: Long) -> Unit, @Assisted categoryId: Long, createBrandsListViewModel: BrandsListViewModel.Factory, createQueryViewModel: Provider @@ -69,8 +69,8 @@ class BrandsDecomposeComponentImpl @AssistedInject constructor( .flowOn(FlipperDispatchers.workStealingDispatcher) .stateIn(coroutineScope, SharingStarted.Eagerly, BrandsDecomposeComponent.Model.Loading) - override fun onBackClicked() { - onBackClicked.invoke() + override fun onBackClick() { + onBackClick.invoke() } override fun onQueryChanged(query: String) { @@ -81,8 +81,8 @@ class BrandsDecomposeComponentImpl @AssistedInject constructor( queryFeature.clearQuery() } - override fun onBrandClicked(brandModel: BrandModel) { - onBrandClicked.invoke(brandModel.id) + override fun onBrandClick(brandModel: BrandModel) { + onBrandClick.invoke(brandModel.id) } override fun tryLoad() { diff --git a/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/presentation/decompose/internal/BrandsScreenDecomposeComponentImpl.kt b/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/presentation/decompose/internal/BrandsScreenDecomposeComponentImpl.kt index 6ef54374b2..72338ba384 100644 --- a/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/presentation/decompose/internal/BrandsScreenDecomposeComponentImpl.kt +++ b/components/remote-controls/brands/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/brands/presentation/decompose/internal/BrandsScreenDecomposeComponentImpl.kt @@ -15,15 +15,15 @@ import me.gulya.anvil.assisted.ContributesAssistedFactory class BrandsScreenDecomposeComponentImpl @AssistedInject constructor( @Assisted componentContext: ComponentContext, @Assisted categoryId: Long, - @Assisted onBackClicked: () -> Unit, - @Assisted onBrandClicked: (brandId: Long) -> Unit, + @Assisted onBackClick: () -> Unit, + @Assisted onBrandClick: (brandId: Long) -> Unit, brandsDecomposeComponentFactory: BrandsDecomposeComponent.Factory, ) : BrandsScreenDecomposeComponent(componentContext) { private val brandsComponent = brandsDecomposeComponentFactory.createBrandsComponent( componentContext = childContext("BrandsComponent"), categoryId = categoryId, - onBackClicked = onBackClicked, - onBrandClicked = onBrandClicked + onBackClick = onBackClick, + onBrandClick = onBrandClick ) @Composable diff --git a/components/remote-controls/categories/api/src/main/kotlin/com/flipperdevices/remotecontrols/api/CategoriesScreenDecomposeComponent.kt b/components/remote-controls/categories/api/src/main/kotlin/com/flipperdevices/remotecontrols/api/CategoriesScreenDecomposeComponent.kt index 6f13e96edc..c1ad36ad93 100644 --- a/components/remote-controls/categories/api/src/main/kotlin/com/flipperdevices/remotecontrols/api/CategoriesScreenDecomposeComponent.kt +++ b/components/remote-controls/categories/api/src/main/kotlin/com/flipperdevices/remotecontrols/api/CategoriesScreenDecomposeComponent.kt @@ -10,8 +10,8 @@ abstract class CategoriesScreenDecomposeComponent( fun interface Factory { fun invoke( componentContext: ComponentContext, - onBackClicked: () -> Unit, - onCategoryClicked: (categoryId: Long) -> Unit + onBackClick: () -> Unit, + onCategoryClick: (categoryId: Long) -> Unit ): CategoriesScreenDecomposeComponent } } diff --git a/components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/composable/DeviceCategoriesScreen.kt b/components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/composable/DeviceCategoriesScreen.kt index 27ad47f9c9..a291e86161 100644 --- a/components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/composable/DeviceCategoriesScreen.kt +++ b/components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/composable/DeviceCategoriesScreen.kt @@ -28,7 +28,7 @@ internal fun DeviceCategoriesScreen( SharedTopBar( title = stringResource(CategoriesR.string.categories_title), subtitle = stringResource(CategoriesR.string.categories_subtitle), - onBackClicked = deviceCategoriesComponent::onBackClicked + onBackClick = deviceCategoriesComponent::onBackClick ) }, backgroundColor = LocalPalletV2.current.surface.backgroundMain.body @@ -43,7 +43,7 @@ internal fun DeviceCategoriesScreen( DeviceCategoriesLoadedContent( model = model, modifier = Modifier.padding(scaffoldPaddings), - onCategoryClicked = deviceCategoriesComponent::onCategoryClicked + onCategoryClick = deviceCategoriesComponent::onCategoryClick ) } diff --git a/components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/composable/components/DeviceCategoriesLoadedContent.kt b/components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/composable/components/DeviceCategoriesLoadedContent.kt index 3b2bbc6839..3baea45f17 100644 --- a/components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/composable/components/DeviceCategoriesLoadedContent.kt +++ b/components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/composable/components/DeviceCategoriesLoadedContent.kt @@ -14,7 +14,7 @@ import com.flipperdevices.remotecontrols.impl.categories.presentation.decompose. @Composable internal fun DeviceCategoriesLoadedContent( model: DeviceCategoriesComponent.Model.Loaded, - onCategoryClicked: (DeviceCategory) -> Unit, + onCategoryClick: (DeviceCategory) -> Unit, modifier: Modifier = Modifier ) { LazyVerticalGrid( @@ -26,8 +26,8 @@ internal fun DeviceCategoriesLoadedContent( items(model.deviceTypes) { deviceCategory -> DeviceCategoryComposable( deviceCategory = deviceCategory, - onClicked = { - onCategoryClicked.invoke(deviceCategory) + onClick = { + onCategoryClick.invoke(deviceCategory) } ) } diff --git a/components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/composable/components/DeviceCategoryComposable.kt b/components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/composable/components/DeviceCategoryComposable.kt index 51ae6e9e9e..31c548e621 100644 --- a/components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/composable/components/DeviceCategoryComposable.kt +++ b/components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/composable/components/DeviceCategoryComposable.kt @@ -31,13 +31,13 @@ import com.flipperdevices.ifrmvp.core.ui.button.rememberImageBitmap @Composable internal fun DeviceCategoryComposable( deviceCategory: DeviceCategory, - onClicked: () -> Unit, + onClick: () -> Unit, modifier: Modifier = Modifier ) { val image = rememberImageBitmap(deviceCategory.meta.iconPngBase64) Card( modifier = modifier - .clickableRipple(onClick = onClicked), + .clickableRipple(onClick = onClick), backgroundColor = LocalPalletV2.current.surface.contentCard.body.default, shape = RoundedCornerShape(12.dp), content = { @@ -97,7 +97,7 @@ private fun DeviceCategoryComposablePreview() { ) ) ), - onClicked = {} + onClick = {} ) } } diff --git a/components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/presentation/decompose/DeviceCategoriesComponent.kt b/components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/presentation/decompose/DeviceCategoriesComponent.kt index b43ed8fedf..f85a362bbd 100644 --- a/components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/presentation/decompose/DeviceCategoriesComponent.kt +++ b/components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/presentation/decompose/DeviceCategoriesComponent.kt @@ -9,9 +9,9 @@ import kotlinx.coroutines.flow.StateFlow interface DeviceCategoriesComponent { val model: StateFlow - fun onCategoryClicked(category: DeviceCategory) + fun onCategoryClick(category: DeviceCategory) - fun onBackClicked() + fun onBackClick() fun tryLoad() @@ -24,8 +24,8 @@ interface DeviceCategoriesComponent { fun interface Factory { fun invoke( componentContext: ComponentContext, - onBackClicked: DecomposeOnBackParameter, - onCategoryClicked: (categoryId: Long) -> Unit + onBackClick: DecomposeOnBackParameter, + onCategoryClick: (categoryId: Long) -> Unit ): DeviceCategoriesComponent } } diff --git a/components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/presentation/decompose/internal/CategoriesScreenDecomposeComponentImpl.kt b/components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/presentation/decompose/internal/CategoriesScreenDecomposeComponentImpl.kt index 10144fcd61..c3a06b4ff2 100644 --- a/components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/presentation/decompose/internal/CategoriesScreenDecomposeComponentImpl.kt +++ b/components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/presentation/decompose/internal/CategoriesScreenDecomposeComponentImpl.kt @@ -14,14 +14,14 @@ import me.gulya.anvil.assisted.ContributesAssistedFactory @ContributesAssistedFactory(AppGraph::class, CategoriesScreenDecomposeComponent.Factory::class) class CategoriesScreenDecomposeComponentImpl @AssistedInject constructor( @Assisted componentContext: ComponentContext, - @Assisted onBackClicked: () -> Unit, - @Assisted onCategoryClicked: (categoryId: Long) -> Unit, + @Assisted onBackClick: () -> Unit, + @Assisted onCategoryClick: (categoryId: Long) -> Unit, deviceCategoriesComponentFactory: DeviceCategoriesComponent.Factory, ) : CategoriesScreenDecomposeComponent(componentContext) { private val deviceCategoriesComponent = deviceCategoriesComponentFactory.invoke( componentContext = childContext("DeviceCategoriesComponent"), - onBackClicked = onBackClicked, - onCategoryClicked = onCategoryClicked + onBackClick = onBackClick, + onCategoryClick = onCategoryClick ) @Composable diff --git a/components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/presentation/decompose/internal/DeviceCategoriesComponentImpl.kt b/components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/presentation/decompose/internal/DeviceCategoriesComponentImpl.kt index 425c0fb00d..a74f8b9a5b 100644 --- a/components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/presentation/decompose/internal/DeviceCategoriesComponentImpl.kt +++ b/components/remote-controls/categories/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/categories/presentation/decompose/internal/DeviceCategoriesComponentImpl.kt @@ -15,8 +15,8 @@ import javax.inject.Provider @ContributesAssistedFactory(AppGraph::class, DeviceCategoriesComponent.Factory::class) class DeviceCategoriesComponentImpl @AssistedInject constructor( @Assisted componentContext: ComponentContext, - @Assisted private val onBackClicked: DecomposeOnBackParameter, - @Assisted private val onCategoryClicked: (categoryId: Long) -> Unit, + @Assisted private val onBackClick: DecomposeOnBackParameter, + @Assisted private val onCategoryClick: (categoryId: Long) -> Unit, createDeviceCategoryListViewModel: Provider, ) : DeviceCategoriesComponent, ComponentContext by componentContext { @@ -26,11 +26,11 @@ class DeviceCategoriesComponentImpl @AssistedInject constructor( override val model = deviceCategoryListFeature.model - override fun onCategoryClicked(category: DeviceCategory) { - onCategoryClicked(category.id) + override fun onCategoryClick(category: DeviceCategory) { + onCategoryClick(category.id) } - override fun onBackClicked() = onBackClicked.invoke() + override fun onBackClick() = onBackClick.invoke() override fun tryLoad() { deviceCategoryListFeature.tryLoad() diff --git a/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/button/ButtonItemComposable.kt b/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/button/ButtonItemComposable.kt index 5ff5f31746..cb46bcf751 100644 --- a/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/button/ButtonItemComposable.kt +++ b/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/button/ButtonItemComposable.kt @@ -18,7 +18,7 @@ import com.flipperdevices.ifrmvp.model.buttondata.VolumeButtonData @Composable fun ButtonItemComposable( buttonData: ButtonData, - onKeyDataClicked: (IfrKeyIdentifier) -> Unit, + onKeyDataClick: (IfrKeyIdentifier) -> Unit, modifier: Modifier = Modifier ) { when (buttonData) { @@ -26,40 +26,40 @@ fun ButtonItemComposable( SquareIconButton( iconType = buttonData.iconId, modifier = modifier, - onClick = { onKeyDataClicked.invoke(buttonData.keyIdentifier) } + onClick = { onKeyDataClick.invoke(buttonData.keyIdentifier) } ) } is ChannelButtonData -> { ChannelButton( - onNextClicked = { onKeyDataClicked.invoke(buttonData.addKeyIdentifier) }, - onPrevClicked = { onKeyDataClicked.invoke(buttonData.reduceKeyIdentifier) }, + onNextClick = { onKeyDataClick.invoke(buttonData.addKeyIdentifier) }, + onPrevClick = { onKeyDataClick.invoke(buttonData.reduceKeyIdentifier) }, modifier = modifier, ) } is VolumeButtonData -> { VolumeButton( - onAddClicked = { onKeyDataClicked.invoke(buttonData.addKeyIdentifier) }, - onReduceClicked = { onKeyDataClicked.invoke(buttonData.reduceKeyIdentifier) }, + onAddClick = { onKeyDataClick.invoke(buttonData.addKeyIdentifier) }, + onReduceClick = { onKeyDataClick.invoke(buttonData.reduceKeyIdentifier) }, modifier = modifier, ) } is NavigationButtonData -> { NavigationButton( - onLeftClicked = { onKeyDataClicked.invoke(buttonData.leftKeyIdentifier) }, - onRightClicked = { onKeyDataClicked.invoke(buttonData.rightKeyIdentifier) }, - onDownClicked = { onKeyDataClicked.invoke(buttonData.downKeyIdentifier) }, - onUpClicked = { onKeyDataClicked.invoke(buttonData.upKeyIdentifier) }, - onOkClicked = { onKeyDataClicked.invoke(buttonData.okKeyIdentifier) }, + onLeftClick = { onKeyDataClick.invoke(buttonData.leftKeyIdentifier) }, + onRightClick = { onKeyDataClick.invoke(buttonData.rightKeyIdentifier) }, + onDownClick = { onKeyDataClick.invoke(buttonData.downKeyIdentifier) }, + onUpClick = { onKeyDataClick.invoke(buttonData.upKeyIdentifier) }, + onOkClick = { onKeyDataClick.invoke(buttonData.okKeyIdentifier) }, modifier = modifier, ) } is TextButtonData -> { TextButton( - onClick = { onKeyDataClicked.invoke(buttonData.keyIdentifier) }, + onClick = { onKeyDataClick.invoke(buttonData.keyIdentifier) }, text = buttonData.text, background = LocalPalletV2.current.surface.menu.body.dufault, modifier = modifier, @@ -69,7 +69,7 @@ fun ButtonItemComposable( is Base64ImageButtonData -> { Base64ImageButton( base64Icon = buttonData.pngBase64, - onClick = { onKeyDataClicked.invoke(buttonData.keyIdentifier) }, + onClick = { onKeyDataClick.invoke(buttonData.keyIdentifier) }, modifier = modifier, ) } diff --git a/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/button/DoubleButton.kt b/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/button/DoubleButton.kt index 7c18745d7c..44fc4c4cf9 100644 --- a/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/button/DoubleButton.kt +++ b/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/button/DoubleButton.kt @@ -14,8 +14,8 @@ import com.flipperdevices.ifrmvp.core.ui.layout.core.sf @Composable fun DoubleButton( - onFirstClicked: () -> Unit, - onLastClicked: () -> Unit, + onFirstClick: () -> Unit, + onLastClick: () -> Unit, firstText: String, lastText: String, modifier: Modifier = Modifier, @@ -29,7 +29,7 @@ fun DoubleButton( horizontalAlignment = Alignment.CenterHorizontally ) { TextButton( - onClick = onFirstClicked, + onClick = onFirstClick, text = firstText, background = LocalPalletV2.current.surface.menu.body.dufault, ) @@ -41,7 +41,7 @@ fun DoubleButton( ) } TextButton( - onClick = onLastClicked, + onClick = onLastClick, text = lastText, background = LocalPalletV2.current.surface.menu.body.dufault, ) @@ -50,13 +50,13 @@ fun DoubleButton( @Composable fun VolumeButton( - onAddClicked: () -> Unit, - onReduceClicked: () -> Unit, + onAddClick: () -> Unit, + onReduceClick: () -> Unit, modifier: Modifier = Modifier ) { DoubleButton( - onFirstClicked = onAddClicked, - onLastClicked = onReduceClicked, + onFirstClick = onAddClick, + onLastClick = onReduceClick, text = "VOL", firstText = "+", lastText = "-", @@ -66,13 +66,13 @@ fun VolumeButton( @Composable fun ChannelButton( - onNextClicked: () -> Unit, - onPrevClicked: () -> Unit, + onNextClick: () -> Unit, + onPrevClick: () -> Unit, modifier: Modifier = Modifier, ) { DoubleButton( - onFirstClicked = onNextClicked, - onLastClicked = onPrevClicked, + onFirstClick = onNextClick, + onLastClick = onPrevClick, text = "CH", firstText = "+", lastText = "-", diff --git a/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/button/NavigationButton.kt b/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/button/NavigationButton.kt index 2d51472695..0048ff8bc2 100644 --- a/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/button/NavigationButton.kt +++ b/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/button/NavigationButton.kt @@ -30,11 +30,11 @@ private const val NAV_BUTTON_SCALE = 4 @Suppress("LongMethod") @Composable fun NavigationButton( - onUpClicked: () -> Unit, - onRightClicked: () -> Unit, - onDownClicked: () -> Unit, - onLeftClicked: () -> Unit, - onOkClicked: () -> Unit, + onUpClick: () -> Unit, + onRightClick: () -> Unit, + onDownClick: () -> Unit, + onLeftClick: () -> Unit, + onOkClick: () -> Unit, modifier: Modifier = Modifier, background: Color = LocalPalletV2.current.surface.menu.body.dufault, iconTint: Color = MaterialTheme.colors.onPrimary, @@ -54,7 +54,7 @@ fun NavigationButton( modifier = Modifier .size(32.sf) .clip(CircleShape) - .clickable(onClick = onUpClicked) + .clickable(onClick = onUpClick) .align(Alignment.TopCenter) ) Icon( @@ -64,7 +64,7 @@ fun NavigationButton( modifier = Modifier .size(32.sf) .clip(CircleShape) - .clickable(onClick = onLeftClicked) + .clickable(onClick = onLeftClick) .align(Alignment.CenterStart) ) Box( @@ -76,7 +76,7 @@ fun NavigationButton( .clip(CircleShape) .background(LocalPalletV2.current.surface.menu.separator.default) .clip(CircleShape) - .clickable(onClick = onOkClicked) + .clickable(onClick = onOkClick) .align(Alignment.Center), contentAlignment = Alignment.Center, content = { @@ -97,7 +97,7 @@ fun NavigationButton( modifier = Modifier .size(32.sf) .clip(CircleShape) - .clickable(onClick = onRightClicked) + .clickable(onClick = onRightClick) .align(Alignment.CenterEnd) ) @@ -108,7 +108,7 @@ fun NavigationButton( modifier = Modifier .size(32.sf) .clip(CircleShape) - .clickable(onClick = onDownClicked) + .clickable(onClick = onDownClick) .align(Alignment.BottomCenter) ) } diff --git a/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/layout/shared/SharedTopBar.kt b/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/layout/shared/SharedTopBar.kt index fe903e46b4..4d98ad6d37 100644 --- a/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/layout/shared/SharedTopBar.kt +++ b/components/remote-controls/core-ui/src/main/kotlin/com/flipperdevices/ifrmvp/core/ui/layout/shared/SharedTopBar.kt @@ -27,7 +27,7 @@ import com.flipperdevices.core.ui.res.R as DesignSystem fun SharedTopBar( title: String, subtitle: String, - onBackClicked: () -> Unit, + onBackClick: () -> Unit, modifier: Modifier = Modifier, ) { Row( @@ -42,7 +42,7 @@ fun SharedTopBar( Icon( modifier = Modifier .size(24.dp) - .clickableRipple(bounded = false, onClick = onBackClicked), + .clickableRipple(bounded = false, onClick = onBackClick), painter = painterResource(DesignSystem.drawable.ic_back), contentDescription = null, tint = LocalPalletV2.current.icon.blackAndWhite.blackOnColor diff --git a/components/remote-controls/grid/api/src/main/kotlin/com/flipperdevices/remotecontrols/api/GridScreenDecomposeComponent.kt b/components/remote-controls/grid/api/src/main/kotlin/com/flipperdevices/remotecontrols/api/GridScreenDecomposeComponent.kt index ab1f3f9ca8..50bc48fc69 100644 --- a/components/remote-controls/grid/api/src/main/kotlin/com/flipperdevices/remotecontrols/api/GridScreenDecomposeComponent.kt +++ b/components/remote-controls/grid/api/src/main/kotlin/com/flipperdevices/remotecontrols/api/GridScreenDecomposeComponent.kt @@ -11,7 +11,7 @@ abstract class GridScreenDecomposeComponent( fun invoke( componentContext: ComponentContext, param: Param, - onPopClicked: () -> Unit + onPopClick: () -> Unit ): GridScreenDecomposeComponent } diff --git a/components/remote-controls/grid/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/composable/ButtonsComposable.kt b/components/remote-controls/grid/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/composable/ButtonsComposable.kt index f4e30642f0..a904223834 100644 --- a/components/remote-controls/grid/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/composable/ButtonsComposable.kt +++ b/components/remote-controls/grid/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/composable/ButtonsComposable.kt @@ -25,7 +25,7 @@ import com.flipperdevices.remotecontrols.grid.impl.R as GridR @Composable fun BoxWithConstraintsScope.ButtonsComposable( pageLayout: PageLayout?, - onButtonClicked: (IfrButton, IfrKeyIdentifier) -> Unit, + onButtonClick: (IfrButton, IfrKeyIdentifier) -> Unit, onReload: () -> Unit, modifier: Modifier = Modifier ) { @@ -57,8 +57,8 @@ fun BoxWithConstraintsScope.ButtonsComposable( content = { ButtonItemComposable( buttonData = button.data, - onKeyDataClicked = { keyIdentifier -> - onButtonClicked.invoke(button, keyIdentifier) + onKeyDataClick = { keyIdentifier -> + onButtonClick.invoke(button, keyIdentifier) } ) } diff --git a/components/remote-controls/grid/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/composable/GridComposable.kt b/components/remote-controls/grid/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/composable/GridComposable.kt index fb2c15e282..0d63d21581 100644 --- a/components/remote-controls/grid/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/composable/GridComposable.kt +++ b/components/remote-controls/grid/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/composable/GridComposable.kt @@ -35,7 +35,7 @@ import com.flipperdevices.remotecontrols.grid.impl.R as GridR @Composable internal fun LoadedContent( pagesLayout: PagesLayout, - onButtonClicked: (IfrButton, IfrKeyIdentifier) -> Unit, + onButtonClick: (IfrButton, IfrKeyIdentifier) -> Unit, onReload: () -> Unit, modifier: Modifier = Modifier, ) { @@ -45,7 +45,7 @@ internal fun LoadedContent( content = { ButtonsComposable( pageLayout = pagesLayout.pages.firstOrNull(), - onButtonClicked = onButtonClicked, + onButtonClick = onButtonClick, onReload = onReload ) } @@ -76,7 +76,7 @@ fun GridComposable( SharedTopBar( title = "", subtitle = "", - onBackClicked = gridComponent::pop + onBackClick = gridComponent::pop ) }, backgroundColor = LocalPalletV2.current.surface.backgroundMain.body, @@ -108,8 +108,8 @@ fun GridComposable( } LoadedContent( pagesLayout = model.pagesLayout, - onButtonClicked = { _, keyIdentifier -> - gridComponent.onButtonClicked(keyIdentifier) + onButtonClick = { _, keyIdentifier -> + gridComponent.onButtonClick(keyIdentifier) }, onReload = gridComponent::tryLoad ) @@ -133,7 +133,7 @@ private fun LoadedContentEmptyPreview() { FlipperThemeInternal { LoadedContent( pagesLayout = PagesLayout(emptyList()), - onButtonClicked = { _, _ -> }, + onButtonClick = { _, _ -> }, onReload = {} ) } diff --git a/components/remote-controls/grid/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/composable/preview/LoadedContentPreview.kt b/components/remote-controls/grid/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/composable/preview/LoadedContentPreview.kt index 6d1c171522..aefc2a4373 100644 --- a/components/remote-controls/grid/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/composable/preview/LoadedContentPreview.kt +++ b/components/remote-controls/grid/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/composable/preview/LoadedContentPreview.kt @@ -14,7 +14,7 @@ private fun LoadedContentPreview() { FlipperThemeInternal { LoadedContent( pagesLayout = KitchenLayoutFactory.create(), - onButtonClicked = { _, _ -> }, + onButtonClick = { _, _ -> }, onReload = {} ) } diff --git a/components/remote-controls/grid/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/presentation/decompose/GridComponent.kt b/components/remote-controls/grid/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/presentation/decompose/GridComponent.kt index a4f6054184..6b3ef66f2d 100644 --- a/components/remote-controls/grid/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/presentation/decompose/GridComponent.kt +++ b/components/remote-controls/grid/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/presentation/decompose/GridComponent.kt @@ -12,7 +12,7 @@ import kotlinx.coroutines.flow.StateFlow interface GridComponent { fun model(coroutineScope: CoroutineScope): StateFlow - fun onButtonClicked(identifier: IfrKeyIdentifier) + fun onButtonClick(identifier: IfrKeyIdentifier) fun tryLoad() fun pop() @@ -37,7 +37,7 @@ interface GridComponent { fun invoke( componentContext: ComponentContext, param: GridScreenDecomposeComponent.Param, - onPopClicked: () -> Unit + onPopClick: () -> Unit ): GridComponent } } diff --git a/components/remote-controls/grid/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/presentation/decompose/internal/GridComponentImpl.kt b/components/remote-controls/grid/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/presentation/decompose/internal/GridComponentImpl.kt index ed25e71713..b7fb28302a 100644 --- a/components/remote-controls/grid/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/presentation/decompose/internal/GridComponentImpl.kt +++ b/components/remote-controls/grid/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/presentation/decompose/internal/GridComponentImpl.kt @@ -25,7 +25,7 @@ import javax.inject.Provider class GridComponentImpl @AssistedInject constructor( @Assisted componentContext: ComponentContext, @Assisted private val param: GridScreenDecomposeComponent.Param, - @Assisted private val onPopClicked: () -> Unit, + @Assisted private val onPopClick: () -> Unit, createGridViewModel: GridViewModel.Factory, createSaveSignalViewModel: Provider, createDispatchSignalViewModel: Provider @@ -92,7 +92,7 @@ class GridComponentImpl @AssistedInject constructor( dispatchSignalViewModel.dismissBusyDialog() } - override fun onButtonClicked(identifier: IfrKeyIdentifier) { + override fun onButtonClick(identifier: IfrKeyIdentifier) { val gridLoadedState = (gridFeature.state.value as? GridViewModel.State.Loaded) ?: return val remotes = gridLoadedState.remotes dispatchSignalViewModel.dispatch( @@ -106,7 +106,7 @@ class GridComponentImpl @AssistedInject constructor( } override fun tryLoad() = gridFeature.tryLoad() - override fun pop() = onPopClicked.invoke() + override fun pop() = onPopClick.invoke() } private val FLIPPER_TEMP_FOLDER = FlipperKeyType.INFRARED.flipperDir + "/temp" diff --git a/components/remote-controls/grid/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/presentation/decompose/internal/GridScreenDecomposeComponentImpl.kt b/components/remote-controls/grid/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/presentation/decompose/internal/GridScreenDecomposeComponentImpl.kt index dd0edf0d36..3f3e00a198 100644 --- a/components/remote-controls/grid/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/presentation/decompose/internal/GridScreenDecomposeComponentImpl.kt +++ b/components/remote-controls/grid/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/presentation/decompose/internal/GridScreenDecomposeComponentImpl.kt @@ -15,13 +15,13 @@ import me.gulya.anvil.assisted.ContributesAssistedFactory class GridScreenDecomposeComponentImpl @AssistedInject constructor( @Assisted componentContext: ComponentContext, @Assisted param: GridScreenDecomposeComponent.Param, - @Assisted onPopClicked: () -> Unit, + @Assisted onPopClick: () -> Unit, gridComponentFactory: GridComponent.Factory ) : GridScreenDecomposeComponent(componentContext) { private val gridComponent = gridComponentFactory.invoke( componentContext = childContext("GridComponent"), param = param, - onPopClicked = onPopClicked + onPopClick = onPopClick ) @Composable diff --git a/components/remote-controls/main/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/api/RemoteControlsScreenDecomposeComponentImpl.kt b/components/remote-controls/main/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/api/RemoteControlsScreenDecomposeComponentImpl.kt index 4d52ef6f73..669d4af79a 100644 --- a/components/remote-controls/main/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/api/RemoteControlsScreenDecomposeComponentImpl.kt +++ b/components/remote-controls/main/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/api/RemoteControlsScreenDecomposeComponentImpl.kt @@ -45,8 +45,8 @@ class RemoteControlsScreenDecomposeComponentImpl @AssistedInject constructor( categoriesScreenDecomposeComponentFactory .invoke( componentContext = componentContext, - onBackClicked = onBack::invoke, - onCategoryClicked = { deviceCategoryId -> + onBackClick = onBack::invoke, + onCategoryClick = { deviceCategoryId -> val configuration = RemoteControlsNavigationConfig.Brands(deviceCategoryId) navigation.pushToFront(configuration) } @@ -57,9 +57,9 @@ class RemoteControlsScreenDecomposeComponentImpl @AssistedInject constructor( brandsScreenDecomposeComponentFactory .createBrandsComponent( componentContext = componentContext, - onBackClicked = navigation::pop, + onBackClick = navigation::pop, categoryId = config.categoryId, - onBrandClicked = { brandId -> + onBrandClick = { brandId -> val configuration = RemoteControlsNavigationConfig.Setup( categoryId = config.categoryId, brandId = brandId @@ -93,7 +93,7 @@ class RemoteControlsScreenDecomposeComponentImpl @AssistedInject constructor( ifrFileId = config.ifrFileId, uiFileId = null, ), - onPopClicked = navigation::pop + onPopClick = navigation::pop ) } } diff --git a/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/composable/SetupScreen.kt b/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/composable/SetupScreen.kt index 37df2e3be5..bdd7450d6b 100644 --- a/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/composable/SetupScreen.kt +++ b/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/composable/SetupScreen.kt @@ -56,7 +56,7 @@ fun SetupScreen( SharedTopBar( title = stringResource(SetupR.string.setup_title), subtitle = stringResource(SetupR.string.setup_subtitle), - onBackClicked = setupComponent::onBackClicked + onBackClick = setupComponent::onBackClick ) } ) { scaffoldPaddings -> @@ -68,7 +68,7 @@ fun SetupScreen( ) { model -> when (model) { SetupComponent.Model.Error -> { - ErrorComposable(onReload = setupComponent::onSuccessClicked) + ErrorComposable(onReload = setupComponent::onSuccessClick) } is SetupComponent.Model.Loaded -> { @@ -84,9 +84,9 @@ fun SetupScreen( LoadedContent( model = model, modifier = Modifier.padding(scaffoldPaddings), - onPositiveClicked = setupComponent::onSuccessClicked, - onNegativeClicked = setupComponent::onFailedClicked, - onDispatchSignalClicked = setupComponent::dispatchSignal + onPositiveClick = setupComponent::onSuccessClick, + onNegativeClick = setupComponent::onFailedClick, + onDispatchSignalClick = setupComponent::dispatchSignal ) } diff --git a/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/composable/components/ButtonContent.kt b/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/composable/components/ButtonContent.kt index 4e80c9a3e9..d01b773835 100644 --- a/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/composable/components/ButtonContent.kt +++ b/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/composable/components/ButtonContent.kt @@ -66,7 +66,7 @@ private fun SignalResponseButton( @Composable fun ButtonContent( - onClicked: () -> Unit, + onClick: () -> Unit, data: SignalResponse.Data, categoryName: String, isEmulating: Boolean, @@ -79,7 +79,7 @@ fun ButtonContent( ) { SignalResponseButton( data = data, - onClick = onClicked, + onClick = onClick, isEmulating = isEmulating ) Spacer(modifier = Modifier.height(14.dp)) @@ -103,7 +103,7 @@ private fun ComposableConfirmContentDarkPreview() { FlipperThemeInternal { Column { ButtonContent( - onClicked = {}, + onClick = {}, categoryName = "CATEGORY", isEmulating = true, data = SignalResponse.Data( @@ -112,7 +112,7 @@ private fun ComposableConfirmContentDarkPreview() { ) ) ButtonContent( - onClicked = {}, + onClick = {}, categoryName = "CATEGORY 2", isEmulating = true, data = SignalResponse.Data( @@ -121,7 +121,7 @@ private fun ComposableConfirmContentDarkPreview() { ) ) ButtonContent( - onClicked = {}, + onClick = {}, categoryName = "CATEGORY 2", isEmulating = true, data = SignalResponse.Data( diff --git a/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/composable/components/ConfirmContent.kt b/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/composable/components/ConfirmContent.kt index 9fda85dc8f..d927b0914e 100644 --- a/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/composable/components/ConfirmContent.kt +++ b/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/composable/components/ConfirmContent.kt @@ -32,8 +32,8 @@ import com.flipperdevices.remotecontrols.setup.impl.R as SetupR @Composable fun ConfirmContent( text: String, - onPositiveClicked: () -> Unit, - onNegativeClicked: () -> Unit, + onPositiveClick: () -> Unit, + onNegativeClick: () -> Unit, modifier: Modifier = Modifier, ) { Box( @@ -76,12 +76,12 @@ fun ConfirmContent( textAlign = TextAlign.Center, modifier = Modifier .clip(RoundedCornerShape(30.dp)) - .clickableRipple(onClick = onNegativeClicked) + .clickableRipple(onClick = onNegativeClick) .padding(vertical = 12.dp, horizontal = 36.dp), ) ComposableFlipperButton( text = stringResource(SetupR.string.yes), - onClick = onPositiveClicked + onClick = onPositiveClick ) } } @@ -99,8 +99,8 @@ private fun ComposableConfirmContentLightPreview() { FlipperThemeInternal { ConfirmContent( text = "Super mega text of preview confirm element", - onPositiveClicked = {}, - onNegativeClicked = {} + onPositiveClick = {}, + onNegativeClick = {} ) } } @@ -115,8 +115,8 @@ private fun ComposableConfirmContentDarkPreview() { FlipperThemeInternal { ConfirmContent( text = "Super mega text of preview confirm element", - onPositiveClicked = {}, - onNegativeClicked = {} + onPositiveClick = {}, + onNegativeClick = {} ) } } diff --git a/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/composable/components/LoadedContent.kt b/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/composable/components/LoadedContent.kt index d4b963f7aa..90abc6188c 100644 --- a/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/composable/components/LoadedContent.kt +++ b/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/composable/components/LoadedContent.kt @@ -21,9 +21,9 @@ import com.flipperdevices.remotecontrols.setup.impl.R as SetupR @Composable fun LoadedContent( model: SetupComponent.Model.Loaded, - onPositiveClicked: () -> Unit, - onNegativeClicked: () -> Unit, - onDispatchSignalClicked: () -> Unit, + onPositiveClick: () -> Unit, + onNegativeClick: () -> Unit, + onDispatchSignalClick: () -> Unit, modifier: Modifier = Modifier ) { val ifrFileModel = model.response.ifrFileModel @@ -34,7 +34,7 @@ fun LoadedContent( signalResponse != null -> { ButtonContent( - onClicked = onDispatchSignalClicked, + onClick = onDispatchSignalClick, modifier = Modifier.align(Alignment.Center), data = signalResponse.data, categoryName = signalResponse.categoryName, @@ -50,8 +50,8 @@ fun LoadedContent( ) { ConfirmContent( text = signalResponse.message, - onNegativeClicked = onNegativeClicked, - onPositiveClicked = onPositiveClicked, + onNegativeClick = onNegativeClick, + onPositiveClick = onPositiveClick, modifier = Modifier.align(Alignment.BottomCenter) ) } @@ -79,9 +79,9 @@ private fun LoadedContentPreview() { response = SignalResponseModel(), isEmulated = true ), - onPositiveClicked = {}, - onNegativeClicked = {}, - onDispatchSignalClicked = {} + onPositiveClick = {}, + onNegativeClick = {}, + onDispatchSignalClick = {} ) } } diff --git a/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/presentation/decompose/SetupComponent.kt b/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/presentation/decompose/SetupComponent.kt index 75cc2e1ad5..114e4331c0 100644 --- a/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/presentation/decompose/SetupComponent.kt +++ b/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/presentation/decompose/SetupComponent.kt @@ -15,10 +15,10 @@ interface SetupComponent { val remoteFoundFlow: Flow val param: SetupScreenDecomposeComponent.Param - fun onBackClicked() + fun onBackClick() - fun onSuccessClicked() - fun onFailedClicked() + fun onSuccessClick() + fun onFailedClick() fun dispatchSignal() fun dismissBusyDialog() diff --git a/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/presentation/decompose/internal/SetupComponentImpl.kt b/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/presentation/decompose/internal/SetupComponentImpl.kt index ef751be6b9..b101a1bd86 100644 --- a/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/presentation/decompose/internal/SetupComponentImpl.kt +++ b/components/remote-controls/setup/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/setup/presentation/decompose/internal/SetupComponentImpl.kt @@ -34,7 +34,7 @@ import javax.inject.Provider class SetupComponentImpl @AssistedInject constructor( @Assisted componentContext: ComponentContext, @Assisted override val param: SetupScreenDecomposeComponent.Param, - @Assisted private val onBackClicked: DecomposeOnBackParameter, + @Assisted private val onBackClick: DecomposeOnBackParameter, @Assisted private val onIfrFileFound: (ifrFileId: Long) -> Unit, currentSignalViewModelFactory: CurrentSignalViewModel.Factory, createHistoryViewModel: Provider, @@ -131,7 +131,7 @@ class SetupComponentImpl @AssistedInject constructor( onIfrFileFound.invoke(ifrFileModel.id) } - override fun onSuccessClicked() { + override fun onSuccessClick() { val state = createCurrentSignalViewModel.state.value as? CurrentSignalViewModel.State.Loaded ?: return val signalModel = state.response.signalResponse?.signalModel ?: return @@ -139,7 +139,7 @@ class SetupComponentImpl @AssistedInject constructor( tryLoad() } - override fun onFailedClicked() { + override fun onFailedClick() { val state = createCurrentSignalViewModel.state.value as? CurrentSignalViewModel.State.Loaded ?: return val signalModel = state.response.signalResponse?.signalModel ?: return @@ -163,7 +163,7 @@ class SetupComponentImpl @AssistedInject constructor( dispatchSignalApi.dispatch(config) } - override fun onBackClicked() = onBackClicked.invoke() + override fun onBackClick() = onBackClick.invoke() } private val FLIPPER_TEMP_FOLDER = FlipperKeyType.INFRARED.flipperDir + "/temp" diff --git a/components/updater/api/src/main/java/com/flipperdevices/updater/api/UpdaterCardApi.kt b/components/updater/api/src/main/java/com/flipperdevices/updater/api/UpdaterCardApi.kt index a85ae1d22a..7837904e86 100644 --- a/components/updater/api/src/main/java/com/flipperdevices/updater/api/UpdaterCardApi.kt +++ b/components/updater/api/src/main/java/com/flipperdevices/updater/api/UpdaterCardApi.kt @@ -17,6 +17,6 @@ interface UpdaterCardApi { deeplink: Deeplink.BottomBar.DeviceTab.WebUpdate?, onStartUpdateRequest: (UpdateRequest) -> Unit, requestRefresh: Boolean, - onRefreshRequestExecuted: () -> Unit + onRefreshRequestExecute: () -> Unit ) } diff --git a/components/updater/card/src/main/java/com/flipperdevices/updater/card/api/UpdaterCardApiImpl.kt b/components/updater/card/src/main/java/com/flipperdevices/updater/card/api/UpdaterCardApiImpl.kt index d379a4aa30..0aa46ac4de 100644 --- a/components/updater/card/src/main/java/com/flipperdevices/updater/card/api/UpdaterCardApiImpl.kt +++ b/components/updater/card/src/main/java/com/flipperdevices/updater/card/api/UpdaterCardApiImpl.kt @@ -31,7 +31,7 @@ class UpdaterCardApiImpl @Inject constructor( deeplink: Deeplink.BottomBar.DeviceTab.WebUpdate?, onStartUpdateRequest: (UpdateRequest) -> Unit, requestRefresh: Boolean, - onRefreshRequestExecuted: () -> Unit + onRefreshRequestExecute: () -> Unit ) { val updateStateViewModel: UpdateStateViewModel = componentContext.viewModelWithFactory(key = null) { @@ -47,10 +47,10 @@ class UpdaterCardApiImpl @Inject constructor( updateRequestViewModelProvider.get() } - LaunchedEffect(requestRefresh, onRefreshRequestExecuted) { + LaunchedEffect(requestRefresh, onRefreshRequestExecute) { if (requestRefresh) { updateCardViewModel.refresh() - onRefreshRequestExecuted() + onRefreshRequestExecute() } } diff --git a/gradle.properties b/gradle.properties index 919399c67f..d4bfc2007e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx4g -XX:+UseParallelGC -Dkotlin.daemon.jvm.options\="-Xmx4096M" +org.gradle.jvmargs=-Xmx8g -XX:+UseParallelGC -Dkotlin.daemon.jvm.options\="-Xmx8192M" #org.gradle.debug=true #kotlin.compiler.execution.strategy=in-process # When configured, Gradle will run in incubating parallel mode. diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c094b5412f..bae39777d8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,11 +4,11 @@ kotlin-general = "2.0.0" # https://kotlinlang.org/docs/releases.html#release-det kotlin-immutable-collections = "0.3.7" # https://github.com/Kotlin/kotlinx.collections.immutable/releases kotlin-datetime = "0.6.0" # https://github.com/Kotlin/kotlinx-datetime/releases kotlinx = "1.8.1" # https://github.com/Kotlin/kotlinx.coroutines/releases -ksp = "2.0.0-1.0.21" # https://github.com/google/ksp/releases +ksp = "2.0.0-1.0.23" # https://github.com/google/ksp/releases anvil = "2.5.0-beta09" # https://github.com/square/anvil/releases anvil-utils = "0.2.1-beta01" # https://github.com/IlyaGulya/anvil-utils/releases android-gradle = "8.5.1" # https://developer.android.com/studio/releases/gradle-plugin -protobuf = "4.26.1" # https://github.com/protocolbuffers/protobuf/releases +protobuf = "4.27.2" # https://github.com/protocolbuffers/protobuf/releases protobuf-gradle = "0.9.4" # https://github.com/google/protobuf-gradle-plugin/releases compose-material = "1.6.8" # https://developer.android.com/jetpack/androidx/releases/compose#versions compose-foundation = "1.6.8" # https://developer.android.com/jetpack/androidx/releases/compose#versions @@ -17,13 +17,13 @@ compose-wear = "1.3.1" # https://developer.android.com/jetpack/androidx/releases compose-wear-preview = "1.0.0" # https://mvnrepository.com/artifact/androidx.wear/wear-tooling-preview compose-compiler = "1.5.14" # https://developer.android.com/jetpack/androidx/releases/compose#versions compose-accompanist = "0.34.0" # https://github.com/google/accompanist/releases -compose-placeholder = "1.1.3" # https://github.com/fornewid/placeholder/releases +compose-placeholder = "2.0.0" # https://github.com/fornewid/placeholder/releases compose-constraint = "1.0.1" # https://developer.android.com/jetpack/compose/layouts/constraintlayout compose-paging = "3.3.0" # https://developer.android.com/jetpack/androidx/releases/paging compose-drag-drop = "0.9.6" # https://github.com/aclassen/ComposeReorderable/releases -compose-multiplatform = "1.6.10" # https://github.com/JetBrains/compose-multiplatform/releases -horologist = "0.6.11" # https://github.com/google/horologist/releases -serialization-json = "1.7.0" # https://github.com/Kotlin/kotlinx.serialization/releases +compose-multiplatform = "1.6.11" # https://github.com/JetBrains/compose-multiplatform/releases +horologist = "0.6.16" # https://github.com/google/horologist/releases +serialization-json = "1.7.1" # https://github.com/Kotlin/kotlinx.serialization/releases wear = "1.3.0" # https://developer.android.com/jetpack/androidx/releases/wear wear-gms = "18.2.0" # https://mvnrepository.com/artifact/com.google.android.gms/play-services-wearable?repo=google wear-interaction-phone = "1.1.0-alpha04" # https://developer.android.com/jetpack/androidx/releases/wear @@ -32,8 +32,8 @@ room = "2.6.1" # https://developer.android.com/jetpack/androidx/releases/room dagger = "2.51.1" # https://github.com/google/dagger/releases timber = "5.0.1" # https://github.com/JakeWharton/timber/releases timber-treessence = "1.1.2" # https://github.com/bastienpaulfr/Treessence/tags -sentry-runtime = "7.9.0" # https://github.com/getsentry/sentry-java/releases -sentry-gradle = "4.6.0" # https://github.com/getsentry/sentry-android-gradle-plugin/releases +sentry-runtime = "7.12.0" # https://github.com/getsentry/sentry-java/releases +sentry-gradle = "4.10.0" # https://github.com/getsentry/sentry-android-gradle-plugin/releases zip4j = "2.11.5" # https://github.com/srikanth-lingala/zip4j/releases ktx = "1.13.1" # https://developer.android.com/jetpack/androidx/releases/core ktx-activity = "1.9.0" # https://developer.android.com/jetpack/androidx/releases/activity @@ -42,11 +42,11 @@ lifecycle = "2.8.3" # https://developer.android.com/jetpack/androidx/releases/li fastutil = "8.5.13" # https://github.com/vigna/fastutil/tags ble = "2.7.5" # https://github.com/NordicSemiconductor/Android-BLE-Library/releases ble-scan = "1.6.0" # https://github.com/NordicSemiconductor/Android-Scanner-Compat-Library/releases -ble-kotlin = "1.0.16" # https://github.com/NordicSemiconductor/Kotlin-BLE-Library/releases +ble-kotlin = "1.1.0" # https://github.com/NordicSemiconductor/Kotlin-BLE-Library/releases # don't update to 2.x, unless the ble-kotlin is also updated. PR: https://github.com/arcao/slf4j-timber/pull/12 slf4j = "1.7.36" # https://github.com/qos-ch/slf4j/tags slf4j-timber = "3.1" # https://github.com/arcao/slf4j-timber -lottie = "6.4.0" # https://github.com/airbnb/lottie/blob/master/android-compose.md +lottie = "6.4.1" # https://github.com/airbnb/lottie/blob/master/android-compose.md material = "1.12.0" # https://github.com/material-components/material-components-android/releases splashscreen = "1.1.0-rc01" # https://developer.android.com/jetpack/androidx/releases/core annotations = "1.8.0" # https://developer.android.com/jetpack/androidx/releases/annotation @@ -54,14 +54,14 @@ appcompat = "1.7.0" # https://developer.android.com/jetpack/androidx/releases/ap datastore = "1.1.1" # https://developer.android.com/topic/libraries/architecture/datastore # https://github.com/vsch/flexmark-java/issues/442 flexmark = "0.42.14" # https://github.com/vsch/flexmark-java/tags -markdown = "0.16.0" # https://github.com/mikepenz/multiplatform-markdown-renderer/releases -ktor = "2.3.11" # https://ktor.io/ +markdown = "0.25.0" # https://github.com/mikepenz/multiplatform-markdown-renderer/releases +ktor = "2.3.12" # https://ktor.io/ apache-compress = "1.26.2" # https://commons.apache.org/proper/commons-compress/ -apache-codec = "1.17.0" # https://mvnrepository.com/artifact/commons-codec/commons-codec -countly = "24.4.0" # https://github.com/Countly/countly-sdk-android/releases +apache-codec = "1.17.1" # https://mvnrepository.com/artifact/commons-codec/commons-codec +countly = "24.7.0" # https://github.com/Countly/countly-sdk-android/releases grgit-gradle = "8d818b74b9" work = "2.9.0" # https://developer.android.com/jetpack/androidx/releases/work -coil = "2.6.0" # https://github.com/coil-kt/coil/releases +coil = "2.7.0" # https://github.com/coil-kt/coil/releases play-core = "2.1.0" # https://developer.android.com/guide/playcore#java-kotlin-in-app-update # don't upgrade to 1.14+ until Kotlin is upgraded to 2.0. https://github.com/Foso/Ktorfit/releases/tag/1.14.0 ktorfit = "1.13.0" # https://github.com/Foso/Ktorfit/releases @@ -70,9 +70,9 @@ essenty = "2.1.0" # https://github.com/arkivanov/Essenty/releases zoomable = "1.6.1" #https://github.com/usuiat/Zoomable # Testing junit = "4.13.2" # https://github.com/junit-team/junit4/releases -mockito = "5.3.1" # https://github.com/mockito/mockito/releases -roboelectric = "4.12.2" # https://github.com/robolectric/robolectric/releases -mockk = "1.13.11" # https://mockk.io/ +mockito = "5.4.0" # https://github.com/mockito/mockito/releases +roboelectric = "4.13" # https://github.com/robolectric/robolectric/releases +mockk = "1.13.12" # https://mockk.io/ # Testing UI espresso-core = "3.6.1" # https://github.com/android/android-test @@ -85,15 +85,15 @@ profileinstaller = "1.3.1" # https://developer.android.com/topic/performance/bas detekt = "1.23.6" # https://detekt.dev/docs/gettingstarted/gradle/ detekt-ruleset-compiler = "0.0.4" # https://github.com/BraisGabin/detekt-compiler-rules/releases detekt-ruleset-ktlint = "0.50.0" # https://github.com/pinterest/ktlint/releases -detekt-ruleset-compose = "0.4.1" # https://github.com/mrmans0n/compose-rules/releases +detekt-ruleset-compose = "0.4.5" # https://github.com/mrmans0n/compose-rules/releases detekt-ruleset-decompose = "1.0.1" # https://github.com/LionZXY/detekt-decompose-rule/releases # Firebase -google-gms-gradle = "4.4.1" # https://developers.google.com/android/guides/google-services-plugin +google-gms-gradle = "4.4.2" # https://developers.google.com/android/guides/google-services-plugin google-gms-firebase = "24.0.0" # https://firebase.google.com/docs/android/setup#kotlin:~:text=com.google.firebase%3Afirebase%2Dmessaging # Build Config -buildkonfig = "5.3.5" +buildkonfig = "5.4.0" [libraries] # Gradle - Core diff --git a/instances/wearable/src/main/java/com/flipperdevices/wearable/MainWearActivity.kt b/instances/wearable/src/main/java/com/flipperdevices/wearable/MainWearActivity.kt index d4e4de9f20..0101cbda43 100644 --- a/instances/wearable/src/main/java/com/flipperdevices/wearable/MainWearActivity.kt +++ b/instances/wearable/src/main/java/com/flipperdevices/wearable/MainWearActivity.kt @@ -121,7 +121,7 @@ class MainWearActivity : ComponentActivity(), LogTagProvider { modifier = Modifier .fillMaxSize() .background(LocalPallet.current.background), - onDismissed = rootComponent::onBack + onDismiss = rootComponent::onBack ) { it.instance.Render() } diff --git a/instances/wearable/src/main/java/com/flipperdevices/wearable/SwipeToDismissBox.kt b/instances/wearable/src/main/java/com/flipperdevices/wearable/SwipeToDismissBox.kt index 9fdb1a460b..1d1e0722a0 100644 --- a/instances/wearable/src/main/java/com/flipperdevices/wearable/SwipeToDismissBox.kt +++ b/instances/wearable/src/main/java/com/flipperdevices/wearable/SwipeToDismissBox.kt @@ -21,7 +21,7 @@ import kotlinx.collections.immutable.toImmutableSet * Displays the [ChildStack] in [SwipeToDismissBox][androidx.wear.compose.material.SwipeToDismissBox]. * * @param stack a [ChildStack] to be displayed. - * @param onDismissed called when the swipe to dismiss gesture has completed, allows popping the stack. + * @param onDismiss called when the swipe to dismiss gesture has completed, allows popping the stack. * See [StackNavigator#pop][com.arkivanov.decompose.router.stack.pop]. * @param modifier a [Modifier] to be applied to the underlying * [SwipeToDismissBox][androidx.wear.compose.material.SwipeToDismissBox]. @@ -30,7 +30,7 @@ import kotlinx.collections.immutable.toImmutableSet @Composable fun SwipeToDismissBox( stack: Value>, - onDismissed: () -> Unit, + onDismiss: () -> Unit, modifier: Modifier = Modifier, content: @Composable (child: Child.Created) -> Unit, ) { @@ -38,7 +38,7 @@ fun SwipeToDismissBox( SwipeToDismissBox( stack = state.value, - onDismissed = onDismissed, + onDismiss = onDismiss, modifier = modifier, content = content ) @@ -48,7 +48,7 @@ fun SwipeToDismissBox( * Displays the [ChildStack] in [SwipeToDismissBox][androidx.wear.compose.material.SwipeToDismissBox]. * * @param stack a [ChildStack] to be displayed. - * @param onDismissed called when the swipe to dismiss gesture has completed, allows popping the stack. + * @param onDismiss called when the swipe to dismiss gesture has completed, allows popping the stack. * See [StackNavigator#pop][com.arkivanov.decompose.router.stack.pop]. * @param modifier a [Modifier] to be applied to the underlying * [SwipeToDismissBox][androidx.wear.compose.material.SwipeToDismissBox]. @@ -57,7 +57,7 @@ fun SwipeToDismissBox( @Composable fun SwipeToDismissBox( stack: ChildStack, - onDismissed: () -> Unit, + onDismiss: () -> Unit, modifier: Modifier = Modifier, content: @Composable (child: Child.Created) -> Unit, ) { @@ -68,7 +68,7 @@ fun SwipeToDismissBox( RetainStates(holder, stack.getConfigurations().toImmutableSet()) SwipeToDismissBox( - onDismissed = onDismissed, + onDismissed = onDismiss, modifier = modifier, backgroundKey = background?.configuration ?: SwipeToDismissKeys.Background, contentKey = active.configuration,