diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java index 3e1322da29..ea183d8533 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java @@ -112,7 +112,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer private SwitchCompat swFavicons; private SwitchCompat swFaviconsPartial; private TextView tvFaviconsHint; - private TextView tvFaviconsPlay; private SwitchCompat swGeneratedIcons; private SwitchCompat swIdenticons; private SwitchCompat swCircular; @@ -178,6 +177,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer private SwitchCompat swAuthentication; private SwitchCompat swAuthenticationIndicator; + private Group grpPlay; private Group grpUnzip; private NumberFormat NF = NumberFormat.getNumberInstance(); @@ -266,7 +266,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer swFavicons = view.findViewById(R.id.swFavicons); swFaviconsPartial = view.findViewById(R.id.swFaviconsPartial); tvFaviconsHint = view.findViewById(R.id.tvFaviconsHint); - tvFaviconsPlay = view.findViewById(R.id.tvFaviconsPlay); swGeneratedIcons = view.findViewById(R.id.swGeneratedIcons); swIdenticons = view.findViewById(R.id.swIdenticons); swCircular = view.findViewById(R.id.swCircular); @@ -330,6 +329,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer swAuthentication = view.findViewById(R.id.swAuthentication); swAuthenticationIndicator = view.findViewById(R.id.swAuthenticationIndicator); + grpPlay = view.findViewById(R.id.grpPlay); grpUnzip = view.findViewById(R.id.grpUnzip); List fonts = StyleHelper.getFonts(getContext()); @@ -1227,7 +1227,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer // Initialize 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, Helper.humanReadableByteCount(ContactInfo.FAVICON_READ_BYTES, false))); grpUnzip.setVisibility(Build.VERSION.SDK_INT < Build.VERSION_CODES.O ? View.GONE : View.VISIBLE); diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml index d0fb8ad8ea..2f5f18fdf2 100644 --- a/app/src/main/res/layout/fragment_options_display.xml +++ b/app/src/main/res/layout/fragment_options_display.xml @@ -808,6 +808,23 @@ app:layout_constraintTop_toBottomOf="@id/vSeparatorAvatar" app:switchPadding="12dp" /> + + + + @@ -830,7 +847,7 @@ android:text="@string/title_advanced_privacy_risk" android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textColor="?attr/colorWarning" - app:layout_constraintStart_toStartOf="parent" + app:layout_constraintStart_toEndOf="@id/vwFaviconPadding" app:layout_constraintTop_toBottomOf="@id/swBimi" /> @@ -879,7 +896,7 @@ android:layout_marginTop="12dp" android:text="@string/title_advanced_efavicons" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" + app:layout_constraintStart_toEndOf="@id/vwFaviconPadding" app:layout_constraintTop_toBottomOf="@id/ibBimi" app:switchPadding="12dp" /> @@ -890,7 +907,7 @@ android:layout_marginTop="12dp" android:text="@string/title_advanced_favicons" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" + app:layout_constraintStart_toEndOf="@id/vwFaviconPadding" app:layout_constraintTop_toBottomOf="@id/swEFavicons" app:switchPadding="12dp" /> @@ -905,7 +922,7 @@ android:text="@string/title_advanced_privacy_risk" android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textColor="?attr/colorWarning" - app:layout_constraintStart_toStartOf="parent" + app:layout_constraintStart_toEndOf="@id/vwFaviconPadding" app:layout_constraintTop_toBottomOf="@id/swFavicons" /> @@ -931,7 +948,8 @@ android:text="@string/title_advanced_favicons_play" android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textColor="?attr/colorWarning" - app:layout_constraintStart_toStartOf="parent" + android:textStyle="bold" + app:layout_constraintStart_toEndOf="@id/vwFaviconPadding" app:layout_constraintTop_toBottomOf="@id/swFaviconsPartial" /> + +