mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Use cards for main setup

This commit is contained in:
M66B 2021-05-11 22:10:47 +02:00
parent 1733299393
commit 24373b4be9
2 changed files with 584 additions and 547 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/eu/faircode/email/FragmentSetup.java
View File

@ -51,6 +51,7 @@ import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.PopupMenu; import androidx.appcompat.widget.PopupMenu;
import androidx.constraintlayout.widget.Group; import androidx.constraintlayout.widget.Group;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.Observer; import androidx.lifecycle.Observer;
import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@ -91,7 +92,6 @@ public class FragmentSetup extends FragmentBase {
private Button btnInbox; private Button btnInbox;
private Group grpManual; private Group grpManual;
private Group grpDoze;
private Group grpBackgroundRestricted; private Group grpBackgroundRestricted;
private Group grpDataSaver; private Group grpDataSaver;
@ -157,7 +157,6 @@ public class FragmentSetup extends FragmentBase {
btnInbox = view.findViewById(R.id.btnInbox); btnInbox = view.findViewById(R.id.btnInbox);
grpManual = view.findViewById(R.id.grpManual); grpManual = view.findViewById(R.id.grpManual);
grpDoze = view.findViewById(R.id.grpDoze);
grpBackgroundRestricted = view.findViewById(R.id.grpBackgroundRestricted); grpBackgroundRestricted = view.findViewById(R.id.grpBackgroundRestricted);
grpDataSaver = view.findViewById(R.id.grpDataSaver); grpDataSaver = view.findViewById(R.id.grpDataSaver);
@ -404,6 +403,9 @@ public class FragmentSetup extends FragmentBase {
}); });
// Initialize // Initialize
if (!Helper.isDarkTheme(getContext()))
view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards_beige));
btnIdentity.setEnabled(false); btnIdentity.setEnabled(false);
tvNoComposable.setVisibility(View.GONE); tvNoComposable.setVisibility(View.GONE);
@ -416,7 +418,6 @@ public class FragmentSetup extends FragmentBase {
btnInbox.setEnabled(false); btnInbox.setEnabled(false);
grpDoze.setVisibility(Build.VERSION.SDK_INT < Build.VERSION_CODES.M ? View.GONE : View.VISIBLE);
grpBackgroundRestricted.setVisibility(View.GONE); grpBackgroundRestricted.setVisibility(View.GONE);
grpDataSaver.setVisibility(View.GONE); grpDataSaver.setVisibility(View.GONE);

1124
app/src/main/res/layout/fragment_setup.xml
View File

File diff suppressed because it is too large Load Diff