frank/wirevpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

MainActivity: don't reuse id names across layouts

Browse Source 
This causes problems on foldables.

Reported-by: Josh Dague <josh3736@gmail.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld
2025-05-19 17:57:39 +02:00
parent 0ea6cee192
commit 2c223fb68c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/src/main/java/com/wireguard/android/activity/MainActivity.kt
+2 -2
View File
@@ -80,7 +80,7 @@ class MainActivity : BaseActivity(), FragmentManager.OnBackStackChangedListener
R.id.menu_action_edit -> { R.id.menu_action_edit -> {
supportFragmentManager.commit { supportFragmentManager.commit {
replace(R.id.detail_container, TunnelEditorFragment()) replace(if (isTwoPaneLayout) R.id.detail_container else R.id.list_detail_container, TunnelEditorFragment())
setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE) setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
addToBackStack(null) addToBackStack(null)
} }
@@ -119,7 +119,7 @@ class MainActivity : BaseActivity(), FragmentManager.OnBackStackChangedListener
} else if (backStackEntries == 0) { } else if (backStackEntries == 0) {
// Create and show a new detail fragment. // Create and show a new detail fragment.
fragmentManager.commit { fragmentManager.commit {
add(R.id.detail_container, TunnelDetailFragment()) add(if (isTwoPaneLayout) R.id.detail_container else R.id.list_detail_container, TunnelDetailFragment())
setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE) setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
addToBackStack(null) addToBackStack(null)
} }
ui/src/main/res/layout/main_activity.xml
+1 -1
View File
@@ -11,7 +11,7 @@
tools:context=".activity.MainActivity"> tools:context=".activity.MainActivity">
<androidx.fragment.app.FragmentContainerView <androidx.fragment.app.FragmentContainerView
android:id="@+id/detail_container" android:id="@+id/list_detail_container"
android:name="com.wireguard.android.fragment.TunnelListFragment" android:name="com.wireguard.android.fragment.TunnelListFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"