mirror of
https://github.com/Kunzisoft/KeePassDX.git
synced 2025-12-04 15:49:33 +01:00
Replace all fill_parent by match_parent
This commit is contained in:
@@ -4,10 +4,6 @@ import android.os.Build;
|
|||||||
|
|
||||||
import com.keepassdroid.compat.BuildCompat;
|
import com.keepassdroid.compat.BuildCompat;
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by joker on 03/11/17.
|
|
||||||
*/
|
|
||||||
|
|
||||||
public class FingerPrintUtils {
|
public class FingerPrintUtils {
|
||||||
|
|
||||||
// Solve bug of VerifyError
|
// Solve bug of VerifyError
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ public class EntryContentsView extends LinearLayout {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected LayoutParams generateDefaultLayoutParams() {
|
protected LayoutParams generateDefaultLayoutParams() {
|
||||||
return new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT);
|
return new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ public class PwEntryView extends ClickView {
|
|||||||
|
|
||||||
populateView(ev, pw, pos);
|
populateView(ev, pw, pos);
|
||||||
|
|
||||||
LayoutParams lp = new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT);
|
LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
|
||||||
|
|
||||||
addView(ev, lp);
|
addView(ev, lp);
|
||||||
|
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ public class PwGroupView extends ClickView {
|
|||||||
|
|
||||||
populateView(gv, pw);
|
populateView(gv, pw);
|
||||||
|
|
||||||
LayoutParams lp = new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT);
|
LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
|
||||||
|
|
||||||
addView(gv, lp);
|
addView(gv, lp);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/AboutText"/>
|
android:text="@string/AboutText"/>
|
||||||
<ImageView android:id="@+id/divider1"
|
<ImageView android:id="@+id/divider1"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:scaleType="fitXY"
|
android:scaleType="fitXY"
|
||||||
tools:ignore="ContentDescription"
|
tools:ignore="ContentDescription"
|
||||||
@@ -42,7 +42,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="end"/>
|
android:layout_gravity="end"/>
|
||||||
<ImageView android:id="@+id/divider2"
|
<ImageView android:id="@+id/divider2"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:scaleType="fitXY"
|
android:scaleType="fitXY"
|
||||||
tools:ignore="ContentDescription"
|
tools:ignore="ContentDescription"
|
||||||
@@ -71,13 +71,13 @@
|
|||||||
android:autoLink="web"/>
|
android:autoLink="web"/>
|
||||||
<ImageView android:id="@+id/divider3"
|
<ImageView android:id="@+id/divider3"
|
||||||
android:layout_marginTop="20dp"
|
android:layout_marginTop="20dp"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:scaleType="fitXY"
|
android:scaleType="fitXY"
|
||||||
tools:ignore="ContentDescription"
|
tools:ignore="ContentDescription"
|
||||||
android:src="@android:drawable/divider_horizontal_dark"/>
|
android:src="@android:drawable/divider_horizontal_dark"/>
|
||||||
<TextView android:id="@+id/disclaimer"
|
<TextView android:id="@+id/disclaimer"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/disclaimer_formal"/>
|
android:text="@string/disclaimer_formal"/>
|
||||||
<Button android:id="@+id/about_button"
|
<Button android:id="@+id/about_button"
|
||||||
|
|||||||
@@ -28,8 +28,8 @@
|
|||||||
android:text="@string/browser_intall_text"
|
android:text="@string/browser_intall_text"
|
||||||
/>
|
/>
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="match_parent"
|
||||||
android:gravity="center_horizontal"
|
android:gravity="center_horizontal"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
<Button android:id="@+id/install_market"
|
<Button android:id="@+id/install_market"
|
||||||
|
|||||||
@@ -19,12 +19,12 @@
|
|||||||
-->
|
-->
|
||||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_margin="@dimen/default_margin"
|
android:layout_margin="@dimen/default_margin"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="fill_parent">
|
android:layout_height="match_parent">
|
||||||
<EditText android:id="@+id/rounds"
|
<EditText android:id="@+id/rounds"
|
||||||
android:hint="@string/rounds_hint"
|
android:hint="@string/rounds_hint"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:inputType="number"/>
|
android:inputType="number"/>
|
||||||
<TextView android:id="@+id/rounds_explaination"
|
<TextView android:id="@+id/rounds_explaination"
|
||||||
android:text="@string/rounds_explaination"
|
android:text="@string/rounds_explaination"
|
||||||
|
|||||||
@@ -18,16 +18,16 @@
|
|||||||
along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
|
along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
|
||||||
-->
|
-->
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
<TextView android:id="@+id/title"
|
<TextView android:id="@+id/title"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
|
style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/value"
|
android:id="@+id/value"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textIsSelectable="true"
|
android:textIsSelectable="true"
|
||||||
style="@style/KeepassDXStyle.TextAppearance.TextEntryItem" />
|
style="@style/KeepassDXStyle.TextAppearance.TextEntryItem" />
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
android:elevation="4dp"
|
android:elevation="4dp"
|
||||||
tools:targetApi="lollipop" >
|
tools:targetApi="lollipop" >
|
||||||
<LinearLayout android:id="@+id/title_block"
|
<LinearLayout android:id="@+id/title_block"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:translationZ="10dp"
|
android:translationZ="10dp"
|
||||||
style="@style/KeepassDXStyle.TextAppearance.Default">
|
style="@style/KeepassDXStyle.TextAppearance.Default">
|
||||||
@@ -55,15 +55,15 @@
|
|||||||
</android.support.v7.widget.Toolbar>
|
</android.support.v7.widget.Toolbar>
|
||||||
|
|
||||||
<ScrollView android:id="@+id/entry_scroll"
|
<ScrollView android:id="@+id/entry_scroll"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_below="@+id/toolbar"
|
android:layout_below="@+id/toolbar"
|
||||||
android:fillViewport="true"
|
android:fillViewport="true"
|
||||||
android:scrollbarStyle="insideOverlay">
|
android:scrollbarStyle="insideOverlay">
|
||||||
|
|
||||||
<com.keepassdroid.view.EntryContentsView android:id="@+id/entry_contents"
|
<com.keepassdroid.view.EntryContentsView android:id="@+id/entry_contents"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_width="fill_parent" />
|
android:layout_width="match_parent" />
|
||||||
|
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
|
||||||
|
|||||||
@@ -21,28 +21,28 @@
|
|||||||
android:layout_margin="@dimen/default_margin"
|
android:layout_margin="@dimen/default_margin"
|
||||||
android:id="@+id/entry_table"
|
android:id="@+id/entry_table"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
<!-- Username -->
|
<!-- Username -->
|
||||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_user_name_label"
|
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_user_name_label"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/entry_user_name"
|
android:text="@string/entry_user_name"
|
||||||
style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
|
style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
|
||||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_user_name"
|
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_user_name"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textIsSelectable="true"
|
android:textIsSelectable="true"
|
||||||
style="@style/KeepassDXStyle.TextAppearance.TextEntryItem" />
|
style="@style/KeepassDXStyle.TextAppearance.TextEntryItem" />
|
||||||
|
|
||||||
<!-- URL -->
|
<!-- URL -->
|
||||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_url_label"
|
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_url_label"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/entry_url"
|
android:text="@string/entry_url"
|
||||||
style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
|
style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
|
||||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_url"
|
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_url"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:autoLink="all"
|
android:autoLink="all"
|
||||||
android:textIsSelectable="true"
|
android:textIsSelectable="true"
|
||||||
@@ -50,12 +50,12 @@
|
|||||||
|
|
||||||
<!-- Password -->
|
<!-- Password -->
|
||||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_password_label"
|
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_password_label"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/entry_password"
|
android:text="@string/entry_password"
|
||||||
style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
|
style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
|
||||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_password"
|
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_password"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:inputType="textPassword"
|
android:inputType="textPassword"
|
||||||
android:textIsSelectable="true"
|
android:textIsSelectable="true"
|
||||||
@@ -63,64 +63,64 @@
|
|||||||
|
|
||||||
<!-- Comment -->
|
<!-- Comment -->
|
||||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_comment_label"
|
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_comment_label"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/entry_comment"
|
android:text="@string/entry_comment"
|
||||||
android:autoLink="all"
|
android:autoLink="all"
|
||||||
style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
|
style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
|
||||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_comment"
|
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_comment"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textIsSelectable="true"
|
android:textIsSelectable="true"
|
||||||
style="@style/KeepassDXStyle.TextAppearance.TextEntryItem" />
|
style="@style/KeepassDXStyle.TextAppearance.TextEntryItem" />
|
||||||
|
|
||||||
<LinearLayout android:id="@+id/extra_strings"
|
<LinearLayout android:id="@+id/extra_strings"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<!-- Created -->
|
<!-- Created -->
|
||||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_created_label"
|
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_created_label"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/entry_created"
|
android:text="@string/entry_created"
|
||||||
style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
|
style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
|
||||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_created"
|
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_created"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
style="@style/KeepassDXStyle.TextAppearance.TextEntryItem" />
|
style="@style/KeepassDXStyle.TextAppearance.TextEntryItem" />
|
||||||
|
|
||||||
<!-- Modified -->
|
<!-- Modified -->
|
||||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_modified_label"
|
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_modified_label"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/entry_modified"
|
android:text="@string/entry_modified"
|
||||||
style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
|
style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
|
||||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_modified"
|
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_modified"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
style="@style/KeepassDXStyle.TextAppearance.TextEntryItem" />
|
style="@style/KeepassDXStyle.TextAppearance.TextEntryItem" />
|
||||||
|
|
||||||
<!-- Accessed -->
|
<!-- Accessed -->
|
||||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_accessed_label"
|
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_accessed_label"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/entry_accessed"
|
android:text="@string/entry_accessed"
|
||||||
style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
|
style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
|
||||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_accessed"
|
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_accessed"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
style="@style/KeepassDXStyle.TextAppearance.TextEntryItem" />
|
style="@style/KeepassDXStyle.TextAppearance.TextEntryItem" />
|
||||||
|
|
||||||
<!-- Expires -->
|
<!-- Expires -->
|
||||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_expires_label"
|
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_expires_label"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/entry_expires"
|
android:text="@string/entry_expires"
|
||||||
style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
|
style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
|
||||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_expires"
|
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_expires"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
style="@style/KeepassDXStyle.TextAppearance.TextEntryItem" />
|
style="@style/KeepassDXStyle.TextAppearance.TextEntryItem" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
-->
|
-->
|
||||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_margin="@dimen/default_margin"
|
android:layout_margin="@dimen/default_margin"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
<TextView android:id="@+id/label_warning"
|
<TextView android:id="@+id/label_warning"
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
android:visibility="invisible" />
|
android:visibility="invisible" />
|
||||||
|
|
||||||
<TextView android:id="@+id/label_open_by_filename"
|
<TextView android:id="@+id/label_open_by_filename"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
style="@style/KeepassDXStyle.TextAppearance.Title"
|
style="@style/KeepassDXStyle.TextAppearance.Title"
|
||||||
android:text="@string/enter_filename"/>
|
android:text="@string/enter_filename"/>
|
||||||
@@ -48,7 +48,7 @@
|
|||||||
|
|
||||||
<android.support.v7.widget.AppCompatEditText
|
<android.support.v7.widget.AppCompatEditText
|
||||||
android:id="@+id/file_filename"
|
android:id="@+id/file_filename"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@id/label_open_by_filename"
|
android:layout_below="@id/label_open_by_filename"
|
||||||
android:inputType="textUri"
|
android:inputType="textUri"
|
||||||
|
|||||||
@@ -19,8 +19,8 @@
|
|||||||
-->
|
-->
|
||||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_margin="@dimen/default_margin"
|
android:layout_margin="@dimen/default_margin"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="fill_parent">
|
android:layout_height="match_parent">
|
||||||
<Button android:id="@+id/accept_button"
|
<Button android:id="@+id/accept_button"
|
||||||
android:layout_margin="@dimen/button_margin"
|
android:layout_margin="@dimen/button_margin"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@@ -43,21 +43,21 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_width="wrap_content">
|
android:layout_width="wrap_content">
|
||||||
<EditText android:id="@+id/password"
|
<EditText android:id="@+id/password"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:ems="10"
|
android:ems="10"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:hint="@string/hint_generated_password" />
|
android:hint="@string/hint_generated_password" />
|
||||||
<Button android:id="@+id/generate_password_button"
|
<Button android:id="@+id/generate_password_button"
|
||||||
android:layout_margin="@dimen/button_margin"
|
android:layout_margin="@dimen/button_margin"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@id/password"
|
android:layout_below="@id/password"
|
||||||
android:text="@string/generate_password" />
|
android:text="@string/generate_password" />
|
||||||
<TextView android:id="@+id/length_label"
|
<TextView android:id="@+id/length_label"
|
||||||
android:text="@string/length"
|
android:text="@string/length"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_below="@id/generate_password_button" />
|
android:layout_below="@id/generate_password_button" />
|
||||||
<Button android:id="@+id/btn_length16"
|
<Button android:id="@+id/btn_length16"
|
||||||
android:text="@string/generate_16"
|
android:text="@string/generate_16"
|
||||||
@@ -92,7 +92,7 @@
|
|||||||
android:minWidth="60dp"
|
android:minWidth="60dp"
|
||||||
android:layout_alignTop="@id/btn_length16" />
|
android:layout_alignTop="@id/btn_length16" />
|
||||||
<EditText android:id="@+id/length"
|
<EditText android:id="@+id/length"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_toLeftOf="@id/btn_length6"
|
android:layout_toLeftOf="@id/btn_length6"
|
||||||
android:layout_toStartOf="@id/btn_length6"
|
android:layout_toStartOf="@id/btn_length6"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
|||||||
@@ -19,8 +19,8 @@
|
|||||||
-->
|
-->
|
||||||
<RelativeLayout 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:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="fill_parent">
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
|
<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
@@ -43,7 +43,7 @@
|
|||||||
</android.support.v7.widget.Toolbar>
|
</android.support.v7.widget.Toolbar>
|
||||||
|
|
||||||
<ListView android:id="@+id/group_list"
|
<ListView android:id="@+id/group_list"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@+id/toolbar"/>
|
android:layout_below="@+id/toolbar"/>
|
||||||
|
|
||||||
|
|||||||
@@ -19,8 +19,8 @@
|
|||||||
-->
|
-->
|
||||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_margin="@dimen/default_margin"
|
android:layout_margin="@dimen/default_margin"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="fill_parent">
|
android:layout_height="match_parent">
|
||||||
<android.support.v7.widget.AppCompatImageButton android:id="@+id/icon_button"
|
<android.support.v7.widget.AppCompatImageButton android:id="@+id/icon_button"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
android:layout_alignParentEnd="true"
|
android:layout_alignParentEnd="true"
|
||||||
android:layout_alignParentTop="true"/>
|
android:layout_alignParentTop="true"/>
|
||||||
<EditText android:id="@+id/group_name"
|
<EditText android:id="@+id/group_name"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginLeft="4dp"
|
android:layout_marginLeft="4dp"
|
||||||
android:layout_marginStart="4dp"
|
android:layout_marginStart="4dp"
|
||||||
|
|||||||
@@ -18,18 +18,18 @@
|
|||||||
along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
|
along with KeePass DX. 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="match_parent"
|
||||||
android:layout_height="fill_parent">
|
android:layout_height="match_parent">
|
||||||
<com.keepassdroid.view.GroupHeaderView
|
<com.keepassdroid.view.GroupHeaderView
|
||||||
android:id="@+id/group_header"
|
android:id="@+id/group_header"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"/>
|
android:layout_height="wrap_content"/>
|
||||||
<ListView android:id="@android:id/list"
|
<ListView android:id="@android:id/list"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@id/group_header"/>
|
android:layout_below="@id/group_header"/>
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@android:id/list"
|
android:layout_below="@android:id/list"
|
||||||
android:text="@string/no_results"/>
|
android:text="@string/no_results"/>
|
||||||
|
|||||||
@@ -19,8 +19,8 @@
|
|||||||
-->
|
-->
|
||||||
<GridView xmlns:android="http://schemas.android.com/apk/res/android"
|
<GridView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:id="@+id/IconGridView"
|
android:id="@+id/IconGridView"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="match_parent"
|
||||||
android:verticalSpacing="5dp"
|
android:verticalSpacing="5dp"
|
||||||
android:horizontalSpacing="5dp"
|
android:horizontalSpacing="5dp"
|
||||||
android:columnWidth="60dp"
|
android:columnWidth="60dp"
|
||||||
|
|||||||
@@ -19,23 +19,23 @@
|
|||||||
-->
|
-->
|
||||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:padding="@dimen/default_margin"
|
android:padding="@dimen/default_margin"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="fill_parent">
|
android:layout_height="match_parent">
|
||||||
<EditText android:id="@+id/pass_password"
|
<EditText android:id="@+id/pass_password"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:inputType="textPassword"
|
android:inputType="textPassword"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:hint="@string/hint_pass"/>
|
android:hint="@string/hint_pass"/>
|
||||||
<EditText android:id="@+id/pass_conf_password"
|
<EditText android:id="@+id/pass_conf_password"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@id/pass_password"
|
android:layout_below="@id/pass_password"
|
||||||
android:inputType="textPassword"
|
android:inputType="textPassword"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:hint="@string/hint_conf_pass"/>
|
android:hint="@string/hint_conf_pass"/>
|
||||||
<EditText android:id="@+id/pass_keyfile"
|
<EditText android:id="@+id/pass_keyfile"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@id/pass_conf_password"
|
android:layout_below="@id/pass_conf_password"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
|
|||||||
Reference in New Issue
Block a user