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 RTL views

Browse Source
This commit is contained in:
J-Jamet
2020-08-05 15:23:49 +02:00
parent 3c96dd2fac
commit 5a3e650e02
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/kunzisoft/keepass/view/EntryEditCustomField.kt
View File

@@ -56,12 +56,12 @@ class EntryEditCustomField @JvmOverloads constructor(context: Context,
val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater? val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater?
inflater?.inflate(R.layout.view_entry_custom_field, this) inflater?.inflate(R.layout.view_entry_custom_field, this)
val deleteView = findViewById<View>(R.id.entry_new_field_delete) val deleteView = findViewById<View>(R.id.entry_custom_field_delete)
deleteView.setOnClickListener { deleteViewFromParent() } deleteView.setOnClickListener { deleteViewFromParent() }
valueLayoutView = findViewById(R.id.new_field_value_container) valueLayoutView = findViewById(R.id.entry_custom_field_value_container)
valueView = findViewById(R.id.new_field_value) valueView = findViewById(R.id.entry_custom_field_value)
protectionCheckView = findViewById(R.id.protection) protectionCheckView = findViewById(R.id.entry_custom_field_protection)
} }
fun setData(label: String?, value: ProtectedString?, fontInVisibility: Boolean) { fun setData(label: String?, value: ProtectedString?, fontInVisibility: Boolean) {

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

@@ -53,8 +53,10 @@
style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" /> style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/entry_user_name" android:id="@+id/entry_user_name"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_below="@+id/entry_user_name_label" android:layout_below="@+id/entry_user_name_label"
android:layout_toLeftOf="@+id/entry_user_name_action_image" android:layout_toLeftOf="@+id/entry_user_name_action_image"
android:layout_toStartOf="@+id/entry_user_name_action_image" android:layout_toStartOf="@+id/entry_user_name_action_image"
@@ -85,8 +87,10 @@
style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" /> style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/entry_password" android:id="@+id/entry_password"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_below="@+id/entry_password_label" android:layout_below="@+id/entry_password_label"
android:layout_toLeftOf="@+id/entry_password_action_image" android:layout_toLeftOf="@+id/entry_password_action_image"
android:layout_toStartOf="@+id/entry_password_action_image" android:layout_toStartOf="@+id/entry_password_action_image"

16
app/src/main/res/layout/view_entry_custom_field.xml
View File

@@ -37,7 +37,7 @@
tools:targetApi="o"> tools:targetApi="o">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/entry_new_field_delete" android:id="@+id/entry_custom_field_delete"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:padding="12dp" android:padding="12dp"
@@ -48,20 +48,20 @@
android:tint="?attr/colorAccent" /> android:tint="?attr/colorAccent" />
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/new_field_value_container" android:id="@+id/entry_custom_field_value_container"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/default_margin" android:layout_marginTop="@dimen/default_margin"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toStartOf="@+id/entry_custom_field_delete"
android:paddingLeft="@dimen/default_margin" android:paddingLeft="@dimen/default_margin"
android:paddingStart="@dimen/default_margin" android:paddingStart="@dimen/default_margin"
android:paddingRight="@dimen/default_margin" android:paddingRight="0dp"
android:paddingEnd="@dimen/default_margin"> android:paddingEnd="0dp">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/new_field_value" android:id="@+id/entry_custom_field_value"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="textMultiLine" android:inputType="textMultiLine"
@@ -71,7 +71,7 @@
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<androidx.appcompat.widget.SwitchCompat <androidx.appcompat.widget.SwitchCompat
android:id="@+id/protection" android:id="@+id/entry_custom_field_protection"
style="@style/KeepassDXStyle.TextAppearance.Small" style="@style/KeepassDXStyle.TextAppearance.Small"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -81,7 +81,7 @@
android:layout_marginEnd="@dimen/default_margin" android:layout_marginEnd="@dimen/default_margin"
android:layout_marginRight="@dimen/default_margin" android:layout_marginRight="@dimen/default_margin"
android:paddingBottom="@dimen/default_margin" android:paddingBottom="@dimen/default_margin"
app:layout_constraintTop_toBottomOf="@+id/new_field_value_container" app:layout_constraintTop_toBottomOf="@+id/entry_custom_field_value_container"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:text="@string/protection" /> android:text="@string/protection" />