From 211f228efaef233cb8a78f35f0242479eff28554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Sch=C3=A4ttgen?= Date: Thu, 5 Apr 2018 00:07:48 +0200 Subject: [PATCH] Added advanced settings to EditProfile view --- app/build.gradle | 1 + .../me/impy/aegis/ui/EditProfileActivity.java | 39 +++++++++++++++ .../ic_keyboard_arrow_down_black_24dp.xml | 9 ++++ .../main/res/layout/activity_edit_profile.xml | 50 ++++++++++++++++++- 4 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/drawable/ic_keyboard_arrow_down_black_24dp.xml diff --git a/app/build.gradle b/app/build.gradle index a8beae90..1dcfc33e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,5 +41,6 @@ dependencies { compile 'com.madgag.spongycastle:core:1.56.0.0' compile 'com.github.apl-devs:appintro:v4.2.2' compile 'com.getbase:floatingactionbutton:1.10.1' + compile 'com.github.aakira:expandable-layout:1.6.0@aar' testCompile 'junit:junit:4.12' } diff --git a/app/src/main/java/me/impy/aegis/ui/EditProfileActivity.java b/app/src/main/java/me/impy/aegis/ui/EditProfileActivity.java index e556317e..934d9f9e 100644 --- a/app/src/main/java/me/impy/aegis/ui/EditProfileActivity.java +++ b/app/src/main/java/me/impy/aegis/ui/EditProfileActivity.java @@ -11,12 +11,18 @@ import android.view.Menu; import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; +import android.view.animation.AccelerateInterpolator; +import android.view.animation.AlphaAnimation; +import android.view.animation.Animation; import android.widget.AdapterView; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.Spinner; import com.amulyakhare.textdrawable.TextDrawable; +import com.github.aakira.expandablelayout.ExpandableLinearLayout; +import com.github.aakira.expandablelayout.ExpandableRelativeLayout; import me.impy.aegis.R; import me.impy.aegis.crypto.KeyInfo; @@ -102,6 +108,39 @@ public class EditProfileActivity extends AegisActivity { _iconView.setImageDrawable(drawable); } }); + + + ExpandableRelativeLayout content=(ExpandableRelativeLayout) findViewById(R.id.expandableLayout); + RelativeLayout header=(RelativeLayout) findViewById(R.id.accordian_header); + +//to toggle content + header.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Animation fadeOut = new AlphaAnimation(1, 0); // the 1, 0 here notifies that we want the opacity to go from opaque (1) to transparent (0) + fadeOut.setInterpolator(new AccelerateInterpolator()); + fadeOut.setDuration(220); // Fadeout duration should be 1000 milli seconds + header.startAnimation(fadeOut); + + fadeOut.setAnimationListener(new Animation.AnimationListener() { + @Override + public void onAnimationStart(Animation animation) { + + } + + @Override + public void onAnimationEnd(Animation animation) { + header.setVisibility(View.GONE); + content.toggle(); + } + + @Override + public void onAnimationRepeat(Animation animation) { + + } + }); + } + }); } private void updateFields() { diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_down_black_24dp.xml b/app/src/main/res/drawable/ic_keyboard_arrow_down_black_24dp.xml new file mode 100644 index 00000000..ad33063c --- /dev/null +++ b/app/src/main/res/drawable/ic_keyboard_arrow_down_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_edit_profile.xml b/app/src/main/res/layout/activity_edit_profile.xml index 779f7da5..cbcf3377 100644 --- a/app/src/main/res/layout/activity_edit_profile.xml +++ b/app/src/main/res/layout/activity_edit_profile.xml @@ -69,7 +69,53 @@ android:layout_height="wrap_content" android:layout_weight="1"/> + + + + + + + + + + @@ -184,8 +230,8 @@ android:inputType="textPassword"/> - - + +