diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/password_recycler_view.xml | 27 | ||||
| -rw-r--r-- | app/src/main/res/menu/main_menu.xml | 5 |
2 files changed, 22 insertions, 10 deletions
diff --git a/app/src/main/res/layout/password_recycler_view.xml b/app/src/main/res/layout/password_recycler_view.xml index c50f5952..b9a4231f 100644 --- a/app/src/main/res/layout/password_recycler_view.xml +++ b/app/src/main/res/layout/password_recycler_view.xml @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:fab="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingLeft="@dimen/activity_horizontal_margin" - android:paddingRight="@dimen/activity_horizontal_margin" android:orientation="vertical" tools:context="com.zeapo.pwdstore.PasswordFragment"> @@ -12,5 +11,23 @@ android:id="@+id/pass_recycler" android:scrollbars="vertical" android:layout_width="match_parent" - android:layout_height="match_parent"/> -</LinearLayout> + android:layout_height="match_parent" + android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingRight="@dimen/activity_horizontal_margin" + android:paddingTop="@dimen/activity_vertical_margin" + android:paddingBottom="@dimen/activity_vertical_margin"/> + + <com.melnykov.fab.FloatingActionButton + android:id="@+id/fab" + android:src="@drawable/ic_action_new" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:layout_alignParentBottom="true" + android:layout_margin="@dimen/activity_vertical_margin" + android:onClick="createPassword" + fab:fab_colorNormal="@color/blue_grey_500" + fab:fab_colorPressed="@color/blue_grey_800" + fab:fab_colorRipple="@color/blue_grey_50"/> +</RelativeLayout> diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml index 6f391460..af6a84c7 100644 --- a/app/src/main/res/menu/main_menu.xml +++ b/app/src/main/res/menu/main_menu.xml @@ -9,11 +9,6 @@ pwstore:showAsAction="ifRoom|collapseActionView" pwstore:actionViewClass="android.support.v7.widget.SearchView" /> - <item android:id="@+id/menu_add_password" - android:icon="@drawable/ic_action_new" - pwstore:showAsAction="ifRoom" - android:title="New password"/> - <!--<item android:id="@+id/menu_add_category"--> <!--android:title="New category"/>--> |