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

ImportKeys: Restore NonInteractive behavior

Browse Source 
Hides container of buttons when NonInteractive is enabled.
In this way user can't interact with the list.
This commit is contained in:
Andrea Torlaschi
2016-07-26 20:36:06 +02:00
parent e4fe1e95fb
commit d947db2569
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
View File

@@ -114,12 +114,13 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
return result; return result;
} }
public static class ViewHolder extends RecyclerView.ViewHolder { public class ViewHolder extends RecyclerView.ViewHolder {
public ImportKeysListItemBinding binding; public ImportKeysListItemBinding binding;
public ViewHolder(View view) { public ViewHolder(View view) {
super(view); super(view);
binding = DataBindingUtil.bind(view); binding = DataBindingUtil.bind(view);
binding.setNonInteractive(mNonInteractive);
} }
} }
@@ -178,7 +179,7 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
b.expand.setOnClickListener(new View.OnClickListener() { b.expand.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
boolean downloaded = mDownloaded[position] = !mDownloaded[position]; boolean downloaded = mDownloaded[position] = !mDownloaded[position];
b.extraContainer.setVisibility(downloaded ? View.VISIBLE : View.GONE); b.extraContainer.setVisibility(downloaded ? View.VISIBLE : View.GONE);
b.expand.animate().rotation(downloaded ? 180 : 0).start(); b.expand.animate().rotation(downloaded ? 180 : 0).start();

5
OpenKeychain/src/main/res/layout/import_keys_list_item.xml
View File

@@ -4,6 +4,8 @@
<import type="android.view.View" /> <import type="android.view.View" />
<import type="org.sufficientlysecure.keychain.ui.util.Highlighter" /> <import type="org.sufficientlysecure.keychain.ui.util.Highlighter" />
<variable name="nonInteractive" type="boolean" />
<variable name="standardColor" type="int" /> <variable name="standardColor" type="int" />
<variable name="revokedExpiredColor" type="int" /> <variable name="revokedExpiredColor" type="int" />
<variable name="secretColor" type="int" /> <variable name="secretColor" type="int" />
@@ -97,7 +99,8 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="8dp"> android:padding="8dp"
android:visibility="@{nonInteractive ? View.GONE : View.VISIBLE}">
<Button <Button
android:id="@+id/import_key" android:id="@+id/import_key"