diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
4 files changed, 56 insertions, 37 deletions
diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml index 7f7b2cdce..189579f91 100644 --- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml @@ -86,7 +86,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:text="@string/create_key_rsa" - android:textColor="@color/android_green_dark" + android:textColor="@color/android_green_light" android:textAppearance="?android:attr/textAppearanceMedium" android:minHeight="?android:attr/listPreferredItemHeight" android:clickable="true" @@ -128,7 +128,7 @@ android:layout_marginTop="16dp" android:layout_marginBottom="8dp" android:text="@string/create_key_final_robot_text" - android:textColor="@color/android_green_dark" + android:textColor="@color/android_green_light" android:textAppearance="?android:attr/textAppearanceMedium" android:drawableLeft="@drawable/create_key_robot" android:drawablePadding="8dp" /> diff --git a/OpenKeychain/src/main/res/layout/key_list_content.xml b/OpenKeychain/src/main/res/layout/key_list_content.xml index dd230806f..7179793b5 100644 --- a/OpenKeychain/src/main/res/layout/key_list_content.xml +++ b/OpenKeychain/src/main/res/layout/key_list_content.xml @@ -1,47 +1,56 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/notify_area" /> + <include + android:id="@+id/toolbar" + layout="@layout/toolbar" /> <LinearLayout - android:id="@+id/content_frame" - android:layout_marginLeft="@dimen/drawer_content_padding" android:orientation="vertical" + android:layout_below="@id/toolbar" android:layout_width="match_parent" android:layout_height="match_parent"> - <!--<LinearLayout + <include layout="@layout/notify_area" /> + + <LinearLayout + android:id="@+id/content_frame" + android:layout_marginLeft="@dimen/drawer_content_padding" android:orientation="vertical" - android:background="@color/holo_gray_bright" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="match_parent"> - <Spinner - android:id="@+id/key_list_filter_spinner" + <!--<LinearLayout + android:orientation="vertical" + android:background="@color/holo_gray_bright" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="12dp" - android:layout_marginRight="12dp" - android:layout_marginTop="4dp" - android:layout_marginBottom="4dp" /> - - <View + android:layout_height="wrap_content"> + + <Spinner + android:id="@+id/key_list_filter_spinner" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="12dp" + android:layout_marginRight="12dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" /> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + + </LinearLayout>--> + + <fragment + android:id="@+id/key_list_fragment" + android:name="org.sufficientlysecure.keychain.ui.KeyListFragment" android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" /> - - </LinearLayout>--> - - <fragment - android:id="@+id/key_list_fragment" - android:name="org.sufficientlysecure.keychain.ui.KeyListFragment" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" /> + android:layout_height="0dp" + android:layout_weight="1" /> + </LinearLayout> </LinearLayout> - -</LinearLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml index 39f4b7238..7e4410f85 100644 --- a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml +++ b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml @@ -16,17 +16,18 @@ <TextView android:layout_width="0dp" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:layout_marginBottom="4dp" android:layout_marginTop="14dp" android:text="@string/exchange_description" - android:layout_weight="1"/> + android:layout_weight="1" + android:gravity="center_vertical"/> - <Spinner + <NumberPicker android:layout_width="wrap_content" android:layout_height="wrap_content" - android:id="@+id/safe_slinger_spinner" - android:gravity="center_vertical"/> + android:id="@+id/safe_slinger_picker" + /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/toolbar.xml b/OpenKeychain/src/main/res/layout/toolbar.xml new file mode 100644 index 000000000..d0c5e4f99 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/toolbar.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?attr/colorPrimaryDark" + app:theme="@style/KeychainToolbarOverflow" + app:popupTheme="@style/KeychainTheme" />
\ No newline at end of file |