mirror of
https://github.com/moparisthebest/keepass2android
synced 2025-02-07 02:10:10 -05:00
Made width of Cancel buttons wrap_content where appropriate, use Android Cancel string
This commit is contained in:
parent
c5c4332e74
commit
8f6ab13f40
@ -1,55 +1,32 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--
|
||||
|
||||
|
||||
This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
|
||||
|
||||
Keepass2Android is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
Keepass2Android is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Keepass2Android. If not, see <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
<!--
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content">
|
||||
-->
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
<TextView android:id="@+id/text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/browser_intall_text"
|
||||
/>
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:gravity="center_horizontal"
|
||||
android:orientation="vertical">
|
||||
<Button android:id="@+id/install_market"
|
||||
android:layout_width="200sp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/install_from_market"
|
||||
/>
|
||||
<Button android:id="@+id/install_web"
|
||||
android:layout_width="200sp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/install_from_website"
|
||||
/>
|
||||
<Button android:id="@+id/cancel"
|
||||
android:layout_width="200sp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/cancel"
|
||||
/>
|
||||
</LinearLayout>
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
<TextView
|
||||
android:id="@+id/text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/browser_intall_text" />
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:gravity="center_horizontal"
|
||||
android:orientation="vertical">
|
||||
<Button
|
||||
android:id="@+id/install_market"
|
||||
android:layout_width="200sp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/install_from_market" />
|
||||
<Button
|
||||
android:id="@+id/install_web"
|
||||
android:layout_width="200sp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/install_from_website" />
|
||||
<Button
|
||||
android:id="@+id/cancel"
|
||||
android:layout_width="200sp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@android:string/cancel" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
@ -44,7 +44,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_below="@id/label_open_by_filename_details"
|
||||
android:width="100sp" />
|
||||
android:minWidth="100sp" />
|
||||
<Button
|
||||
android:id="@+id/create"
|
||||
android:text="@string/menu_create"
|
||||
@ -52,15 +52,15 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_below="@id/label_open_by_filename_details"
|
||||
android:layout_toRightOf="@id/open"
|
||||
android:width="100sp" />
|
||||
android:minWidth="100sp" />
|
||||
<Button
|
||||
android:id="@+id/fnv_cancel"
|
||||
android:text="@string/cancel"
|
||||
android:text="@android:string/cancel"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_below="@id/label_open_by_filename_details"
|
||||
android:layout_toRightOf="@id/create"
|
||||
android:width="100sp" />
|
||||
android:minWidth="100sp" />
|
||||
</RelativeLayout>
|
||||
<Button
|
||||
android:text="@string/start_open_file"
|
||||
|
@ -12,7 +12,7 @@
|
||||
android:id="@+id/cancel_button"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:text="@string/cancel"
|
||||
android:text="@android:string/cancel"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_toRightOf="@id/accept_button" />
|
||||
<ScrollView
|
||||
|
@ -1,47 +1,35 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
|
||||
|
||||
This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
|
||||
|
||||
Keepass2Android is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
Keepass2Android is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Keepass2Android. If not, see <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent">
|
||||
<ImageButton android:id="@+id/icon_button"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/ic00"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentTop="true"/>
|
||||
<EditText android:id="@+id/group_name"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="4dp"
|
||||
android:layout_toLeftOf="@+id/icon_button"
|
||||
android:singleLine="true"
|
||||
android:hint="@string/hint_group_name"/>
|
||||
<Button android:id="@+id/ok"
|
||||
android:layout_width="100sp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/group_name"
|
||||
android:text="@android:string/ok"/>
|
||||
<Button android:id="@+id/cancel"
|
||||
android:layout_width="100sp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/group_name"
|
||||
android:layout_toRightOf="@id/ok"
|
||||
android:text="@string/cancel"/>
|
||||
</RelativeLayout>
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent">
|
||||
<ImageButton
|
||||
android:id="@+id/icon_button"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/ic00"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentTop="true" />
|
||||
<EditText
|
||||
android:id="@+id/group_name"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="4dp"
|
||||
android:layout_toLeftOf="@+id/icon_button"
|
||||
android:singleLine="true"
|
||||
android:hint="@string/hint_group_name" />
|
||||
<Button
|
||||
android:id="@+id/ok"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/group_name"
|
||||
android:minWidth="100sp"
|
||||
android:text="@android:string/ok" />
|
||||
<Button
|
||||
android:id="@+id/cancel"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/group_name"
|
||||
android:layout_toRightOf="@id/ok"
|
||||
android:text="@android:string/cancel"
|
||||
android:minWidth="100sp" />
|
||||
</RelativeLayout>
|
@ -1,54 +1,42 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
|
||||
|
||||
This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
|
||||
|
||||
Keepass2Android is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
Keepass2Android is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Keepass2Android. If not, see <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent">
|
||||
|
||||
<EditText android:id="@+id/pass_password"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:password="true"
|
||||
android:singleLine="true"
|
||||
android:hint="@string/hint_pass"/>
|
||||
<EditText android:id="@+id/pass_conf_password"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/pass_password"
|
||||
android:password="true"
|
||||
android:singleLine="true"
|
||||
android:hint="@string/hint_conf_pass"/>
|
||||
<EditText android:id="@+id/pass_keyfile"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/pass_conf_password"
|
||||
android:singleLine="true"
|
||||
android:hint="@string/hint_keyfile"/>
|
||||
<Button android:id="@+id/ok"
|
||||
android:layout_width="100sp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/pass_keyfile"
|
||||
android:text="@android:string/ok"/>
|
||||
<Button android:id="@+id/cancel"
|
||||
android:layout_width="100sp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/pass_keyfile"
|
||||
android:layout_toRightOf="@id/ok"
|
||||
android:text="@string/cancel"/>
|
||||
</RelativeLayout>
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent">
|
||||
<EditText
|
||||
android:id="@+id/pass_password"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:password="true"
|
||||
android:singleLine="true"
|
||||
android:hint="@string/hint_pass" />
|
||||
<EditText
|
||||
android:id="@+id/pass_conf_password"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/pass_password"
|
||||
android:password="true"
|
||||
android:singleLine="true"
|
||||
android:hint="@string/hint_conf_pass" />
|
||||
<EditText
|
||||
android:id="@+id/pass_keyfile"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/pass_conf_password"
|
||||
android:singleLine="true"
|
||||
android:hint="@string/hint_keyfile" />
|
||||
<Button
|
||||
android:id="@+id/ok"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/pass_keyfile"
|
||||
android:text="@android:string/ok"
|
||||
android:minWidth="100sp" />
|
||||
<Button
|
||||
android:id="@+id/cancel"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/pass_keyfile"
|
||||
android:layout_toRightOf="@id/ok"
|
||||
android:text="@android:string/cancel"
|
||||
android:minWidth="100sp" />
|
||||
</RelativeLayout>
|
Loading…
Reference in New Issue
Block a user