mirror of https://github.com/M66B/FairEmail.git
Moved unsubscribe button
This commit is contained in:
parent
f808a343f6
commit
5b4f691ba5
|
@ -36,7 +36,6 @@ import android.content.Intent;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
import android.content.res.ColorStateList;
|
import android.content.res.ColorStateList;
|
||||||
import android.content.res.Configuration;
|
|
||||||
import android.database.Cursor;
|
import android.database.Cursor;
|
||||||
import android.graphics.Color;
|
import android.graphics.Color;
|
||||||
import android.graphics.Paint;
|
import android.graphics.Paint;
|
||||||
|
@ -1319,8 +1318,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
|
|
||||||
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
|
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
|
||||||
boolean cross_hint = prefs.getBoolean("cross_hint", true);
|
boolean cross_hint = prefs.getBoolean("cross_hint", true);
|
||||||
boolean normal = context.getResources().getConfiguration()
|
boolean normal = (context.getResources().getConfiguration().screenWidthDp >= 360);
|
||||||
.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_NORMAL);
|
|
||||||
|
|
||||||
vSeparator.setVisibility(View.VISIBLE);
|
vSeparator.setVisibility(View.VISIBLE);
|
||||||
ibFull.setEnabled(false);
|
ibFull.setEnabled(false);
|
||||||
|
|
|
@ -47,6 +47,7 @@
|
||||||
android:padding="6dp"
|
android:padding="6dp"
|
||||||
android:scaleType="fitCenter"
|
android:scaleType="fitCenter"
|
||||||
android:tooltipText="@string/title_delete"
|
android:tooltipText="@string/title_delete"
|
||||||
|
android:visibility="gone"
|
||||||
app:layout_constraintStart_toEndOf="@id/ibMore"
|
app:layout_constraintStart_toEndOf="@id/ibMore"
|
||||||
app:layout_constraintTop_toBottomOf="@id/vSeparator"
|
app:layout_constraintTop_toBottomOf="@id/vSeparator"
|
||||||
app:srcCompat="@drawable/baseline_close_24" />
|
app:srcCompat="@drawable/baseline_close_24" />
|
||||||
|
@ -137,25 +138,11 @@
|
||||||
android:padding="6dp"
|
android:padding="6dp"
|
||||||
android:scaleType="fitCenter"
|
android:scaleType="fitCenter"
|
||||||
android:tooltipText="@string/title_undo"
|
android:tooltipText="@string/title_undo"
|
||||||
|
android:visibility="gone"
|
||||||
app:layout_constraintEnd_toStartOf="@+id/ibUnsubscribe"
|
app:layout_constraintEnd_toStartOf="@+id/ibUnsubscribe"
|
||||||
app:layout_constraintTop_toBottomOf="@id/vSeparator"
|
app:layout_constraintTop_toBottomOf="@id/vSeparator"
|
||||||
app:srcCompat="@drawable/baseline_undo_24" />
|
app:srcCompat="@drawable/baseline_undo_24" />
|
||||||
|
|
||||||
<ImageButton
|
|
||||||
android:id="@+id/ibUnsubscribe"
|
|
||||||
android:layout_width="36dp"
|
|
||||||
android:layout_height="36dp"
|
|
||||||
android:layout_marginEnd="9dp"
|
|
||||||
android:background="?android:attr/selectableItemBackgroundBorderless"
|
|
||||||
android:contentDescription="@string/title_legend_show_unsubscribe"
|
|
||||||
android:foregroundTint="?android:attr/textColorSecondary"
|
|
||||||
android:padding="6dp"
|
|
||||||
android:scaleType="fitCenter"
|
|
||||||
android:tooltipText="@string/title_legend_show_unsubscribe"
|
|
||||||
app:layout_constraintEnd_toStartOf="@+id/ibImages"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/vSeparator"
|
|
||||||
app:srcCompat="@drawable/baseline_unsubscribe_24" />
|
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:id="@+id/ibImages"
|
android:id="@+id/ibImages"
|
||||||
android:layout_width="36dp"
|
android:layout_width="36dp"
|
||||||
|
@ -204,16 +191,31 @@
|
||||||
android:id="@+id/ibDecrypt"
|
android:id="@+id/ibDecrypt"
|
||||||
android:layout_width="36dp"
|
android:layout_width="36dp"
|
||||||
android:layout_height="36dp"
|
android:layout_height="36dp"
|
||||||
|
android:layout_marginEnd="9dp"
|
||||||
android:background="?android:attr/selectableItemBackgroundBorderless"
|
android:background="?android:attr/selectableItemBackgroundBorderless"
|
||||||
android:contentDescription="@string/title_decrypt"
|
android:contentDescription="@string/title_decrypt"
|
||||||
android:foregroundTint="?android:attr/textColorSecondary"
|
android:foregroundTint="?android:attr/textColorSecondary"
|
||||||
android:padding="6dp"
|
android:padding="6dp"
|
||||||
android:scaleType="fitCenter"
|
android:scaleType="fitCenter"
|
||||||
android:tooltipText="@string/title_decrypt"
|
android:tooltipText="@string/title_decrypt"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toStartOf="@+id/ibUnsubscribe"
|
||||||
app:layout_constraintTop_toBottomOf="@id/ibFull"
|
app:layout_constraintTop_toBottomOf="@id/ibFull"
|
||||||
app:srcCompat="@drawable/baseline_lock_open_24" />
|
app:srcCompat="@drawable/baseline_lock_open_24" />
|
||||||
|
|
||||||
|
<ImageButton
|
||||||
|
android:id="@+id/ibUnsubscribe"
|
||||||
|
android:layout_width="36dp"
|
||||||
|
android:layout_height="36dp"
|
||||||
|
android:background="?android:attr/selectableItemBackgroundBorderless"
|
||||||
|
android:contentDescription="@string/title_legend_show_unsubscribe"
|
||||||
|
android:foregroundTint="?android:attr/textColorSecondary"
|
||||||
|
android:padding="6dp"
|
||||||
|
android:scaleType="fitCenter"
|
||||||
|
android:tooltipText="@string/title_legend_show_unsubscribe"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/ibFull"
|
||||||
|
app:srcCompat="@drawable/baseline_unsubscribe_24" />
|
||||||
|
|
||||||
<eu.faircode.email.FixedTextView
|
<eu.faircode.email.FixedTextView
|
||||||
android:id="@+id/tvSignedData"
|
android:id="@+id/tvSignedData"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
|
|
Loading…
Reference in New Issue