Merge branch 'main' into renovate/hashicorp-terraform-1.x

.github/workflows/pull-request.yml

@@ -56,9 +56,11 @@ jobs:
         env:
           GOOGLE_SERVICES: ${{ steps.op-secrets.outputs.GOOGLE_SERVICES }}
 
-      - id: gradle
+      - id: gradle-build
         run: ./gradlew build --console=plain
 
+      - run: ./gradlew detektAll --continue --console=plain
+
       - id: screenshot-validation
         run: ./gradlew validateScreenshotTest --console=plain
 
@@ -70,7 +72,7 @@ jobs:
           path: "**/build/reports/screenshotTest/preview/debug"
 
       - uses: thollander/actions-comment-pull-request@v3
-        if: ${{ steps.gradle.outputs.build-scan-url }}
+        if: ${{ steps.gradle-build.outputs.build-scan-url }}
         with:
           message: "Build scan published to ${{ steps.gradle.outputs.build-scan-url }}"
           comment-tag: build-scan-url

conferences-app/src/androidMain/AndroidManifest.xml

@@ -11,7 +11,7 @@
             android:name="io.ashdavies.party.MainActivity"
             android:configChanges="keyboardHidden|orientation"
             android:exported="true"
-            android:label="Playground"
+            android:label="Conferences"
             android:theme="@style/Theme.Material3.DynamicColors.DayNight">
 
             <intent-filter>

conferences-app/src/commonMain/composeResources/values/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="application">Playground</string>
+    <string name="application">Conferences</string>
     <string name="upcoming">Upcoming</string>
     <string name="profile">Profile</string>
     <string name="events">Events</string>

conferences-app/src/screenshotTest/kotlin/io/ashdavies/party/events/EventsDetailTest.kt → conferences-app/src/screenshotTest/kotlin/io/ashdavies/party/events/EventsDetailTests.kt

@@ -4,11 +4,11 @@ import androidx.compose.runtime.Composable
 import io.ashdavies.party.tooling.MaterialPreviewTheme
 import io.ashdavies.party.tooling.PreviewDayNight
 
-internal class EventsDetailTest {
+internal class EventsDetailTests {
 
     @Composable
     @PreviewDayNight
-    fun EventsDetailPreview() {
+    private fun EventsDetailPreview() {
         MaterialPreviewTheme {
             EventsDetail(DroidconBerlin)
         }

conferences-app/src/screenshotTest/kotlin/io/ashdavies/party/events/EventsListTest.kt → conferences-app/src/screenshotTest/kotlin/io/ashdavies/party/events/EventsListTests.kt

@@ -11,11 +11,11 @@ import kotlinx.coroutines.flow.flowOf
 
 private val DroidconEvents = listOf(AndroidMakers, DroidconBerlin, DroidconLondon)
 
-internal class EventsListTest {
+internal class EventsListTests {
 
     @Composable
     @PreviewDayNight
-    fun EventsListPreview(data: List<Event> = DroidconEvents) {
+    private fun EventsListPreview(data: List<Event> = DroidconEvents) {
         MaterialPreviewTheme {
             EventsList(
                 state = EventsScreen.State(lazyPagingItems(flowOf(PagingData.from(data)))),

conferences-app/src/screenshotTest/kotlin/io/ashdavies/party/gallery/GalleryScreenTests.kt

@@ -6,12 +6,12 @@ import io.ashdavies.party.tooling.MaterialPreviewTheme
 import io.ashdavies.party.tooling.PreviewDayNight
 import kotlinx.collections.immutable.persistentListOf
 
-internal class GalleryListTest {
+internal class GalleryScreenTests {
 
     @Composable
     @PreviewDayNight
     @OptIn(ExperimentalFoundationApi::class)
-    fun GalleryGridPreview() {
+    private fun GalleryGridPreview() {
         MaterialPreviewTheme {
             GalleryGrid(
                 itemList = persistentListOf(
@@ -29,7 +29,7 @@ internal class GalleryListTest {
 
     @Composable
     @PreviewDayNight
-    fun GalleryBottomSheetPreview() {
+    private fun GalleryBottomSheetPreview() {
         MaterialPreviewTheme {
             GallerySheetContent(eventSink = { })
         }

conferences-app/src/screenshotTest/kotlin/io/ashdavies/party/home/HomeScreenTests.kt

@@ -12,7 +12,7 @@ internal class HomeScreenTests {
     @Composable
     @PreviewDayNight
     @OptIn(ExperimentalMaterial3Api::class)
-    fun HomeTopAppBarPreview() {
+    private fun HomeTopAppBarPreview() {
         MaterialPreviewTheme {
             HomeTopBar(
                 actions = {
@@ -27,7 +27,7 @@ internal class HomeScreenTests {
 
     @Composable
     @PreviewDayNight
-    fun HomeBottomSheetPreview() {
+    private fun HomeBottomSheetPreview() {
         MaterialPreviewTheme {
             HomeBottomBar()
         }

detekt-config.yml

@@ -19,6 +19,8 @@ naming:
 style:
   MagicNumber:
     ignorePropertyDeclaration: true
+  UnusedPrivateMember:
+    ignoreAnnotated: ['Preview', 'PreviewDayNight']
   UnusedPrivateProperty:
     excludes:
       - '**/*.gradle.kts'

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 android-compileSdk = "35"
 android-minSdk = "34"
 androidx-activity = "1.9.3"
-androidx-paging = "3.3.4"
+androidx-paging = "3.3.5"
 cash-sqldelight = "2.0.2"
 coil-kt = "3.0.4"
 compose-adaptive = "1.0.1"