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

Mark not allowed options

Browse Source
pull/207/head
M66B 2 years ago
parent f22125d15b
commit 01906b4d91
2 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File

6
app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
Unescape View File

@ -112,7 +112,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
private SwitchCompat swFavicons; private SwitchCompat swFavicons;
private SwitchCompat swFaviconsPartial; private SwitchCompat swFaviconsPartial;
private TextView tvFaviconsHint; private TextView tvFaviconsHint;
private TextView tvFaviconsPlay;
private SwitchCompat swGeneratedIcons; private SwitchCompat swGeneratedIcons;
private SwitchCompat swIdenticons; private SwitchCompat swIdenticons;
private SwitchCompat swCircular; private SwitchCompat swCircular;
@ -178,6 +177,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
private SwitchCompat swAuthentication; private SwitchCompat swAuthentication;
private SwitchCompat swAuthenticationIndicator; private SwitchCompat swAuthenticationIndicator;
private Group grpPlay;
private Group grpUnzip; private Group grpUnzip;
private NumberFormat NF = NumberFormat.getNumberInstance(); private NumberFormat NF = NumberFormat.getNumberInstance();
@ -266,7 +266,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
swFavicons = view.findViewById(R.id.swFavicons); swFavicons = view.findViewById(R.id.swFavicons);
swFaviconsPartial = view.findViewById(R.id.swFaviconsPartial); swFaviconsPartial = view.findViewById(R.id.swFaviconsPartial);
tvFaviconsHint = view.findViewById(R.id.tvFaviconsHint); tvFaviconsHint = view.findViewById(R.id.tvFaviconsHint);
tvFaviconsPlay = view.findViewById(R.id.tvFaviconsPlay);
swGeneratedIcons = view.findViewById(R.id.swGeneratedIcons); swGeneratedIcons = view.findViewById(R.id.swGeneratedIcons);
swIdenticons = view.findViewById(R.id.swIdenticons); swIdenticons = view.findViewById(R.id.swIdenticons);
swCircular = view.findViewById(R.id.swCircular); swCircular = view.findViewById(R.id.swCircular);
@ -330,6 +329,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
swAuthentication = view.findViewById(R.id.swAuthentication); swAuthentication = view.findViewById(R.id.swAuthentication);
swAuthenticationIndicator = view.findViewById(R.id.swAuthenticationIndicator); swAuthenticationIndicator = view.findViewById(R.id.swAuthenticationIndicator);
grpPlay = view.findViewById(R.id.grpPlay);
grpUnzip = view.findViewById(R.id.grpUnzip); grpUnzip = view.findViewById(R.id.grpUnzip);
List<StyleHelper.FontDescriptor> fonts = StyleHelper.getFonts(getContext()); List<StyleHelper.FontDescriptor> fonts = StyleHelper.getFonts(getContext());
@ -1227,7 +1227,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
// Initialize // Initialize
FragmentDialogTheme.setBackground(getContext(), view, false); FragmentDialogTheme.setBackground(getContext(), view, false);
tvFaviconsPlay.setVisibility(BuildConfig.PLAY_STORE_RELEASE ? View.VISIBLE : View.GONE); grpPlay.setVisibility(BuildConfig.PLAY_STORE_RELEASE || BuildConfig.DEBUG ? View.VISIBLE : View.GONE);
swFaviconsPartial.setText(getString(R.string.title_advanced_favicons_partial, swFaviconsPartial.setText(getString(R.string.title_advanced_favicons_partial,
Helper.humanReadableByteCount(ContactInfo.FAVICON_READ_BYTES, false))); Helper.humanReadableByteCount(ContactInfo.FAVICON_READ_BYTES, false)));
grpUnzip.setVisibility(Build.VERSION.SDK_INT < Build.VERSION_CODES.O ? View.GONE : View.VISIBLE); grpUnzip.setVisibility(Build.VERSION.SDK_INT < Build.VERSION_CODES.O ? View.GONE : View.VISIBLE);

44
app/src/main/res/layout/fragment_options_display.xml
Unescape View File

@ -808,6 +808,23 @@
app:layout_constraintTop_toBottomOf="@id/vSeparatorAvatar" app:layout_constraintTop_toBottomOf="@id/vSeparatorAvatar"
app:switchPadding="12dp" /> app:switchPadding="12dp" />
<View
android:id="@+id/vwFavicon"
android:layout_width="6dp"
android:layout_height="0dp"
android:background="?attr/colorSeparator"
app:layout_constraintBottom_toBottomOf="@+id/tvFaviconsPlay"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/swBimi" />
<View
android:id="@+id/vwFaviconPadding"
android:layout_width="6dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="@+id/tvFaviconsPlay"
app:layout_constraintStart_toEndOf="@+id/vwFavicon"
app:layout_constraintTop_toTopOf="@+id/swBimi" />
<androidx.appcompat.widget.SwitchCompat <androidx.appcompat.widget.SwitchCompat
android:id="@+id/swBimi" android:id="@+id/swBimi"
android:layout_width="0dp" android:layout_width="0dp"
@ -815,7 +832,7 @@
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:text="@string/title_advanced_bimi" android:text="@string/title_advanced_bimi"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toEndOf="@id/vwFaviconPadding"
app:layout_constraintTop_toBottomOf="@id/swAvatars" app:layout_constraintTop_toBottomOf="@id/swAvatars"
app:switchPadding="12dp" /> app:switchPadding="12dp" />
@ -830,7 +847,7 @@
android:text="@string/title_advanced_privacy_risk" android:text="@string/title_advanced_privacy_risk"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?attr/colorWarning" android:textColor="?attr/colorWarning"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toEndOf="@id/vwFaviconPadding"
app:layout_constraintTop_toBottomOf="@id/swBimi" /> app:layout_constraintTop_toBottomOf="@id/swBimi" />
<eu.faircode.email.FixedTextView <eu.faircode.email.FixedTextView
@ -844,7 +861,7 @@
android:text="@string/title_advanced_bimi_unverified" android:text="@string/title_advanced_bimi_unverified"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic" android:textStyle="italic"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toEndOf="@id/vwFaviconPadding"
app:layout_constraintTop_toBottomOf="@id/tvBimiHint" /> app:layout_constraintTop_toBottomOf="@id/tvBimiHint" />
<eu.faircode.email.FixedTextView <eu.faircode.email.FixedTextView
@ -858,7 +875,7 @@
android:text="@string/title_advanced_bimi_verified" android:text="@string/title_advanced_bimi_verified"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic" android:textStyle="italic"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toEndOf="@id/vwFaviconPadding"
app:layout_constraintTop_toBottomOf="@id/tvBimiUnverified" /> app:layout_constraintTop_toBottomOf="@id/tvBimiUnverified" />
<eu.faircode.email.FixedImageButton <eu.faircode.email.FixedImageButton
@ -868,7 +885,7 @@
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:contentDescription="@string/title_info" android:contentDescription="@string/title_info"
android:tooltipText="@string/title_info" android:tooltipText="@string/title_info"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toEndOf="@id/vwFaviconPadding"
app:layout_constraintTop_toBottomOf="@+id/tvBimiVerified" app:layout_constraintTop_toBottomOf="@+id/tvBimiVerified"
app:srcCompat="@drawable/twotone_info_24" /> app:srcCompat="@drawable/twotone_info_24" />
@ -879,7 +896,7 @@
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:text="@string/title_advanced_efavicons" android:text="@string/title_advanced_efavicons"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toEndOf="@id/vwFaviconPadding"
app:layout_constraintTop_toBottomOf="@id/ibBimi" app:layout_constraintTop_toBottomOf="@id/ibBimi"
app:switchPadding="12dp" /> app:switchPadding="12dp" />
@ -890,7 +907,7 @@
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:text="@string/title_advanced_favicons" android:text="@string/title_advanced_favicons"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toEndOf="@id/vwFaviconPadding"
app:layout_constraintTop_toBottomOf="@id/swEFavicons" app:layout_constraintTop_toBottomOf="@id/swEFavicons"
app:switchPadding="12dp" /> app:switchPadding="12dp" />
@ -905,7 +922,7 @@
android:text="@string/title_advanced_privacy_risk" android:text="@string/title_advanced_privacy_risk"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?attr/colorWarning" android:textColor="?attr/colorWarning"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toEndOf="@id/vwFaviconPadding"
app:layout_constraintTop_toBottomOf="@id/swFavicons" /> app:layout_constraintTop_toBottomOf="@id/swFavicons" />
<androidx.appcompat.widget.SwitchCompat <androidx.appcompat.widget.SwitchCompat
@ -917,7 +934,7 @@
android:checked="true" android:checked="true"
android:text="@string/title_advanced_favicons_partial" android:text="@string/title_advanced_favicons_partial"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toEndOf="@id/vwFaviconPadding"
app:layout_constraintTop_toBottomOf="@id/tvFaviconsHint" app:layout_constraintTop_toBottomOf="@id/tvFaviconsHint"
app:switchPadding="12dp" /> app:switchPadding="12dp" />
@ -931,7 +948,8 @@
android:text="@string/title_advanced_favicons_play" android:text="@string/title_advanced_favicons_play"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?attr/colorWarning" android:textColor="?attr/colorWarning"
app:layout_constraintStart_toStartOf="parent" android:textStyle="bold"
app:layout_constraintStart_toEndOf="@id/vwFaviconPadding"
app:layout_constraintTop_toBottomOf="@id/swFaviconsPartial" /> app:layout_constraintTop_toBottomOf="@id/swFaviconsPartial" />
<androidx.appcompat.widget.SwitchCompat <androidx.appcompat.widget.SwitchCompat
@ -1465,6 +1483,12 @@
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/tvPreviewLinesHint" /> app:layout_constraintTop_toBottomOf="@id/tvPreviewLinesHint" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grpPlay"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="vwFavicon,vwFaviconPadding,tvFaviconsPlay" />
</eu.faircode.email.ConstraintLayoutEx> </eu.faircode.email.ConstraintLayoutEx>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>

Write Preview
Loading…
Cancel
Save