mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-23 22:51:02 +00:00
Code Issues Releases Wiki Activity

Small layout improvement

Browse source
This commit is contained in:
M66B 2024-03-07 14:54:36 +01:00
parent cb08193c42
commit 4ea1b549f0
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/eu/faircode/email/FragmentDialogJunk.java
View file

@ -84,6 +84,7 @@ public class FragmentDialogJunk extends FragmentDialogBase {
final TextView tvJunkHint = view.findViewById(R.id.tvJunkHint); final TextView tvJunkHint = view.findViewById(R.id.tvJunkHint);
final CheckBox cbBlockSender = view.findViewById(R.id.cbBlockSender); final CheckBox cbBlockSender = view.findViewById(R.id.cbBlockSender);
final CheckBox cbBlockDomain = view.findViewById(R.id.cbBlockDomain); final CheckBox cbBlockDomain = view.findViewById(R.id.cbBlockDomain);
final TextView tvBlockDomainHint = view.findViewById(R.id.tvBlockDomainHint);
final ImageButton ibMore = view.findViewById(R.id.ibMore); final ImageButton ibMore = view.findViewById(R.id.ibMore);
final TextView tvMore = view.findViewById(R.id.tvMore); final TextView tvMore = view.findViewById(R.id.tvMore);
final CheckBox cbJunkFilter = view.findViewById(R.id.cbJunkFilter); final CheckBox cbJunkFilter = view.findViewById(R.id.cbJunkFilter);
@ -94,7 +95,6 @@ public class FragmentDialogJunk extends FragmentDialogBase {
final Button btnClear = view.findViewById(R.id.btnClear); final Button btnClear = view.findViewById(R.id.btnClear);
final ImageButton ibRules = view.findViewById(R.id.ibRules); final ImageButton ibRules = view.findViewById(R.id.ibRules);
final ImageButton ibManage = view.findViewById(R.id.ibManage); final ImageButton ibManage = view.findViewById(R.id.ibManage);
final Group grpBlockDomain = view.findViewById(R.id.grpBlockDomain);
final Group grpFilter = view.findViewById(R.id.grpFilter); final Group grpFilter = view.findViewById(R.id.grpFilter);
final Group grpManage = view.findViewById(R.id.grpManage); final Group grpManage = view.findViewById(R.id.grpManage);
@ -393,7 +393,8 @@ public class FragmentDialogJunk extends FragmentDialogBase {
tvBlocklist.setText(TextUtils.join(", ", DnsBlockList.getNamesEnabled(context))); tvBlocklist.setText(TextUtils.join(", ", DnsBlockList.getNamesEnabled(context)));
cbBlockSender.setVisibility(View.VISIBLE); cbBlockSender.setVisibility(View.VISIBLE);
grpBlockDomain.setVisibility(domains.size() > 0 ? View.VISIBLE : View.GONE); cbBlockDomain.setVisibility(domains.size() > 0 ? View.VISIBLE : View.GONE);
tvBlockDomainHint.setVisibility(domains.size() > 0 && !ActivityBilling.isPro(context) ? View.VISIBLE : View.GONE);
grpFilter.setVisibility(View.GONE); grpFilter.setVisibility(View.GONE);
grpManage.setVisibility(View.GONE); grpManage.setVisibility(View.GONE);

6
app/src/main/res/layout/dialog_junk.xml
View file

@ -246,12 +246,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnClear" /> app:layout_constraintTop_toBottomOf="@id/btnClear" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grpBlockDomain"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="cbBlockDomain,tvBlockDomainHint" />
<androidx.constraintlayout.widget.Group <androidx.constraintlayout.widget.Group
android:id="@+id/grpFilter" android:id="@+id/grpFilter"
android:layout_width="0dp" android:layout_width="0dp"