Merge pull request #467 from uberspot/master

Make foldable settings in EncryptActivity into a separate widget

6 files changed, 329 insertions, 140 deletions

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
index 28c9c7b28..4ccfd393f 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
@@ -108,11 +108,6 @@ public class EncryptActivity extends DrawerActivity {
     private String mInputFilename = null;
     private String mOutputFilename = null;
 
-    private Integer mShortAnimationDuration = null;
-    private boolean mFileAdvancedSettingsVisible = false;
-    private TextView mFileAdvancedSettings = null;
-    private LinearLayout mFileAdvancedSettingsContainer = null;
-    private FontAwesomeText mAdvancedSettingsIcon;
     private boolean mAsciiArmorDemand = false;
     private boolean mOverrideAsciiArmor = false;
 
@@ -147,9 +142,6 @@ public class EncryptActivity extends DrawerActivity {
         updateMode();
 
         updateActionBarButtons();
-
-        // retrieve and cache the system's short animation time
-        mShortAnimationDuration = getResources().getInteger(android.R.integer.config_shortAnimTime);
     }
 
     /**
@@ -795,49 +787,10 @@ public class EncryptActivity extends DrawerActivity {
             }
         });
 
-        mAdvancedSettingsIcon = (FontAwesomeText) findViewById(R.id.advancedSettingsIcon);
-        mFileAdvancedSettingsContainer = (LinearLayout) findViewById(R.id.fileAdvancedSettingsContainer);
-        mFileAdvancedSettings = (TextView) findViewById(R.id.advancedSettings);
 
-        LinearLayout advancedSettingsControl = (LinearLayout) findViewById(R.id.advancedSettingsControl);
-        advancedSettingsControl.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                mFileAdvancedSettingsVisible = !mFileAdvancedSettingsVisible;
-                if (mFileAdvancedSettingsVisible) {
-                    mAdvancedSettingsIcon.setIcon("fa-chevron-down");
-                    mFileAdvancedSettingsContainer.setVisibility(View.VISIBLE);
-                    AlphaAnimation animation = new AlphaAnimation(0f, 1f);
-                    animation.setDuration(mShortAnimationDuration);
-                    mFileAdvancedSettingsContainer.startAnimation(animation);
-                    mFileAdvancedSettings.setText(R.string.btn_encryption_advanced_settings_hide);
 
-                } else {
-                    mAdvancedSettingsIcon.setIcon("fa-chevron-right");
-                    AlphaAnimation animation = new AlphaAnimation(1f, 0f);
-                    animation.setDuration(mShortAnimationDuration);
-                    animation.setAnimationListener(new Animation.AnimationListener() {
-                        @Override
-                        public void onAnimationStart(Animation animation) {
-                            // do nothing
-                        }
 
-                        @Override
-                        public void onAnimationEnd(Animation animation) {
-                            // making sure that at the end the container is completely removed from view
-                            mFileAdvancedSettingsContainer.setVisibility(View.GONE);
-                        }
 
-                        @Override
-                        public void onAnimationRepeat(Animation animation) {
-                            // do nothing
-                        }
-                    });
-                    mFileAdvancedSettingsContainer.startAnimation(animation);
-                    mFileAdvancedSettings.setText(R.string.btn_encryption_advanced_settings_show);
-                }
-            }
-        });
 
         mFileCompression = (Spinner) findViewById(R.id.fileCompression);
         Choice[] choices = new Choice[]{
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FoldableLinearLayout.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FoldableLinearLayout.java
new file mode 100644
index 000000000..f9a5b92f3
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FoldableLinearLayout.java
@@ -0,0 +1,203 @@
+/*
+ * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.sufficientlysecure.keychain.ui.widget;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.animation.AlphaAnimation;
+import android.view.animation.Animation;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import com.beardedhen.androidbootstrap.FontAwesomeText;
+import org.sufficientlysecure.keychain.R;
+
+/**
+ * Class representing a LinearLayout that can fold and hide it's content when pressed
+ * To use just add the following to your xml layout
+
+ <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
+     android:layout_width="wrap_content"
+     android:layout_height="wrap_content"
+     custom:foldedLabel="@string/TEXT_TO_DISPLAY_WHEN_FOLDED"
+     custom:unFoldedLabel="@string/TEXT_TO_DISPLAY_WHEN_UNFOLDED"
+     custom:foldedIcon="ICON_NAME_FROM_FontAwesomeText_TO_USE_WHEN_FOLDED"
+     custom:unFoldedIcon="ICON_NAME_FROM_FontAwesomeText_TO_USE_WHEN_UNFOLDED">
+
+    <include layout="@layout/ELEMENTS_TO_BE_FOLDED"/>
+
+ </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout>
+
+ */
+public class FoldableLinearLayout extends LinearLayout {
+
+    private FontAwesomeText mFoldableIcon;
+    private boolean mFolded;
+    private boolean mHasMigrated = false;
+    private Integer mShortAnimationDuration = null;
+    private TextView mFoldableTextView = null;
+    private LinearLayout mFoldableContainer = null;
+    private View mFoldableLayout = null;
+
+    private String mFoldedIconName;
+    private String mUnFoldedIconName;
+    private String mFoldedLabel;
+    private String mUnFoldedLabel;
+
+    public FoldableLinearLayout(Context context) {
+        super(context);
+        processAttributes(context, null);
+    }
+
+    public Foldabl