Skip to content

Commit 5d7ce13

Browse files
committed
ui: use commit extension from fragment-ktx
Signed-off-by: Harsh Shandilya <[email protected]>
1 parent ddb6c87 commit 5d7ce13

File tree

3 files changed

+19
-16
lines changed

3 files changed

+19
-16
lines changed

ui/src/main/java/com/wireguard/android/activity/MainActivity.kt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import android.view.View
1212
import androidx.appcompat.app.ActionBar
1313
import androidx.fragment.app.FragmentManager
1414
import androidx.fragment.app.FragmentTransaction
15+
import androidx.fragment.app.commit
1516
import com.wireguard.android.R
1617
import com.wireguard.android.fragment.TunnelDetailFragment
1718
import com.wireguard.android.fragment.TunnelEditorFragment
@@ -72,11 +73,11 @@ class MainActivity : BaseActivity(), FragmentManager.OnBackStackChangedListener
7273
true
7374
}
7475
R.id.menu_action_edit -> {
75-
supportFragmentManager.beginTransaction()
76-
.replace(R.id.detail_container, TunnelEditorFragment())
77-
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
78-
.addToBackStack(null)
79-
.commit()
76+
supportFragmentManager.commit {
77+
replace(R.id.detail_container, TunnelEditorFragment())
78+
setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
79+
addToBackStack(null)
80+
}
8081
true
8182
}
8283
// This menu item is handled by the editor fragment.
@@ -104,11 +105,11 @@ class MainActivity : BaseActivity(), FragmentManager.OnBackStackChangedListener
104105
fragmentManager.popBackStackImmediate()
105106
} else if (backStackEntries == 0) {
106107
// Create and show a new detail fragment.
107-
fragmentManager.beginTransaction()
108-
.add(R.id.detail_container, TunnelDetailFragment())
109-
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
110-
.addToBackStack(null)
111-
.commit()
108+
fragmentManager.commit {
109+
add(R.id.detail_container, TunnelDetailFragment())
110+
setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
111+
addToBackStack(null)
112+
}
112113
}
113114
}
114115
}

ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import android.content.Intent
88
import android.os.Build
99
import android.os.Bundle
1010
import android.view.MenuItem
11+
import androidx.fragment.app.commit
1112
import androidx.lifecycle.lifecycleScope
1213
import androidx.preference.Preference
1314
import androidx.preference.PreferenceFragmentCompat
@@ -28,9 +29,9 @@ class SettingsActivity : ThemeChangeAwareActivity() {
2829
override fun onCreate(savedInstanceState: Bundle?) {
2930
super.onCreate(savedInstanceState)
3031
if (supportFragmentManager.findFragmentById(android.R.id.content) == null) {
31-
supportFragmentManager.beginTransaction()
32-
.add(android.R.id.content, SettingsFragment())
33-
.commit()
32+
supportFragmentManager.commit {
33+
add(android.R.id.content, SettingsFragment())
34+
}
3435
}
3536
}
3637

ui/src/main/java/com/wireguard/android/activity/TunnelCreatorActivity.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package com.wireguard.android.activity
66

77
import android.os.Bundle
8+
import androidx.fragment.app.commit
89
import com.wireguard.android.fragment.TunnelEditorFragment
910
import com.wireguard.android.model.ObservableTunnel
1011

@@ -15,9 +16,9 @@ class TunnelCreatorActivity : BaseActivity() {
1516
override fun onCreate(savedInstanceState: Bundle?) {
1617
super.onCreate(savedInstanceState)
1718
if (supportFragmentManager.findFragmentById(android.R.id.content) == null) {
18-
supportFragmentManager.beginTransaction()
19-
.add(android.R.id.content, TunnelEditorFragment())
20-
.commit()
19+
supportFragmentManager.commit {
20+
add(android.R.id.content, TunnelEditorFragment())
21+
}
2122
}
2223
}
2324

0 commit comments

Comments
 (0)