jrpie/launcher
1
0
Fork 0
mirror of https://github.com/jrpie/Launcher.git synced 2025-04-24 21:00:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix #130 - revert part of 9043461 as ViewPager2 causes an issue with opening the keyboard

Browse source
This commit is contained in:
Josia Pietsch 2025-03-20 14:08:21 +01:00
parent 0baa889de5
commit 58ddd3c8cc
Signed by: jrpie
GPG key ID: E70B571D66986A2D
2 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/src/main/java/de/jrpie/android/launcher/ui/list/ListActivity.kt
View file

@ -9,8 +9,7 @@ import android.window.OnBackInvokedDispatcher
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.content.res.AppCompatResources
import androidx.fragment.app.Fragment
import androidx.viewpager2.adapter.FragmentStateAdapter
import com.google.android.material.tabs.TabLayoutMediator
import androidx.fragment.app.FragmentPagerAdapter
import de.jrpie.android.launcher.Application
import de.jrpie.android.launcher.R
import de.jrpie.android.launcher.actions.LauncherAction
@ -225,13 +224,10 @@ class ListActivity : AppCompatActivity(), UIObject {
updateTitle()
val sectionsPagerAdapter = ListSectionsPagerAdapter(this)
binding.listViewpager.apply {
adapter = sectionsPagerAdapter
currentItem = 0
binding.listViewpager.let {
it.adapter = sectionsPagerAdapter
binding.listTabs.setupWithViewPager(it)
}
TabLayoutMediator(binding.listTabs, binding.listViewpager) { tab, position ->
tab.text = sectionsPagerAdapter.getPageTitle(position)
}.attach()
}
}
@ -243,11 +239,17 @@ private val TAB_TITLES = arrayOf(
/**
* The [ListSectionsPagerAdapter] returns the fragment,
* which corresponds to the selected tab in [ListActivity].
*
* This should eventually be replaced by a [FragmentStateAdapter]
* However this keyboard does not open when using [ViewPager2]
* so currently [ViewPager] is used here.
* https://github.com/jrpie/launcher/issues/130
*/
@Suppress("deprecation")
class ListSectionsPagerAdapter(private val activity: ListActivity) :
FragmentStateAdapter(activity) {
FragmentPagerAdapter(activity.supportFragmentManager) {
override fun createFragment(position: Int): Fragment {
override fun getItem(position: Int): Fragment {
return when (position) {
0 -> ListFragmentApps()
1 -> ListFragmentOther()
@ -255,11 +257,11 @@ class ListSectionsPagerAdapter(private val activity: ListActivity) :
}
}
fun getPageTitle(position: Int): CharSequence {
override fun getPageTitle(position: Int): CharSequence {
return activity.resources.getString(TAB_TITLES[position])
}
override fun getItemCount(): Int {
override fun getCount(): Int {
return when (activity.intention) {
ListActivity.ListActivityIntention.VIEW -> 1
else -> 2

7
app/src/main/res/layout/list.xml
View file

@ -95,7 +95,12 @@
</com.google.android.material.appbar.AppBarLayout>
<androidx.viewpager2.widget.ViewPager2
<!--
Should be replaced by androidx.viewpager2.widget.ViewPager2
but there is an issue with opening the keyboard:
https://github.com/jrpie/launcher/issues/130
-->
<androidx.viewpager.widget.ViewPager
android:id="@+id/list_viewpager"
android:layout_width="0dp"
android:layout_height="0dp"