Adapted PlanFragment into a superclass inherited by GeneralPlanFragment and PersonalPlanFragment, changed text layout attribute for dialogues

This commit is contained in:
Deniz Düzgören
2019-07-22 19:10:25 +02:00
parent d3d727d2ae
commit 0576ca0d1a
14 changed files with 112 additions and 103 deletions
@@ -244,11 +244,11 @@ class Main : AppCompatActivity(R.layout.activity_main) {
}
lateinit var fragment: Fragment
if (prefs.getBoolean("defaultPersonalised", false)) {
fragment = mPlanFragment(true)
fragment = PersonalPlanFragment()
bottomNav.selectedItemId = R.id.personal
toolbarTxt.text = userPlan
} else {
fragment = mPlanFragment(false)
fragment = GeneralPlanFragment()
bottomNav.selectedItemId = R.id.plan
toolbarTxt.text = getString(R.string.app_name)
}
@@ -259,11 +259,11 @@ class Main : AppCompatActivity(R.layout.activity_main) {
lateinit var fragment: Fragment
when (item.itemId) {
R.id.plan -> {
fragment = mPlanFragment(false)
fragment = GeneralPlanFragment()
toolbarTxt.text = getString(R.string.app_name)
}
R.id.personal -> {
fragment = mPlanFragment(true)
fragment = PersonalPlanFragment()
toolbarTxt.text = userPlan
}
R.id.menu -> {
@@ -327,14 +327,6 @@ class Main : AppCompatActivity(R.layout.activity_main) {
}
}
private fun mPlanFragment(ispersonal: Boolean): PlanFragment {
val f = PlanFragment()
val bdl = Bundle(1)
bdl.putBoolean("ispersonal", ispersonal)
f.arguments = bdl
return f
}
private fun loadFragment(fragment: Fragment): Boolean {
supportFragmentManager.beginTransaction().replace(R.id.fragment_container, fragment).commit()
return true