mirror of https://github.com/M66B/FairEmail.git
Show tracking images remark in orginal message confirmation
This commit is contained in:
parent
344669cc1c
commit
7d7702a9e4
|
@ -5655,22 +5655,22 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
|
|
||||||
boolean isDark = Helper.isDarkTheme(context);
|
boolean isDark = Helper.isDarkTheme(context);
|
||||||
tvDark.setVisibility(isDark && !(canDarken || fake_dark) ? View.VISIBLE : View.GONE);
|
tvDark.setVisibility(isDark && !(canDarken || fake_dark) ? View.VISIBLE : View.GONE);
|
||||||
} else {
|
|
||||||
boolean disable_tracking = prefs.getBoolean("disable_tracking", true);
|
|
||||||
|
|
||||||
TextView tvTracking = dview.findViewById(R.id.tvTracking);
|
|
||||||
Group grpTracking = dview.findViewById(R.id.grpTracking);
|
|
||||||
|
|
||||||
grpTracking.setVisibility(disable_tracking ? View.VISIBLE : View.GONE);
|
|
||||||
|
|
||||||
tvTracking.setOnClickListener(new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
Helper.viewFAQ(v.getContext(), 82);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
boolean disable_tracking = prefs.getBoolean("disable_tracking", true);
|
||||||
|
|
||||||
|
TextView tvTracking = dview.findViewById(R.id.tvTracking);
|
||||||
|
Group grpTracking = dview.findViewById(R.id.grpTracking);
|
||||||
|
|
||||||
|
grpTracking.setVisibility(disable_tracking ? View.VISIBLE : View.GONE);
|
||||||
|
|
||||||
|
tvTracking.setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
Helper.viewFAQ(v.getContext(), 82);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
// TODO: dialog fragment
|
// TODO: dialog fragment
|
||||||
final AlertDialog.Builder builder = new AlertDialog.Builder(context)
|
final AlertDialog.Builder builder = new AlertDialog.Builder(context)
|
||||||
.setView(dview)
|
.setView(dview)
|
||||||
|
|
|
@ -42,6 +42,34 @@
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvDark" />
|
app:layout_constraintTop_toBottomOf="@id/tvDark" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/ivTracking"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="24dp"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/tvTracking"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/tvTracking"
|
||||||
|
app:srcCompat="@drawable/twotone_my_location_24"
|
||||||
|
app:tint="?attr/colorWarning" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tvTracking"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="12dp"
|
||||||
|
android:layout_marginTop="6dp"
|
||||||
|
android:background="?android:attr/selectableItemBackground"
|
||||||
|
android:drawableEnd="@drawable/twotone_info_24"
|
||||||
|
android:drawablePadding="6dp"
|
||||||
|
android:text="@string/title_ask_show_image_hint"
|
||||||
|
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
||||||
|
android:textColor="?android:attr/textColorPrimary"
|
||||||
|
android:textStyle="italic"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toEndOf="@id/ivTracking"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/cbAlwaysImages" />
|
||||||
|
|
||||||
<CheckBox
|
<CheckBox
|
||||||
android:id="@+id/cbNotAgainSender"
|
android:id="@+id/cbNotAgainSender"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
@ -50,7 +78,7 @@
|
||||||
android:text="@string/title_no_ask_for_again"
|
android:text="@string/title_no_ask_for_again"
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/cbAlwaysImages" />
|
app:layout_constraintTop_toBottomOf="@id/tvTracking" />
|
||||||
|
|
||||||
<CheckBox
|
<CheckBox
|
||||||
android:id="@+id/cbNotAgainDomain"
|
android:id="@+id/cbNotAgainDomain"
|
||||||
|
@ -84,5 +112,11 @@
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/cbNotAgain" />
|
app:layout_constraintTop_toBottomOf="@id/cbNotAgain" />
|
||||||
|
|
||||||
|
<androidx.constraintlayout.widget.Group
|
||||||
|
android:id="@+id/grpTracking"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
app:constraint_referenced_ids="ivTracking,tvTracking" />
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
</ScrollView>
|
</ScrollView>
|
Loading…
Reference in New Issue