Replace history view constraint layout by linear layout

This commit is contained in:
J-Jamet committed 2021-08-27 16:48:50 +02:00
1 parent e01621e658
commit 58fb75e55d
3 files changed
+35 -79

No files matched your search

@@ -44,7 +44,6 @@ class EntryHistoryAdapter(val context: Context) : RecyclerView.Adapter<EntryHist
holder.lastModifiedView.text = entryHistory.lastModificationTime.getDateTimeString(context.resources)
holder.titleView.text = entryHistory.title
holder.usernameView.text = entryHistory.username
holder.urlView.text = entryHistory.url
holder.itemView.setOnClickListener {
onItemClickListener?.invoke(entryHistory, position)
@@ -64,6 +63,5 @@ class EntryHistoryAdapter(val context: Context) : RecyclerView.Adapter<EntryHist
var lastModifiedView: TextView = itemView.findViewById(R.id.entry_history_last_modified)
var titleView: TextView = itemView.findViewById(R.id.entry_history_title)
var usernameView: TextView = itemView.findViewById(R.id.entry_history_username)
var urlView: TextView = itemView.findViewById(R.id.entry_history_url)
}
}
@@ -38,10 +38,11 @@
android:text="@string/entry_history"
style="@style/KeepassDXStyle.TextAppearance.LabelTextStyle" />
<androidx.constraintlayout.widget.ConstraintLayout
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:weightSum="3"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp">
@@ -49,51 +50,30 @@
android:id="@+id/entry_history_last_modified"
android:text="@string/entry_modified"
style="@style/KeepassDXStyle.TextAppearance.LabelTableTextStyle"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/entry_history_title"
android:gravity="center"
android:layout_width="0dp"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:layout_weight="1" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/entry_history_title"
android:text="@string/entry_title"
style="@style/KeepassDXStyle.TextAppearance.LabelTableTextStyle"
app:layout_constraintStart_toEndOf="@+id/entry_history_last_modified"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/entry_history_username"
android:gravity="center"
android:layout_width="0dp"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:layout_weight="1" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/entry_history_username"
android:text="@string/entry_user_name"
style="@style/KeepassDXStyle.TextAppearance.LabelTableTextStyle"
app:layout_constraintStart_toEndOf="@+id/entry_history_title"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/entry_history_url"
android:gravity="center"
android:layout_width="0dp"
android:layout_height="wrap_content" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/entry_history_url"
android:text="@string/entry_url"
style="@style/KeepassDXStyle.TextAppearance.LabelTableTextStyle"
app:layout_constraintStart_toEndOf="@+id/entry_history_username"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:gravity="center"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:visibility="gone"/>
</androidx.constraintlayout.widget.ConstraintLayout>
android:layout_weight="1" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/entry_history_list"
@@ -17,65 +17,43 @@
You should have received a copy of the GNU General Public License
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
-->
<androidx.constraintlayout.widget.ConstraintLayout
<LinearLayout
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:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:weightSum="3"
android:background="?android:attr/selectableItemBackground">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/entry_history_last_modified"
tools:text = "Last Modified"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/entry_history_title"
style="@style/KeepassDXStyle.TextAppearance.TextEntryItem"
android:gravity="center"
android:layout_width="0dp"
android:layout_height="wrap_content" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/entry_history_title"
tools:text = "Title"
app:layout_constraintStart_toEndOf="@+id/entry_history_last_modified"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/entry_history_username"
style="@style/KeepassDXStyle.TextAppearance.TextEntryItem"
android:maxLines="6"
android:ellipsize="end"
android:gravity="center"
android:layout_width="0dp"
android:layout_height="wrap_content" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/entry_history_username"
tools:text = "Username"
app:layout_constraintStart_toEndOf="@+id/entry_history_title"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/entry_history_url"
style="@style/KeepassDXStyle.TextAppearance.TextEntryItem"
android:maxLines="6"
android:ellipsize="end"
android:gravity="center"
android:layout_width="0dp"
android:layout_height="wrap_content" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/entry_history_url"
tools:text = "URL"
app:layout_constraintStart_toEndOf="@+id/entry_history_username"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
style="@style/KeepassDXStyle.TextAppearance.TextEntryItem"
android:gravity="center"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:visibility="gone"/>
</androidx.constraintlayout.widget.ConstraintLayout>
android:layout_weight="1" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/entry_history_title"
tools:text = "Title"
style="@style/KeepassDXStyle.TextAppearance.TextEntryItem"
android:maxLines="6"
android:ellipsize="end"
android:gravity="center"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/entry_history_username"
tools:text = "Username"
style="@style/KeepassDXStyle.TextAppearance.TextEntryItem"
android:maxLines="6"
android:ellipsize="end"
android:gravity="center"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
</LinearLayout>