From 854dd855881a70b584e4446224f64b854cfc432c Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 23 Dec 2018 09:17:02 +0000 Subject: [PATCH] Added hint about compact view --- .../eu/faircode/email/FragmentMessages.java | 26 +++++++++--- app/src/main/res/layout/fragment_messages.xml | 41 ++++++++++++++++++- app/src/main/res/values-nl-rNL/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 4 files changed, 61 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index c401ea2673..6a49a504cf 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -81,6 +81,7 @@ public class FragmentMessages extends FragmentEx { private ImageButton ibHintSupport; private ImageButton ibHintSwipe; private ImageButton ibHintSelect; + private ImageButton ibHintCompact; private TextView tvNoEmail; private RecyclerView rvMessage; private BottomNavigationView bottom_navigation; @@ -89,6 +90,7 @@ public class FragmentMessages extends FragmentEx { private Group grpHintSupport; private Group grpHintSwipe; private Group grpHintSelect; + private Group grpHintCompact; private Group grpReady; private FloatingActionButton fab; private FloatingActionButton fabMore; @@ -174,6 +176,7 @@ public class FragmentMessages extends FragmentEx { ibHintSupport = view.findViewById(R.id.ibHintSupport); ibHintSwipe = view.findViewById(R.id.ibHintSwipe); ibHintSelect = view.findViewById(R.id.ibHintSelect); + ibHintCompact = view.findViewById(R.id.ibHintCompact); tvNoEmail = view.findViewById(R.id.tvNoEmail); rvMessage = view.findViewById(R.id.rvFolder); bottom_navigation = view.findViewById(R.id.bottom_navigation); @@ -182,6 +185,7 @@ public class FragmentMessages extends FragmentEx { grpHintSupport = view.findViewById(R.id.grpHintSupport); grpHintSwipe = view.findViewById(R.id.grpHintSwipe); grpHintSelect = view.findViewById(R.id.grpHintSelect); + grpHintCompact = view.findViewById(R.id.grpHintCompact); grpReady = view.findViewById(R.id.grpReady); fab = view.findViewById(R.id.fab); fabMore = view.findViewById(R.id.fabMore); @@ -267,6 +271,14 @@ public class FragmentMessages extends FragmentEx { } }); + ibHintSupport.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + prefs.edit().putBoolean("app_support", true).apply(); + grpHintSupport.setVisibility(View.GONE); + } + }); + ibHintSwipe.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -283,11 +295,11 @@ public class FragmentMessages extends FragmentEx { } }); - ibHintSupport.setOnClickListener(new View.OnClickListener() { + ibHintCompact.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - prefs.edit().putBoolean("app_support", true).apply(); - grpHintSupport.setVisibility(View.GONE); + prefs.edit().putBoolean("message_compact", true).apply(); + grpHintCompact.setVisibility(View.GONE); } }); @@ -1215,10 +1227,12 @@ public class FragmentMessages extends FragmentEx { selectionTracker.onRestoreInstanceState(savedInstanceState); } + boolean hints = (viewType == AdapterMessage.ViewType.UNIFIED || viewType == AdapterMessage.ViewType.FOLDER); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); - grpHintSupport.setVisibility(prefs.getBoolean("app_support", false) || viewType != AdapterMessage.ViewType.UNIFIED ? View.GONE : View.VISIBLE); - grpHintSwipe.setVisibility(prefs.getBoolean("message_swipe", false) || viewType == AdapterMessage.ViewType.THREAD ? View.GONE : View.VISIBLE); - grpHintSelect.setVisibility(prefs.getBoolean("message_select", false) || viewType != AdapterMessage.ViewType.FOLDER ? View.GONE : View.VISIBLE); + grpHintSupport.setVisibility(prefs.getBoolean("app_support", false) || !hints ? View.GONE : View.VISIBLE); + grpHintSwipe.setVisibility(prefs.getBoolean("message_swipe", false) || !hints ? View.GONE : View.VISIBLE); + grpHintSelect.setVisibility(prefs.getBoolean("message_select", false) || !hints ? View.GONE : View.VISIBLE); + grpHintCompact.setVisibility(prefs.getBoolean("message_compact", false) || !hints ? View.GONE : View.VISIBLE); final DB db = DB.getInstance(getContext()); diff --git a/app/src/main/res/layout/fragment_messages.xml b/app/src/main/res/layout/fragment_messages.xml index 2dccf8b93d..47edc9901a 100644 --- a/app/src/main/res/layout/fragment_messages.xml +++ b/app/src/main/res/layout/fragment_messages.xml @@ -136,6 +136,37 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/ibHintSelect" /> + + + + + + + app:layout_constraintTop_toBottomOf="@id/vSeparatorHintCompact" /> + app:layout_constraintTop_toBottomOf="@id/vSeparatorHintCompact" /> + + Als u een vraag of een probleem heeft, gebruik dan het menu ondersteuning om hulp te krijgen Veeg naar links om weg te gooien; veeg naar rechts om te archiveren (indien beschikbaar) Druk lang op een bericht om te beginnen met het selecteren van meerdere berichten + U kunt een compactere berichtweergave in de geavanceerde opties selecteren Het downloaden van berichten kan enige tijd duren, afhankelijk van de snelheid van de provider, de internet-verbinding en het apparaat en van het aantal berichten. Tijdens het downloaden van berichten kan de app trager reageren. Link openen Selecteer app diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 62de37108e..6bc59f1a82 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -378,6 +378,7 @@ If you have a question or a problem, please use the support menu to get help Swipe left to trash; swipe right to archive (if available) Long press a message to start selecting multiple messages + You can select a more compact message view in the advanced options Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower. Open link