diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout/view_key_activity.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_activity.xml | 211 |
1 files changed, 175 insertions, 36 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index 451eb30ee..1a45370a5 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -1,52 +1,191 @@ <?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" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + xmlns:fab="http://schemas.android.com/apk/res-auto" + xmlns:card_view="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> + android:layout_height="match_parent"> - <include layout="@layout/notify_area" /> - - <LinearLayout - android:id="@+id/view_key_status_layout" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" + <RelativeLayout + android:id="@+id/toolbar_big" + android:layout_width="match_parent" + android:layout_height="@dimen/huge_toolbar" + android:elevation="4dp" + android:background="?attr/colorPrimary" android:orientation="horizontal"> + <org.sufficientlysecure.keychain.ui.widget.AspectRatioImageView + android:id="@+id/view_key_photo" + app:aspectRatioEnabled="true" + android:visibility="gone" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@+id/status_bar" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:src="@drawable/first_time_1" /> + <ImageView - android:id="@+id/view_key_status_image" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> + android:id="@+id/status_bar" + android:layout_width="match_parent" + android:layout_height="@dimen/statusbar_height" + android:background="?attr/colorPrimary" /> + + <android.support.v7.widget.Toolbar + android:id="@+id/toolbar" + android:layout_below="@+id/status_bar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?attr/actionBarSize" + android:overScrollMode="always" + app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + app:popupTheme="@style/ThemeOverlay.AppCompat.Light" + tools:ignore="UnusedAttribute" + android:transitionGroup="false" + android:touchscreenBlocksFocus="false" /> <TextView - android:id="@+id/view_key_status_text" + android:id="@+id/view_key_name" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="48dp" + android:layout_marginStart="48dp" + android:layout_marginRight="48dp" + android:layout_marginEnd="48dp" + android:text="" + android:textColor="@color/icons" + android:textAppearance="?android:attr/textAppearanceLarge" + android:layout_above="@+id/view_key_status" /> + + <TextView + android:id="@+id/view_key_status" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="48dp" + android:layout_marginStart="48dp" + android:layout_marginRight="48dp" + android:layout_marginEnd="48dp" + android:text="" + android:textColor="@color/tab_text" + android:textAppearance="?android:attr/textAppearanceSmall" + android:layout_above="@+id/toolbar2" /> + + <LinearLayout + android:id="@+id/toolbar2" + android:orientation="horizontal" + android:layout_alignParentBottom="true" android:layout_width="wrap_content" + android:minHeight="?attr/actionBarSize" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_gravity="center_vertical" - android:layout_marginLeft="8dp" /> + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_marginLeft="32dp" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true"> - </LinearLayout> + <ImageButton + android:id="@+id/view_key_action_encrypt_files" + android:layout_width="64dp" + android:layout_height="64dp" + android:visibility="invisible" + style="?android:attr/borderlessButtonStyle" + android:src="@drawable/ic_action_encrypt_file" /> - <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" - android:visibility="gone" - android:id="@+id/view_key_status_divider" /> + <ImageButton + android:id="@+id/view_key_action_encrypt_text" + android:layout_width="64dp" + android:layout_height="64dp" + android:visibility="invisible" + style="?android:attr/borderlessButtonStyle" + android:src="@drawable/ic_action_encrypt_text" /> - <org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout - android:id="@+id/view_key_sliding_tab_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + <ImageButton + android:id="@+id/view_key_action_nfc" + android:layout_width="64dp" + android:layout_height="64dp" + android:visibility="invisible" + style="?android:attr/borderlessButtonStyle" + android:src="@drawable/ic_nfc_white_24dp" /> - <android.support.v4.view.ViewPager - android:id="@+id/view_key_pager" + </LinearLayout> + + <ImageView + android:id="@+id/view_key_status_image" + android:layout_width="96dp" + android:visibility="invisible" + android:src="@drawable/status_signature_unverified_cutout_96px" + android:layout_height="96dp" + android:layout_above="@id/toolbar2" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:layout_marginRight="16dp" /> + + <android.support.v7.widget.CardView + android:id="@+id/view_key_qr_code_layout" + android:transitionName="qr_code" + android:visibility="visible" + android:layout_above="@id/toolbar2" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:layout_marginRight="20dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:clickable="true" + android:foreground="?android:attr/selectableItemBackground" + card_view:cardBackgroundColor="@android:color/white" + card_view:cardElevation="2dp" + card_view:cardUseCompatPadding="true" + card_view:cardCornerRadius="4dp"> + + <ImageView + android:id="@+id/view_key_qr_code" + android:layout_width="96dp" + android:layout_height="96dp" /> + </android.support.v7.widget.CardView> + + </RelativeLayout> + + <LinearLayout + android:id="@+id/body" + android:layout_below="@id/toolbar_big" + android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="0px" - android:layout_weight="1" - android:background="@android:color/white" /> + android:layout_height="match_parent"> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" + android:visibility="gone" + android:id="@+id/view_key_status_divider" /> + + <FrameLayout + android:id="@+id/content_frame" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <FrameLayout + android:id="@+id/view_key_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" /> + + </FrameLayout> + </LinearLayout> + + <com.getbase.floatingactionbutton.FloatingActionButton + android:id="@+id/fab" + android:layout_alignBottom="@id/toolbar_big" + android:layout_alignParentRight="true" + android:layout_marginRight="20dp" + android:layout_marginBottom="-40dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="invisible" + android:elevation="4dp" + fab:fab_icon="@drawable/ic_qrcode_white_24dp" + fab:fab_colorNormal="@color/fab" + fab:fab_colorPressed="@color/fab_pressed" /> -</LinearLayout>
\ No newline at end of file +</RelativeLayout>
\ No newline at end of file |