mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-04 06:20:26 +00:00
Code Issues Releases Wiki Activity

Made managing subscriptions free

Browse source
This commit is contained in:
M66B 2020-06-17 16:27:18 +02:00
parent 848c1d343a
commit fac2aedab2
2 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java
View file

@ -78,7 +78,6 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
private SwitchCompat swSyncFolders; private SwitchCompat swSyncFolders;
private SwitchCompat swSyncSharedFolders; private SwitchCompat swSyncSharedFolders;
private SwitchCompat swSubscriptions; private SwitchCompat swSubscriptions;
private TextView tvSubscriptionPro;
private SwitchCompat swCheckMx; private SwitchCompat swCheckMx;
private SwitchCompat swCheckReply; private SwitchCompat swCheckReply;
private SwitchCompat swTuneKeepAlive; private SwitchCompat swTuneKeepAlive;
@ -129,7 +128,6 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
swSyncFolders = view.findViewById(R.id.swSyncFolders); swSyncFolders = view.findViewById(R.id.swSyncFolders);
swSyncSharedFolders = view.findViewById(R.id.swSyncSharedFolders); swSyncSharedFolders = view.findViewById(R.id.swSyncSharedFolders);
swSubscriptions = view.findViewById(R.id.swSubscriptions); swSubscriptions = view.findViewById(R.id.swSubscriptions);
tvSubscriptionPro = view.findViewById(R.id.tvSubscriptionPro);
swCheckMx = view.findViewById(R.id.swCheckMx); swCheckMx = view.findViewById(R.id.swCheckMx);
swCheckReply = view.findViewById(R.id.swCheckReply); swCheckReply = view.findViewById(R.id.swCheckReply);
swTuneKeepAlive = view.findViewById(R.id.swTuneKeepAlive); swTuneKeepAlive = view.findViewById(R.id.swTuneKeepAlive);
@ -304,8 +302,6 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
} }
}); });
Helper.linkPro(tvSubscriptionPro);
swCheckMx.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { swCheckMx.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@ -414,8 +410,7 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
swSyncFolders.setChecked(prefs.getBoolean("sync_folders", true)); swSyncFolders.setChecked(prefs.getBoolean("sync_folders", true));
swSyncSharedFolders.setChecked(prefs.getBoolean("sync_shared_folders", false)); swSyncSharedFolders.setChecked(prefs.getBoolean("sync_shared_folders", false));
swSyncSharedFolders.setEnabled(swSyncFolders.isChecked()); swSyncSharedFolders.setEnabled(swSyncFolders.isChecked());
swSubscriptions.setChecked(prefs.getBoolean("subscriptions", false) && pro); swSubscriptions.setChecked(prefs.getBoolean("subscriptions", false));
swSubscriptions.setEnabled(pro);
swCheckMx.setChecked(prefs.getBoolean("check_mx", false)); swCheckMx.setChecked(prefs.getBoolean("check_mx", false));
swCheckReply.setChecked(prefs.getBoolean("check_reply", false)); swCheckReply.setChecked(prefs.getBoolean("check_reply", false));
swTuneKeepAlive.setChecked(prefs.getBoolean("tune_keep_alive", true)); swTuneKeepAlive.setChecked(prefs.getBoolean("tune_keep_alive", true));

15
app/src/main/res/layout/fragment_options_synchronize.xml
View file

@ -432,19 +432,6 @@
app:layout_constraintTop_toBottomOf="@id/swSyncSharedFolders" app:layout_constraintTop_toBottomOf="@id/swSyncSharedFolders"
app:switchPadding="12dp" /> app:switchPadding="12dp" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvSubscriptionPro"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:layout_marginEnd="48dp"
android:text="@string/title_pro_feature"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorLink"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swSubscriptions" />
<androidx.appcompat.widget.SwitchCompat <androidx.appcompat.widget.SwitchCompat
android:id="@+id/swCheckMx" android:id="@+id/swCheckMx"
android:layout_width="0dp" android:layout_width="0dp"
@ -453,7 +440,7 @@
android:text="@string/title_advanced_check_mx" android:text="@string/title_advanced_check_mx"
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/tvSubscriptionPro" app:layout_constraintTop_toBottomOf="@id/swSubscriptions"
app:switchPadding="12dp" /> app:switchPadding="12dp" />
<eu.faircode.email.FixedTextView <eu.faircode.email.FixedTextView