diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-14 16:21:04 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-14 16:21:04 +0200 |
commit | 3814ae7d53a22ba89f1e39d7a4661016f76cf8c8 (patch) | |
tree | d83d41d3c424a784da144515665fb41ef650aa52 /OpenKeychain/src/main/res/layout/view_key_activity.xml | |
parent | dbaf7070ead596f5c70ad48fc55aada2f77a856a (diff) | |
parent | d5dd6a49c8156a699b3fbbbeef06658e1c232c16 (diff) | |
download | open-keychain-3814ae7d53a22ba89f1e39d7a4661016f76cf8c8.tar.gz open-keychain-3814ae7d53a22ba89f1e39d7a4661016f76cf8c8.tar.bz2 open-keychain-3814ae7d53a22ba89f1e39d7a4661016f76cf8c8.zip |
Merge branch 'master' into mime4j
Conflicts:
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res/layout/view_key_activity.xml')
-rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_activity.xml | 383 |
1 files changed, 201 insertions, 182 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index 8e04f6899..560180407 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -1,206 +1,225 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<android.support.design.widget.CoordinatorLayout 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" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/main_content" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:fitsSystemWindows="true"> - <RelativeLayout - android:id="@+id/toolbar_big" + <android.support.design.widget.AppBarLayout + android:id="@+id/app_bar_layout" android:layout_width="match_parent" - android:layout_height="@dimen/huge_toolbar" - android:elevation="4dp" - android:background="?attr/colorPrimary" - android:orientation="horizontal"> - - <ImageView - android:id="@+id/view_key_photo" - android:visibility="gone" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_below="@+id/status_bar" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:src="@drawable/ic_launcher" - android:baselineAlignBottom="false" - android:cropToPadding="false" - android:focusable="false" - android:adjustViewBounds="false" - android:layout_alignParentTop="false" - android:scaleType="centerCrop" /> - - <ImageView - android:id="@+id/status_bar" - android:layout_width="match_parent" - android:layout_height="@dimen/statusbar_height" - android:background="?attr/colorPrimary" /> + android:layout_height="wrap_content" + android:background="@color/primary" + android:fitsSystemWindows="true" + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> - <android.support.v7.widget.Toolbar - android:id="@+id/toolbar" - android:background="@color/transparent" - 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_name" + <android.support.design.widget.CollapsingToolbarLayout + android:id="@+id/collapsing_toolbar" 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="" - tools:text="Alice Skywalker" - 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="" - tools:text="My Key" - android:textColor="?attr/colorTabText" - 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:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_marginLeft="32dp" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true"> - - <ImageButton - android:id="@+id/view_key_action_encrypt_files" - android:layout_width="64dp" - android:layout_height="64dp" - android:visibility="invisible" - tools:visibility="visible" - style="?android:attr/borderlessButtonStyle" - android:src="@drawable/ic_action_encrypt_file_24dp" /> - - <ImageButton - android:id="@+id/view_key_action_encrypt_text" - android:layout_width="64dp" - android:layout_height="64dp" - android:visibility="invisible" - tools:visibility="visible" - style="?android:attr/borderlessButtonStyle" - android:src="@drawable/ic_action_encrypt_text_24dp" /> - - <ImageButton - android:id="@+id/view_key_action_nfc" - android:layout_width="64dp" - android:layout_height="64dp" - android:visibility="invisible" - tools:visibility="visible" - style="?android:attr/borderlessButtonStyle" - android:src="@drawable/ic_nfc_white_24dp" /> - - </LinearLayout> - - <ImageView - android:id="@+id/view_key_status_image" - android:layout_width="96dp" - android:visibility="invisible" - tools:visibility="visible" - android:src="@drawable/status_signature_unverified_cutout_96dp" - 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" - tools:visibility="invisible" - 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_height="match_parent" + android:fitsSystemWindows="true" + app:contentScrim="@color/primary" + app:expandedTitleMarginBottom="102dp" + app:expandedTitleMarginEnd="128dp" + app:expandedTitleMarginStart="47dp" + app:expandedTitleTextAppearance="@style/TextAppearance.AppCompat.Headline" + app:layout_scrollFlags="scroll|exitUntilCollapsed"> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="238dp" + android:fitsSystemWindows="true" + app:layout_collapseMode="parallax"> + + <FrameLayout + android:id="@+id/view_key_photo_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_alignParentTop="false" + android:fitsSystemWindows="true" + android:visibility="gone"> + + <ImageView + android:id="@+id/view_key_photo" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:adjustViewBounds="false" + android:baselineAlignBottom="false" + android:cropToPadding="false" + android:fitsSystemWindows="true" + android:focusable="false" + android:scaleType="centerCrop" + android:src="@mipmap/ic_launcher" /> + + <!-- text protection scrim --> + <View + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="bottom" + android:background="@drawable/scrim_bottom" /> + + </FrameLayout> + + <TextView + android:id="@+id/view_key_status" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_above="@+id/toolbar2" + android:layout_marginEnd="48dp" + android:layout_marginLeft="48dp" + android:layout_marginRight="48dp" + android:layout_marginStart="48dp" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="?attr/colorTabText" + tools:text="My Key" /> + + <LinearLayout + android:id="@+id/toolbar2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentEnd="true" + android:layout_alignParentLeft="true" + android:layout_alignParentRight="true" + android:layout_alignParentStart="true" + android:layout_marginLeft="32dp" + android:minHeight="?attr/actionBarSize" + android:orientation="horizontal"> + + <ImageButton + android:id="@+id/view_key_action_encrypt_files" + style="?android:attr/borderlessButtonStyle" + android:layout_width="64dp" + android:layout_height="64dp" + android:src="@drawable/ic_action_encrypt_file_24dp" + android:visibility="invisible" + tools:visibility="visible" /> + + <ImageButton + android:id="@+id/view_key_action_encrypt_text" + style="?android:attr/borderlessButtonStyle" + android:layout_width="64dp" + android:layout_height="64dp" + android:src="@drawable/ic_action_encrypt_text_24dp" + android:visibility="invisible" + tools:visibility="visible" /> + + <ImageButton + android:id="@+id/view_key_action_nfc" + style="?android:attr/borderlessButtonStyle" + android:layout_width="64dp" + android:layout_height="64dp" + android:src="@drawable/ic_nfc_white_24dp" + android:visibility="invisible" + tools:visibility="visible" /> + + </LinearLayout> + + <ImageView + android:id="@+id/view_key_status_image" + android:layout_width="96dp" + android:layout_height="96dp" + android:layout_above="@id/toolbar2" + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:layout_marginRight="16dp" + android:src="@drawable/status_signature_unverified_cutout_96dp" + android:visibility="invisible" + tools:visibility="visible" /> + + <android.support.v7.widget.CardView + android:id="@+id/view_key_qr_code_layout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_above="@id/toolbar2" + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:layout_marginRight="20dp" + android:clickable="true" + android:foreground="?android:attr/selectableItemBackground" + android:transitionName="qr_code" + android:visibility="visible" + app:layout_collapseMode="parallax" + card_view:cardBackgroundColor="@android:color/white" + card_view:cardCornerRadius="4dp" + card_view:cardElevation="2dp" + card_view:cardUseCompatPadding="true" + tools:visibility="invisible"> + + <ImageView + android:id="@+id/view_key_qr_code" + android:layout_width="96dp" + android:layout_height="96dp" /> + </android.support.v7.widget.CardView> + + </RelativeLayout> + + <android.support.v7.widget.Toolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + android:elevation="4dp" + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + android:touchscreenBlocksFocus="false" + android:transitionGroup="false" + app:layout_collapseMode="pin" + app:popupTheme="@style/ThemeOverlay.AppCompat.Light" + tools:ignore="UnusedAttribute" /> + </android.support.design.widget.CollapsingToolbarLayout> + + </android.support.design.widget.AppBarLayout> + + <android.support.v4.widget.FlingNestedScrollView + android:id="@+id/scroll" android:layout_width="match_parent" - 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" /> + android:layout_height="match_parent" + android:layout_gravity="fill_vertical" + app:layout_behavior="@string/appbar_scrolling_view_behavior"> - <FrameLayout + <LinearLayout android:id="@+id/content_frame" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:orientation="vertical"> <FrameLayout android:id="@+id/view_key_fragment" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" /> + + <FrameLayout + android:id="@+id/view_key_keybase_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <!-- + placeholder to improve the scrolling. + Somehow the content must be large enough to enable scrolling on NestedScrollView + --> + <View + android:layout_width="match_parent" + android:layout_height="230dp" android:orientation="vertical" /> - </FrameLayout> - </LinearLayout> + </LinearLayout> + + </android.support.v4.widget.FlingNestedScrollView> - <com.getbase.floatingactionbutton.FloatingActionButton + <android.support.design.widget.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:layout_margin="24dp" + android:src="@drawable/ic_qrcode_white_24dp" android:visibility="invisible" - tools:visibility="visible" - android:elevation="4dp" - fab:fab_icon="@drawable/ic_qrcode_white_24dp" - fab:fab_colorNormal="?attr/colorFab" - fab:fab_colorPressed="?attr/colorFabPressed" /> + app:layout_anchor="@id/app_bar_layout" + app:layout_anchorGravity="bottom|right|end" + tools:visibility="visible" /> -</RelativeLayout> +</android.support.design.widget.CoordinatorLayout> |