From 7abfa313f93bcba1ed98d676e319b0a654243ce0 Mon Sep 17 00:00:00 2001 From: Andrea Torlaschi Date: Thu, 25 Aug 2016 23:25:17 +0200 Subject: [PATCH] ImportKeys: Move creation date in the top part of the card --- .../ui/bindings/ImportKeysBindings.java | 25 +++++----- .../ui/bindings/ImportKeysExtraBindings.java | 25 +++++----- .../main/res/layout/import_keys_list_item.xml | 48 +++++++++---------- .../layout/import_keys_list_item_extra.xml | 21 -------- 4 files changed, 50 insertions(+), 69 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/bindings/ImportKeysBindings.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/bindings/ImportKeysBindings.java index e2dc49c05..2dc739e2e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/bindings/ImportKeysBindings.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/bindings/ImportKeysBindings.java @@ -4,12 +4,13 @@ import android.content.Context; import android.content.res.Resources; import android.databinding.BindingAdapter; import android.graphics.Color; -import android.widget.ImageView; +import android.text.format.DateFormat; import android.widget.TextView; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.ui.util.Highlighter; -import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; + +import java.util.Date; public class ImportKeysBindings { @@ -51,17 +52,19 @@ public class ImportKeysBindings { textView.setTextColor(ImportKeysBindingsUtils.getColor(context, revokedOrExpired)); } - @BindingAdapter({"app:keyRevoked", "app:keyExpired"}) - public static void setStatus(ImageView imageView, boolean revoked, boolean expired) { - Context context = imageView.getContext(); + @BindingAdapter({"app:keyCreation", "app:keyRevokedOrExpired"}) + public static void setCreation(TextView textView, Date creationDate, boolean revokedOrExpired) { + Context context = textView.getContext(); - if (revoked) { - KeyFormattingUtils.setStatusImage(context, imageView, null, - KeyFormattingUtils.State.REVOKED, R.color.key_flag_gray); - } else if (expired) { - KeyFormattingUtils.setStatusImage(context, imageView, null, - KeyFormattingUtils.State.EXPIRED, R.color.key_flag_gray); + String text; + if (creationDate != null) { + text = DateFormat.getDateFormat(context).format(creationDate); + } else { + Resources resources = context.getResources(); + text = resources.getString(R.string.unknown); } + textView.setText(text); + textView.setTextColor(ImportKeysBindingsUtils.getColor(context, revokedOrExpired)); } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/bindings/ImportKeysExtraBindings.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/bindings/ImportKeysExtraBindings.java index 7f47cffe6..0039bd6d6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/bindings/ImportKeysExtraBindings.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/bindings/ImportKeysExtraBindings.java @@ -3,8 +3,8 @@ package org.sufficientlysecure.keychain.ui.bindings; import android.content.Context; import android.content.res.Resources; import android.databinding.BindingAdapter; -import android.text.format.DateFormat; import android.view.LayoutInflater; +import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; @@ -14,30 +14,29 @@ import org.sufficientlysecure.keychain.ui.util.Highlighter; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; import java.util.ArrayList; -import java.util.Date; import java.util.HashSet; import java.util.Map; public class ImportKeysExtraBindings { - @BindingAdapter({"app:keyCreation"}) - public static void setCreation(TextView textView, Date creationDate) { - Context context = textView.getContext(); - String text; - if (creationDate != null) { - text = DateFormat.getDateFormat(context).format(creationDate); - } else { - Resources resources = context.getResources(); - text = resources.getString(R.string.unknown); + @BindingAdapter({"app:keyRevoked", "app:keyExpired"}) + public static void setStatus(ImageView imageView, boolean revoked, boolean expired) { + Context context = imageView.getContext(); + + if (revoked) { + KeyFormattingUtils.setStatusImage(context, imageView, null, + KeyFormattingUtils.State.REVOKED, R.color.key_flag_gray); + } else if (expired) { + KeyFormattingUtils.setStatusImage(context, imageView, null, + KeyFormattingUtils.State.EXPIRED, R.color.key_flag_gray); } - textView.setText(text); } @BindingAdapter({"app:keyId"}) public static void setKeyId(TextView textView, String keyId) { Context context = textView.getContext(); String text; - if (keyId != null){ + if (keyId != null) { text = KeyFormattingUtils.beautifyKeyId(keyId); } else { Resources resources = context.getResources(); diff --git a/OpenKeychain/src/main/res/layout/import_keys_list_item.xml b/OpenKeychain/src/main/res/layout/import_keys_list_item.xml index 06a3ec00f..7bfb60a37 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_list_item.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_list_item.xml @@ -28,39 +28,39 @@ android:layout_height="wrap_content" android:orientation="vertical" android:paddingBottom="16dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" android:paddingTop="24dp"> + android:orientation="vertical"> - + android:textAppearance="?android:attr/textAppearanceMedium" + app:keyRevokedOrExpired="@{entry.revokedOrExpired}" + app:keySecret="@{entry.secretKey}" + app:keyUserId="@{entry.primaryUserId.name}" + app:query="@{entry.query}" /> - + - - - + diff --git a/OpenKeychain/src/main/res/layout/import_keys_list_item_extra.xml b/OpenKeychain/src/main/res/layout/import_keys_list_item_extra.xml index ebb986f58..d3a7a02ee 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_list_item_extra.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_list_item_extra.xml @@ -77,27 +77,6 @@ - - - - - - - -