Use new FoldableLinearLayout in API settings

2 files changed, 15 insertions, 59 deletions

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/AppSettingsFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/AppSettingsFragment.java
index 837295018..52b06a2ae 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/AppSettingsFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/AppSettingsFragment.java
@@ -25,13 +25,13 @@ import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Animation;
-import android.widget.*;
+import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemSelectedListener;
-import com.beardedhen.androidbootstrap.BootstrapButton;
+import android.widget.ImageView;
+import android.widget.Spinner;
+import android.widget.TextView;
+
 import org.spongycastle.util.encoders.Hex;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
@@ -50,8 +50,6 @@ public class AppSettingsFragment extends Fragment implements
     private AppSettings mAppSettings;
 
     // view
-    private LinearLayout mAdvancedSettingsContainer;
-    private BootstrapButton mAdvancedSettingsButton;
     private TextView mAppNameView;
     private ImageView mAppIconView;
     private Spinner mEncryptionAlgorithm;
@@ -117,11 +115,6 @@ public class AppSettingsFragment extends Fragment implements
                 R.id.api_app_settings_select_key_fragment);
         mSelectKeyFragment.setCallback(this);
 
-        mAdvancedSettingsButton = (BootstrapButton) view
-                .findViewById(R.id.api_app_settings_advanced_button);
-        mAdvancedSettingsContainer = (LinearLayout) view
-                .findViewById(R.id.api_app_settings_advanced);
-
         mAppNameView = (TextView) view.findViewById(R.id.api_app_settings_app_name);
         mAppIconView = (ImageView) view.findViewById(R.id.api_app_settings_app_icon);
         mEncryptionAlgorithm = (Spinner) view
@@ -176,35 +169,6 @@ public class AppSettingsFragment extends Fragment implements
             public void onNothingSelected(AdapterView<?> parent) {
             }
         });
-
-        final Animation visibleAnimation = new AlphaAnimation(0.0f, 1.0f);
-        visibleAnimation.setDuration(250);
-        final Animation invisibleAnimation = new AlphaAnimation(1.0f, 0.0f);
-        invisibleAnimation.setDuration(250);
-
-        // TODO: Better: collapse/expand animation
-        // final Animation animation2 = new TranslateAnimation(Animation.RELATIVE_TO_SELF, 0.0f,
-        // Animation.RELATIVE_TO_SELF, 0.0f, Animation.RELATIVE_TO_SELF, -1.0f,
-        // Animation.RELATIVE_TO_SELF, 0.0f);u
-        // animation2.setDuration(150);
-
-        mAdvancedSettingsButton.setOnClickListener(new OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                if (mAdvancedSettingsContainer.getVisibility() == View.VISIBLE) {
-                    mAdvancedSettingsContainer.startAnimation(invisibleAnimation);
-                    mAdvancedSettingsContainer.setVisibility(View.GONE);
-                    mAdvancedSettingsButton.setText(getString(R.string.api_settings_show_advanced));
-                    mAdvancedSettingsButton.setLeftIcon("fa-caret-up");
-                } else {
-                    mAdvancedSettingsContainer.startAnimation(visibleAnimation);
-                    mAdvancedSettingsContainer.setVisibility(View.VISIBLE);
-                    mAdvancedSettingsButton.setText(getString(R.string.api_settings_hide_advanced));
-                    mAdvancedSettingsButton.setLeftIcon("fa-caret-down");
-                }
-            }
-        });
     }
 
     private void setPackage(String packageName) {
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_settings_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/api_app_settings_fragment.xml
index a8b68859b..a7917ad4e 100644
--- a/OpenPGP-Keychain/src/main/res/layout/api_app_settings_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/api_app_settings_fragment.xml
@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:custom="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
@@ -42,24 +43,13 @@
         android:layout_height="wrap_content"
         tools:layout="@layout/select_secret_key_layout_fragment" />
 
-    <com.beardedhen.androidbootstrap.BootstrapButton
-        android:id="@+id/api_app_settings_advanced_button"
+    <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginBottom="4dp"
-        android:layout_marginTop="4dp"
-        android:text="@string/api_settings_show_advanced"
-        bootstrapbutton:bb_icon_left="fa-caret-up"
-        bootstrapbutton:bb_size="default"
-        bootstrapbutton:bb_type="default" />
-
-    <LinearLayout
-        android:id="@+id/api_app_settings_advanced"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:visibility="gone">
+        android:layout_height="match_parent"
+        custom:foldedLabel="@string/btn_encryption_advanced_settings_show"
+        custom:unFoldedLabel="@string/btn_encryption_advanced_settings_hide"
+        custom:foldedIcon="fa-chevron-right"
+        custom:unFoldedIcon="fa-chevron-down">
 
         <TextView
             android:layout_width="match_parent"
@@ -119,5 +109,7 @@
             android:layout_height="wrap_content"
             android:text="Base64 encoded signature"
             android:textAppearance="?android:attr/textAppearanceSmall" />
-    </LinearLayout>
+
+    </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout>
+
 </LinearLayout>
\ No newline at end of file