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

Fix small views issues

Browse Source
This commit is contained in:
J-Jamet
2019-08-18 18:31:14 +02:00
parent 6d671f53c2
commit a1cd2683d4
10 changed files with 75 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/drawable-v21/background_image_button.xml
View File

@@ -6,7 +6,7 @@
<item>
<shape
android:shape="oval">
<stroke android:color="?attr/colorAccent" android:width="2dp"/>
<stroke android:color="?attr/colorAccent" android:width="1dp"/>
<padding
android:left="12dp"
android:right="12dp"

5
app/src/main/res/drawable-v21/background_new_field.xml
View File

@@ -6,11 +6,6 @@
<item>
<shape>
<stroke android:color="?attr/colorAccent" android:width="1dp"/>
<padding
android:left="12dp"
android:right="12dp"
android:top="12dp"
android:bottom="12dp"/>
<solid android:color="@color/transparent"/>
</shape>
</item>

4
app/src/main/res/drawable/background_image_button.xml
View File

@@ -3,7 +3,7 @@
<item android:state_pressed="true">
<shape
android:shape="oval">
<stroke android:color="@color/orange_light" android:width="2dp"/>
<stroke android:color="@color/orange_light" android:width="1dp"/>
<padding
android:left="12dp"
android:right="12dp"
@@ -15,7 +15,7 @@
<item>
<shape
android:shape="oval">
<stroke android:color="@color/orange" android:width="2dp"/>
<stroke android:color="@color/orange" android:width="1dp"/>
<padding
android:left="12dp"
android:right="12dp"

5
app/src/main/res/drawable/background_new_field.xml
View File

@@ -3,11 +3,6 @@
<item>
<shape>
<stroke android:color="@color/orange" android:width="1dp"/>
<padding
android:left="12dp"
android:right="12dp"
android:top="12dp"
android:bottom="12dp"/>
<solid android:color="@color/transparent"/>
</shape>
</item>

33
app/src/main/res/layout/activity_file_selection.xml
View File

@@ -197,19 +197,14 @@
<android.support.v7.widget.AppCompatImageView
android:id="@+id/file_select_expandable_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="48dp"
android:layout_height="48dp"
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:padding="12dp"
android:tint="?attr/textColorInverse"
android:src="@drawable/ic_link_white_24dp"
android:contentDescription="@string/content_description_show_file_link"/>
@@ -227,33 +222,29 @@
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">
android:background="?attr/colorPrimaryDark">
<android.support.v7.widget.AppCompatEditText
android:id="@+id/file_filename"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="48dp"
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:layout_marginLeft="@dimen/default_margin"
android:layout_marginStart="@dimen/default_margin"
android:layout_marginRight="@dimen/default_margin"
android:layout_marginEnd="@dimen/default_margin"
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_width="48dp"
android:layout_height="48dp"
android:padding="12dp"
android:layout_alignTop="@+id/file_filename"
android:layout_alignBottom="@+id/file_filename"
android:layout_alignParentRight="true"

8
app/src/main/res/layout/activity_password.xml
View File

@@ -53,6 +53,7 @@
android:id="@+id/default_database"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:layout_gravity="end"
style="@style/KeepassDXStyle.TextAppearance.Small"
android:textColor="?android:attr/textColorHintInverse"
@@ -61,7 +62,6 @@
android:layout_marginStart="24dp"
android:layout_marginRight="12dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="6dp"
android:text="@string/default_checkbox" />
<com.kunzisoft.keepass.view.FingerPrintInfoView
android:id="@+id/fingerprint_info"
@@ -194,13 +194,13 @@
<android.support.v7.widget.AppCompatImageView
android:id="@+id/browse_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="12dp"
android:layout_alignBottom="@+id/input_entry_keyfile"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:contentDescription="@string/content_description_open_file"
android:padding="8dp"
android:focusable="true"
android:src="@drawable/ic_folder_white_24dp"
android:tint="?attr/colorAccent" />

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

@@ -33,7 +33,8 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<EditText android:id="@+id/password"
<EditText
android:id="@+id/password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
@@ -41,14 +42,17 @@
android:hint="@string/hint_generated_password"
tools:ignore="TextFields" />
<Button android:id="@+id/generate_password_button"
<Button
android:id="@+id/generate_password_button"
android:layout_margin="@dimen/button_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:text="@string/generate_password" />
</LinearLayout>
<ScrollView android:id="@+id/ScrollView"
<ScrollView
android:id="@+id/ScrollView"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
@@ -61,12 +65,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView android:id="@+id/length_label"
<TextView
android:id="@+id/length_label"
android:text="@string/length"
android:layout_height="match_parent"
android:layout_width="match_parent" />
<EditText android:id="@+id/length"
<EditText
android:id="@+id/length"
android:layout_width="50dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
@@ -95,7 +101,8 @@
</RelativeLayout>
<LinearLayout android:id="@+id/RelativeLayout"
<LinearLayout
android:id="@+id/RelativeLayout"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:orientation="vertical"
@@ -105,7 +112,8 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<CheckBox android:id="@+id/cb_uppercase"
<CheckBox
android:id="@+id/cb_uppercase"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/uppercase"
@@ -125,7 +133,8 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<CheckBox android:id="@+id/cb_lowercase"
<CheckBox
android:id="@+id/cb_lowercase"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lowercase"
@@ -145,7 +154,8 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<CheckBox android:id="@+id/cb_digits"
<CheckBox
android:id="@+id/cb_digits"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/digits"
@@ -165,7 +175,8 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<CheckBox android:id="@+id/cb_minus"
<CheckBox
android:id="@+id/cb_minus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/minus" />
@@ -184,7 +195,8 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<CheckBox android:id="@+id/cb_underline"
<CheckBox
android:id="@+id/cb_underline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/underline" />
@@ -203,7 +215,8 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<CheckBox android:id="@+id/cb_space"
<CheckBox
android:id="@+id/cb_space"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/space" />
@@ -222,7 +235,8 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<CheckBox android:id="@+id/cb_specials"
<CheckBox
android:id="@+id/cb_specials"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/special" />
@@ -241,7 +255,8 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<CheckBox android:id="@+id/cb_brackets"
<CheckBox
android:id="@+id/cb_brackets"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/brackets"
@@ -262,7 +277,8 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<CheckBox android:id="@+id/cb_extended"
<CheckBox
android:id="@+id/cb_extended"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/extended_ASCII"

9
app/src/main/res/layout/item_file_row.xml
View File

@@ -22,8 +22,8 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingEnd="12dp"
android:paddingLeft="12dp"
android:paddingRight="12dp"
@@ -45,8 +45,9 @@
android:paddingStart="12dp" />
<android.support.v7.widget.AppCompatImageView
android:id="@+id/file_information"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="12dp"
android:layout_centerVertical="true"
android:src="@drawable/ic_info_white_24dp"
android:contentDescription="@string/content_description_file_information"

14
app/src/main/res/layout/view_entry_edit_contents.xml
View File

@@ -127,8 +127,9 @@
<android.support.v7.widget.AppCompatImageView
android:id="@+id/entry_edit_generate_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="12dp"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
@@ -179,15 +180,14 @@
android:orientation="vertical">
</LinearLayout>
<ImageView
<android.support.v7.widget.AppCompatImageButton
android:id="@+id/entry_edit_add_new_field"
android:layout_width="30sp"
android:layout_height="30sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_add_white_24dp"
android:contentDescription="@string/content_description_add_field"
android:tint="?attr/colorAccent"
android:scaleType="centerCrop"
android:visibility="gone"/>
android:scaleType="centerCrop"/>
</LinearLayout>
</android.support.constraint.ConstraintLayout>

21
app/src/main/res/layout/view_entry_new_field.xml
View File

@@ -22,8 +22,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:layout_marginBottom="@dimen/default_margin"
android:importantForAutofill="noExcludeDescendants"
android:background="@drawable/background_new_field"
@@ -33,8 +31,11 @@
android:id="@+id/title_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/entry_new_field_delete"
android:layout_toStartOf="@+id/entry_new_field_delete">
android:paddingTop="12dp"
android:paddingLeft="12dp"
android:paddingStart="12dp"
android:paddingRight="12dp"
android:paddingEnd="12dp">
<EditText
android:id="@+id/entry_new_field_label"
@@ -49,12 +50,11 @@
<android.support.v7.widget.AppCompatImageView
android:id="@+id/entry_new_field_delete"
android:layout_margin="4dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="12dp"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:scaleType="centerCrop"
android:src="@drawable/ic_close_white_24dp"
android:contentDescription="@string/content_description_remove_field"
android:tint="?attr/colorAccent" />
@@ -64,6 +64,7 @@
style="@style/KeepassDXStyle.TextAppearance.Default"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:layout_below="@+id/value_container"
android:layout_centerHorizontal="true"
android:text="@string/protection" />
@@ -72,6 +73,10 @@
android:id="@+id/value_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="12dp"
android:paddingStart="12dp"
android:paddingRight="12dp"
android:paddingEnd="12dp"
android:layout_below="@+id/title_container">
<EditText