Migrate to ViewPager2 and as Activity

This commit is contained in:
J-Jamet committed 2021-02-25 18:54:42 +01:00
1 parent b609ed3ad4
commit 2a2f8dcecd
16 files changed
+295 -167

No files matched your search

+2 -1
View File
@@ -114,13 +114,14 @@ dependencies {
implementation 'androidx.preference:preference-ktx:1.1.1'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01'
implementation 'androidx.documentfile:documentfile:1.0.1'
implementation 'androidx.biometric:biometric:1.1.0-rc01'
// Lifecycle - LiveData - ViewModel - Coroutines
implementation "androidx.core:core-ktx:1.3.2"
implementation 'androidx.fragment:fragment-ktx:1.2.5'
// WARNING: To upgrade with style, bug in edit text
implementation 'com.google.android.material:material:1.0.0'
implementation 'com.google.android.material:material:1.1.0'
// Database
implementation "androidx.room:room-runtime:$room_version"
kapt "androidx.room:room-compiler:$room_version"
+3
View File
@@ -129,6 +129,9 @@
<activity
android:name="com.kunzisoft.keepass.activities.EntryActivity"
android:configChanges="keyboardHidden" />
<activity
android:name="com.kunzisoft.keepass.activities.IconPickerActivity"
android:configChanges="keyboardHidden" />
<activity
android:name="com.kunzisoft.keepass.activities.ImageViewerActivity"
android:configChanges="keyboardHidden" />
@@ -78,7 +78,6 @@ import java.util.*
import kotlin.collections.ArrayList
class EntryEditActivity : LockingActivity(),
IconPickerDialogFragment.IconPickerListener,
EntryCustomFieldDialogFragment.EntryCustomFieldListener,
GeneratePasswordDialogFragment.GeneratePasswordListener,
SetOTPDialogFragment.CreateOtpListener,
@@ -224,7 +223,7 @@ class EntryEditActivity : LockingActivity(),
}
// Add listener to the icon
setOnIconViewClickListener = View.OnClickListener {
IconPickerDialogFragment.launch(this@EntryEditActivity)
IconPickerActivity.launch(this@EntryEditActivity)
}
setOnRemoveAttachment = { attachment ->
mAttachmentFileBinderManager?.removeBinaryAttachment(attachment)
@@ -501,6 +500,10 @@ class EntryEditActivity : LockingActivity(),
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
IconPickerActivity.onActivityResult(requestCode, resultCode, data) { icon ->
entryEditFragment?.icon = icon
}
mSelectFileHelper?.onActivityResultCallback(requestCode, resultCode, data) { uri ->
uri?.let { attachmentToUploadUri ->
// TODO Async to get the name
@@ -715,10 +718,6 @@ class EntryEditActivity : LockingActivity(),
}
}
override fun iconPicked(icon: IconImage) {
entryEditFragment?.icon = icon
}
override fun onDateSet(datePicker: DatePicker?, year: Int, month: Int, day: Int) {
// To fix android 4.4 issue
// https://stackoverflow.com/questions/12436073/datepicker-ondatechangedlistener-called-twice
@@ -54,7 +54,6 @@ import com.kunzisoft.keepass.adapters.SearchEntryCursorAdapter
import com.kunzisoft.keepass.autofill.AutofillComponent
import com.kunzisoft.keepass.autofill.AutofillHelper
import com.kunzisoft.keepass.database.element.*
import com.kunzisoft.keepass.database.element.icon.IconImage
import com.kunzisoft.keepass.database.element.node.Node
import com.kunzisoft.keepass.database.element.node.NodeId
import com.kunzisoft.keepass.database.element.node.Type
@@ -82,7 +81,6 @@ import org.joda.time.DateTime
class GroupActivity : LockingActivity(),
GroupEditDialogFragment.EditGroupListener,
IconPickerDialogFragment.IconPickerListener,
DatePickerDialog.OnDateSetListener,
TimePickerDialog.OnTimeSetListener,
ListNodesFragment.NodeClickListener,
@@ -1121,13 +1119,6 @@ class GroupActivity : LockingActivity(),
// Do nothing here
}
// For icon in create tree dialog
override fun iconPicked(icon: IconImage) {
(supportFragmentManager
.findFragmentByTag(GroupEditDialogFragment.TAG_CREATE_GROUP) as GroupEditDialogFragment)
.iconPicked(icon)
}
override fun onSortSelected(sortNodeEnum: SortNodeEnum, sortNodeParameters: SortNodeEnum.SortNodeParameters) {
mListNodesFragment?.onSortSelected(sortNodeEnum, sortNodeParameters)
}
@@ -1166,6 +1157,13 @@ class GroupActivity : LockingActivity(),
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
// To create tree dialog for icon
IconPickerActivity.onActivityResult(requestCode, resultCode, data) { icon ->
(supportFragmentManager
.findFragmentByTag(GroupEditDialogFragment.TAG_CREATE_GROUP) as GroupEditDialogFragment)
.setIcon(icon)
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
AutofillHelper.onActivityResultSetResultAndFinish(this, requestCode, resultCode, data)
}
@@ -0,0 +1,111 @@
/*
* Copyright 2019 Jeremy Jamet / Kunzisoft.
*
* This file is part of KeePassDX.
*
* KeePassDX is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* KeePassDX is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.activities
import android.app.Activity
import android.content.Intent
import android.os.Bundle
import android.view.MenuItem
import android.view.View
import androidx.appcompat.widget.Toolbar
import androidx.fragment.app.commit
import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.activities.fragments.IconPickerFragment
import com.kunzisoft.keepass.activities.lock.LockingActivity
import com.kunzisoft.keepass.adapters.IconAdapter
import com.kunzisoft.keepass.database.element.icon.IconImage
import com.kunzisoft.keepass.view.updateLockPaddingLeft
class IconPickerActivity : LockingActivity(), IconAdapter.IconPickerListener {
private lateinit var toolbar: Toolbar
private lateinit var uploadButton: View
override fun iconPicked(icon: IconImage) {
setResult(Activity.RESULT_OK, Intent().apply {
putExtra(EXTRA_ICON, icon)
})
finish()
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_icon_picker)
toolbar = findViewById(R.id.toolbar)
toolbar.title = getString(R.string.about)
setSupportActionBar(toolbar)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
supportActionBar?.setDisplayShowHomeEnabled(true)
supportActionBar?.setDisplayShowTitleEnabled(false)
uploadButton = findViewById(R.id.icon_picker_upload)
uploadButton.setOnClickListener {
// TODO Upload icon
}
if (savedInstanceState == null) {
supportFragmentManager.commit {
setReorderingAllowed(true)
add(R.id.icon_picker_fragment, IconPickerFragment(), ICON_PICKER_FRAGMENT_TAG)
}
}
}
override fun onResume() {
super.onResume()
// Padding if lock button visible
toolbar.updateLockPaddingLeft()
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) {
android.R.id.home -> {
onBackPressed()
}
}
return super.onOptionsItemSelected(item)
}
companion object {
private const val ICON_PICKER_FRAGMENT_TAG = "ICON_PICKER_FRAGMENT_TAG"
private const val ICON_SELECTED_REQUEST = 15861
private const val EXTRA_ICON = "EXTRA_ICON"
fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?, listener: (icon: IconImage) -> Unit) {
if (requestCode == ICON_SELECTED_REQUEST) {
if (resultCode == Activity.RESULT_OK) {
listener.invoke(data?.getParcelableExtra(EXTRA_ICON) ?: IconImage())
}
}
}
fun launch(context: Activity) {
// Create an instance to return the picker icon
context.startActivityForResult(Intent(context, IconPickerActivity::class.java), ICON_SELECTED_REQUEST)
}
}
}
@@ -31,6 +31,7 @@ import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.DialogFragment
import com.google.android.material.textfield.TextInputLayout
import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.activities.IconPickerActivity
import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.CREATION
import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.UPDATE
import com.kunzisoft.keepass.database.element.Database
@@ -41,7 +42,7 @@ import com.kunzisoft.keepass.model.GroupInfo
import com.kunzisoft.keepass.view.ExpirationView
import org.joda.time.DateTime
class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconPickerListener {
class GroupEditDialogFragment : DialogFragment() {
private var mDatabase: Database? = null
@@ -145,7 +146,7 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP
}
iconButtonView.setOnClickListener { _ ->
IconPickerDialogFragment().show(parentFragmentManager, "IconPickerDialogFragment")
IconPickerActivity.launch(activity)
}
return builder.create()
@@ -210,7 +211,7 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP
}
}
override fun iconPicked(icon: IconImage) {
fun setIcon(icon: IconImage) {
mGroupInfo.icon = icon
assignIconView()
}
@@ -1,108 +0,0 @@
/*
* Copyright 2019 Jeremy Jamet / Kunzisoft.
*
* This file is part of KeePassDX.
*
* KeePassDX is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* KeePassDX is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.activities.dialogs
import android.content.Context
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.DialogFragment
import androidx.fragment.app.FragmentActivity
import androidx.viewpager.widget.ViewPager
import com.google.android.material.tabs.TabLayout
import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.adapters.IconPickerPagerAdapter
import com.kunzisoft.keepass.database.element.icon.IconImage
class IconPickerDialogFragment : DialogFragment() {
private lateinit var iconPickerPagerAdapter: IconPickerPagerAdapter
private lateinit var viewPager: ViewPager
private lateinit var tabLayout: TabLayout
private var iconPickerListener: IconPickerListener? = null
override fun onAttach(context: Context) {
super.onAttach(context)
try {
iconPickerListener = object : IconPickerListener {
override fun iconPicked(icon: IconImage) {
(context as IconPickerListener).iconPicked(icon)
dismiss()
}
}
} catch (e: ClassCastException) {
// The activity doesn't implement the interface, throw exception
throw ClassCastException(context.toString()
+ " must implement " + IconPickerListener::class.java.name)
}
}
override fun onDetach() {
iconPickerListener = null
super.onDetach()
}
/*
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
activity?.let { activity ->
val builder = AlertDialog.Builder(activity)
// Inflate and set the layout for the dialog
// Pass null as the parent view because its going in the dialog layout
val root = activity.layoutInflater.inflate(R.layout.fragment_icon_picker, null)
//viewPager = root.findViewById(R.id.icon_picker_pager)
//tabLayout = root.findViewById(R.id.icon_picker_tabs)
builder.setView(root)
builder.setNegativeButton(android.R.string.cancel) { _, _ -> [email protected]?.cancel() }
return builder.create()
}
return super.onCreateDialog(savedInstanceState)
}
*/
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
//val root = super.onCreateView(inflater, container, savedInstanceState)
val root = layoutInflater.inflate(R.layout.fragment_icon_picker, container)
viewPager = root.findViewById(R.id.icon_picker_pager)
tabLayout = root.findViewById(R.id.icon_picker_tabs)
iconPickerPagerAdapter = IconPickerPagerAdapter(childFragmentManager)
iconPickerPagerAdapter.iconSelected = iconPickerListener
viewPager.adapter = iconPickerPagerAdapter
tabLayout.setupWithViewPager(viewPager)
return root
}
interface IconPickerListener {
fun iconPicked(icon: IconImage)
}
companion object {
fun launch(activity: FragmentActivity) {
// Create an instance of the dialog fragment and show it
val dialog = IconPickerDialogFragment()
dialog.show(activity.supportFragmentManager, "IconPickerDialogFragment")
}
}
}
@@ -1,7 +1,6 @@
package com.kunzisoft.keepass.activities.fragments
import android.content.Context
import android.graphics.Color
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
@@ -9,7 +8,6 @@ import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.RecyclerView
import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.activities.dialogs.IconPickerDialogFragment
import com.kunzisoft.keepass.adapters.IconAdapter
import com.kunzisoft.keepass.database.element.Database
import com.kunzisoft.keepass.database.element.icon.IconImage
@@ -18,7 +16,8 @@ abstract class IconFragment : Fragment() {
private lateinit var iconsGridView: RecyclerView
private lateinit var iconAdapter: IconAdapter
var iconListener: IconPickerDialogFragment.IconPickerListener? = null
var iconListener: IconAdapter.IconPickerListener? = null
abstract fun retrieveMainLayoutId(): Int
@@ -36,11 +35,6 @@ abstract class IconFragment : Fragment() {
iconAdapter.iconPickerListener = iconListener
}
override fun onDetach() {
iconAdapter.iconPickerListener = null
super.onDetach()
}
override fun onCreateView(inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?): View {
@@ -0,0 +1,62 @@
package com.kunzisoft.keepass.activities.fragments
import android.content.Context
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.viewpager2.widget.ViewPager2
import com.google.android.material.tabs.TabLayout
import com.google.android.material.tabs.TabLayoutMediator
import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.adapters.IconAdapter
import com.kunzisoft.keepass.adapters.IconPickerPagerAdapter
class IconPickerFragment : Fragment() {
private var mListener: IconAdapter.IconPickerListener? = null
private var iconPickerPagerAdapter: IconPickerPagerAdapter? = null
private lateinit var viewPager: ViewPager2
override fun onAttach(context: Context) {
super.onAttach(context)
try {
mListener = context as IconAdapter.IconPickerListener
} catch (e: ClassCastException) {
throw ClassCastException(context.toString()
+ " must implement " + IconAdapter.IconPickerListener::class.java.name)
}
}
override fun onDetach() {
mListener = null
super.onDetach()
}
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
return inflater.inflate(R.layout.fragment_icon_picker, container, false)
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
viewPager = view.findViewById(R.id.icon_picker_pager)
val tabLayout = view.findViewById<TabLayout>(R.id.icon_picker_tabs)
iconPickerPagerAdapter = IconPickerPagerAdapter(this)
// TODO fix listener
viewPager.adapter = iconPickerPagerAdapter!!.apply {
setListeners(mListener, mListener)
}
TabLayoutMediator(tabLayout, viewPager) { tab, position ->
tab.text = when (position) {
1 -> "Custom"
else -> "Standard"
}
}.attach()
}
}
@@ -11,7 +11,7 @@ import com.kunzisoft.keepass.database.element.icon.IconImage
class IconStandardFragment : IconFragment() {
override fun retrieveMainLayoutId(): Int {
return R.layout.fragment_icon_standard_picker
return R.layout.fragment_icon_grid
}
override fun defineIconList(database: Database): List<IconImage> {
@@ -8,7 +8,6 @@ import android.view.ViewGroup
import android.widget.ImageView
import androidx.recyclerview.widget.RecyclerView
import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.activities.dialogs.IconPickerDialogFragment
import com.kunzisoft.keepass.database.element.icon.IconImage
import com.kunzisoft.keepass.icons.IconDrawableFactory
import com.kunzisoft.keepass.icons.assignDatabaseIcon
@@ -20,7 +19,7 @@ class IconAdapter(context: Context) : RecyclerView.Adapter<IconAdapter.CustomIco
private val iconList = ArrayList<IconImage>()
var iconDrawableFactory: IconDrawableFactory? = null
var iconPickerListener: IconPickerDialogFragment.IconPickerListener? = null
var iconPickerListener: IconPickerListener? = null
var tintColor : Int = Color.BLACK
@@ -53,6 +52,10 @@ class IconAdapter(context: Context) : RecyclerView.Adapter<IconAdapter.CustomIco
return iconList.size
}
interface IconPickerListener {
fun iconPicked(icon: IconImage)
}
inner class CustomIconViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
var iconImageView: ImageView = itemView.findViewById(R.id.icon_image)
}
@@ -1,34 +1,30 @@
package com.kunzisoft.keepass.adapters
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentManager
import androidx.fragment.app.FragmentStatePagerAdapter
import com.kunzisoft.keepass.activities.dialogs.IconPickerDialogFragment
import androidx.viewpager2.adapter.FragmentStateAdapter
import com.kunzisoft.keepass.activities.fragments.IconCustomFragment
import com.kunzisoft.keepass.activities.fragments.IconStandardFragment
class IconPickerPagerAdapter(fragmentManager: FragmentManager)
: FragmentStatePagerAdapter(fragmentManager, BEHAVIOR_SET_USER_VISIBLE_HINT) {
class IconPickerPagerAdapter(fragment: Fragment)
: FragmentStateAdapter(fragment) {
var iconSelected: IconPickerDialogFragment.IconPickerListener? = null
private val iconStandardFragment = IconStandardFragment()
private val iconCustomFragment = IconCustomFragment()
override fun getCount(): Int = 2
override fun getItem(i: Int): Fragment {
return when (i) {
1 -> iconCustomFragment
else -> iconStandardFragment
}.apply {
iconListener = iconSelected
}
fun setListeners(iconStandardSelected: IconAdapter.IconPickerListener?,
iconCustomSelected: IconAdapter.IconPickerListener?) {
iconStandardFragment.iconListener = iconStandardSelected
iconCustomFragment.iconListener = iconCustomSelected
}
override fun getPageTitle(position: Int): CharSequence {
override fun getItemCount(): Int {
return 2
}
override fun createFragment(position: Int): Fragment {
return when (position) {
1 -> "Custom" //context.getString(R.string.iconStandard)
else -> "Standard" //context.getString(R.string.iconStandard)
1 -> iconCustomFragment
else -> iconStandardFragment
}
}
}
@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2019 Jeremy Jamet / Kunzisoft.
This file is part of KeePassDX.
KeePassDX is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
KeePassDX is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
-->
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.fragment.app.FragmentContainerView
android:id="@+id/icon_picker_fragment"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/toolbar" />
<com.kunzisoft.keepass.view.ToolbarAction
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_gravity="bottom"
android:theme="?attr/toolbarActionAppearance"
app:layout_constraintBottom_toBottomOf="parent" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/icon_picker_upload"
style="@style/KeepassDXStyle.Fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/validate"
android:src="@drawable/ic_file_upload_white_24dp"
app:fabSize="mini"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginBottom="8dp"/>
<include
layout="@layout/view_button_lock"
android:layout_width="@dimen/lock_button_size"
android:layout_height="@dimen/lock_button_size"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -17,11 +17,13 @@
You should have received a copy of the GNU General Public License
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
-->
<androidx.recyclerview.widget.RecyclerView
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/icons_grid_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:spanCount="4" />
android:layout_height="match_parent">
<include
layout="@layout/fragment_icon_grid"/>
<!-- TODO Prebuild custom icons -->
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -24,4 +24,4 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:spanCount="4" />
app:spanCount="5" />
@@ -17,15 +17,21 @@
You should have received a copy of the GNU General Public License
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
-->
<androidx.viewpager.widget.ViewPager
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/icon_picker_pager"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">
<com.google.android.material.tabs.TabLayout
android:id="@+id/icon_picker_tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</androidx.viewpager.widget.ViewPager>
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/icon_picker_pager"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
</LinearLayout>