rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change layout to better visibility in landscape mode

Browse Source
This commit is contained in:
J-Jamet
2019-07-29 17:35:56 +02:00
parent f445fbca3d
commit bff9ec86ff
10 changed files with 341 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle
View File

@@ -90,6 +90,7 @@ dependencies {
implementation "com.android.support:preference-v7:$supportVersion"
implementation "com.android.support:preference-v14:$supportVersion"
implementation "com.android.support:cardview-v7:$supportVersion"
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation "com.madgag.spongycastle:core:$spongycastleVersion"
implementation "com.madgag.spongycastle:prov:$spongycastleVersion"
// Expandable view

26
app/src/main/res/layout/about.xml
View File

@@ -17,19 +17,25 @@
You should have received a copy of the GNU General Public License
along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.constraint.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical">
<include
android:id="@+id/toolbar"
layout="@layout/toolbar_default" />
layout="@layout/toolbar_default"
app:layout_constraintTop_toTopOf="parent"/>
<ScrollView
android:layout_below="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/toolbar"
app:layout_constraintWidth_percent="@dimen/content_percent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<LinearLayout
android:layout_width="match_parent"
@@ -122,12 +128,14 @@
</LinearLayout>
</ScrollView>
<TextView android:id="@+id/disclaimer"
<TextView
android:id="@+id/disclaimer"
android:padding="20dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_alignParentBottom="true"
android:text="@string/disclaimer_formal"
style="@style/KeepassDXStyle.TextAppearance.TinyText"/>
</RelativeLayout>
style="@style/KeepassDXStyle.TextAppearance.TinyText"
app:layout_constraintBottom_toBottomOf="parent"/>
</android.support.constraint.ConstraintLayout>

79
app/src/main/res/layout/entry_edit.xml
View File

@@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License
along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@@ -27,21 +27,25 @@
<include
android:id="@+id/toolbar"
layout="@layout/toolbar_default" />
layout="@layout/toolbar_default"
app:layout_constraintTop_toTopOf="parent"/>
<ScrollView
<ScrollView
android:id="@+id/entry_edit_scroll"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/toolbar"
android:fillViewport="true">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/toolbar"
android:fillViewport="true"
app:layout_constraintWidth_percent="@dimen/content_percent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<LinearLayout
android:padding="@dimen/default_margin"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content">
<!-- Title -->
<!-- Title -->
<RelativeLayout
android:orientation="horizontal"
android:layout_width="match_parent"
@@ -61,7 +65,7 @@
android:layout_height="wrap_content"
android:inputType="text"
android:maxLines="1"
android:hint="@string/entry_title" />
android:hint="@string/entry_title"/>
</android.support.design.widget.TextInputLayout>
@@ -75,7 +79,7 @@
android:layout_alignParentEnd="true"/>
</RelativeLayout>
<!-- Username -->
<!-- Username -->
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -86,10 +90,10 @@
android:layout_height="wrap_content"
android:inputType="text"
android:maxLines="1"
android:hint="@string/entry_user_name" />
android:hint="@string/entry_user_name"/>
</android.support.design.widget.TextInputLayout>
<!-- Password -->
<!-- Password -->
<RelativeLayout
android:orientation="horizontal"
android:layout_width="match_parent"
@@ -112,7 +116,7 @@
android:inputType="textPassword"
android:importantForAccessibility="no"
android:maxLines="1"
android:hint="@string/entry_password" />
android:hint="@string/entry_password"/>
</android.support.design.widget.TextInputLayout>
<!-- Confirm Password -->
@@ -133,7 +137,7 @@
android:inputType="textPassword"
android:importantForAccessibility="no"
android:maxLines="1"
android:hint="@string/entry_confpassword" />
android:hint="@string/entry_confpassword"/>
</android.support.design.widget.TextInputLayout>
<android.support.v7.widget.AppCompatImageView
@@ -145,7 +149,7 @@
android:layout_centerVertical="true"
android:layout_margin="8dp"
android:src="@drawable/ic_key_white_24dp"
android:tint="?attr/colorAccent" />
android:tint="?attr/colorAccent"/>
</RelativeLayout>
<!-- URL -->
@@ -159,10 +163,10 @@
android:layout_height="wrap_content"
android:inputType="textUri"
android:maxLines="1"
android:hint="@string/entry_url" />
android:hint="@string/entry_url"/>
</android.support.design.widget.TextInputLayout>
<!-- Comment -->
<!-- Comment -->
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -175,36 +179,35 @@
android:lines="4"
android:maxLines="10"
android:inputType="textMultiLine"
android:hint="@string/entry_notes" />
android:hint="@string/entry_notes"/>
</android.support.design.widget.TextInputLayout>
<LinearLayout
<LinearLayout
android:id="@+id/entry_edit_advanced_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
</LinearLayout>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
</LinearLayout>
<ImageView
<ImageView
android:id="@+id/entry_edit_add_new_field"
android:layout_width="30sp"
android:layout_height="30sp"
android:contentDescription="@string/add_string"
android:src="@drawable/ic_add_white_24dp"
android:layout_width="30sp"
android:layout_height="30sp"
android:contentDescription="@string/add_string"
android:src="@drawable/ic_add_white_24dp"
android:tint="?attr/colorAccent"
android:scaleType="centerCrop"
android:visibility="gone" />
</LinearLayout>
</ScrollView >
android:scaleType="centerCrop"
android:visibility="gone"/>
</LinearLayout>
</ScrollView>
<android.support.design.widget.FloatingActionButton
android:id="@+id/entry_edit_save"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:src="@drawable/ic_save_white_24dp"
app:useCompatPadding="true"
style="@style/KeepassDXStyle.Fab"/>
</RelativeLayout>
</android.support.constraint.ConstraintLayout>

30
app/src/main/res/layout/entry_view.xml
View File

@@ -17,13 +17,13 @@
You should have received a copy of the GNU General Public License
along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.constraint.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
<android.support.v7.widget.Toolbar
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/toolbar"
android:title="@string/app_name"
@@ -33,8 +33,10 @@
app:theme="?attr/toolbarAppearance"
app:popupTheme="?attr/toolbarPopupAppearance"
android:elevation="4dp"
tools:targetApi="lollipop" >
<LinearLayout android:id="@+id/title_block"
tools:targetApi="lollipop"
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:id="@+id/title_block"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:translationZ="10dp"
@@ -57,18 +59,22 @@
</LinearLayout>
</android.support.v7.widget.Toolbar>
<ScrollView android:id="@+id/entry_scroll"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/toolbar"
<ScrollView
android:id="@+id/entry_scroll"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:fillViewport="true"
android:scrollbarStyle="insideOverlay">
android:scrollbarStyle="insideOverlay"
app:layout_constraintTop_toBottomOf="@+id/toolbar"
app:layout_constraintWidth_percent="@dimen/content_percent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<com.kunzisoft.keepass.view.EntryContentsView
android:id="@+id/entry_contents"
android:layout_height="wrap_content"
android:layout_width="match_parent" />
android:layout_width="match_parent"/>
</ScrollView>
</RelativeLayout>
</android.support.constraint.ConstraintLayout>

354
app/src/main/res/layout/file_selection.xml
View File

@@ -17,31 +17,40 @@
You should have received a copy of the GNU General Public License
along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.constraint.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:importantForAutofill="noExcludeDescendants"
android:background="?attr/colorPrimaryDark"
tools:targetApi="o">
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/background_repeat"/>
<android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/browse_button"
android:background="?attr/colorPrimaryDark"
android:layout_height="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/file_selection_buttons_container"
android:layout_gravity="fill_vertical"
android:fillViewport="true">
<RelativeLayout
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/background_repeat"
android:orientation="vertical">
<FrameLayout
<LinearLayout
android:id="@+id/file_selection_title_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintTop_toTopOf="parent"
android:paddingLeft="24dp"
android:paddingStart="24dp"
android:paddingRight="24dp"
@@ -49,92 +58,89 @@
android:paddingTop="48dp"
android:paddingBottom="24dp"
android:layout_marginBottom="36dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
<TextView
android:id="@+id/file_selection_title_part_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="32sp"
android:textStyle="bold"
android:shadowColor="#393939"
android:shadowDx="2"
android:shadowDy="2"
android:shadowRadius="4"
android:paddingTop="?attr/actionBarSize"
android:textColor="?attr/textColorInverse"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/file_selection_title_part_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="32sp"
android:textStyle="bold"
android:shadowColor="#393939"
android:shadowDx="2"
android:shadowDy="2"
android:shadowRadius="4"
android:paddingTop="?attr/actionBarSize"
android:textColor="?attr/textColorInverse"
android:gravity="center"
android:text="@string/app_name_part1"/>
<TextView
android:id="@+id/file_selection_title_part_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginLeft="12dp"
android:textSize="32sp"
android:textStyle="bold"
android:shadowColor="#393939"
android:shadowDx="2"
android:shadowDy="2"
android:shadowRadius="4"
android:paddingTop="?attr/actionBarSize"
android:textColor="?attr/colorAccentCompat"
android:gravity="center"
android:text="@string/app_name_part2"/>
<TextView
android:id="@+id/file_selection_title_part_3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginLeft="12dp"
android:textSize="32sp"
android:textStyle="bold"
android:shadowColor="#393939"
android:shadowDx="2"
android:shadowDy="2"
android:shadowRadius="4"
android:paddingTop="?attr/actionBarSize"
android:textColor="?android:attr/textColorHintInverse"
android:gravity="center"
android:text="@string/app_name_part3"/>
</LinearLayout>
</FrameLayout>
android:text="@string/app_name_part1"/>
<TextView
android:id="@+id/file_selection_title_part_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginLeft="12dp"
android:textSize="32sp"
android:textStyle="bold"
android:shadowColor="#393939"
android:shadowDx="2"
android:shadowDy="2"
android:shadowRadius="4"
android:paddingTop="?attr/actionBarSize"
android:textColor="?attr/colorAccentCompat"
android:gravity="center"
android:text="@string/app_name_part2"/>
<TextView
android:id="@+id/file_selection_title_part_3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginLeft="12dp"
android:textSize="32sp"
android:textStyle="bold"
android:shadowColor="#393939"
android:shadowDx="2"
android:shadowDy="2"
android:shadowRadius="4"
android:paddingTop="?attr/actionBarSize"
android:textColor="?android:attr/textColorHintInverse"
android:gravity="center"
android:text="@string/app_name_part3"/>
</LinearLayout>
<TextView android:id="@+id/label_warning"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/default_margin"
android:layout_marginStart="@dimen/default_margin"
android:layout_marginRight="@dimen/default_margin"
android:layout_marginEnd="@dimen/default_margin"
android:layout_marginBottom="@dimen/default_margin"
android:gravity="center"
android:textColor="?attr/textColorInverse"
android:layout_below="@+id/file_selection_title_container"
android:visibility="gone" />
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/default_margin"
android:layout_marginStart="@dimen/default_margin"
android:layout_marginRight="@dimen/default_margin"
android:layout_marginEnd="@dimen/default_margin"
android:layout_marginBottom="@dimen/default_margin"
android:gravity="center"
android:textColor="?attr/textColorInverse"
app:layout_constraintTop_toBottomOf="@+id/file_selection_title_container"
android:visibility="gone" />
<android.support.v7.widget.CardView
android:id="@+id/container_file_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_width="0dp"
android:backgroundTint="?attr/colorPrimary"
android:layout_margin="12dp"
android:layout_below="@+id/label_warning">
app:layout_constraintWidth_percent="@dimen/content_percent"
app:layout_constraintTop_toBottomOf="@+id/label_warning"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView android:id="@+id/file_list_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="12dp"
style="@style/KeepassDXStyle.TextAppearance.Title"
android:textColor="?android:attr/textColorHintInverse"
android:text="@string/open_recent" />
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="12dp"
style="@style/KeepassDXStyle.TextAppearance.Title"
android:textColor="?android:attr/textColorHintInverse"
android:text="@string/open_recent"/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
@@ -142,116 +148,136 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/file_list"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"/>
</LinearLayout>
</android.support.v7.widget.CardView>
</RelativeLayout>
</android.support.constraint.ConstraintLayout>
</android.support.v4.widget.NestedScrollView>
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_constraintTop_toTopOf="parent"
android:elevation="4dp"
android:background="@color/transparent"
app:theme="?attr/toolbarAppearance"
app:popupTheme="?attr/toolbarPopupAppearance" />
<android.support.v7.widget.AppCompatButton
android:id="@+id/browse_button"
android:layout_width="match_parent"
<FrameLayout
android:id="@+id/file_selection_buttons_container"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/select_database_file"
android:drawableRight="@drawable/ic_folder_white_24dp"
android:drawableEnd="@drawable/ic_folder_white_24dp"
style="@style/KeepassDXStyle.Button.Primary"
android:paddingLeft="32dp"
android:paddingStart="32dp"
android:paddingRight="24dp"
android:paddingEnd="24dp"
android:layout_above="@+id/file_select_expandable"/>
<android.support.v7.widget.AppCompatImageView
android:id="@+id/file_select_expandable_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:elevation="8dp"
android:layout_alignTop="@+id/browse_button"
android:layout_alignBottom="@+id/browse_button"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:paddingStart="12dp"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:paddingEnd="12dp"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp"
android:tint="?attr/textColorInverse"
android:src="@drawable/ic_link_white_24dp" />
<net.cachapa.expandablelayout.ExpandableLayout
android:id="@+id/file_select_expandable"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/create_database"
app:el_duration="300"
app:el_expanded="false"
app:el_parallax="0.5">
<RelativeLayout
android:id="@+id/file_select"
android:layout_width="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimaryDark"
android:paddingLeft="@dimen/default_margin"
android:paddingStart="@dimen/default_margin"
android:paddingRight="@dimen/default_margin"
android:paddingEnd="@dimen/default_margin">
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
<android.support.v7.widget.AppCompatEditText
android:id="@+id/file_filename"
<android.support.v7.widget.AppCompatButton
android:id="@+id/browse_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textUri"
android:textColor="?attr/textColorInverse"
android:textColorHint="?attr/android:textColorHintInverse"
android:layout_toLeftOf="@+id/open_database"
android:layout_toStartOf="@+id/open_database"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp"
android:layout_marginStart="2dp"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:layout_marginEnd="2dp"
android:maxLines="1" />
android:text="@string/select_database_file"
android:drawableRight="@drawable/ic_folder_white_24dp"
android:drawableEnd="@drawable/ic_folder_white_24dp"
style="@style/KeepassDXStyle.Button.Primary"
android:focusable="true"
android:paddingLeft="32dp"
android:paddingStart="32dp"
android:paddingRight="24dp"
android:paddingEnd="24dp"
app:layout_constraintBottom_toTopOf="@+id/file_select_expandable"/>
<android.support.v7.widget.AppCompatImageView
android:id="@+id/open_database"
android:id="@+id/file_select_expandable_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/file_filename"
android:layout_alignBottom="@+id/file_filename"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:src="@drawable/ic_send_white_24dp"
android:tint="?attr/textColorInverse" />
</RelativeLayout>
android:elevation="8dp"
app:layout_constraintTop_toTopOf="@+id/browse_button"
app:layout_constraintBottom_toBottomOf="@+id/browse_button"
app:layout_constraintStart_toStartOf="parent"
android:focusable="true"
android:paddingStart="12dp"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:paddingEnd="12dp"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp"
android:tint="?attr/textColorInverse"
android:src="@drawable/ic_link_white_24dp"/>
</net.cachapa.expandablelayout.ExpandableLayout>
<net.cachapa.expandablelayout.ExpandableLayout
android:id="@+id/file_select_expandable"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@+id/create_database"
app:el_duration="300"
app:el_expanded="false"
app:el_parallax="0.5">
<android.support.v7.widget.AppCompatButton
android:id="@+id/create_database"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:drawableRight="@drawable/ic_database_plus_white_24dp"
android:drawableEnd="@drawable/ic_database_plus_white_24dp"
android:paddingLeft="24dp"
android:paddingStart="24dp"
android:paddingRight="24dp"
android:paddingEnd="24dp"
android:text="@string/create_keepass_file"/>
<RelativeLayout
android:id="@+id/file_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/colorPrimaryDark"
android:paddingLeft="@dimen/default_margin"
android:paddingStart="@dimen/default_margin"
android:paddingRight="@dimen/default_margin"
android:paddingEnd="@dimen/default_margin">
</RelativeLayout>
<android.support.v7.widget.AppCompatEditText
android:id="@+id/file_filename"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textUri"
android:textColor="?attr/textColorInverse"
android:textColorHint="?attr/android:textColorHintInverse"
android:layout_toLeftOf="@+id/open_database"
android:layout_toStartOf="@+id/open_database"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp"
android:layout_marginStart="2dp"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:layout_marginEnd="2dp"
android:maxLines="1"/>
<android.support.v7.widget.AppCompatImageView
android:id="@+id/open_database"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/file_filename"
android:layout_alignBottom="@+id/file_filename"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:focusable="true"
android:src="@drawable/ic_send_white_24dp"
android:tint="?attr/textColorInverse"/>
</RelativeLayout>
</net.cachapa.expandablelayout.ExpandableLayout>
<android.support.v7.widget.AppCompatButton
android:id="@+id/create_database"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:focusable="true"
app:layout_constraintBottom_toBottomOf="parent"
android:drawableRight="@drawable/ic_database_plus_white_24dp"
android:drawableEnd="@drawable/ic_database_plus_white_24dp"
android:paddingLeft="24dp"
android:paddingStart="24dp"
android:paddingRight="24dp"
android:paddingEnd="24dp"
android:text="@string/create_keepass_file"/>
</android.support.constraint.ConstraintLayout>
</FrameLayout>
</android.support.constraint.ConstraintLayout>

2
app/src/main/res/layout/fingerprint_show.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/fingerprint_container"
android:layout_width="match_parent"

17
app/src/main/res/layout/list_nodes_with_add_button.xml
View File

@@ -44,9 +44,7 @@
app:contentScrim="?attr/colorPrimary"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:title="@string/app_name"
android:layout_width="match_parent"
@@ -112,11 +110,18 @@
android:gravity="center_horizontal"
android:background="?attr/colorAccent"
android:text="@string/selection_mode"/>
<FrameLayout
android:id="@+id/nodes_list_fragment_container"
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:attr/windowBackground" />
android:background="?android:attr/windowBackground">
<FrameLayout
android:id="@+id/nodes_list_fragment_container"
android:layout_width="0dp"
android:layout_height="match_parent"
app:layout_constraintWidth_percent="@dimen/content_percent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
</android.support.constraint.ConstraintLayout>
</LinearLayout>
<com.kunzisoft.keepass.view.AddNodeButtonView

46
app/src/main/res/layout/password.xml
View File

@@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License
along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/container"
@@ -50,10 +50,12 @@
android:layout_marginTop="?attr/actionBarSize">
<android.support.v7.widget.SwitchCompat
android:id="@+id/default_database"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
style="@style/KeepassDXStyle.TextAppearance.Small"
android:textColor="?android:attr/textColorHintInverse"
android:paddingHorizontal="8dp"
android:layout_marginLeft="24dp"
android:layout_marginStart="24dp"
android:layout_marginRight="12dp"
@@ -99,12 +101,19 @@
android:layout_gravity="fill_vertical"
android:fillViewport="true">
<LinearLayout
android:id="@+id/unlock_container"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/default_margin">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/unlock_container"
android:orientation="vertical"
android:layout_width="0dp"
android:layout_height="match_parent"
android:padding="@dimen/default_margin"
app:layout_constraintWidth_percent="@dimen/content_percent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<!-- Password Input -->
<RelativeLayout
@@ -117,6 +126,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="20dp"
android:focusable="false"
android:layout_alignBottom="@+id/password_input_layout"
android:gravity="center_vertical" />
@@ -152,6 +162,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="20dp"
android:focusable="false"
android:layout_alignBottom="@+id/input_entry_keyfile"
android:gravity="center_vertical" />
@@ -180,12 +191,14 @@
android:layout_alignBottom="@+id/input_entry_keyfile"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:padding="12dp"
android:padding="8dp"
android:focusable="true"
android:src="@drawable/ic_folder_white_24dp"
android:tint="?attr/colorAccentCompat" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
</android.support.constraint.ConstraintLayout>
</android.support.v4.widget.NestedScrollView>
@@ -193,13 +206,12 @@
<android.support.v7.widget.AppCompatButton
android:id="@+id/pass_ok"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:focusable="true"
android:text="@string/menu_open" />
</RelativeLayout>
</android.support.constraint.ConstraintLayout>

31
app/src/main/res/values-land/dimens.xml Normal file
View File

@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<dimen name="list_margin">5dp</dimen>
<dimen name="default_margin">12dp</dimen>
<dimen name="button_margin">5dp</dimen>
<dimen name="fab_menu_margin">8dp</dimen>
<dimen name="margin_tiny">4dp</dimen>
<dimen name="margin_small">8dp</dimen>
<dimen name="margin_medium">16dp</dimen>
<dimen name="margin_large">32dp</dimen>
<dimen name="margin_huge">64dp</dimen>
<dimen name="icon_size">32dp</dimen>
<dimen name="content_percent">0.5</dimen>
</resources>

2
app/src/main/res/values/dimens.xml
View File

@@ -27,5 +27,7 @@
<dimen name="icon_size">32dp</dimen>
<dimen name="content_percent">1</dimen>
<integer name="animation_duration">320</integer>
</resources>