cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

show only a single trust id icon

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-03-04 12:46:58 +01:00
parent ea953db521
commit 3bf7fd54b0
2 changed files with 19 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeySectionedListAdapter.java
View File

@@ -354,7 +354,7 @@ public class KeySectionedListAdapter extends SectionCursorAdapter<KeySectionedLi
public class KeyItemViewHolder extends SectionCursorAdapter.ViewHolder public class KeyItemViewHolder extends SectionCursorAdapter.ViewHolder
implements View.OnClickListener, View.OnLongClickListener { implements View.OnClickListener, View.OnLongClickListener {
private final ViewGroup mTrustIdIcons; private final ImageView mTrustIdIcon;
private final TextView mMainUserId; private final TextView mMainUserId;
private final TextView mMainUserIdRest; private final TextView mMainUserIdRest;
private final TextView mCreationDate; private final TextView mCreationDate;
@@ -371,7 +371,7 @@ public class KeySectionedListAdapter extends SectionCursorAdapter<KeySectionedLi
mSlinger = itemView.findViewById(R.id.key_list_item_slinger_view); mSlinger = itemView.findViewById(R.id.key_list_item_slinger_view);
mSlingerButton = (ImageButton) itemView.findViewById(R.id.key_list_item_slinger_button); mSlingerButton = (ImageButton) itemView.findViewById(R.id.key_list_item_slinger_button);
mCreationDate = (TextView) itemView.findViewById(R.id.key_list_item_creation); mCreationDate = (TextView) itemView.findViewById(R.id.key_list_item_creation);
mTrustIdIcons = (ViewGroup) itemView.findViewById(R.id.key_list_item_tid_icon); mTrustIdIcon = (ImageView) itemView.findViewById(R.id.key_list_item_tid_icon);
itemView.setClickable(true); itemView.setClickable(true);
itemView.setLongClickable(true); itemView.setLongClickable(true);
@@ -498,27 +498,18 @@ public class KeySectionedListAdapter extends SectionCursorAdapter<KeySectionedLi
{ // set icons { // set icons
List<String> packageNames = keyItem.getTrustIdPackages(); List<String> packageNames = keyItem.getTrustIdPackages();
LayoutInflater layoutInflater = LayoutInflater.from(getContext()); if (!keyItem.isSecret() && !packageNames.isEmpty()) {
while (mTrustIdIcons.getChildCount() < packageNames.size()) { String packageName = packageNames.get(0);
layoutInflater.inflate(R.layout.trust_id_icon, mTrustIdIcons, true); Drawable drawable = getDrawableForPackageName(packageName);
} if (drawable != null) {
mTrustIdIcon.setImageDrawable(drawable);
int visibleIcons = 0; mTrustIdIcon.setVisibility(View.VISIBLE);
for (int i = 0; i < packageNames.size(); i++) { } else {
ImageView imageView = (ImageView) mTrustIdIcons.getChildAt(i); mTrustIdIcon.setVisibility(View.GONE);
Drawable drawable = getDrawableForPackageName(packageNames.get(i));
if (drawable == null) {
continue;
} }
} else {
imageView.setImageDrawable(drawable); mTrustIdIcon.setVisibility(View.GONE);
imageView.setVisibility(View.VISIBLE);
visibleIcons += 1;
} }
for (int i = visibleIcons; i < mTrustIdIcons.getChildCount(); i++) {
mTrustIdIcons.getChildAt(i).setVisibility(View.GONE);
}
} }
} }

20
OpenKeychain/src/main/res/layout/key_list_item.xml
View File

@@ -14,6 +14,13 @@
android:focusable="false" android:focusable="false"
tools:layout_marginTop="30dp"> tools:layout_marginTop="30dp">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_margin="4dp"
android:id="@+id/key_list_item_tid_icon"
tools:src="@drawable/apps_k9" />
<LinearLayout <LinearLayout
android:id="@+id/key_list_item_data" android:id="@+id/key_list_item_data"
android:layout_width="0dip" android:layout_width="0dip"
@@ -55,19 +62,6 @@
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal"
android:id="@+id/key_list_item_tid_icon"
android:gravity="center_vertical">
<!--
<include layout="@layout/trust_id_icon" />
-->
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/key_list_item_slinger_view" android:id="@+id/key_list_item_slinger_view"
android:layout_width="wrap_content" android:layout_width="wrap_content"