From 2a2f8dcecd7cb1441f19982233ffd2764323e082 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Thu, 25 Feb 2021 18:54:42 +0100 Subject: [PATCH] Migrate to ViewPager2 and as Activity --- app/build.gradle | 3 +- app/src/main/AndroidManifest.xml | 3 + .../keepass/activities/EntryEditActivity.kt | 11 +- .../keepass/activities/GroupActivity.kt | 16 ++- .../keepass/activities/IconPickerActivity.kt | 111 ++++++++++++++++++ .../dialogs/GroupEditDialogFragment.kt | 7 +- .../dialogs/IconPickerDialogFragment.kt | 108 ----------------- .../activities/fragments/IconFragment.kt | 10 +- .../fragments/IconPickerFragment.kt | 62 ++++++++++ .../fragments/IconStandardFragment.kt | 2 +- .../kunzisoft/keepass/adapters/IconAdapter.kt | 7 +- .../adapters/IconPickerPagerAdapter.kt | 32 +++-- .../main/res/layout/activity_icon_picker.xml | 60 ++++++++++ .../layout/fragment_icon_custom_picker.xml | 14 ++- ...dard_picker.xml => fragment_icon_grid.xml} | 2 +- .../main/res/layout/fragment_icon_picker.xml | 14 ++- 16 files changed, 295 insertions(+), 167 deletions(-) create mode 100644 app/src/main/java/com/kunzisoft/keepass/activities/IconPickerActivity.kt delete mode 100644 app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconPickerDialogFragment.kt create mode 100644 app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconPickerFragment.kt create mode 100644 app/src/main/res/layout/activity_icon_picker.xml rename app/src/main/res/layout/{fragment_icon_standard_picker.xml => fragment_icon_grid.xml} (97%) diff --git a/app/build.gradle b/app/build.gradle index ad38178f0..00f160670 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7bcdcb9a3..0f4d196b2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -129,6 +129,9 @@ + diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt index 0576bba78..5522e3523 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt @@ -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 diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt index 99f98b84e..4c6da22b2 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt @@ -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) } diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/IconPickerActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/IconPickerActivity.kt new file mode 100644 index 000000000..885c163a2 --- /dev/null +++ b/app/src/main/java/com/kunzisoft/keepass/activities/IconPickerActivity.kt @@ -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 . + * + */ +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) + } + } +} diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupEditDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupEditDialogFragment.kt index 164434cea..451e9ea48 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupEditDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupEditDialogFragment.kt @@ -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() } diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconPickerDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconPickerDialogFragment.kt deleted file mode 100644 index 542816aa5..000000000 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconPickerDialogFragment.kt +++ /dev/null @@ -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 . - * - */ -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) { _, _ -> this@IconPickerDialogFragment.dialog?.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") - } - } -} diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconFragment.kt index 22a539569..a6e6d7019 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconFragment.kt @@ -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 { diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconPickerFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconPickerFragment.kt new file mode 100644 index 000000000..37db3f4c7 --- /dev/null +++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconPickerFragment.kt @@ -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(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() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconStandardFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconStandardFragment.kt index 48dd1c0be..72da6d127 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconStandardFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconStandardFragment.kt @@ -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 { diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/IconAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/IconAdapter.kt index b75467762..99010accc 100644 --- a/app/src/main/java/com/kunzisoft/keepass/adapters/IconAdapter.kt +++ b/app/src/main/java/com/kunzisoft/keepass/adapters/IconAdapter.kt @@ -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() 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 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 } } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_icon_picker.xml b/app/src/main/res/layout/activity_icon_picker.xml new file mode 100644 index 000000000..813747dfb --- /dev/null +++ b/app/src/main/res/layout/activity_icon_picker.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_icon_custom_picker.xml b/app/src/main/res/layout/fragment_icon_custom_picker.xml index 9a6822cdc..6709fa704 100644 --- a/app/src/main/res/layout/fragment_icon_custom_picker.xml +++ b/app/src/main/res/layout/fragment_icon_custom_picker.xml @@ -17,11 +17,13 @@ You should have received a copy of the GNU General Public License along with KeePassDX. If not, see . --> - + android:layout_height="match_parent"> + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_icon_standard_picker.xml b/app/src/main/res/layout/fragment_icon_grid.xml similarity index 97% rename from app/src/main/res/layout/fragment_icon_standard_picker.xml rename to app/src/main/res/layout/fragment_icon_grid.xml index 9a6822cdc..6f3775a40 100644 --- a/app/src/main/res/layout/fragment_icon_standard_picker.xml +++ b/app/src/main/res/layout/fragment_icon_grid.xml @@ -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" /> diff --git a/app/src/main/res/layout/fragment_icon_picker.xml b/app/src/main/res/layout/fragment_icon_picker.xml index f7c897a8f..a09f47f6a 100644 --- a/app/src/main/res/layout/fragment_icon_picker.xml +++ b/app/src/main/res/layout/fragment_icon_picker.xml @@ -17,15 +17,21 @@ You should have received a copy of the GNU General Public License along with KeePassDX. If not, see . --> - + android:layout_height="match_parent" + android:orientation="vertical"> - + + +