From 8ce6aba68e25b70c87bafe87c65b43b003b9d36f Mon Sep 17 00:00:00 2001
From: Andrea Torlaschi <runnerway@gmail.com>
Date: Wed, 17 Aug 2016 11:14:23 +0200
Subject: [PATCH] ImportKeys: Refactoring

---
 .../keychain/ui/ImportKeysListFragment.java   | 20 ++++-----
 .../main/res/layout/import_keys_list_item.xml | 42 +++++++------------
 OpenKeychain/src/main/res/values/styles.xml   | 11 +++++
 3 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
index 94f01fa79..8e22a3868 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
@@ -266,24 +266,24 @@ public class ImportKeysListFragment extends Fragment implements
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.basic:
-                mAdvanced = false;
-                mAdapter.setAdvanced(false);
-                mActivity.invalidateOptionsMenu();
-
-                binding.setAdvanced(mAdvanced);
+                setAdvanced(false);
                 return true;
             case R.id.advanced:
-                mAdvanced = true;
-                mAdapter.setAdvanced(true);
-                mActivity.invalidateOptionsMenu();
-                
-                binding.setAdvanced(mAdvanced);
+                setAdvanced(true);
                 return true;
         }
 
         return false;
     }
 
+    public void setAdvanced(boolean advanced) {
+        this.mAdvanced = advanced;
+
+        mAdapter.setAdvanced(advanced);
+        mActivity.invalidateOptionsMenu();
+        binding.setAdvanced(advanced);
+    }
+
     @Override
     public void onRequestPermissionsResult(int requestCode,
                                            @NonNull String[] permissions,
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 f4d6ff57c..e017ae2e6 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_list_item.xml
@@ -2,7 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
-        <import type="android.view.View" />
+        <import type="android.view.View" alias="V" />
         <import type="org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry" />
 
         <variable name="advanced" type="boolean" />
@@ -20,7 +20,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingTop="24dp">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -28,8 +29,7 @@
                 android:orientation="vertical"
                 android:paddingBottom="16dp"
                 android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:paddingTop="24dp">
+                android:paddingRight="16dp">
 
                 <RelativeLayout
                     android:layout_width="match_parent"
@@ -69,7 +69,7 @@
                         android:layout_height="wrap_content"
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
-                        android:visibility="@{entry.revokedOrExpired ? View.VISIBLE : View.GONE}"
+                        android:visibility="@{entry.revokedOrExpired ? V.VISIBLE : V.GONE}"
                         app:keyExpired="@{entry.expired}"
                         app:keyRevoked="@{entry.revoked}" />
 
@@ -77,48 +77,36 @@
 
             </LinearLayout>
 
-            <LinearLayout
+            <!-- This empty layout is needed to get correct bottom padding in basic mode -->
+            <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingBottom="8dp"
-                android:visibility="@{(!advanced || nonInteractive) ? View.VISIBLE : View.GONE}" />
+                android:visibility="@{(!advanced || nonInteractive) ? V.VISIBLE : V.GONE}" />
 
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:padding="8dp"
-                android:visibility="@{(!advanced || nonInteractive) ? View.GONE : View.VISIBLE}">
+                android:visibility="@{(!advanced || nonInteractive) ? V.GONE : V.VISIBLE}">
 
                 <Button
                     android:id="@+id/import_key"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:minHeight="0dp"
-                    android:minWidth="0dp"
-                    android:padding="8dp"
-                    android:text="@string/btn_import"
-                    android:textColor="@color/card_view_button" />
+                    style="@style/CardViewActionButton"
+                    android:text="@string/btn_import" />
 
                 <ImageButton
                     android:id="@+id/expand"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    style="@style/CardViewActionButton"
                     android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:minHeight="0dp"
-                    android:minWidth="0dp"
-                    android:padding="8dp"
                     android:src="@drawable/ic_expand_more_black_24dp" />
 
             </RelativeLayout>
 
-            <LinearLayout
+            <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:visibility="@{advanced ? View.VISIBLE : View.GONE}">
+                android:visibility="@{advanced ? V.VISIBLE : V.GONE}">
 
                 <LinearLayout
                     android:id="@+id/extra_container"
@@ -138,7 +126,7 @@
 
                 </LinearLayout>
 
-            </LinearLayout>
+            </FrameLayout>
 
         </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml
index 5d7486d19..d397d8e3a 100644
--- a/OpenKeychain/src/main/res/values/styles.xml
+++ b/OpenKeychain/src/main/res/values/styles.xml
@@ -11,6 +11,17 @@
         <item name="android:textSize">17sp</item>
     </style>
 
+    <style name="CardViewActionButton">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:background">?android:attr/selectableItemBackground</item>
+        <item name="android:minHeight">0dp</item>
+        <item name="android:minWidth">0dp</item>
+        <item name="android:padding">8dp</item>
+        <item name="android:textColor">@color/card_view_button</item>
+    </style>
+
     <style name="SectionHeader">
         <item name="android:drawableBottom">?attr/sectionHeaderDrawable</item>
         <item name="android:drawablePadding">4dp</item>