diff --git a/CHANGELOG b/CHANGELOG index 49f6a960a..37b2f97c4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ KeePassDX(3.1.0) * Add breadcrumb * Add path in search results #1148 + * Add group info dialog #1177 KeePassDX(3.0.4) * Fix autofill inline bugs #1173 #1165 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 5faa47d7d..fd5ad1f9e 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt @@ -44,7 +44,7 @@ import androidx.core.view.isVisible import androidx.recyclerview.widget.RecyclerView import com.kunzisoft.keepass.R import com.kunzisoft.keepass.activities.dialogs.* -import com.kunzisoft.keepass.activities.fragments.GroupFragment +import com.kunzisoft.keepass.activities.dialogs.NodesFragment import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper import com.kunzisoft.keepass.activities.helpers.SpecialMode import com.kunzisoft.keepass.activities.legacy.DatabaseLockActivity @@ -76,9 +76,9 @@ import org.joda.time.DateTime class GroupActivity : DatabaseLockActivity(), DatePickerDialog.OnDateSetListener, TimePickerDialog.OnTimeSetListener, - GroupFragment.NodeClickListener, - GroupFragment.NodesActionMenuListener, - GroupFragment.OnScrollListener, + NodesFragment.NodeClickListener, + NodesFragment.NodesActionMenuListener, + NodesFragment.OnScrollListener, SortDialogFragment.SortSelectionListener { // Views @@ -103,7 +103,7 @@ class GroupActivity : DatabaseLockActivity(), private var mBreadcrumbAdapter: BreadcrumbAdapter? = null - private var mGroupFragment: GroupFragment? = null + private var mNodesFragment: NodesFragment? = null private var mRecyclingBinEnabled = false private var mRecyclingBinIsCurrentGroup = false private var mRequestStartupSearch = true @@ -164,8 +164,15 @@ class GroupActivity : DatabaseLockActivity(), // Open group on breadcrumb click onItemClickListener = { node, _ -> finishNodeAction() - mDatabase?.let { database -> - onNodeClick(database, node) + // If last item + val currentGroup = mCurrentGroup + if (currentGroup != null && node == currentGroup) { + GroupDialogFragment.launch(currentGroup.getGroupInfo()) + .show(supportFragmentManager, "group_fragment") + } else { + mDatabase?.let { database -> + onNodeClick(database, node) + } } } } @@ -201,15 +208,15 @@ class GroupActivity : DatabaseLockActivity(), } // Initialize the fragment with the list - mGroupFragment = - supportFragmentManager.findFragmentByTag(GROUP_FRAGMENT_TAG) as GroupFragment? - if (mGroupFragment == null) - mGroupFragment = GroupFragment() + mNodesFragment = + supportFragmentManager.findFragmentByTag(GROUP_FRAGMENT_TAG) as NodesFragment? + if (mNodesFragment == null) + mNodesFragment = NodesFragment() // Attach fragment to content view supportFragmentManager.beginTransaction().replace( R.id.nodes_list_fragment_container, - mGroupFragment!!, + mNodesFragment!!, GROUP_FRAGMENT_TAG ).commit() @@ -245,7 +252,7 @@ class GroupActivity : DatabaseLockActivity(), mDatabase?.let { database -> EntrySelectionHelper.doSpecialAction(intent, { - mGroupFragment?.mEntryActivityResultLauncher?.let { resultLauncher -> + mNodesFragment?.mEntryActivityResultLauncher?.let { resultLauncher -> EntryEditActivity.launchToCreate( this@GroupActivity, database, @@ -601,7 +608,7 @@ class GroupActivity : DatabaseLockActivity(), val entryVersioned = node as Entry EntrySelectionHelper.doSpecialAction(intent, { - mGroupFragment?.mEntryActivityResultLauncher?.let { resultLauncher -> + mNodesFragment?.mEntryActivityResultLauncher?.let { resultLauncher -> EntryActivity.launch( this@GroupActivity, database, @@ -762,7 +769,7 @@ class GroupActivity : DatabaseLockActivity(), ): Boolean { if (nodes.isNotEmpty()) { if (actionNodeMode == null || toolbarAction?.getSupportActionModeCallback() == null) { - mGroupFragment?.actionNodesCallback( + mNodesFragment?.actionNodesCallback( database, nodes, this @@ -806,7 +813,7 @@ class GroupActivity : DatabaseLockActivity(), ) } Type.ENTRY -> { - mGroupFragment?.mEntryActivityResultLauncher?.let { resultLauncher -> + mNodesFragment?.mEntryActivityResultLauncher?.let { resultLauncher -> EntryEditActivity.launchToUpdate( this@GroupActivity, database, @@ -842,17 +849,17 @@ class GroupActivity : DatabaseLockActivity(), override fun onPasteMenuClick( database: Database, - pasteMode: GroupFragment.PasteMode?, + pasteMode: NodesFragment.PasteMode?, nodes: List ): Boolean { when (pasteMode) { - GroupFragment.PasteMode.PASTE_FROM_COPY -> { + NodesFragment.PasteMode.PASTE_FROM_COPY -> { // Copy mCurrentGroup?.let { newParent -> copyNodes(nodes, newParent) } } - GroupFragment.PasteMode.PASTE_FROM_MOVE -> { + NodesFragment.PasteMode.PASTE_FROM_MOVE -> { // Move mCurrentGroup?.let { newParent -> moveNodes(nodes, newParent) @@ -1053,7 +1060,7 @@ class GroupActivity : DatabaseLockActivity(), sortNodeEnum: SortNodeEnum, sortNodeParameters: SortNodeEnum.SortNodeParameters ) { - mGroupFragment?.onSortSelected(sortNodeEnum, sortNodeParameters) + mNodesFragment?.onSortSelected(sortNodeEnum, sortNodeParameters) } override fun startActivity(intent: Intent) { @@ -1092,7 +1099,7 @@ class GroupActivity : DatabaseLockActivity(), } override fun onBackPressed() { - if (mGroupFragment?.nodeActionSelectionMode == true) { + if (mNodesFragment?.nodeActionSelectionMode == true) { finishNodeAction() } else { // Normal way when we are not in root diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt new file mode 100644 index 000000000..238342855 --- /dev/null +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt @@ -0,0 +1,128 @@ +/* + * Copyright 2021 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.app.Dialog +import android.graphics.Color +import android.os.Bundle +import android.view.View +import android.widget.ImageView +import android.widget.TextView +import androidx.appcompat.app.AlertDialog +import com.kunzisoft.keepass.R +import com.kunzisoft.keepass.database.element.Database +import com.kunzisoft.keepass.database.element.icon.IconImage +import com.kunzisoft.keepass.model.GroupInfo +import com.kunzisoft.keepass.view.DateTimeFieldView + +class GroupDialogFragment : DatabaseDialogFragment() { + + private var mPopulateIconMethod: ((ImageView, IconImage) -> Unit)? = null + private var mGroupInfo = GroupInfo() + + private lateinit var iconView: ImageView + private var mIconColor: Int = 0 + private lateinit var nameTextView: TextView + private lateinit var notesTextLabelView: TextView + private lateinit var notesTextView: TextView + private lateinit var expirationView: DateTimeFieldView + private lateinit var creationView: TextView + private lateinit var modificationView: TextView + + override fun onDatabaseRetrieved(database: Database?) { + super.onDatabaseRetrieved(database) + mPopulateIconMethod = { imageView, icon -> + database?.iconDrawableFactory?.assignDatabaseIcon(imageView, icon, mIconColor) + } + mPopulateIconMethod?.invoke(iconView, mGroupInfo.icon) + } + + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { + activity?.let { activity -> + val root = activity.layoutInflater.inflate(R.layout.fragment_group, null) + iconView = root.findViewById(R.id.group_icon) + nameTextView = root.findViewById(R.id.group_name) + notesTextLabelView = root.findViewById(R.id.group_note_label) + notesTextView = root.findViewById(R.id.group_note) + expirationView = root.findViewById(R.id.group_expiration) + creationView = root.findViewById(R.id.group_created) + modificationView = root.findViewById(R.id.group_modified) + + // Retrieve the textColor to tint the icon + val ta = activity.theme.obtainStyledAttributes(intArrayOf(R.attr.colorAccent)) + mIconColor = ta.getColor(0, Color.WHITE) + ta.recycle() + + if (savedInstanceState != null + && savedInstanceState.containsKey(KEY_GROUP_INFO)) { + mGroupInfo = savedInstanceState.getParcelable(KEY_GROUP_INFO) ?: mGroupInfo + } else { + arguments?.apply { + if (containsKey(KEY_GROUP_INFO)) { + mGroupInfo = getParcelable(KEY_GROUP_INFO) ?: mGroupInfo + } + } + } + + // populate info in views + nameTextView.text = mGroupInfo.title + val notes = mGroupInfo.notes + if (notes == null || notes.isEmpty()) { + notesTextLabelView.visibility = View.GONE + notesTextView.visibility = View.GONE + } else { + notesTextView.text = notes + notesTextLabelView.visibility = View.VISIBLE + notesTextView.visibility = View.VISIBLE + } + expirationView.activation = mGroupInfo.expires + expirationView.dateTime = mGroupInfo.expiryTime + creationView.text = mGroupInfo.creationTime.getDateTimeString(resources) + modificationView.text = mGroupInfo.lastModificationTime.getDateTimeString(resources) + + val builder = AlertDialog.Builder(activity) + builder.setView(root) + .setPositiveButton(android.R.string.ok){ _, _ -> + // Do nothing + } + return builder.create() + } + return super.onCreateDialog(savedInstanceState) + } + + override fun onSaveInstanceState(outState: Bundle) { + outState.putParcelable(KEY_GROUP_INFO, mGroupInfo) + super.onSaveInstanceState(outState) + } + + data class Error(val isError: Boolean, val messageId: Int?) + + companion object { + const val KEY_GROUP_INFO = "KEY_GROUP_INFO" + + fun launch(groupInfo: GroupInfo): GroupDialogFragment { + val bundle = Bundle() + bundle.putParcelable(KEY_GROUP_INFO, groupInfo) + val fragment = GroupDialogFragment() + fragment.arguments = bundle + return fragment + } + } +} diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/GroupFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/NodesFragment.kt similarity index 95% rename from app/src/main/java/com/kunzisoft/keepass/activities/fragments/GroupFragment.kt rename to app/src/main/java/com/kunzisoft/keepass/activities/dialogs/NodesFragment.kt index 432cd70a4..44a9fbcb9 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/GroupFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/NodesFragment.kt @@ -17,10 +17,9 @@ * along with KeePassDX. If not, see . * */ -package com.kunzisoft.keepass.activities.fragments +package com.kunzisoft.keepass.activities.dialogs import android.content.Context -import android.content.Intent import android.os.Bundle import android.util.Log import android.view.* @@ -31,29 +30,28 @@ import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE import com.kunzisoft.keepass.R import com.kunzisoft.keepass.activities.EntryEditActivity -import com.kunzisoft.keepass.activities.dialogs.SortDialogFragment +import com.kunzisoft.keepass.activities.fragments.DatabaseFragment import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper import com.kunzisoft.keepass.activities.helpers.SpecialMode -import com.kunzisoft.keepass.adapters.NodeAdapter +import com.kunzisoft.keepass.adapters.NodesAdapter import com.kunzisoft.keepass.database.element.Database import com.kunzisoft.keepass.database.element.Group import com.kunzisoft.keepass.database.element.SortNodeEnum import com.kunzisoft.keepass.database.element.node.Node -import com.kunzisoft.keepass.database.element.node.NodeId import com.kunzisoft.keepass.database.element.node.Type import com.kunzisoft.keepass.settings.PreferencesUtil import com.kunzisoft.keepass.tasks.ActionRunnable import com.kunzisoft.keepass.viewmodels.GroupViewModel import java.util.* -class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListener { +class NodesFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListener { private var nodeClickListener: NodeClickListener? = null private var onScrollListener: OnScrollListener? = null private var mNodesRecyclerView: RecyclerView? = null private var mLayoutManager: LinearLayoutManager? = null - private var mAdapter: NodeAdapter? = null + private var mAdapter: NodesAdapter? = null private val mGroupViewModel: GroupViewModel by activityViewModels() @@ -107,7 +105,7 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen } catch (e: ClassCastException) { // The activity doesn't implement the interface, throw exception throw ClassCastException(context.toString() - + " must implement " + NodeAdapter.NodeClickCallback::class.java.name) + + " must implement " + NodesAdapter.NodeClickCallback::class.java.name) } try { @@ -115,7 +113,8 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen } catch (e: ClassCastException) { onScrollListener = null // Context menu can be omit - Log.w(TAG, context.toString() + Log.w( + TAG, context.toString() + " must implement " + RecyclerView.OnScrollListener::class.java.name) } } @@ -138,8 +137,8 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen contextThemed?.let { context -> database?.let { database -> - mAdapter = NodeAdapter(context, database).apply { - setOnNodeClickListener(object : NodeAdapter.NodeClickCallback { + mAdapter = NodesAdapter(context, database).apply { + setOnNodeClickListener(object : NodesAdapter.NodeClickCallback { override fun onNodeClick(database: Database, node: Node) { if (nodeActionSelectionMode) { if (listActionNodes.contains(node)) { @@ -195,7 +194,7 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen super.onCreateView(inflater, container, savedInstanceState) // To apply theme return inflater.cloneInContext(contextThemed) - .inflate(R.layout.fragment_group, container, false) + .inflate(R.layout.fragment_nodes, container, false) } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -448,6 +447,6 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen } companion object { - private val TAG = GroupFragment::class.java.name + private val TAG = NodesFragment::class.java.name } } diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt similarity index 98% rename from app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt rename to app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt index 301244b0b..b77a3b762 100644 --- a/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt +++ b/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt @@ -55,9 +55,9 @@ import java.util.* * Create node list adapter with contextMenu or not * @param context Context to use */ -class NodeAdapter (private val context: Context, - private val database: Database) - : RecyclerView.Adapter() { +class NodesAdapter (private val context: Context, + private val database: Database) + : RecyclerView.Adapter() { private var mNodeComparator: Comparator>? = null private val mNodeSortedListCallback: NodeSortedListCallback @@ -169,6 +169,7 @@ class NodeAdapter (private val context: Context, && oldItem.containsAttachment() == newItem.containsAttachment() } else if (oldItem is Group && newItem is Group) { typeContentTheSame = oldItem.numberOfChildEntries == newItem.numberOfChildEntries + && oldItem.notes == newItem.notes } return typeContentTheSame && oldItem.nodeId == newItem.nodeId @@ -522,6 +523,6 @@ class NodeAdapter (private val context: Context, } companion object { - private val TAG = NodeAdapter::class.java.name + private val TAG = NodesAdapter::class.java.name } } diff --git a/app/src/main/res/layout/fragment_group.xml b/app/src/main/res/layout/fragment_group.xml index 117aba30d..1bb0126c3 100644 --- a/app/src/main/res/layout/fragment_group.xml +++ b/app/src/main/res/layout/fragment_group.xml @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_nodes.xml b/app/src/main/res/layout/fragment_nodes.xml new file mode 100644 index 000000000..117aba30d --- /dev/null +++ b/app/src/main/res/layout/fragment_nodes.xml @@ -0,0 +1,54 @@ + + + + + + + + + diff --git a/fastlane/metadata/android/en-US/changelogs/92.txt b/fastlane/metadata/android/en-US/changelogs/92.txt index 5449f6d6c..4b17f8f50 100644 --- a/fastlane/metadata/android/en-US/changelogs/92.txt +++ b/fastlane/metadata/android/en-US/changelogs/92.txt @@ -1,2 +1,3 @@ * Add breadcrumb - * Add path in search results #1148 \ No newline at end of file + * Add path in search results #1148 + * Add group info dialog #1177 \ No newline at end of file diff --git a/fastlane/metadata/android/fr-FR/changelogs/92.txt b/fastlane/metadata/android/fr-FR/changelogs/92.txt index 638178863..b7197fef7 100644 --- a/fastlane/metadata/android/fr-FR/changelogs/92.txt +++ b/fastlane/metadata/android/fr-FR/changelogs/92.txt @@ -1,2 +1,3 @@ * Ajout d'un fil d'ariane - * Ajout du chemin pour les résultats de recherche #1148 \ No newline at end of file + * Ajout du chemin pour les résultats de recherche #1148 + * Ajout d'un dialogue pour les informations de groupe #1177 \ No newline at end of file