cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inline subkey editing (wip commit)

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-11-14 03:24:07 +01:00
committed by Dominik Schürmann
parent fd119bda00
commit 00e97586b0
26 changed files with 410 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml
View File

@@ -63,7 +63,7 @@
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:id="@+id/view_key_user_id_fab_layout"
android:id="@+id/view_key_subkey_fab_layout"
android:inAnimation="@anim/fab_slide_in"
android:outAnimation="@anim/fab_slide_down">
@@ -72,7 +72,7 @@
android:layout_height="wrap_content" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/view_key_user_id_fab"
android:id="@+id/view_key_subkey_fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"

106
OpenKeychain/src/main/res/layout/view_key_adv_subkeys_fragment.xml
View File

@@ -1,34 +1,88 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusable="true"
android:focusableInTouchMode="true"
android:descendantFocusability="beforeDescendants"
android:orientation="vertical">
android:layout_height="match_parent">
<TextView
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginTop="8dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:text="@string/section_keys" />
<FrameLayout
<!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="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">
<ListView
<TextView
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginTop="8dp"
android:text="@string/section_keys"
android:layout_weight="1" />
<org.sufficientlysecure.keychain.ui.widget.FixedListView
android:id="@+id/keys"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbarStyle="outsideOverlay"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:layout_marginBottom="8dp" />
</FrameLayout>
android:layout_height="0dp"
android:layout_marginBottom="4dp"
android:layout_weight="1"
android:scrollbarStyle="outsideOverlay" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:id="@+id/view_key_subkeys_add_layout"
android:visibility="gone"
tools:visibility="visible">
<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_subkeys_added"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</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_subkey_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_subkey_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>
</RelativeLayout>