diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-03 14:28:54 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-03 14:28:54 +0100 |
commit | e2a8819385dab5c925cbc25f728a6491fea185e9 (patch) | |
tree | 775404eea45f6187a01d3fa0b0fb2ca5ece65b30 /OpenKeychain/src/main/res/layout/api_app_settings_activity.xml | |
parent | c763ea35035be678bedacea13ec4c2b7c51f9943 (diff) | |
download | open-keychain-e2a8819385dab5c925cbc25f728a6491fea185e9.tar.gz open-keychain-e2a8819385dab5c925cbc25f728a6491fea185e9.tar.bz2 open-keychain-e2a8819385dab5c925cbc25f728a6491fea185e9.zip |
Floating Action Button added in app settings
Diffstat (limited to 'OpenKeychain/src/main/res/layout/api_app_settings_activity.xml')
-rw-r--r-- | OpenKeychain/src/main/res/layout/api_app_settings_activity.xml | 111 |
1 files changed, 100 insertions, 11 deletions
diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml index ac579d006..cdf450f6e 100644 --- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml +++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml @@ -1,26 +1,66 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:custom="http://schemas.android.com/apk/res-auto" + 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" - layout="@layout/toolbar" /> + <RelativeLayout + android:id="@+id/toolbar_big" + android:layout_width="match_parent" + android:layout_height="120dp" + android:elevation="4dp" + android:background="?attr/colorPrimaryDark" + android:orientation="horizontal"> + + <android.support.v7.widget.Toolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?attr/actionBarSize" + android:background="?attr/colorPrimaryDark" + 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" /> + + <LinearLayout + android:layout_below="@+id/toolbar" + android:paddingLeft="48dp" + android:paddingBottom="8dp" + android:paddingRight="72dp" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <ImageView + android:id="@+id/api_app_settings_app_icon" + android:layout_width="48dp" + android:layout_height="48dp" + android:src="@drawable/ic_launcher" /> + + <TextView + 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:paddingLeft="8dp" + android:layout_gravity="center_vertical" /> + </LinearLayout> + </RelativeLayout> <LinearLayout - android:layout_below="@id/toolbar" + android:id="@+id/body" + android:layout_below="@id/toolbar_big" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> - <fragment - android:id="@+id/api_app_settings_fragment" - android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsHeaderFragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - tools:layout="@layout/api_app_settings_fragment" /> - <ScrollView android:layout_width="match_parent" android:layout_height="match_parent"> @@ -55,7 +95,56 @@ android:layout_height="match_parent" android:orientation="vertical" /> + <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:textColor="@color/icons" + custom:foldedLabel="@string/api_settings_show_info" + custom:unFoldedLabel="@string/api_settings_hide_info"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/api_settings_package_name" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:id="@+id/api_app_settings_package_name" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="com.example" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/api_settings_package_signature" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:id="@+id/api_app_settings_package_signature" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="Base64 encoded hash of signature" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout> + </LinearLayout> </ScrollView> </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_play_arrow_white_24dp" + fab:fab_colorNormal="@color/fab" + fab:fab_colorPressed="@color/fab_pressed" /> + </RelativeLayout>
\ No newline at end of file |