From 1c70668f45a9aa79ce6b2a1dfe17d2a163971296 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 12 Sep 2021 09:36:18 +0200 Subject: [PATCH] Setup welcome collapsible --- .../java/eu/faircode/email/FragmentSetup.java | 24 +++++++++++++++++++ app/src/main/res/layout/fragment_setup.xml | 17 +++++++++++++ 2 files changed, 41 insertions(+) diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java index f504927ff4..a68d2b089e 100644 --- a/app/src/main/java/eu/faircode/email/FragmentSetup.java +++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java @@ -67,6 +67,9 @@ public class FragmentSetup extends FragmentBase { private TextView tvPrivacy; private TextView tvSupport; + private ImageButton ibWelcome; + private Group grpWelcome; + private TextView tvNoInternet; private ImageButton ibHelp; private Button btnQuick; @@ -128,6 +131,8 @@ public class FragmentSetup extends FragmentBase { tvPrivacy = view.findViewById(R.id.tvPrivacy); tvSupport = view.findViewById(R.id.tvSupport); + ibWelcome = view.findViewById(R.id.ibWelcome); + grpWelcome = view.findViewById(R.id.grpWelcome); tvNoInternet = view.findViewById(R.id.tvNoInternet); ibHelp = view.findViewById(R.id.ibHelp); @@ -186,6 +191,18 @@ public class FragmentSetup extends FragmentBase { } }); + updateWelcome(); + + ibWelcome.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(view.getContext()); + boolean setup_welcome = !prefs.getBoolean("setup_welcome", true); + prefs.edit().putBoolean("setup_welcome", setup_welcome).apply(); + updateWelcome(); + } + }); + ibHelp.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -658,6 +675,13 @@ public class FragmentSetup extends FragmentBase { } } + private void updateWelcome() { + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); + boolean setup_welcome = prefs.getBoolean("setup_welcome", true); + ibWelcome.setImageLevel(setup_welcome ? 0 /* less */ : 1 /* more */); + grpWelcome.setVisibility(setup_welcome ? View.VISIBLE : View.GONE); + } + private void updateManual() { FragmentActivity activity = getActivity(); if (activity != null) { diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml index 5d66f92b92..43e46ac05f 100644 --- a/app/src/main/res/layout/fragment_setup.xml +++ b/app/src/main/res/layout/fragment_setup.xml @@ -123,6 +123,23 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/tvPrivacy" app:layout_constraintTop_toBottomOf="@id/analytics" /> + + + +