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/activity | |
| 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 '')
| -rw-r--r-- | ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt | 6 | ||||
| -rw-r--r-- | ui/src/main/java/com/wireguard/android/activity/MainActivity.kt | 12 |
2 files changed, 0 insertions, 18 deletions
diff --git a/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt b/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt index 84cc6c7c..eeabe4d1 100644 --- a/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt +++ b/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt @@ -39,9 +39,6 @@ import com.wireguard.android.R import com.wireguard.android.databinding.LogViewerActivityBinding import com.wireguard.android.util.DownloadsFileSaver 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.crypto.KeyPair import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -97,9 +94,6 @@ class LogViewerActivity : AppCompatActivity() { binding = LogViewerActivityBinding.inflate(layoutInflater) setContentView(binding.root) supportActionBar?.setDisplayHomeAsUpEnabled(true) - setUpFAB(binding.shareFab) - setUpRoot(binding.root) - setUpScrollingContent(binding.recyclerView, binding.shareFab) logAdapter = LogEntryAdapter() binding.recyclerView.apply { recyclerView = this diff --git a/ui/src/main/java/com/wireguard/android/activity/MainActivity.kt b/ui/src/main/java/com/wireguard/android/activity/MainActivity.kt index f567e763..336cda84 100644 --- a/ui/src/main/java/com/wireguard/android/activity/MainActivity.kt +++ b/ui/src/main/java/com/wireguard/android/activity/MainActivity.kt @@ -10,8 +10,6 @@ import android.view.Menu import android.view.MenuItem import android.view.View import androidx.appcompat.app.ActionBar -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentTransaction import com.wireguard.android.R @@ -59,16 +57,6 @@ class MainActivity : BaseActivity(), FragmentManager.OnBackStackChangedListener isTwoPaneLayout = findViewById<View?>(R.id.master_detail_wrapper) != null supportFragmentManager.addOnBackStackChangedListener(this) onBackStackChanged() - // Dispatch insets on back stack change - // This is required to ensure replaced fragments are also able to consume insets - findViewById<View>(R.id.main_activity_container).setOnApplyWindowInsetsListener { _, insets -> - supportFragmentManager.addOnBackStackChangedListener { - supportFragmentManager.fragments.forEach { - ViewCompat.dispatchApplyWindowInsets(it.requireView(), WindowInsetsCompat.toWindowInsetsCompat(insets)) - } - } - insets - } } override fun onCreateOptionsMenu(menu: Menu): Boolean { |