ImportKeys: Use Toolbar for Import button
This commit is contained in:
parent
f52e4a8c7f
commit
8ae245e6df
Binary file not shown.
After Width: | Height: | Size: 163 B |
Binary file not shown.
After Width: | Height: | Size: 116 B |
Binary file not shown.
After Width: | Height: | Size: 157 B |
Binary file not shown.
After Width: | Height: | Size: 197 B |
Binary file not shown.
After Width: | Height: | Size: 233 B |
|
@ -1,8 +1,7 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent">
|
||||||
xmlns:tools="http://schemas.android.com/tools">
|
|
||||||
|
|
||||||
<include
|
<include
|
||||||
android:id="@+id/toolbar_include"
|
android:id="@+id/toolbar_include"
|
||||||
|
@ -13,22 +12,21 @@
|
||||||
https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705
|
https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705
|
||||||
-->
|
-->
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_below="@id/toolbar_include"
|
|
||||||
android:fitsSystemWindows="true"
|
|
||||||
android:layout_marginTop="@dimen/minus_statusbar_height"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="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">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<include layout="@layout/notify_area" />
|
<include layout="@layout/notify_area" />
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
android:id="@+id/import_keys_top_layout"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:id="@+id/import_keys_top_layout"
|
android:visibility="gone">
|
||||||
android:visibility="gone"
|
|
||||||
tools:visibility="visible">
|
|
||||||
|
|
||||||
<FrameLayout
|
<FrameLayout
|
||||||
android:id="@+id/import_keys_top_container"
|
android:id="@+id/import_keys_top_container"
|
||||||
|
@ -46,39 +44,29 @@
|
||||||
<FrameLayout
|
<FrameLayout
|
||||||
android:id="@+id/import_keys_list_container"
|
android:id="@+id/import_keys_list_container"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="0dp"
|
android:layout_height="match_parent"
|
||||||
android:orientation="vertical"
|
|
||||||
android:layout_weight="1" />
|
android:layout_weight="1" />
|
||||||
|
|
||||||
<RelativeLayout
|
<android.support.v7.widget.Toolbar
|
||||||
android:id="@+id/import_footer"
|
android:id="@+id/import_footer"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="?attr/actionBarSize"
|
||||||
android:orientation="vertical">
|
android:background="?attr/colorPrimary"
|
||||||
|
android:elevation="4dp"
|
||||||
<View
|
android:paddingLeft="8dp"
|
||||||
android:id="@+id/import_divider"
|
android:paddingRight="8dp"
|
||||||
android:layout_width="match_parent"
|
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
|
||||||
android:layout_height="1dip"
|
|
||||||
android:background="?android:attr/listDivider" />
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/import_import"
|
android:id="@+id/import_import"
|
||||||
android:paddingLeft="8dp"
|
style="@style/TextAppearance.Widget.AppCompat.Toolbar.Subtitle"
|
||||||
android:paddingRight="8dp"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="match_parent"
|
||||||
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:drawablePadding="8dp"
|
android:drawablePadding="8dp"
|
||||||
|
android:drawableRight="@drawable/ic_file_download_white_24dp"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:clickable="true"
|
android:text="@string/import_import"
|
||||||
android:background="?android:selectableItemBackground" />
|
android:textColor="#ffffffff" />
|
||||||
|
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
android:id="@+id/import_snackbar"
|
android:id="@+id/import_snackbar"
|
||||||
|
@ -86,6 +74,8 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignBottom="@id/import_import" />
|
android:layout_alignBottom="@id/import_import" />
|
||||||
|
|
||||||
</RelativeLayout>
|
</android.support.v7.widget.Toolbar>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/md_grey_100">
|
||||||
|
|
||||||
<ProgressBar
|
<ProgressBar
|
||||||
android:id="@+id/progress_view"
|
android:id="@+id/progress_view"
|
||||||
|
@ -14,10 +15,8 @@
|
||||||
android:id="@+id/recycler_view"
|
android:id="@+id/recycler_view"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:paddingBottom="4dp"
|
|
||||||
android:paddingLeft="8dp"
|
android:paddingLeft="8dp"
|
||||||
android:paddingRight="8dp"
|
android:paddingRight="8dp"
|
||||||
android:paddingTop="4dp"
|
|
||||||
android:scrollbars="vertical"
|
android:scrollbars="vertical"
|
||||||
android:visibility="gone" />
|
android:visibility="gone" />
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
|
|
Loading…
Reference in a new issue