diff options
author | Harsh Shandilya <me@msfjarvis.dev> | 2020-09-17 23:09:05 +0530 |
---|---|---|
committer | Harsh Shandilya <me@msfjarvis.dev> | 2020-09-17 23:09:05 +0530 |
commit | 4bee579e48aa1bc9ff74b8f088131ebf91dd216a (patch) | |
tree | ccd837871d00a2ef53fa0d502ca70a1ad0d09b59 /ui/src/main/java/com/wireguard/android/fragment | |
parent | ui: replace deprecated onActivityCreated with onViewCreated (diff) | |
download | wireguard-android-4bee579e48aa1bc9ff74b8f088131ebf91dd216a.tar.xz wireguard-android-4bee579e48aa1bc9ff74b8f088131ebf91dd216a.zip |
ui: retire EdgeToEdge
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'ui/src/main/java/com/wireguard/android/fragment')
3 files changed, 1 insertions, 17 deletions
diff --git a/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt index 75627665..21f0be5d 100644 --- a/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt +++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt @@ -17,8 +17,6 @@ import com.wireguard.android.backend.Tunnel import com.wireguard.android.databinding.TunnelDetailFragmentBinding import com.wireguard.android.databinding.TunnelDetailPeerBinding import com.wireguard.android.model.ObservableTunnel -import com.wireguard.android.widget.EdgeToEdge.setUpRoot -import com.wireguard.android.widget.EdgeToEdge.setUpScrollingContent import kotlinx.coroutines.launch import java.util.Timer import java.util.TimerTask @@ -55,11 +53,7 @@ class TunnelDetailFragment : BaseFragment() { savedInstanceState: Bundle?): View? { super.onCreateView(inflater, container, savedInstanceState) binding = TunnelDetailFragmentBinding.inflate(inflater, container, false) - binding?.apply { - executePendingBindings() - setUpRoot(root as ViewGroup) - setUpScrollingContent(root as ViewGroup, null) - } + binding?.executePendingBindings() return binding!!.root } diff --git a/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt index f26862ac..26349211 100644 --- a/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt +++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt @@ -29,8 +29,6 @@ import com.wireguard.android.util.AdminKnobs import com.wireguard.android.util.BiometricAuthenticator import com.wireguard.android.util.ErrorMessages import com.wireguard.android.viewmodel.ConfigProxy -import com.wireguard.android.widget.EdgeToEdge.setUpRoot -import com.wireguard.android.widget.EdgeToEdge.setUpScrollingContent import com.wireguard.config.Config import kotlinx.coroutines.launch @@ -77,8 +75,6 @@ class TunnelEditorFragment : BaseFragment() { binding = TunnelEditorFragmentBinding.inflate(inflater, container, false) binding?.apply { executePendingBindings() - setUpRoot(root as ViewGroup) - setUpScrollingContent(mainContainer, null) privateKeyTextLayout.setEndIconOnClickListener { config?.`interface`?.generateKeyPair() } } return binding?.root diff --git a/ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt index 29b667b0..11ebc4d6 100644 --- a/ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt +++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt @@ -32,9 +32,6 @@ import com.wireguard.android.databinding.TunnelListItemBinding import com.wireguard.android.fragment.ConfigNamingDialogFragment.Companion.newInstance import com.wireguard.android.model.ObservableTunnel import com.wireguard.android.util.ErrorMessages -import com.wireguard.android.widget.EdgeToEdge.setUpFAB -import com.wireguard.android.widget.EdgeToEdge.setUpRoot -import com.wireguard.android.widget.EdgeToEdge.setUpScrollingContent import com.wireguard.android.widget.MultiselectableRelativeLayout import com.wireguard.config.Config import kotlinx.coroutines.Deferred @@ -209,9 +206,6 @@ class TunnelListFragment : BaseFragment() { bottomSheet.show(childFragmentManager, "BOTTOM_SHEET") } executePendingBindings() - setUpRoot(root as ViewGroup) - setUpFAB(createFab) - setUpScrollingContent(tunnelList, createFab) } return binding!!.root } |