Set Android View ID on TreehouseLayout by default (#1533)

* Set Android View ID on `TreehouseLayout` by default If one doesn't explicitly set an Android View ID, `onSaveInstanceState` is never invoked, and thus `rememberSaveable` will never work as intended. * Define ID in resources --------- Co-authored-by: Jake Wharton <[email protected]>
cashapp · Sep 30, 2023 · 57f78b9 · 57f78b9
1 parent 68b5332
commit 57f78b9
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
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
@@ -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(
@@ -57,6 +58,11 @@ public class TreehouseLayout(
 
   override var saveCallback: TreehouseView.SaveCallback? = null
 
+  init {
+    // The view needs to have an ID to participate in instance state saving.
+    id = R.id.treehouse_layout
+  }
+
   override fun onAttachedToWindow() {
     super.onAttachedToWindow()
     readyForContent = true

diff --git a/redwood-treehouse-host/src/androidMain/res/values/ids.xml 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>
diff --git a/...iews/src/main/kotlin/com/example/redwood/emojisearch/android/views/EmojiSearchActivity.kt b/...iews/src/main/kotlin/com/example/redwood/emojisearch/android/views/EmojiSearchActivity.kt
@@ -75,8 +75,6 @@ class EmojiSearchActivity : ComponentActivity() {
     }
 
     treehouseLayout = TreehouseLayout(this, widgetSystem, onBackPressedDispatcher).apply {
-      // The view needs to have an id for Android to populate saved data back
-      this.id = 9000
       treehouseContentSource.bindWhenReady(this, treehouseApp)
     }
     setContentView(treehouseLayout)