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

ImportKeys: Show single key card for files with only one key

Browse Source
This commit is contained in:
Andrea Torlaschi
2016-08-23 16:59:42 +02:00
parent 139c362058
commit 1e33cd3a1a
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
View File

@@ -283,7 +283,7 @@ public class ImportKeysListFragment extends Fragment implements
mAdapter.setData(data.getResult()); mAdapter.setData(data.getResult());
int size = mAdapter.getItemCount(); int size = mAdapter.getItemCount();
mBindingBasic.setNumber(size); mBinding.setNumber(size);
mBinding.setStatus(size > 0 ? STATUS_LOADED : STATUS_EMPTY); mBinding.setStatus(size > 0 ? STATUS_LOADED : STATUS_EMPTY);
GetKeyResult getKeyResult = (GetKeyResult) data.getOperationResult(); GetKeyResult getKeyResult = (GetKeyResult) data.getOperationResult();

11
OpenKeychain/src/main/res/layout/import_keys_list_fragment.xml
View File

@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"> <layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data> <data>
<import type="android.view.View" alias="V" /> <import type="android.view.View" alias="V" />
<import type="org.sufficientlysecure.keychain.ui.ImportKeysListFragment" alias="I" /> <import type="org.sufficientlysecure.keychain.ui.ImportKeysListFragment" alias="I" />
<variable name="status" type="int" /> <variable name="status" type="int" />
<variable name="number" type="int" />
<variable name="advanced" type="boolean" /> <variable name="advanced" type="boolean" />
</data> </data>
@@ -45,11 +47,12 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="@{advanced ? V.GONE : V.VISIBLE}"> android:visibility="@{advanced || (number == 1) ? V.GONE : V.VISIBLE}">
<include <include
android:id="@+id/basic" android:id="@+id/basic"
layout="@layout/import_keys_list_basic_item" /> layout="@layout/import_keys_list_basic_item"
app:number="@{number}" />
</LinearLayout> </LinearLayout>
@@ -58,7 +61,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scrollbars="vertical" android:scrollbars="vertical"
android:visibility="@{advanced ? V.VISIBLE : V.GONE}" /> android:visibility="@{advanced || (number == 1) ? V.VISIBLE : V.GONE}" />
</LinearLayout> </LinearLayout>