Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set Android View ID on TreehouseLayout by default #1533

Merged
merged 3 commits into from
Sep 30, 2023
Merged

Set Android View ID on TreehouseLayout by default #1533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ec4832
Set Android View ID on `TreehouseLayout` by default
veyndan Sep 28, 2023
570e085
Define ID in resources
JakeWharton Sep 29, 2023
4a9f7fb
Merge branch 'trunk' into veyndan/2023-09-28/TreehouseLayoutId
JakeWharton Sep 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions redwood-treehouse-host/src/androidMain/kotlin/app/cash/redwood/treehouse/TreehouseLayout.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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
Expand Down
18 changes: 18 additions & 0 deletions redwood-treehouse-host/src/androidMain/res/values/ids.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 0 additions & 2 deletions ...iews/src/main/kotlin/com/example/redwood/emojisearch/android/views/EmojiSearchActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down