From cba2e428fc5741ee4a4554151e9e9d0670039d32 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 19 Sep 2020 19:38:14 +0200 Subject: [PATCH] fix #15, finish selection mode at swiping from player to recorder --- .../simplemobiletools/voicerecorder/activities/MainActivity.kt | 1 + .../voicerecorder/adapters/ViewPagerAdapter.kt | 3 +++ .../voicerecorder/fragments/PlayerFragment.kt | 2 ++ 3 files changed, 6 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/activities/MainActivity.kt index 0308072..0534af0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/activities/MainActivity.kt @@ -88,6 +88,7 @@ class MainActivity : SimpleActivity() { view_pager.adapter = ViewPagerAdapter(this) view_pager.onPageChangeListener { main_tabs_holder.getTabAt(it)?.select() + (view_pager.adapter as ViewPagerAdapter).finishActMode() } view_pager.currentItem = config.lastUsedViewPagerPage diff --git a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/adapters/ViewPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/adapters/ViewPagerAdapter.kt index ef628e2..1354777 100644 --- a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/adapters/ViewPagerAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/adapters/ViewPagerAdapter.kt @@ -7,6 +7,7 @@ import androidx.viewpager.widget.PagerAdapter import com.simplemobiletools.voicerecorder.R import com.simplemobiletools.voicerecorder.activities.SimpleActivity import com.simplemobiletools.voicerecorder.fragments.MyViewPagerFragment +import com.simplemobiletools.voicerecorder.fragments.PlayerFragment class ViewPagerAdapter(private val activity: SimpleActivity) : PagerAdapter() { private val mFragments = SparseArray() @@ -40,4 +41,6 @@ class ViewPagerAdapter(private val activity: SimpleActivity) : PagerAdapter() { mFragments[i].onDestroy() } } + + fun finishActMode() = (mFragments[1] as? PlayerFragment)?.finishActMode() } diff --git a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/fragments/PlayerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/fragments/PlayerFragment.kt index 6c91339..584212e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/fragments/PlayerFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/fragments/PlayerFragment.kt @@ -394,6 +394,8 @@ class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPager play_pause_btn.setImageDrawable(getToggleButtonIcon(false)) } + fun finishActMode() = getRecordingsAdapter()?.finishActMode() + @Subscribe(threadMode = ThreadMode.MAIN) fun recordingCompleted(event: Events.RecordingCompleted) { refreshRecordings()