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

CardView and more header design

Browse Source
This commit is contained in:
Dominik Schürmann
2015-02-25 18:37:31 +01:00
parent 4ea59f79cc
commit 27263edda5
9 changed files with 90 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenKeychain/src/main/res/drawable/cardview_header.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<size
android:height="1dp"
android:width="1000dp" />
<solid android:color="@color/bg_gray" />
</shape>

43
OpenKeychain/src/main/res/layout/view_key_activity.xml
View File

@@ -3,6 +3,7 @@
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">
@@ -52,12 +53,12 @@
android:layout_marginStart="48dp"
android:layout_marginRight="48dp"
android:layout_marginEnd="48dp"
android:layout_above="@+id/view_key_status"
android:text=""
android:textColor="@color/icons"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_toLeftOf="@+id/view_key_qr_code"
android:layout_toStartOf="@+id/view_key_qr_code" />
android:layout_above="@+id/view_key_status"
android:layout_toLeftOf="@+id/view_key_qr_code_layout"
android:layout_toStartOf="@+id/view_key_qr_code_layout" />
<TextView
android:id="@+id/view_key_status"
@@ -67,19 +68,18 @@
android:layout_marginStart="48dp"
android:layout_marginRight="48dp"
android:layout_marginEnd="48dp"
android:layout_above="@+id/toolbar2"
android:text=""
android:textColor="@color/tab_text"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_toLeftOf="@+id/view_key_qr_code"
android:layout_toStartOf="@+id/view_key_qr_code" />
android:layout_above="@+id/toolbar2"
android:layout_toLeftOf="@+id/view_key_qr_code_layout"
android:layout_toStartOf="@+id/view_key_qr_code_layout" />
<LinearLayout
android:id="@+id/toolbar2"
android:orientation="horizontal"
android:layout_alignParentBottom="true"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:minHeight="?attr/actionBarSize"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
@@ -128,23 +128,30 @@
android:visibility="invisible"
android:src="@drawable/status_signature_unverified_cutout_96px"
android:layout_height="96dp"
android:layout_gravity="center_vertical"
android:layout_above="@+id/toolbar2"
android:layout_above="@id/toolbar2"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_marginRight="16dp" />
<ImageButton
android:id="@+id/view_key_qr_code"
android:layout_width="96dp"
android:layout_height="96dp"
<android.support.v7.widget.CardView
android:id="@+id/view_key_qr_code_layout"
android:visibility="gone"
style="?android:attr/borderlessButtonStyle"
android:layout_gravity="center_vertical"
android:layout_above="@+id/toolbar2"
android:layout_below="@id/toolbar"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_marginRight="20dp" />
android:layout_marginRight="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
card_view:cardBackgroundColor="@android:color/white"
card_view:cardUseCompatPadding="true"
card_view:cardCornerRadius="4dp">
<ImageButton
android:id="@+id/view_key_qr_code"
android:layout_width="96dp"
android:layout_height="96dp"
style="?android:attr/borderlessButtonStyle" />
</android.support.v7.widget.CardView>
</RelativeLayout>

9
OpenKeychain/src/main/res/layout/view_key_fragment.xml
View File

@@ -8,6 +8,7 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:paddingLeft="16dp"
android:paddingRight="16dp">
@@ -15,7 +16,10 @@
android:id="@+id/card_view"
android:layout_gravity="center"
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_height="wrap_content"
card_view:cardBackgroundColor="@android:color/white"
card_view:cardElevation="2sp"
card_view:cardUseCompatPadding="true"
card_view:cardCornerRadius="4dp">
<LinearLayout
@@ -24,10 +28,9 @@
android:orientation="vertical">
<TextView
style="@style/SectionHeader"
style="@style/CardViewHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/section_user_ids" />
<org.sufficientlysecure.keychain.ui.widget.FixedListView

1
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -584,6 +584,7 @@
<!-- View key -->
<string name="view_key_revoked">"Revoked: Key must not be used anymore!"</string>
<string name="view_key_expired">"Expired: The contact needs to extend the keys validity!"</string>
<string name="view_key_expired_secret">"Expired: You can extend the keys validity by editing it!"</string>
<string name="view_key_my_key">"My Key"</string>
<string name="view_key_verified">"Verified Key"</string>
<string name="view_key_unverified">"Unverified: Scan QR Code to verify key!"</string>

10
OpenKeychain/src/main/res/values/styles.xml
View File

@@ -20,6 +20,16 @@
<!--<item name="centerMedium">@android:drawable/popup_center_medium</item>-->
</style>
<style name="CardViewHeader">
<item name="android:drawableBottom">@drawable/cardview_header</item>
<item name="android:drawablePadding">16dp</item>
<item name="android:layout_marginTop">16dp</item>
<item name="android:paddingLeft">16dp</item>
<item name="android:textStyle">normal</item>
<item name="android:textColor">@color/header_text</item>
<item name="android:textSize">17sp</item>
</style>
<style name="SectionHeader">
<item name="android:drawableBottom">@drawable/section_header</item>
<item name="android:drawablePadding">4dp</item>