Commit 2ef15b0b authored by Mygod's avatar Mygod

Fix R8 shrinking

parent 096a8ba0
......@@ -39,7 +39,6 @@ import androidx.core.net.toUri
import androidx.core.view.GravityCompat
import androidx.core.view.updateLayoutParams
import androidx.drawerlayout.widget.DrawerLayout
import androidx.fragment.app.replace
import androidx.preference.PreferenceDataStore
import com.crashlytics.android.Crashlytics
import com.github.shadowsocks.acl.CustomRulesFragment
......@@ -168,7 +167,7 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Callback, OnPref
navigation.setNavigationItemSelectedListener(this)
if (savedInstanceState == null) {
navigation.menu.findItem(R.id.profiles).isChecked = true
displayFragment<ProfilesFragment>()
displayFragment(ProfilesFragment())
}
fab = findViewById(R.id.fab)
......@@ -195,8 +194,8 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Callback, OnPref
}
}
private inline fun <reified F : ToolbarFragment> displayFragment() {
supportFragmentManager.beginTransaction().replace<F>(R.id.fragment_holder).commitAllowingStateLoss()
private fun displayFragment(fragment: ToolbarFragment) {
supportFragmentManager.beginTransaction().replace(R.id.fragment_holder, fragment).commitAllowingStateLoss()
drawer.closeDrawers()
}
......@@ -204,20 +203,20 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Callback, OnPref
if (item.isChecked) drawer.closeDrawers() else {
when (item.itemId) {
R.id.profiles -> {
displayFragment<ProfilesFragment>()
displayFragment(ProfilesFragment())
connection.bandwidthTimeout = connection.bandwidthTimeout // request stats update
}
R.id.globalSettings -> displayFragment<GlobalSettingsFragment>()
R.id.globalSettings -> displayFragment(GlobalSettingsFragment())
R.id.about -> {
Core.analytics.logEvent("about", Bundle())
displayFragment<AboutFragment>()
displayFragment(AboutFragment())
}
R.id.faq -> {
launchUrl(getString(R.string.faq_url))
return true
}
R.id.customRules -> displayFragment<CustomRulesFragment>()
R.id.subscriptions -> displayFragment<SubscriptionFragment>()
R.id.customRules -> displayFragment(CustomRulesFragment())
R.id.subscriptions -> displayFragment(SubscriptionFragment())
else -> return false
}
item.isChecked = true
......@@ -236,7 +235,7 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Callback, OnPref
if (!currentFragment.onBackPressed()) {
if (currentFragment is ProfilesFragment) super.onBackPressed() else {
navigation.menu.findItem(R.id.profiles).isChecked = true
displayFragment<ProfilesFragment>()
displayFragment(ProfilesFragment())
}
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment