diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
6 files changed, 118 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml index ab1bf3d4a..3245fd28b 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml @@ -91,6 +91,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="@color/md_black_1000" android:text="@string/label_asymmetric_from" android:paddingRight="8dp"/> diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml index a2e6af27c..7252effad 100644 --- a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml +++ b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:custom="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" + xmlns:tools="http://schemas.android.com/tools" android:paddingTop="16dp" - android:paddingBottom="16dp" android:paddingLeft="24dp" android:paddingRight="24dp" - android:orientation="vertical"> + android:orientation="vertical" + custom:initialView="0"> <LinearLayout - android:id="@+id/input" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> @@ -31,10 +33,33 @@ android:ems="10" android:layout_gravity="center_horizontal" /> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:gravity="center_vertical" + android:layout_margin="8dp" + android:id="@+id/remember_layout"> + + <!-- paddingBottom for spinner alignment --> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/remember" + android:paddingBottom="1dp" + android:textAppearance="@android:style/TextAppearance.Medium" /> + + <org.sufficientlysecure.keychain.ui.widget.CacheTTLSpinner + android:id="@+id/ttl_spinner" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + </org.sufficientlysecure.keychain.ui.widget.CacheTTLSpinner> + + </LinearLayout> + </LinearLayout> <LinearLayout - android:id="@+id/progress" android:layout_centerInParent="true" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -57,4 +82,4 @@ </LinearLayout> -</RelativeLayout>
\ No newline at end of file +</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/settings_cache_ttl.xml b/OpenKeychain/src/main/res/layout/settings_cache_ttl.xml new file mode 100644 index 000000000..25ac33c5c --- /dev/null +++ b/OpenKeychain/src/main/res/layout/settings_cache_ttl.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <include + android:id="@+id/toolbar_include" + layout="@layout/toolbar_standalone" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/settings_cache_select_three"/> + + </LinearLayout> + + <View style="@style/Divider"/> + + <FrameLayout + android:id="@+id/settings_cache_ttl_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" /> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/settings_cache_ttl_fragment.xml b/OpenKeychain/src/main/res/layout/settings_cache_ttl_fragment.xml new file mode 100644 index 000000000..4a34bc5bc --- /dev/null +++ b/OpenKeychain/src/main/res/layout/settings_cache_ttl_fragment.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> + +<android.support.v7.widget.RecyclerView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/cache_ttl_recycler_view" + android:layout_width="match_parent" + android:layout_height="match_parent" />
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/settings_cache_ttl_item.xml b/OpenKeychain/src/main/res/layout/settings_cache_ttl_item.xml new file mode 100644 index 000000000..c0470288f --- /dev/null +++ b/OpenKeychain/src/main/res/layout/settings_cache_ttl_item.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?listPreferredItemHeight" + android:orientation="horizontal" + android:gravity="center_vertical" + android:background="?selectableItemBackground"> + + <CheckBox + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/ttl_selected" + android:layout_margin="8dp" + /> + + <TextView + android:layout_width="0dp" + android:layout_height="wrap_content" + android:id="@+id/ttl_title" + android:layout_weight="1" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textStyle="bold" + tools:text="One Hour" + /> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/simple_item.xml b/OpenKeychain/src/main/res/layout/simple_item.xml new file mode 100644 index 000000000..45033a6e0 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/simple_item.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center_vertical"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/simple_item_text" + android:textAppearance="@android:style/TextAppearance.Medium" + android:padding="8dp" + tools:text="itemtext" /> +</LinearLayout>
\ No newline at end of file |