msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Fixed selectable item background

Browse Source
pull/152/head
M66B 7 years ago
parent 7b81d8df1c
commit 5946904ee2
15 changed files with 195 additions and 178 deletions
Show Stats Download Patch File Download Diff File

2
app/src/main/java/eu/faircode/email/AdapterAnswer.java
Unescape View File

@ -58,7 +58,7 @@ public class AdapterAnswer extends RecyclerView.Adapter<AdapterAnswer.ViewHolder
ViewHolder(View itemView) { ViewHolder(View itemView) {
super(itemView); super(itemView);
this.itemView = itemView; this.itemView = itemView.findViewById(R.id.clItem);
tvName = itemView.findViewById(R.id.tvName); tvName = itemView.findViewById(R.id.tvName);
} }

2
app/src/main/java/eu/faircode/email/AdapterAttachment.java
Unescape View File

@ -80,7 +80,7 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
ViewHolder(View itemView) { ViewHolder(View itemView) {
super(itemView); super(itemView);
this.itemView = itemView; this.itemView = itemView.findViewById(R.id.clItem);
ivDelete = itemView.findViewById(R.id.ivDelete); ivDelete = itemView.findViewById(R.id.ivDelete);
tvName = itemView.findViewById(R.id.tvName); tvName = itemView.findViewById(R.id.tvName);
tvType = itemView.findViewById(R.id.tvType); tvType = itemView.findViewById(R.id.tvType);

2
app/src/main/java/eu/faircode/email/AdapterImage.java
Unescape View File

@ -63,7 +63,7 @@ public class AdapterImage extends RecyclerView.Adapter<AdapterImage.ViewHolder>
ViewHolder(View itemView) { ViewHolder(View itemView) {
super(itemView); super(itemView);
this.itemView = itemView; this.itemView = itemView.findViewById(R.id.clItem);
image = itemView.findViewById(R.id.image); image = itemView.findViewById(R.id.image);
caption = itemView.findViewById(R.id.caption); caption = itemView.findViewById(R.id.caption);
} }

15
app/src/main/res/drawable/item_background_dark.xml
Unescape View File

@ -1,12 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="?android:attr/selectableItemBackground" /> <item android:drawable="@color/darkColorItemSelected" android:state_activated="true" />
<item> <item android:drawable="@android:color/transparent" />
<selector> </selector>
<item
android:drawable="@color/darkColorItemSelected"
android:state_activated="true" />
<item android:drawable="@android:color/transparent" />
</selector>
</item>
</layer-list>

15
app/src/main/res/drawable/item_background_light.xml
Unescape View File

@ -1,12 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="?android:attr/selectableItemBackground" /> <item android:drawable="@color/lightColorItemSelected" android:state_activated="true" />
<item> <item android:drawable="@android:color/transparent" />
<selector> </selector>
<item
android:drawable="@color/lightColorItemSelected"
android:state_activated="true" />
<item android:drawable="@android:color/transparent" />
</selector>
</item>
</layer-list>

3
app/src/main/res/layout/item_account.xml
Unescape View File

@ -8,7 +8,8 @@
android:id="@+id/clItem" android:id="@+id/clItem"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/drawableItemBackground"> android:background="?attr/drawableItemBackground"
android:foreground="?attr/selectableItemBackground">
<View <View
android:id="@+id/vwColor" android:id="@+id/vwColor"

56
app/src/main/res/layout/item_answer.xml
Unescape View File

@ -1,31 +1,39 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/tvName" android:id="@+id/clItem"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="6dp" android:background="?attr/drawableItemBackground"
android:layout_marginTop="6dp" android:foreground="?attr/selectableItemBackground">
android:layout_marginEnd="6dp"
android:ellipsize="end"
android:maxLines="1"
android:text="Name"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View <TextView
android:id="@+id/vSeparator" android:id="@+id/tvName"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="1dp" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginStart="6dp"
android:layout_marginBottom="6dp" android:layout_marginTop="6dp"
android:background="?attr/colorSeparator" android:layout_marginEnd="6dp"
app:layout_constraintStart_toStartOf="parent" android:ellipsize="end"
app:layout_constraintTop_toBottomOf="@id/tvName" /> android:maxLines="1"
</androidx.constraintlayout.widget.ConstraintLayout> android:text="Name"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/vSeparator"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp"
android:background="?attr/colorSeparator"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvName" />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>

206
app/src/main/res/layout/item_attachment.xml
Unescape View File

@ -1,111 +1,119 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp">
<ImageView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/ivDelete" android:id="@+id/clItem"
android:layout_width="36dp" android:layout_width="match_parent"
android:layout_height="24dp" android:layout_height="wrap_content"
android:paddingEnd="12dp" android:background="?attr/drawableItemBackground"
android:src="@drawable/baseline_delete_24" android:foreground="?attr/selectableItemBackground"
android:visibility="visible" android:paddingTop="6dp"
app:layout_constraintStart_toStartOf="parent" android:paddingBottom="6dp">
app:layout_constraintTop_toTopOf="parent" />
<ImageView <ImageView
android:id="@+id/ivAttachments" android:id="@+id/ivDelete"
android:layout_width="24dp" android:layout_width="36dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/baseline_attachment_24" android:paddingEnd="12dp"
app:layout_constraintStart_toEndOf="@id/ivDelete" android:src="@drawable/baseline_delete_24"
app:layout_constraintTop_toTopOf="parent" /> android:visibility="visible"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView <ImageView
android:id="@+id/tvName" android:id="@+id/ivAttachments"
android:layout_width="0dp" android:layout_width="24dp"
android:layout_height="wrap_content" android:layout_height="24dp"
android:layout_marginStart="6dp" android:src="@drawable/baseline_attachment_24"
android:ellipsize="middle" app:layout_constraintStart_toEndOf="@id/ivDelete"
android:singleLine="true" app:layout_constraintTop_toTopOf="parent" />
android:text="Name"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintBottom_toBottomOf="@id/ivAttachments"
app:layout_constraintEnd_toStartOf="@+id/tvType"
app:layout_constraintHorizontal_weight="4"
app:layout_constraintStart_toEndOf="@id/ivAttachments"
app:layout_constraintTop_toTopOf="@id/ivAttachments" />
<TextView <TextView
android:id="@+id/tvType" android:id="@+id/tvName"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:ellipsize="start" android:ellipsize="middle"
android:gravity="end" android:singleLine="true"
android:singleLine="true" android:text="Name"
android:text="text/plain" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textAppearance="@style/TextAppearance.AppCompat.Small" app:layout_constraintBottom_toBottomOf="@id/ivAttachments"
app:layout_constraintBottom_toBottomOf="@id/ivAttachments" app:layout_constraintEnd_toStartOf="@+id/tvType"
app:layout_constraintEnd_toStartOf="@id/tvSize" app:layout_constraintHorizontal_weight="4"
app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toEndOf="@id/ivAttachments"
app:layout_constraintStart_toEndOf="@id/tvName" app:layout_constraintTop_toTopOf="@id/ivAttachments" />
app:layout_constraintTop_toTopOf="@id/ivAttachments" />
<TextView <TextView
android:id="@+id/tvSize" android:id="@+id/tvType"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:text="10 kB" android:ellipsize="start"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:gravity="end"
app:layout_constraintBottom_toBottomOf="@id/ivAttachments" android:singleLine="true"
app:layout_constraintEnd_toStartOf="@+id/ivStatus" android:text="text/plain"
app:layout_constraintStart_toEndOf="@id/tvType" android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintTop_toTopOf="@id/ivAttachments" /> app:layout_constraintBottom_toBottomOf="@id/ivAttachments"
app:layout_constraintEnd_toStartOf="@id/tvSize"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toEndOf="@id/tvName"
app:layout_constraintTop_toTopOf="@id/ivAttachments" />
<ImageView <TextView
android:id="@+id/ivStatus" android:id="@+id/tvSize"
android:layout_width="24dp" android:layout_width="wrap_content"
android:layout_height="24dp" android:layout_height="wrap_content"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:src="@drawable/baseline_cloud_download_24" android:text="10 kB"
app:layout_constraintEnd_toStartOf="@+id/ivSave" android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toEndOf="@id/tvSize" app:layout_constraintBottom_toBottomOf="@id/ivAttachments"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintEnd_toStartOf="@+id/ivStatus"
app:layout_constraintStart_toEndOf="@id/tvType"
app:layout_constraintTop_toTopOf="@id/ivAttachments" />
<ImageView <ImageView
android:id="@+id/ivSave" android:id="@+id/ivStatus"
android:layout_width="36dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:paddingStart="12dp" android:layout_marginStart="6dp"
android:src="@drawable/baseline_save_24" android:src="@drawable/baseline_cloud_download_24"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toStartOf="@+id/ivSave"
app:layout_constraintStart_toEndOf="@id/ivStatus" app:layout_constraintStart_toEndOf="@id/tvSize"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView <ImageView
android:id="@+id/tvDebug" android:id="@+id/ivSave"
android:layout_width="0dp" android:layout_width="36dp"
android:layout_height="wrap_content" android:layout_height="24dp"
android:layout_marginStart="6dp" android:paddingStart="12dp"
android:text="debug" android:src="@drawable/baseline_save_24"
android:textAppearance="@style/TextAppearance.AppCompat.Small" app:layout_constraintEnd_toEndOf="parent"
android:textColor="?attr/colorWarning" app:layout_constraintStart_toEndOf="@id/ivStatus"
app:layout_constraintEnd_toEndOf="@id/ivStatus" app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintStart_toEndOf="@id/ivAttachments"
app:layout_constraintTop_toBottomOf="@id/ivAttachments" />
<ProgressBar <TextView
android:id="@+id/progressbar" android:id="@+id/tvDebug"
style="@style/Base.Widget.AppCompat.ProgressBar.Horizontal" android:layout_width="0dp"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginStart="6dp"
android:progress="50" android:text="debug"
app:layout_constraintEnd_toEndOf="parent" android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent" android:textColor="?attr/colorWarning"
app:layout_constraintTop_toBottomOf="@id/tvDebug" /> app:layout_constraintEnd_toEndOf="@id/ivStatus"
</androidx.constraintlayout.widget.ConstraintLayout> app:layout_constraintStart_toEndOf="@id/ivAttachments"
app:layout_constraintTop_toBottomOf="@id/ivAttachments" />
<ProgressBar
android:id="@+id/progressbar"
style="@style/Base.Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:progress="50"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvDebug" />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>

3
app/src/main/res/layout/item_folder.xml
Unescape View File

@ -8,7 +8,8 @@
android:id="@+id/clItem" android:id="@+id/clItem"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/drawableItemBackground"> android:background="?attr/drawableItemBackground"
android:foreground="?attr/selectableItemBackground">
<View <View
android:id="@+id/vwColor" android:id="@+id/vwColor"

3
app/src/main/res/layout/item_identity.xml
Unescape View File

@ -8,7 +8,8 @@
android:id="@+id/clItem" android:id="@+id/clItem"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/drawableItemBackground"> android:background="?attr/drawableItemBackground"
android:foreground="?attr/selectableItemBackground">
<View <View
android:id="@+id/vwColor" android:id="@+id/vwColor"

52
app/src/main/res/layout/item_image.xml
Unescape View File

@ -1,29 +1,37 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:padding="6dp">
<ImageView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/image" android:id="@+id/clItem"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:adjustViewBounds="true" android:background="?attr/drawableItemBackground"
android:scaleType="centerCrop" android:foreground="?attr/selectableItemBackground"
android:src="@mipmap/ic_launcher" android:padding="6dp">
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView <ImageView
android:id="@+id/caption" android:id="@+id/image"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:adjustViewBounds="true"
android:text="Launcher icon" android:scaleType="centerCrop"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:src="@mipmap/ic_launcher"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/image" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="Launcher icon"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/image" />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>

3
app/src/main/res/layout/item_message_compact.xml
Unescape View File

@ -11,7 +11,8 @@
android:background="?attr/drawableItemBackground" android:background="?attr/drawableItemBackground"
android:descendantFocusability="beforeDescendants" android:descendantFocusability="beforeDescendants"
android:focusable="true" android:focusable="true"
android:focusableInTouchMode="true"> android:focusableInTouchMode="true"
android:foreground="?attr/selectableItemBackground">
<TextView <TextView
android:id="@+id/tvDay" android:id="@+id/tvDay"

3
app/src/main/res/layout/item_message_normal.xml
Unescape View File

@ -11,7 +11,8 @@
android:background="?attr/drawableItemBackground" android:background="?attr/drawableItemBackground"
android:descendantFocusability="beforeDescendants" android:descendantFocusability="beforeDescendants"
android:focusable="true" android:focusable="true"
android:focusableInTouchMode="true"> android:focusableInTouchMode="true"
android:foreground="?attr/selectableItemBackground">
<TextView <TextView
android:id="@+id/tvDay" android:id="@+id/tvDay"

5
app/src/main/res/layout/item_operation.xml
Unescape View File

@ -8,8 +8,9 @@
android:id="@+id/clItem" android:id="@+id/clItem"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="3dp" android:foreground="?attr/selectableItemBackground"
android:layout_marginBottom="3dp"> android:paddingTop="3dp"
android:paddingBottom="3dp">
<TextView <TextView
android:id="@+id/tvFolder" android:id="@+id/tvFolder"

3
app/src/main/res/layout/item_rule.xml
Unescape View File

@ -8,7 +8,8 @@
android:id="@+id/clItem" android:id="@+id/clItem"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/drawableItemBackground"> android:background="?attr/drawableItemBackground"
android:foreground="?attr/selectableItemBackground">
<TextView <TextView
android:id="@+id/tvName" android:id="@+id/tvName"

Write Preview
Loading…
Cancel
Save