rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add gray copy icon when copy not available

Browse Source
This commit is contained in:
J-Jamet
2018-07-28 15:18:34 +02:00
parent 228831acdd
commit a59ae820b5
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.java
View File

@@ -330,8 +330,9 @@ public class EntryActivity extends LockingHideActivity {
getString(R.string.copy_field, getString(R.string.entry_user_name)))
);
entryContentsView.assignPassword(mEntry.getPassword());
if (PreferencesUtil.allowCopyPasswordAndProtectedFields(this)) {
boolean allowCopyPassword = PreferencesUtil.allowCopyPasswordAndProtectedFields(this);
entryContentsView.assignPassword(mEntry.getPassword(), allowCopyPassword);
if (allowCopyPassword) {
entryContentsView.assignPasswordCopyListener(view ->
clipboardHelper.timeoutCopyToClipboard(mEntry.getPassword(),
getString(R.string.copy_field, getString(R.string.entry_password)))

11
app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.java
View File

@@ -20,6 +20,7 @@
package com.kunzisoft.keepass.view;
import android.content.Context;
import android.support.v4.content.ContextCompat;
import android.text.method.PasswordTransformationMethod;
import android.util.AttributeSet;
import android.view.LayoutInflater;
@@ -129,13 +130,18 @@ public class EntryContentsView extends LinearLayout {
return userNameContainerView.getVisibility() == VISIBLE;
}
public void assignPassword(String password) {
public void assignPassword(String password, boolean allowCopyPassword) {
if (password != null && !password.isEmpty()) {
passwordContainerView.setVisibility(VISIBLE);
passwordView.setText(password);
if (fontInVisibility)
Util.applyFontVisibilityTo(getContext(), passwordView);
passwordActionView.setVisibility(GONE);
if (!allowCopyPassword) {
passwordActionView.setEnabled(false);
passwordActionView.setColorFilter(ContextCompat.getColor(getContext(), R.color.grey_dark));
} else {
passwordActionView.setEnabled(true);
}
} else {
passwordContainerView.setVisibility(GONE);
}
@@ -143,7 +149,6 @@ public class EntryContentsView extends LinearLayout {
public void assignPasswordCopyListener(OnClickListener onClickListener) {
passwordActionView.setOnClickListener(onClickListener);
passwordActionView.setVisibility(VISIBLE);
}
public boolean isPasswordPresent() {

9
app/src/main/java/com/kunzisoft/keepass/view/EntryCustomField.java
View File

@@ -20,6 +20,7 @@
package com.kunzisoft.keepass.view;
import android.content.Context;
import android.support.v4.content.ContextCompat;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.widget.ImageView;
@@ -62,10 +63,12 @@ public class EntryCustomField extends LinearLayout {
setLabel(label);
setValue(value);
if (!showAction) {
actionImageView.setVisibility(INVISIBLE);
} else {
if (showAction) {
actionImageView.setEnabled(true);
setAction(onClickActionListener);
} else {
actionImageView.setEnabled(false);
actionImageView.setColorFilter(ContextCompat.getColor(getContext(), R.color.grey_dark));
}
}