change disconnect button color and run codeql

DatL4g · Dec 5, 2023 · d7a6066 · d7a6066
1 parent 78cbf29
commit d7a6066
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -2,10 +2,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "compose" ]
+    branches: [ "5.x" ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "compose" ]
+    branches: [ "5.x" ]
 
 jobs:
   analyze:
@@ -27,7 +27,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
@@ -44,7 +44,7 @@ jobs:
     - name: Manual Java Build
       if: matrix.language == 'java'
       run: |
-        ./gradlew app:build
+        ./gradlew build
 
     - name: Manual Javascript Build
       if: matrix.language == 'javascript'

diff --git a/.../kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/cast/CastDialog.android.kt b/.../kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/cast/CastDialog.android.kt
@@ -139,7 +139,11 @@ actual fun CastDialog(component: CastComponent) {
                     onClick = {
                         Kast.unselect(UnselectReason.disconnected)
                         component.dismiss()
-                    }
+                    },
+                    colors = ButtonDefaults.buttonColors(
+                        containerColor = MaterialTheme.colorScheme.errorContainer,
+                        contentColor = MaterialTheme.colorScheme.onErrorContainer
+                    )
                 ) {
                     Text(text = stringResource(SharedRes.strings.disconnect))
                 }

diff --git a/...ev/datlag/burningseries/shared/ui/screen/initial/series/dialog/language/LanguageDialog.kt b/...ev/datlag/burningseries/shared/ui/screen/initial/series/dialog/language/LanguageDialog.kt
@@ -93,7 +93,6 @@ fun LanguageDialog(component: LanguageComponent) {
                 onClick = {
                     component.dismiss()
                 },
-                modifier = Modifier.padding(bottom = 8.dp),
                 colors = ButtonDefaults.buttonColors(
                     containerColor = MaterialTheme.colorScheme.errorContainer,
                     contentColor = MaterialTheme.colorScheme.onErrorContainer

diff --git a/...in/dev/datlag/burningseries/shared/ui/screen/initial/series/dialog/season/SeasonDialog.kt b/...in/dev/datlag/burningseries/shared/ui/screen/initial/series/dialog/season/SeasonDialog.kt
@@ -92,7 +92,6 @@ fun SeasonDialog(component: SeasonComponent) {
                 onClick = {
                     component.dismiss()
                 },
-                modifier = Modifier.padding(bottom = 8.dp),
                 colors = ButtonDefaults.buttonColors(
                     containerColor = MaterialTheme.colorScheme.errorContainer,
                     contentColor = MaterialTheme.colorScheme.onErrorContainer

diff --git a/...esktopMain/kotlin/dev/datlag/burningseries/shared/common/PlatformExtendCompose.desktop.kt b/...esktopMain/kotlin/dev/datlag/burningseries/shared/common/PlatformExtendCompose.desktop.kt
@@ -1,7 +1,7 @@
 package dev.datlag.burningseries.shared.common
 
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.onClick
+import androidx.compose.foundation.onClick as defaultClick
 import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ImageBitmap
@@ -22,7 +22,7 @@ actual fun Modifier.onClick(
     onLongClick: (() -> Unit)?,
     onClick: () -> Unit
 ): Modifier {
-    return this.onClick(
+    return this.defaultClick(
         enabled = enabled,
         onDoubleClick = onDoubleClick,
         onLongClick = onLongClick,