PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

ImportKeys: Use Toolbar for Import button

Browse source
This commit is contained in:
Andrea Torlaschi 2016-06-02 01:34:29 +02:00
parent f52e4a8c7f
commit 8ae245e6df
7 changed files with 24 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
OpenKeychain/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 163 B

BIN
OpenKeychain/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 116 B

BIN
OpenKeychain/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 157 B

BIN
OpenKeychain/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 197 B

BIN
OpenKeychain/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 233 B

54
OpenKeychain/src/main/res/layout/import_keys_activity.xml
View file

@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools">
android:layout_height="match_parent">
<include
android:id="@+id/toolbar_include"
@ -13,22 +12,21 @@
https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705
-->
<LinearLayout
android:layout_below="@id/toolbar_include"
android:fitsSystemWindows="true"
android:layout_marginTop="@dimen/minus_statusbar_height"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/toolbar_include"
android:layout_marginTop="@dimen/minus_statusbar_height"
android:fitsSystemWindows="true"
android:orientation="vertical">
<include layout="@layout/notify_area" />
<LinearLayout
android:id="@+id/import_keys_top_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:id="@+id/import_keys_top_layout"
android:visibility="gone"
tools:visibility="visible">
android:visibility="gone">
<FrameLayout
android:id="@+id/import_keys_top_container"
@ -46,39 +44,29 @@
<FrameLayout
android:id="@+id/import_keys_list_container"
android:layout_width="match_parent"
android:layout_height="0dp"
android:orientation="vertical"
android:layout_height="match_parent"
android:layout_weight="1" />
<RelativeLayout
<android.support.v7.widget.Toolbar
android:id="@+id/import_footer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<View
android:id="@+id/import_divider"
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:elevation="4dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
<TextView
android:id="@+id/import_import"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
style="@style/TextAppearance.Widget.AppCompat.Toolbar.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_below="@id/import_divider"
android:text="@string/import_import"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_file_download_grey_24dp"
android:layout_height="match_parent"
android:drawablePadding="8dp"
android:drawableRight="@drawable/ic_file_download_white_24dp"
android:gravity="center_vertical"
android:clickable="true"
android:background="?android:selectableItemBackground" />
android:text="@string/import_import"
android:textColor="#ffffffff" />
<RelativeLayout
android:id="@+id/import_snackbar"
@ -86,6 +74,8 @@
android:layout_height="wrap_content"
android:layout_alignBottom="@id/import_import" />
</RelativeLayout>
</android.support.v7.widget.Toolbar>
</LinearLayout>
</RelativeLayout>

5
OpenKeychain/src/main/res/layout/import_keys_list_fragment.xml
View file

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@color/md_grey_100">
<ProgressBar
android:id="@+id/progress_view"
@ -14,10 +15,8 @@
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="4dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="4dp"
android:scrollbars="vertical"
android:visibility="gone" />
</FrameLayout>