mirror of
https://github.com/Kunzisoft/KeePassDX.git
synced 2025-12-04 15:49:33 +01:00
Change form layouts
This commit is contained in:
@@ -104,14 +104,7 @@ public class EntryEditActivityV4 extends EntryEditActivity {
|
||||
|
||||
View iconPicker = findViewById(R.id.icon_button);
|
||||
iconPicker.setVisibility(View.GONE);
|
||||
|
||||
View divider = findViewById(R.id.divider_title);
|
||||
RelativeLayout.LayoutParams lp_div = (RelativeLayout.LayoutParams) divider.getLayoutParams();
|
||||
lp_div.addRule(RelativeLayout.BELOW, R.id.entry_title);
|
||||
|
||||
View user_label = findViewById(R.id.entry_user_name_label);
|
||||
RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) user_label.getLayoutParams();
|
||||
lp.addRule(RelativeLayout.BELOW, R.id.divider_title);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -21,15 +21,14 @@ package com.keepassdroid.view;
|
||||
|
||||
import android.content.Context;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.LayoutInflater;
|
||||
import android.widget.CheckBox;
|
||||
import android.widget.RelativeLayout;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.android.keepass.R;
|
||||
import com.keepassdroid.database.security.ProtectedString;
|
||||
|
||||
public class EntryEditSection extends RelativeLayout {
|
||||
public class EntryEditSection extends LinearLayout {
|
||||
|
||||
public EntryEditSection(Context context) {
|
||||
super(context);
|
||||
@@ -43,28 +42,6 @@ public class EntryEditSection extends RelativeLayout {
|
||||
super(context, attrs, defStyle);
|
||||
}
|
||||
|
||||
/*
|
||||
public EntryEditSection(Context context, AttributeSet attrs, String title, ProtectedString value) {
|
||||
super(context, attrs);
|
||||
|
||||
LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
||||
inflate(inflater, context, title, value);
|
||||
|
||||
fillData(title, value);
|
||||
}
|
||||
*/
|
||||
|
||||
/*
|
||||
private int getLayout() {
|
||||
return R.layout.entry_edit_section;
|
||||
}
|
||||
|
||||
protected void inflate(LayoutInflater inflater, Context context,
|
||||
String title, ProtectedString value) {
|
||||
|
||||
inflater.inflate(getLayout(), this);
|
||||
*/
|
||||
|
||||
public void setData(String title, ProtectedString value) {
|
||||
setText(R.id.title, title);
|
||||
setText(R.id.value, value.toString());
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
|
||||
|
||||
This file is part of KeePass DX.
|
||||
|
||||
KeePass DX 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.
|
||||
|
||||
KeePass DX 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 KeePass DX. If not, see <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
<TextView android:id="@+id/title"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/LabelTextStyle"
|
||||
/>
|
||||
<TextView
|
||||
android:id="@+id/value"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textIsSelectable="true"
|
||||
style="@style/EntryItem"
|
||||
/>
|
||||
<View style="@style/Divider" />
|
||||
</LinearLayout>
|
||||
@@ -1,140 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
|
||||
|
||||
This file is part of KeePass DX.
|
||||
|
||||
KeePass DX 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.
|
||||
|
||||
KeePass DX 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 KeePass DX. If not, see <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_margin="@dimen/default_margin"
|
||||
android:id="@+id/entry_table"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:orientation="vertical">
|
||||
<!-- Username -->
|
||||
<TextView android:id="@+id/entry_user_name_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_user_name"
|
||||
style="@style/LabelTextStyle"
|
||||
/>
|
||||
<TextView android:id="@+id/entry_user_name"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textIsSelectable="true"
|
||||
style="@style/EntryItem"
|
||||
/>
|
||||
<View style="@style/Divider" />
|
||||
<!-- URL -->
|
||||
<TextView android:id="@+id/entry_url_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_url"
|
||||
style="@style/LabelTextStyle"
|
||||
/>
|
||||
<TextView android:id="@+id/entry_url"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:autoLink="all"
|
||||
android:textIsSelectable="true"
|
||||
style="@style/EntryItem"
|
||||
/>
|
||||
<View style="@style/Divider" />
|
||||
<!-- Password -->
|
||||
<TextView android:id="@+id/entry_password_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_password"
|
||||
style="@style/LabelTextStyle"
|
||||
/>
|
||||
<EditText android:id="@+id/entry_password"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textPassword"
|
||||
android:textIsSelectable="true"
|
||||
style="@style/EntryItem"
|
||||
/>
|
||||
<View style="@style/Divider" />
|
||||
<!-- Comment -->
|
||||
<TextView android:id="@+id/entry_comment_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_comment"
|
||||
style="@style/LabelTextStyle"
|
||||
/>
|
||||
<TextView android:id="@+id/entry_comment"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textIsSelectable="true"
|
||||
style="@style/EntryItem"
|
||||
/>
|
||||
<View style="@style/Divider" />
|
||||
<LinearLayout android:id="@+id/extra_strings"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
</LinearLayout>
|
||||
<!-- Created -->
|
||||
<TextView android:id="@+id/entry_created_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_created"
|
||||
style="@style/LabelTextStyle"
|
||||
/>
|
||||
<TextView android:id="@+id/entry_created"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/EntryItem"
|
||||
/>
|
||||
<View style="@style/Divider" />
|
||||
<!-- Modified -->
|
||||
<TextView android:id="@+id/entry_modified_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_modified"
|
||||
style="@style/LabelTextStyle"
|
||||
/>
|
||||
<TextView android:id="@+id/entry_modified"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/EntryItem"
|
||||
/>
|
||||
<View style="@style/Divider" />
|
||||
<!-- Accessed -->
|
||||
<TextView android:id="@+id/entry_accessed_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_accessed"
|
||||
style="@style/LabelTextStyle"
|
||||
/>
|
||||
<TextView android:id="@+id/entry_accessed"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/EntryItem"
|
||||
/>
|
||||
<View style="@style/Divider" />
|
||||
<!-- Expires -->
|
||||
<TextView android:id="@+id/entry_expires_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_expires"
|
||||
style="@style/LabelTextStyle"
|
||||
/>
|
||||
<TextView android:id="@+id/entry_expires"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/EntryItem"
|
||||
/>
|
||||
</LinearLayout>
|
||||
@@ -30,150 +30,148 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/toolbar"
|
||||
android:fillViewport="true">
|
||||
<RelativeLayout
|
||||
<LinearLayout
|
||||
android:padding="@dimen/default_margin"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<!-- Title -->
|
||||
<TextView android:id="@+id/entry_title_label"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_title" />
|
||||
<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_alignParentEnd="true"
|
||||
android:layout_below="@id/entry_title_label"/>
|
||||
<EditText android:id="@+id/entry_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_toLeftOf="@+id/icon_button"
|
||||
android:layout_toStartOf="@+id/icon_button"
|
||||
android:maxLines="1"
|
||||
android:layout_below="@id/entry_title_label"
|
||||
android:hint="@string/hint_title"/>
|
||||
<View android:id="@+id/divider_title"
|
||||
android:layout_below="@id/icon_button"
|
||||
android:layout_marginTop="6dp"
|
||||
android:scaleType="fitXY"
|
||||
style="@style/DividerEntry"/>
|
||||
<RelativeLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<android.support.design.widget.TextInputLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_toLeftOf="@+id/icon_button"
|
||||
android:layout_toStartOf="@+id/icon_button">
|
||||
|
||||
<EditText
|
||||
android:id="@+id/entry_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxLines="1"
|
||||
android:hint="@string/entry_title" />
|
||||
|
||||
</android.support.design.widget.TextInputLayout>
|
||||
|
||||
<android.support.v7.widget.AppCompatImageButton 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_alignParentEnd="true"/>
|
||||
</RelativeLayout>
|
||||
|
||||
<!-- Username -->
|
||||
<TextView android:id="@+id/entry_user_name_label"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/divider_title"
|
||||
android:text="@string/entry_user_name" />
|
||||
<EditText android:id="@+id/entry_user_name"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxLines="1"
|
||||
android:inputType="textEmailAddress"
|
||||
android:layout_below="@id/entry_user_name_label"
|
||||
android:hint="@string/hint_username"/>
|
||||
<View android:id="@+id/divider_username"
|
||||
android:layout_below="@id/entry_user_name"
|
||||
android:layout_marginTop="6dp"
|
||||
android:scaleType="fitXY"
|
||||
style="@style/DividerEntry"/>
|
||||
<android.support.design.widget.TextInputLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<EditText
|
||||
android:id="@+id/entry_user_name"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxLines="1"
|
||||
android:hint="@string/entry_user_name" />
|
||||
</android.support.design.widget.TextInputLayout>
|
||||
|
||||
<!-- URL -->
|
||||
<TextView android:id="@+id/entry_url_label"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/divider_username"
|
||||
android:text="@string/entry_url" />
|
||||
<EditText android:id="@+id/entry_url"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxLines="1"
|
||||
android:inputType="textUri"
|
||||
android:layout_below="@id/entry_url_label"
|
||||
android:hint="@string/hint_url"/>
|
||||
<View android:id="@+id/divider_url"
|
||||
android:layout_below="@id/entry_url"
|
||||
android:layout_marginTop="6dp"
|
||||
android:scaleType="fitXY"
|
||||
style="@style/DividerEntry"/>
|
||||
<android.support.design.widget.TextInputLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<EditText
|
||||
android:id="@+id/entry_url"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxLines="1"
|
||||
android:inputType="textUri"
|
||||
android:hint="@string/entry_url" />
|
||||
</android.support.design.widget.TextInputLayout>
|
||||
|
||||
<!-- Password -->
|
||||
<TextView android:id="@+id/entry_password_label"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/divider_url"
|
||||
android:text="@string/entry_password" />
|
||||
<android.support.v7.widget.AppCompatImageView android:id="@+id/generate_button"
|
||||
android:layout_below="@id/entry_password_label"
|
||||
android:layout_width="wrap_content"
|
||||
android:src="@drawable/ic_mode_edit_white_24dp"
|
||||
android:tint="@color/colorAccent"
|
||||
android:layout_margin="8dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentEnd="true"/>
|
||||
<EditText android:id="@+id/entry_password"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textPassword"
|
||||
android:maxLines="1"
|
||||
android:layout_toLeftOf="@id/generate_button"
|
||||
android:layout_toStartOf="@id/generate_button"
|
||||
android:hint="@string/hint_pass"
|
||||
android:layout_alignTop="@id/generate_button"/>
|
||||
<View android:id="@+id/divider_password"
|
||||
android:layout_below="@id/generate_button"
|
||||
android:layout_marginTop="6dp"
|
||||
android:scaleType="fitXY"
|
||||
style="@style/DividerEntry"/>
|
||||
<RelativeLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<android.support.design.widget.TextInputLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_toLeftOf="@+id/generate_button"
|
||||
android:layout_toStartOf="@+id/generate_button">
|
||||
|
||||
<EditText
|
||||
android:id="@+id/entry_password"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textPassword"
|
||||
android:maxLines="1"
|
||||
android:hint="@string/entry_password" />
|
||||
</android.support.design.widget.TextInputLayout>
|
||||
|
||||
<android.support.v7.widget.AppCompatImageView android:id="@+id/generate_button"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:src="@drawable/ic_mode_edit_white_24dp"
|
||||
android:tint="@color/colorAccent"
|
||||
android:layout_margin="8dp"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentEnd="true"/>
|
||||
</RelativeLayout>
|
||||
|
||||
|
||||
<!-- Confirm Password -->
|
||||
<TextView android:id="@+id/entry_confpassword_label"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/divider_password"
|
||||
android:text="@string/entry_confpassword" />
|
||||
<EditText android:id="@+id/entry_confpassword"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textPassword"
|
||||
android:maxLines="1"
|
||||
android:layout_below="@id/entry_confpassword_label"
|
||||
android:hint="@string/hint_conf_pass"/>
|
||||
<View android:id="@+id/divider_confpassword"
|
||||
android:layout_below="@id/entry_confpassword"
|
||||
android:layout_marginTop="6dp"
|
||||
android:scaleType="fitXY"
|
||||
style="@style/DividerEntry"/>
|
||||
<android.support.design.widget.TextInputLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<EditText
|
||||
android:id="@+id/entry_confpassword"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxLines="1"
|
||||
android:inputType="textPassword"
|
||||
android:hint="@string/entry_confpassword" />
|
||||
</android.support.design.widget.TextInputLayout>
|
||||
|
||||
<!-- Comment -->
|
||||
<TextView android:id="@+id/entry_comment_label"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/divider_confpassword"
|
||||
android:text="@string/entry_comment" />
|
||||
<EditText android:id="@+id/entry_comment"
|
||||
android:inputType="textMultiLine"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/entry_comment_label"
|
||||
android:hint="@string/hint_comment"/>
|
||||
<View android:id="@+id/divider_comment"
|
||||
android:layout_below="@id/entry_comment"
|
||||
android:scaleType="fitXY"
|
||||
style="@style/DividerEntry"/>
|
||||
<android.support.design.widget.TextInputLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<EditText
|
||||
android:id="@+id/entry_comment"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxLines="1"
|
||||
android:inputType="textMultiLine"
|
||||
android:hint="@string/entry_comment" />
|
||||
</android.support.design.widget.TextInputLayout>
|
||||
|
||||
|
||||
<LinearLayout android:id="@+id/advanced_container"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/divider_comment"
|
||||
android:orientation="vertical">
|
||||
</LinearLayout>
|
||||
|
||||
<ImageView android:id="@+id/add_advanced"
|
||||
android:layout_width="30sp"
|
||||
android:layout_height="30sp"
|
||||
android:layout_below="@id/advanced_container"
|
||||
android:contentDescription="@string/add_string"
|
||||
android:src="@drawable/ic_add_white_24dp"
|
||||
android:tint="@color/colorAccent"
|
||||
android:scaleType="centerCrop"
|
||||
android:visibility="gone" />
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
</com.keepassdroid.view.NoFocusScrollView >
|
||||
|
||||
<android.support.v7.widget.AppCompatImageButton
|
||||
|
||||
@@ -18,41 +18,62 @@
|
||||
along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
<com.keepassdroid.view.EntryEditSection xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_margin="@dimen/default_margin"
|
||||
android:layout_width="fill_parent"
|
||||
android:orientation="vertical"
|
||||
android:background="@color/colorPrimaryInverse"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
<EditText android:id="@+id/title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxLines="1"
|
||||
android:inputType="text"
|
||||
android:hint="@string/field_name"
|
||||
style="@style/TinyTextStyle" />
|
||||
<CheckBox android:id="@+id/protection"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/title"
|
||||
android:text="@string/protection" />
|
||||
<android.support.v7.widget.AppCompatImageView android:id="@+id/delete"
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="30dp"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_below="@id/title"
|
||||
android:src="@drawable/ic_close_white_24dp"
|
||||
android:tint="@color/colorAccent"
|
||||
android:scaleType="centerCrop"
|
||||
android:onClick="deleteAdvancedString" />
|
||||
<EditText android:id="@+id/value"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/delete"
|
||||
android:inputType="textMultiLine"
|
||||
android:hint="@string/field_value" />
|
||||
<android.support.v7.widget.AppCompatImageView android:id="@+id/divider_comment"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/value"
|
||||
android:scaleType="fitXY"
|
||||
android:src="@android:drawable/divider_horizontal_dark" />
|
||||
|
||||
<RelativeLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_margin="5dp"
|
||||
android:id="@+id/relativeLayout">
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/protection"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/protection"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_toLeftOf="@+id/delete"
|
||||
android:layout_toStartOf="@+id/delete"/>
|
||||
|
||||
<android.support.v7.widget.AppCompatImageView
|
||||
android:id="@+id/delete"
|
||||
android:layout_margin="4dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:onClick="deleteAdvancedString"
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@drawable/ic_close_white_24dp"
|
||||
android:tint="@color/colorAccent" />
|
||||
</RelativeLayout>
|
||||
|
||||
<android.support.design.widget.TextInputLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<EditText android:id="@+id/title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxLines="1"
|
||||
android:inputType="text"
|
||||
android:hint="@string/field_name" />
|
||||
</android.support.design.widget.TextInputLayout>
|
||||
|
||||
<android.support.design.widget.TextInputLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<EditText android:id="@+id/value"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textMultiLine"
|
||||
android:hint="@string/field_value" />
|
||||
</android.support.design.widget.TextInputLayout>
|
||||
|
||||
</com.keepassdroid.view.EntryEditSection>
|
||||
@@ -24,14 +24,12 @@
|
||||
<TextView android:id="@+id/title"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/LabelTextStyle"
|
||||
/>
|
||||
<com.keepassdroid.view.TextViewSelect
|
||||
android:id="@+id/value"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:autoLink="all"
|
||||
style="@style/EntryItem"
|
||||
/>
|
||||
style="@style/KeepassoidStyle.TextAppearance.LabelTextStyle" />
|
||||
<TextView
|
||||
android:id="@+id/value"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textIsSelectable="true"
|
||||
style="@style/KeepassoidStyle.TextAppearance.TextEntryItem" />
|
||||
<View style="@style/Divider" />
|
||||
</LinearLayout>
|
||||
|
||||
@@ -19,119 +19,108 @@
|
||||
-->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_margin="@dimen/default_margin"
|
||||
android:id="@+id/entry_table"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:orientation="vertical">
|
||||
android:id="@+id/entry_table"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:orientation="vertical">
|
||||
<!-- Username -->
|
||||
<TextView android:id="@+id/entry_user_name_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_user_name"
|
||||
style="@style/LabelTextStyle"
|
||||
/>
|
||||
<com.keepassdroid.view.TextViewSelect android:id="@+id/entry_user_name"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/EntryItem"
|
||||
/>
|
||||
<View style="@style/Divider" />
|
||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_user_name_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_user_name"
|
||||
style="@style/KeepassoidStyle.TextAppearance.LabelTextStyle" />
|
||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_user_name"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textIsSelectable="true"
|
||||
style="@style/KeepassoidStyle.TextAppearance.TextEntryItem" />
|
||||
|
||||
<!-- URL -->
|
||||
<TextView android:id="@+id/entry_url_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_url"
|
||||
style="@style/LabelTextStyle"
|
||||
/>
|
||||
<com.keepassdroid.view.TextViewSelect android:id="@+id/entry_url"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:autoLink="all"
|
||||
style="@style/EntryItem"
|
||||
/>
|
||||
<View style="@style/Divider" />
|
||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_url_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_url"
|
||||
style="@style/KeepassoidStyle.TextAppearance.LabelTextStyle" />
|
||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_url"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:autoLink="all"
|
||||
android:textIsSelectable="true"
|
||||
style="@style/KeepassoidStyle.TextAppearance.TextEntryItem" />
|
||||
|
||||
<!-- Password -->
|
||||
<TextView android:id="@+id/entry_password_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_password"
|
||||
style="@style/LabelTextStyle"
|
||||
/>
|
||||
<EditText android:id="@+id/entry_password"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textPassword"
|
||||
style="@style/EntryItem"
|
||||
/>
|
||||
<View style="@style/Divider" />
|
||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_password_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_password"
|
||||
style="@style/KeepassoidStyle.TextAppearance.LabelTextStyle" />
|
||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_password"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textPassword"
|
||||
android:textIsSelectable="true"
|
||||
style="@style/KeepassoidStyle.TextAppearance.TextEntryItem" />
|
||||
|
||||
<!-- Comment -->
|
||||
<TextView android:id="@+id/entry_comment_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_comment"
|
||||
android:autoLink="all"
|
||||
style="@style/LabelTextStyle"
|
||||
/>
|
||||
<com.keepassdroid.view.TextViewSelect android:id="@+id/entry_comment"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/EntryItem"
|
||||
/>
|
||||
<View style="@style/Divider" />
|
||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_comment_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_comment"
|
||||
android:autoLink="all"
|
||||
style="@style/KeepassoidStyle.TextAppearance.LabelTextStyle" />
|
||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_comment"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textIsSelectable="true"
|
||||
style="@style/KeepassoidStyle.TextAppearance.TextEntryItem" />
|
||||
|
||||
<LinearLayout android:id="@+id/extra_strings"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
</LinearLayout>
|
||||
|
||||
<!-- Created -->
|
||||
<TextView android:id="@+id/entry_created_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_created"
|
||||
style="@style/LabelTextStyle"
|
||||
/>
|
||||
<TextView android:id="@+id/entry_created"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/EntryItem"
|
||||
/>
|
||||
<View style="@style/Divider" />
|
||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_created_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_created"
|
||||
style="@style/KeepassoidStyle.TextAppearance.LabelTextStyle" />
|
||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_created"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/KeepassoidStyle.TextAppearance.TextEntryItem" />
|
||||
|
||||
<!-- Modified -->
|
||||
<TextView android:id="@+id/entry_modified_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_modified"
|
||||
style="@style/LabelTextStyle"
|
||||
/>
|
||||
<TextView android:id="@+id/entry_modified"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/EntryItem"
|
||||
/>
|
||||
<View style="@style/Divider" />
|
||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_modified_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_modified"
|
||||
style="@style/KeepassoidStyle.TextAppearance.LabelTextStyle" />
|
||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_modified"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/KeepassoidStyle.TextAppearance.TextEntryItem" />
|
||||
|
||||
<!-- Accessed -->
|
||||
<TextView android:id="@+id/entry_accessed_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_accessed"
|
||||
style="@style/LabelTextStyle"
|
||||
/>
|
||||
<TextView android:id="@+id/entry_accessed"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/EntryItem"
|
||||
/>
|
||||
<View style="@style/Divider" />
|
||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_accessed_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_accessed"
|
||||
style="@style/KeepassoidStyle.TextAppearance.LabelTextStyle" />
|
||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_accessed"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/KeepassoidStyle.TextAppearance.TextEntryItem" />
|
||||
|
||||
<!-- Expires -->
|
||||
<TextView android:id="@+id/entry_expires_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_expires"
|
||||
style="@style/LabelTextStyle"
|
||||
/>
|
||||
<TextView android:id="@+id/entry_expires"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/EntryItem"
|
||||
/>
|
||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_expires_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/entry_expires"
|
||||
style="@style/KeepassoidStyle.TextAppearance.LabelTextStyle" />
|
||||
<android.support.v7.widget.AppCompatTextView android:id="@+id/entry_expires"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/KeepassoidStyle.TextAppearance.TextEntryItem" />
|
||||
</LinearLayout>
|
||||
|
||||
@@ -101,14 +101,16 @@
|
||||
<style name="WarningTextStyle" parent="android:TextAppearance">
|
||||
<item name="@android:textColor">@color/colorAccent</item>
|
||||
</style>
|
||||
<style name="LabelTextStyle" parent="android:TextAppearance">
|
||||
|
||||
<!-- Form -->
|
||||
<style name="KeepassoidStyle.TextAppearance.LabelTextStyle" parent="android:TextAppearance">
|
||||
<item name="@android:textSize">12sp</item>
|
||||
</style>
|
||||
|
||||
|
||||
<style name="EntryItem">
|
||||
<style name="KeepassoidStyle.TextAppearance.TextEntryItem">
|
||||
<item name="@android:padding">5sp</item>
|
||||
<item name="@android:textSize">16sp</item>
|
||||
</style>
|
||||
|
||||
<style name="Divider">
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:layout_height">1dp</item>
|
||||
|
||||
Reference in New Issue
Block a user