From 570e085d8e842e833d8ab7f7698dbabea35edc06 Mon Sep 17 00:00:00 2001
From: Jake Wharton <jw@squareup.com>
Date: Fri, 29 Sep 2023 19:41:17 -0400
Subject: [PATCH] Define ID in resources

---
 .../cash/redwood/treehouse/TreehouseLayout.kt  |  6 +++---
 .../src/androidMain/res/values/ids.xml         | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 redwood-treehouse-host/src/androidMain/res/values/ids.xml

diff --git a/redwood-treehouse-host/src/androidMain/kotlin/app/cash/redwood/treehouse/TreehouseLayout.kt b/redwood-treehouse-host/src/androidMain/kotlin/app/cash/redwood/treehouse/TreehouseLayout.kt
index 25e7a30da5..272ac269c9 100644
--- a/redwood-treehouse-host/src/androidMain/kotlin/app/cash/redwood/treehouse/TreehouseLayout.kt
+++ b/redwood-treehouse-host/src/androidMain/kotlin/app/cash/redwood/treehouse/TreehouseLayout.kt
@@ -25,6 +25,7 @@ import androidx.activity.OnBackPressedDispatcher as AndroidOnBackPressedDispatch
 import app.cash.redwood.treehouse.TreehouseView.ReadyForContentChangeListener
 import app.cash.redwood.treehouse.TreehouseView.WidgetSystem
 import app.cash.redwood.widget.RedwoodLayout
+import app.cash.treehouse.host.R
 import java.util.UUID
 
 @Deprecated(
@@ -58,9 +59,8 @@ public class TreehouseLayout(
   override var saveCallback: TreehouseView.SaveCallback? = null
 
   init {
-    // The view needs to have an id for Android to populate saved data back
-    @SuppressLint("ResourceType")
-    id = 9000
+    // The view needs to have an ID to participate in instance state saving.
+    id = R.id.treehouse_layout
   }
 
   override fun onAttachedToWindow() {
diff --git a/redwood-treehouse-host/src/androidMain/res/values/ids.xml b/redwood-treehouse-host/src/androidMain/res/values/ids.xml
new file mode 100644
index 0000000000..677db48916
--- /dev/null
+++ b/redwood-treehouse-host/src/androidMain/res/values/ids.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (C) 2023 Square, Inc.
+  ~
+  ~ 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
+  ~
+  ~      http://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.
+  -->
+<resources>
+  <item type="id" name="treehouse_layout"/>
+</resources>