From 3d7dd46fd59a9930c3a3b5a9cc6a89534005af23 Mon Sep 17 00:00:00 2001
From: Michael Stillwell <mjs@beebo.org>
Date: Thu, 18 Jul 2024 14:57:43 +0100
Subject: [PATCH 1/3] Migrate build scripts to Kotlin DSL

---
 WearTilesKotlin/app/build.gradle              | 85 -------------------
 WearTilesKotlin/app/build.gradle.kts          | 85 +++++++++++++++++++
 WearTilesKotlin/app/proguard-rules.pro        |  4 +-
 .../{build.gradle => build.gradle.kts}        | 16 ++--
 4 files changed, 95 insertions(+), 95 deletions(-)
 delete mode 100644 WearTilesKotlin/app/build.gradle
 create mode 100644 WearTilesKotlin/app/build.gradle.kts
 rename WearTilesKotlin/{build.gradle => build.gradle.kts} (72%)

diff --git a/WearTilesKotlin/app/build.gradle b/WearTilesKotlin/app/build.gradle
deleted file mode 100644
index fb81b6f42..000000000
--- a/WearTilesKotlin/app/build.gradle
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-plugins {
-    id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
-}
-
-android {
-    compileSdk 34
-
-    namespace "com.example.wear.tiles"
-
-    defaultConfig {
-        applicationId "com.example.wear.tiles"
-        minSdk 26
-        targetSdk 33
-        versionCode 1
-        versionName "1.0"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-        coreLibraryDesugaringEnabled true
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.majorVersion
-        freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
-        freeCompilerArgs += "-opt-in=com.google.android.horologist.annotations.ExperimentalHorologistApi"
-    }
-
-    buildFeatures {
-        compose true
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.compiler.get()
-    }
-}
-
-dependencies {
-    implementation libs.androidx.lifecycle.runtime.ktx
-    implementation libs.androidx.lifecycle.viewmodel.ktx
-    implementation libs.androidx.datastore
-
-    implementation libs.androidx.wear.tiles.material
-
-    implementation libs.coil
-    implementation libs.kotlinx.coroutines.android
-    implementation libs.kotlinx.coroutines.guava
-
-    implementation libs.horologist.compose.tools
-    implementation libs.horologist.tiles
-
-    implementation libs.androidx.wear.tooling.preview
-    implementation libs.compose.ui.tooling.preview
-
-    coreLibraryDesugaring libs.desugar.jdk.libs
-
-    debugImplementation libs.androidx.ui.tooling
-    debugImplementation libs.androidx.tiles.tooling.preview
-    debugImplementation libs.androidx.tiles.tooling
-}
diff --git a/WearTilesKotlin/app/build.gradle.kts b/WearTilesKotlin/app/build.gradle.kts
new file mode 100644
index 000000000..7da31a0bf
--- /dev/null
+++ b/WearTilesKotlin/app/build.gradle.kts
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+}
+
+android {
+    compileSdk = 34
+
+    namespace = "com.example.wear.tiles"
+
+    defaultConfig {
+        applicationId = "com.example.wear.tiles"
+        minSdk = 26
+        targetSdk = 33
+        versionCode = 1
+        versionName = "1.0"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+        isCoreLibraryDesugaringEnabled = true
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.majorVersion
+        freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
+        freeCompilerArgs += "-opt-in=com.google.android.horologist.annotations.ExperimentalHorologistApi"
+    }
+
+    buildFeatures {
+        compose = true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
+    }
+}
+
+dependencies {
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.lifecycle.viewmodel.ktx)
+    implementation(libs.androidx.datastore)
+
+    implementation(libs.androidx.wear.tiles.material)
+
+    implementation(libs.coil)
+    implementation(libs.kotlinx.coroutines.android)
+    implementation(libs.kotlinx.coroutines.guava)
+
+    implementation(libs.horologist.compose.tools)
+    implementation(libs.horologist.tiles)
+
+    implementation(libs.androidx.wear.tooling.preview)
+    implementation(libs.compose.ui.tooling.preview)
+
+    coreLibraryDesugaring(libs.desugar.jdk.libs)
+
+    debugImplementation(libs.androidx.ui.tooling)
+    debugImplementation(libs.androidx.tiles.tooling.preview)
+    debugImplementation(libs.androidx.tiles.tooling)
+}
diff --git a/WearTilesKotlin/app/proguard-rules.pro b/WearTilesKotlin/app/proguard-rules.pro
index 481bb4348..2f9dc5a47 100644
--- a/WearTilesKotlin/app/proguard-rules.pro
+++ b/WearTilesKotlin/app/proguard-rules.pro
@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
@@ -18,4 +18,4 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
+#-renamesourcefileattribute SourceFile
diff --git a/WearTilesKotlin/build.gradle b/WearTilesKotlin/build.gradle.kts
similarity index 72%
rename from WearTilesKotlin/build.gradle
rename to WearTilesKotlin/build.gradle.kts
index de553d7eb..401268e1d 100644
--- a/WearTilesKotlin/build.gradle
+++ b/WearTilesKotlin/build.gradle.kts
@@ -16,7 +16,7 @@
 
 buildscript {
     dependencies {
-        classpath libs.kotlin.gradle.plugin
+        classpath(libs.kotlin.gradle.plugin)
     }
 }
 
@@ -26,21 +26,21 @@ plugins {
 }
 
 subprojects {
-    apply plugin: "com.diffplug.spotless"
-    spotless {
+    apply(plugin = "com.diffplug.spotless")
+    configure<com.diffplug.gradle.spotless.SpotlessExtension> {
         kotlin {
-            target "**/*.kt"
+            target("**/*.kt")
             targetExclude("$buildDir/**/*.kt")
             targetExclude("bin/**/*.kt")
 
             ktlint(libs.versions.ktlint.get())
-            licenseHeaderFile rootProject.file("../spotless/copyright.kt")
+            licenseHeaderFile(rootProject.file("../spotless/copyright.kt"))
         }
         format("xml") {
-            target('**/*.xml')
-            targetExclude('**/build/**/*.xml')
+            target("**/*.xml")
+            targetExclude("**/build/**/*.xml")
             // Look for the first XML tag that isn't a comment (<!--) or the xml declaration (<?xml)
-            licenseHeaderFile(rootProject.file('../spotless/copyright.xml'), '(<[^!?])')
+            licenseHeaderFile(rootProject.file("../spotless/copyright.xml"), "(<[^!?])")
         }
     }
 }

From d381ceac854159a929dc5420679237c01ef130e0 Mon Sep 17 00:00:00 2001
From: Michael Stillwell <mjs@beebo.org>
Date: Thu, 18 Jul 2024 15:24:33 +0100
Subject: [PATCH 2/3] Bump lib versions and eliminate warnings

---
 .../com/example/wear/tiles/messaging/MessagingTileRenderer.kt | 2 +-
 WearTilesKotlin/build.gradle.kts                              | 1 +
 WearTilesKotlin/gradle/libs.versions.toml                     | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/WearTilesKotlin/app/src/main/java/com/example/wear/tiles/messaging/MessagingTileRenderer.kt b/WearTilesKotlin/app/src/main/java/com/example/wear/tiles/messaging/MessagingTileRenderer.kt
index 6012b8a20..aa08a074a 100644
--- a/WearTilesKotlin/app/src/main/java/com/example/wear/tiles/messaging/MessagingTileRenderer.kt
+++ b/WearTilesKotlin/app/src/main/java/com/example/wear/tiles/messaging/MessagingTileRenderer.kt
@@ -41,7 +41,7 @@ class MessagingTileRenderer(context: Context) :
     override fun Resources.Builder.produceRequestedResources(
         resourceState: Map<Contact, Bitmap>,
         deviceParameters: DeviceParametersBuilders.DeviceParameters,
-        resourceIds: MutableList<String>
+        resourceIds: List<String>
     ) {
         // If `resourceIds` is empty, it means all resources are being requested so we should add
         // the Search image resource in both of these cases.
diff --git a/WearTilesKotlin/build.gradle.kts b/WearTilesKotlin/build.gradle.kts
index 401268e1d..2c341fb80 100644
--- a/WearTilesKotlin/build.gradle.kts
+++ b/WearTilesKotlin/build.gradle.kts
@@ -30,6 +30,7 @@ subprojects {
     configure<com.diffplug.gradle.spotless.SpotlessExtension> {
         kotlin {
             target("**/*.kt")
+            val buildDir = layout.buildDirectory.get().asFile
             targetExclude("$buildDir/**/*.kt")
             targetExclude("bin/**/*.kt")
 
diff --git a/WearTilesKotlin/gradle/libs.versions.toml b/WearTilesKotlin/gradle/libs.versions.toml
index e3a913653..7480d6318 100644
--- a/WearTilesKotlin/gradle/libs.versions.toml
+++ b/WearTilesKotlin/gradle/libs.versions.toml
@@ -1,10 +1,10 @@
 [versions]
-android-gradle-plugin = "8.5.0"
+android-gradle-plugin = "8.5.1"
 androidx-wear-tiles = "1.4.0-beta01"
 androidx-wear-tooling-preview = "1.0.0"
 compose = "1.6.8"
 compose-compiler = "1.5.14"
-horologist = "0.5.27"
+horologist = "0.6.9"
 ktlint = "0.50.0"
 org-jetbrains-kotlin = "1.9.24"
 org-jetbrains-kotlinx = "1.8.1"

From e6632b10107d8583f9aa6f5b3b27b4766226f67a Mon Sep 17 00:00:00 2001
From: Michael Stillwell <mjs@beebo.org>
Date: Wed, 31 Jul 2024 13:28:50 +0100
Subject: [PATCH 3/3] Migrate to Jetpack Tile previews

---
 .../tiles/messaging/MessagingTileLayout.kt    | 138 ++++++++----------
 .../wear/tiles/tools/IconSizePreview.kt       |  26 ----
 .../wear/tiles/tools/WearPreviewDevices.kt    |  37 -----
 WearTilesKotlin/gradle/libs.versions.toml     |   2 +-
 4 files changed, 65 insertions(+), 138 deletions(-)
 delete mode 100644 WearTilesKotlin/app/src/main/java/com/example/wear/tiles/tools/IconSizePreview.kt
 delete mode 100644 WearTilesKotlin/app/src/main/java/com/example/wear/tiles/tools/WearPreviewDevices.kt

diff --git a/WearTilesKotlin/app/src/main/java/com/example/wear/tiles/messaging/MessagingTileLayout.kt b/WearTilesKotlin/app/src/main/java/com/example/wear/tiles/messaging/MessagingTileLayout.kt
index 176dfe637..f0f2bfb82 100644
--- a/WearTilesKotlin/app/src/main/java/com/example/wear/tiles/messaging/MessagingTileLayout.kt
+++ b/WearTilesKotlin/app/src/main/java/com/example/wear/tiles/messaging/MessagingTileLayout.kt
@@ -16,11 +16,9 @@
 package com.example.wear.tiles.messaging
 
 import android.content.Context
-import android.graphics.BitmapFactory
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
 import androidx.wear.protolayout.DeviceParametersBuilders
 import androidx.wear.protolayout.ModifiersBuilders
+import androidx.wear.protolayout.ResourceBuilders.Resources
 import androidx.wear.protolayout.material.Button
 import androidx.wear.protolayout.material.ButtonColors
 import androidx.wear.protolayout.material.ChipColors
@@ -33,23 +31,21 @@ import androidx.wear.tiles.tooling.preview.TilePreviewHelper
 import androidx.wear.tooling.preview.devices.WearDevices
 import com.example.wear.tiles.R
 import com.example.wear.tiles.golden.resources
-import com.example.wear.tiles.tools.IconSizePreview
 import com.example.wear.tiles.tools.emptyClickable
-import com.google.android.horologist.compose.tools.LayoutElementPreview
-import com.google.android.horologist.compose.tools.buildDeviceParameters
 import com.google.android.horologist.tiles.images.drawableResToImageResource
 
 /**
  * Layout definition for the Messaging Tile.
  *
- * By separating the layout completely, we can pass fake data for the [MessageTilePreview] so it can
- * be rendered in Android Studio (use the "Split" or "Design" editor modes).
+ * By separating the layout completely, we can pass fake data for the [messagingTilePreview] so it
+ * can be rendered in Android Studio (use the "Split" or "Design" editor modes).
  */
 internal fun messagingTileLayout(
     state: MessagingTileState,
     context: Context,
     deviceParameters: DeviceParametersBuilders.DeviceParameters
 ) = PrimaryLayout.Builder(deviceParameters)
+    .setResponsiveContentInsetEnabled(true)
     .setContent(
         MultiButtonLayout.Builder()
             .apply {
@@ -100,83 +96,77 @@ private fun searchLayout(
     .setButtonColors(ButtonColors.secondaryButtonColors(MessagingTileTheme.colors))
     .build()
 
-@Preview(device = WearDevices.SMALL_ROUND, fontScale = 1.24f)
-@Preview(device = WearDevices.LARGE_ROUND, fontScale = 0.94f)
-private fun MessageTilePreview(context: Context): TilePreviewData {
+@Preview(device = WearDevices.SMALL_ROUND)
+@Preview(device = WearDevices.LARGE_ROUND)
+private fun messagingTilePreview(context: Context): TilePreviewData {
     val state = MessagingTileState(MessagingRepo.knownContacts)
-    return TilePreviewData(onTileResourceRequest = resources {
-        addIdToImageMapping(
-            state.contacts[1].imageResourceId(),
-            bitmapToImageResource(
-                BitmapFactory.decodeResource(context.resources, R.drawable.ali)
+    return TilePreviewData(
+        onTileResourceRequest = resources {
+            addIdToImageMapping(
+                state.contacts[1].imageResourceId(),
+                drawableResToImageResource(R.drawable.ali)
             )
-        )
-        addIdToImageMapping(
-            state.contacts[2].imageResourceId(),
-            bitmapToImageResource(
-                BitmapFactory.decodeResource(context.resources, R.drawable.taylor)
+            addIdToImageMapping(
+                state.contacts[2].imageResourceId(),
+                drawableResToImageResource(R.drawable.taylor)
             )
-        )
-        addIdToImageMapping(
-            MessagingTileRenderer.ID_IC_SEARCH,
-            drawableResToImageResource(R.drawable.ic_search_24)
-        )
-    }) {
+            addIdToImageMapping(
+                MessagingTileRenderer.ID_IC_SEARCH,
+                drawableResToImageResource(R.drawable.ic_search_24)
+            )
+        },
+        onTileRequest = { request ->
+            TilePreviewHelper.singleTimelineEntryTileBuilder(
+                messagingTileLayout(
+                    state,
+                    context,
+                    request.deviceConfiguration
+                )
+            ).build()
+        })
+}
+
+@Preview
+private fun contactPreview(context: Context) = TilePreviewData(
+    onTileRequest = {
         TilePreviewHelper.singleTimelineEntryTileBuilder(
-            messagingTileLayout(
-                state,
-                context,
-                buildDeviceParameters(context.resources)
+            contactLayout(
+                context = context,
+                contact = MessagingRepo.knownContacts[0],
+                clickable = emptyClickable
             )
         ).build()
     }
-}
-
-@IconSizePreview
-@Composable
-private fun ContactPreview() {
-    LayoutElementPreview(
-        contactLayout(
-            context = LocalContext.current,
-            contact = MessagingRepo.knownContacts[0],
-            clickable = emptyClickable
-        )
-    )
-}
+)
 
-@IconSizePreview
-@Composable
-private fun ContactWithImagePreview() {
-    val context = LocalContext.current
+@Preview
+private fun contactWithImagePreview(context: Context): TilePreviewData {
     val contact = MessagingRepo.knownContacts[1]
-    val bitmap = BitmapFactory.decodeResource(context.resources, R.drawable.ali)
-
-    val layout = contactLayout(
-        context = context,
-        contact = contact,
-        clickable = emptyClickable
-    )
 
-    LayoutElementPreview(layout) {
-        addIdToImageMapping(
-            "${MessagingTileRenderer.ID_CONTACT_PREFIX}${contact.id}",
-            bitmapToImageResource(bitmap)
-        )
-    }
+    return TilePreviewData(
+        onTileResourceRequest = {
+            Resources.Builder().addIdToImageMapping(
+                "${MessagingTileRenderer.ID_CONTACT_PREFIX}${contact.id}",
+                drawableResToImageResource(R.drawable.ali)
+            ).build()
+        },
+        onTileRequest = {
+            TilePreviewHelper.singleTimelineEntryTileBuilder(
+                contactLayout(context = context, contact = contact, clickable = emptyClickable)
+            ).build()
+        })
 }
 
-@IconSizePreview
-@Composable
-private fun SearchButtonPreview() {
-    LayoutElementPreview(
-        searchLayout(
-            context = LocalContext.current,
-            clickable = emptyClickable
-        )
-    ) {
-        addIdToImageMapping(
+@Preview
+private fun searchButtonPreview(context: Context) = TilePreviewData(
+    onTileResourceRequest = {
+        Resources.Builder().addIdToImageMapping(
             MessagingTileRenderer.ID_IC_SEARCH,
             drawableResToImageResource(R.drawable.ic_search_24)
-        )
-    }
-}
+        ).build()
+    },
+    onTileRequest = {
+        TilePreviewHelper.singleTimelineEntryTileBuilder(
+            searchLayout(context, emptyClickable)
+        ).build()
+    })
diff --git a/WearTilesKotlin/app/src/main/java/com/example/wear/tiles/tools/IconSizePreview.kt b/WearTilesKotlin/app/src/main/java/com/example/wear/tiles/tools/IconSizePreview.kt
deleted file mode 100644
index 146a7c1ac..000000000
--- a/WearTilesKotlin/app/src/main/java/com/example/wear/tiles/tools/IconSizePreview.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.example.wear.tiles.tools
-
-import androidx.compose.ui.tooling.preview.Preview
-
-@Preview(
-    backgroundColor = 0xff000000,
-    showBackground = true,
-    widthDp = 100,
-    heightDp = 100
-)
-public annotation class IconSizePreview
diff --git a/WearTilesKotlin/app/src/main/java/com/example/wear/tiles/tools/WearPreviewDevices.kt b/WearTilesKotlin/app/src/main/java/com/example/wear/tiles/tools/WearPreviewDevices.kt
deleted file mode 100644
index fed7423bb..000000000
--- a/WearTilesKotlin/app/src/main/java/com/example/wear/tiles/tools/WearPreviewDevices.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.example.wear.tiles.tools
-
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.wear.tooling.preview.devices.WearDevices
-
-@Preview(
-    device = WearDevices.SMALL_ROUND,
-    showSystemUi = true,
-    backgroundColor = 0xff000000,
-    showBackground = true,
-    group = "Devices - Small Round"
-)
-public annotation class WearSmallRoundDevicePreview
-
-@Preview(
-    device = WearDevices.LARGE_ROUND,
-    showSystemUi = true,
-    backgroundColor = 0xff000000,
-    showBackground = true,
-    group = "Devices - Large Round"
-)
-public annotation class WearLargeRoundDevicePreview
diff --git a/WearTilesKotlin/gradle/libs.versions.toml b/WearTilesKotlin/gradle/libs.versions.toml
index 7480d6318..2181be71f 100644
--- a/WearTilesKotlin/gradle/libs.versions.toml
+++ b/WearTilesKotlin/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 android-gradle-plugin = "8.5.1"
-androidx-wear-tiles = "1.4.0-beta01"
+androidx-wear-tiles = "1.4.0-rc01"
 androidx-wear-tooling-preview = "1.0.0"
 compose = "1.6.8"
 compose-compiler = "1.5.14"