diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/anim/fab_slide_down.xml | 6 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/anim/fab_slide_in.xml | 7 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml | 122 |
3 files changed, 80 insertions, 55 deletions
diff --git a/OpenKeychain/src/main/res/anim/fab_slide_down.xml b/OpenKeychain/src/main/res/anim/fab_slide_down.xml new file mode 100644 index 000000000..e51ac0cb9 --- /dev/null +++ b/OpenKeychain/src/main/res/anim/fab_slide_down.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<translate xmlns:android="http://schemas.android.com/apk/res/android" + android:fromYDelta="0" android:toYDelta="300" + android:interpolator="@android:anim/anticipate_interpolator" + android:duration="250" +/> diff --git a/OpenKeychain/src/main/res/anim/fab_slide_in.xml b/OpenKeychain/src/main/res/anim/fab_slide_in.xml new file mode 100644 index 000000000..cb38f81e8 --- /dev/null +++ b/OpenKeychain/src/main/res/anim/fab_slide_in.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<translate xmlns:android="http://schemas.android.com/apk/res/android" + android:fromYDelta="300" android:toYDelta="0" + android:interpolator="@android:anim/overshoot_interpolator" + android:duration="250" + android:startOffset="100" +/>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml index d36c09ea1..ab0c59865 100644 --- a/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml @@ -1,74 +1,86 @@ -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" xmlns:tools="http://schemas.android.com/tools"> - <!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331--> - <LinearLayout + <ScrollView android:layout_width="match_parent" - android:layout_height="wrap_content" - android:focusable="true" - android:focusableInTouchMode="true" - android:descendantFocusability="beforeDescendants" - android:orientation="vertical" - android:paddingLeft="16dp" - android:paddingRight="16dp"> - - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="0dp" - android:layout_marginTop="8dp" - android:text="@string/section_user_ids" - android:layout_weight="1" /> - - <org.sufficientlysecure.keychain.ui.widget.FixedListView - android:id="@+id/view_key_user_ids" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_marginBottom="4dp" - android:layout_weight="1" /> + android:layout_height="match_parent"> + <!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331--> <LinearLayout - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" + android:focusable="true" + android:focusableInTouchMode="true" + android:descendantFocusability="beforeDescendants" android:orientation="vertical" - android:id="@+id/view_key_user_ids_add_layout" - android:visibility="gone" - tools:visibility="visible"> + android:paddingLeft="16dp" + android:paddingRight="16dp"> - <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" /> + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_marginTop="8dp" + android:text="@string/section_user_ids" + android:layout_weight="1" /> <org.sufficientlysecure.keychain.ui.widget.FixedListView - android:id="@+id/view_key_user_ids_added" + android:id="@+id/view_key_user_ids" android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="0dp" + android:layout_marginBottom="4dp" + android:layout_weight="1" /> - <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" /> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + android:id="@+id/view_key_user_ids_add_layout" + android:visibility="gone" + tools:visibility="visible"> - <TextView - android:id="@+id/view_key_action_add_user_id" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:text="@string/edit_key_action_add_identity" - android:minHeight="?android:attr/listPreferredItemHeight" - android:drawableRight="@drawable/ic_person_add_grey_24dp" - android:drawablePadding="8dp" - android:gravity="center_vertical" - android:clickable="true" - style="?android:attr/borderlessButtonStyle" /> + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + + <org.sufficientlysecure.keychain.ui.widget.FixedListView + android:id="@+id/view_key_user_ids_added" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + </LinearLayout> </LinearLayout> - </LinearLayout> + </ScrollView> + + <ViewAnimator + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:layout_alignParentBottom="true" + android:id="@+id/view_key_user_id_fab_layout" + android:inAnimation="@anim/fab_slide_in" + android:outAnimation="@anim/fab_slide_down"> + + <Space + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + + <android.support.design.widget.FloatingActionButton + android:id="@+id/view_key_user_id_fab" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="24dp" + android:src="@drawable/ic_person_add_grey_24dp" + android:visibility="invisible" + android:layout_gravity="bottom" + tools:visibility="visible" /> + + </ViewAnimator> -</ScrollView> +</RelativeLayout> |