moparisthebest/keepass2android
1
0
Fork 0
mirror of https://github.com/moparisthebest/keepass2android synced 2025-02-07 02:10:10 -05:00
Code Issues Releases Wiki Activity

Made width of Cancel buttons wrap_content where appropriate, use Android Cancel string

Browse Source
This commit is contained in:
PhilippC 2013-03-01 06:00:41 +01:00
parent c5c4332e74
commit 8f6ab13f40
5 changed files with 108 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/keepass2android/Resources/layout/browser_install.xml
View File

@ -1,55 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?> <?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">
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<TextView android:id="@+id/text" <TextView
android:layout_width="wrap_content" android:id="@+id/text"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:text="@string/browser_intall_text" android:layout_height="wrap_content"
/> android:text="@string/browser_intall_text" />
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical"> android:orientation="vertical">
<Button android:id="@+id/install_market" <Button
android:layout_width="200sp" android:id="@+id/install_market"
android:layout_height="wrap_content" android:layout_width="200sp"
android:text="@string/install_from_market" android:layout_height="wrap_content"
/> android:text="@string/install_from_market" />
<Button android:id="@+id/install_web" <Button
android:layout_width="200sp" android:id="@+id/install_web"
android:layout_height="wrap_content" android:layout_width="200sp"
android:text="@string/install_from_website" android:layout_height="wrap_content"
/> android:text="@string/install_from_website" />
<Button android:id="@+id/cancel" <Button
android:layout_width="200sp" android:id="@+id/cancel"
android:layout_height="wrap_content" android:layout_width="200sp"
android:text="@string/cancel" android:layout_height="wrap_content"
/> android:text="@android:string/cancel" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

8
src/keepass2android/Resources/layout/file_selection_filename.xml
View File

@ -44,7 +44,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_below="@id/label_open_by_filename_details" android:layout_below="@id/label_open_by_filename_details"
android:width="100sp" /> android:minWidth="100sp" />
<Button <Button
android:id="@+id/create" android:id="@+id/create"
android:text="@string/menu_create" android:text="@string/menu_create"
@ -52,15 +52,15 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_below="@id/label_open_by_filename_details" android:layout_below="@id/label_open_by_filename_details"
android:layout_toRightOf="@id/open" android:layout_toRightOf="@id/open"
android:width="100sp" /> android:minWidth="100sp" />
<Button <Button
android:id="@+id/fnv_cancel" android:id="@+id/fnv_cancel"
android:text="@string/cancel" android:text="@android:string/cancel"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_below="@id/label_open_by_filename_details" android:layout_below="@id/label_open_by_filename_details"
android:layout_toRightOf="@id/create" android:layout_toRightOf="@id/create"
android:width="100sp" /> android:minWidth="100sp" />
</RelativeLayout> </RelativeLayout>
<Button <Button
android:text="@string/start_open_file" android:text="@string/start_open_file"

2
src/keepass2android/Resources/layout/generate_password.xml
View File

@ -12,7 +12,7 @@
android:id="@+id/cancel_button" android:id="@+id/cancel_button"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:text="@string/cancel" android:text="@android:string/cancel"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_toRightOf="@id/accept_button" /> android:layout_toRightOf="@id/accept_button" />
<ScrollView <ScrollView

78
src/keepass2android/Resources/layout/group_edit.xml
View File

@ -1,47 +1,35 @@
<?xml version="1.0" encoding="utf-8"?> <?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" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent"> android:layout_height="fill_parent">
<ImageButton android:id="@+id/icon_button" <ImageButton
android:layout_width="wrap_content" android:id="@+id/icon_button"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:src="@drawable/ic00" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:src="@drawable/ic00"
android:layout_alignParentTop="true"/> android:layout_alignParentRight="true"
<EditText android:id="@+id/group_name" android:layout_alignParentTop="true" />
android:layout_width="fill_parent" <EditText
android:layout_height="wrap_content" android:id="@+id/group_name"
android:layout_marginLeft="4dp" android:layout_width="fill_parent"
android:layout_toLeftOf="@+id/icon_button" android:layout_height="wrap_content"
android:singleLine="true" android:layout_marginLeft="4dp"
android:hint="@string/hint_group_name"/> android:layout_toLeftOf="@+id/icon_button"
<Button android:id="@+id/ok" android:singleLine="true"
android:layout_width="100sp" android:hint="@string/hint_group_name" />
android:layout_height="wrap_content" <Button
android:layout_below="@id/group_name" android:id="@+id/ok"
android:text="@android:string/ok"/> android:layout_width="wrap_content"
<Button android:id="@+id/cancel" android:layout_height="wrap_content"
android:layout_width="100sp" android:layout_below="@id/group_name"
android:layout_height="wrap_content" android:minWidth="100sp"
android:layout_below="@id/group_name" android:text="@android:string/ok" />
android:layout_toRightOf="@id/ok" <Button
android:text="@string/cancel"/> android:id="@+id/cancel"
</RelativeLayout> 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>

92
src/keepass2android/Resources/layout/set_password.xml
View File

@ -1,54 +1,42 @@
<?xml version="1.0" encoding="utf-8"?> <?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" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent"> android:layout_height="fill_parent">
<EditText
<EditText android:id="@+id/pass_password" android:id="@+id/pass_password"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:password="true" android:password="true"
android:singleLine="true" android:singleLine="true"
android:hint="@string/hint_pass"/> android:hint="@string/hint_pass" />
<EditText android:id="@+id/pass_conf_password" <EditText
android:layout_width="fill_parent" android:id="@+id/pass_conf_password"
android:layout_height="wrap_content" android:layout_width="fill_parent"
android:layout_below="@id/pass_password" android:layout_height="wrap_content"
android:password="true" android:layout_below="@id/pass_password"
android:singleLine="true" android:password="true"
android:hint="@string/hint_conf_pass"/> android:singleLine="true"
<EditText android:id="@+id/pass_keyfile" android:hint="@string/hint_conf_pass" />
android:layout_width="fill_parent" <EditText
android:layout_height="wrap_content" android:id="@+id/pass_keyfile"
android:layout_below="@id/pass_conf_password" android:layout_width="fill_parent"
android:singleLine="true" android:layout_height="wrap_content"
android:hint="@string/hint_keyfile"/> android:layout_below="@id/pass_conf_password"
<Button android:id="@+id/ok" android:singleLine="true"
android:layout_width="100sp" android:hint="@string/hint_keyfile" />
android:layout_height="wrap_content" <Button
android:layout_below="@id/pass_keyfile" android:id="@+id/ok"
android:text="@android:string/ok"/> android:layout_width="wrap_content"
<Button android:id="@+id/cancel" android:layout_height="wrap_content"
android:layout_width="100sp" android:layout_below="@id/pass_keyfile"
android:layout_height="wrap_content" android:text="@android:string/ok"
android:layout_below="@id/pass_keyfile" android:minWidth="100sp" />
android:layout_toRightOf="@id/ok" <Button
android:text="@string/cancel"/> android:id="@+id/cancel"
</RelativeLayout> 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>