Skip to content

Commit aeb88ac

Browse files
authored
Merge pull request #124 from Hamza417/ui_migration
Update panel switcher dialog
2 parents 6a4149c + 7ec9239 commit aeb88ac

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

app/src/main/java/app/simple/positional/activities/main/MainActivity.kt

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@ import app.simple.positional.R
2222
import app.simple.positional.adapters.bottombar.BottomBarAdapter
2323
import app.simple.positional.adapters.bottombar.BottomBarItems
2424
import app.simple.positional.callbacks.BottomSheetSlide
25+
import app.simple.positional.callbacks.PanelsCallback
2526
import app.simple.positional.callbacks.PermissionCallbacks
2627
import app.simple.positional.decorations.corners.DynamicCornerLinearLayout
2728
import app.simple.positional.decorations.popup.PopupLinearLayout
2829
import app.simple.positional.decorations.ripple.DynamicRippleTextView
2930
import app.simple.positional.decorations.transformers.DepthTransformer
31+
import app.simple.positional.dialogs.app.Panels.Companion.showPanelsDialog
3032
import app.simple.positional.extensions.activity.BaseActivity
31-
import app.simple.positional.popups.miscellaneous.PopupFragments
3233
import app.simple.positional.preferences.BottomBarPreferences
3334
import app.simple.positional.preferences.FragmentPreferences
3435
import app.simple.positional.preferences.MainPreferences
@@ -75,26 +76,25 @@ class MainActivity : BaseActivity(),
7576
label = findViewById(R.id.label)
7677

7778
bottomBarAdapter = BottomBarAdapter(BottomBarItems.getBottomBarItems(baseContext)) {
78-
PopupFragments(bottomBarContainer) { _, tag, position ->
79-
bottomBar.setCurrentItem(position, true)
80-
openFragment(tag)
81-
FragmentPreferences.setCurrentPage(position)
82-
FragmentPreferences.setCurrentTag(tag)
83-
}.setOnDismissListener {
84-
bottomBarContainer.animate()
85-
.alpha(1f)
86-
.setInterpolator(DecelerateInterpolator())
87-
.setDuration(500)
88-
.start()
89-
}
90-
91-
// // They didn't like it :(
92-
// supportFragmentManager.showPanelsDialog(PanelsCallback { _, string, position ->
79+
// PopupFragments(bottomBarContainer) { _, tag, position ->
9380
// bottomBar.setCurrentItem(position, true)
94-
// openFragment(string!!)
81+
// openFragment(tag)
9582
// FragmentPreferences.setCurrentPage(position)
96-
// FragmentPreferences.setCurrentTag(string)
97-
// })
83+
// FragmentPreferences.setCurrentTag(tag)
84+
// }.setOnDismissListener {
85+
// bottomBarContainer.animate()
86+
// .alpha(1f)
87+
// .setInterpolator(DecelerateInterpolator())
88+
// .setDuration(500)
89+
// .start()
90+
// }
91+
92+
supportFragmentManager.showPanelsDialog(PanelsCallback { _, string, position ->
93+
bottomBar.setCurrentItem(position, true)
94+
openFragment(string!!)
95+
FragmentPreferences.setCurrentPage(position)
96+
FragmentPreferences.setCurrentTag(string)
97+
})
9898
}
9999

100100
label.setOnClickListener {

0 commit comments

Comments
 (0)