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 | 105 |
1 files changed, 81 insertions, 24 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index 25115eb2f..f9c23f065 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -1,44 +1,88 @@ <?xml version="1.0" encoding="utf-8"?> <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" android:layout_width="match_parent" android:layout_height="match_parent"> - <include - android:id="@+id/toolbar_include" - layout="@layout/toolbar_standalone" /> - - <LinearLayout - android:layout_below="@id/toolbar_include" + <RelativeLayout + android:id="@+id/toolbar_big" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> + android:layout_height="@dimen/big_toolbar" + android:elevation="4dp" + android:background="?attr/colorPrimary" + android:orientation="horizontal"> - <include layout="@layout/notify_area" /> + <ImageView + android:id="@+id/status_bar" + android:layout_width="match_parent" + android:layout_height="@dimen/statusbar_height" + android:background="?attr/colorPrimary" /> - <LinearLayout - android:id="@+id/view_key_status_layout" - android:layout_width="wrap_content" + <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:layout_gravity="center" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" - android:orientation="horizontal"> + android:minHeight="?attr/actionBarSize" + android:background="?attr/colorPrimary" + 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" /> - <ImageView - android:id="@+id/view_key_status_image" + <LinearLayout + android:layout_below="@+id/toolbar" + android:layout_marginLeft="48dp" + android:layout_marginRight="72dp" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <LinearLayout + android:id="@+id/view_key_status_layout" android:layout_width="wrap_content" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:orientation="horizontal"> + + <ImageView + android:id="@+id/view_key_status_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + + <TextView + android:id="@+id/view_key_status_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_gravity="center_vertical" + android:layout_marginLeft="8dp" /> + + </LinearLayout> <TextView - android:id="@+id/view_key_status_text" + android:id="@+id/api_app_settings_app_name" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:text="Name (set in-code)longlong" + android:textColor="@color/icons" android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_gravity="center_vertical" - android:layout_marginLeft="8dp" /> - + android:paddingLeft="8dp" + android:layout_gravity="center_vertical" /> </LinearLayout> + </RelativeLayout> + + <LinearLayout + android:id="@+id/body" + android:layout_below="@id/toolbar_big" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> <View android:layout_width="match_parent" @@ -59,6 +103,19 @@ 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:elevation="4dp" + fab:fab_icon="@drawable/ic_qrcode_white_24dp" + fab:fab_colorNormal="@color/fab" + fab:fab_colorPressed="@color/fab_pressed" /> + </RelativeLayout>
\ No newline at end of file |