diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 53236088..57ac6c83 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -63,10 +63,12 @@ import androidx.recyclerview.widget.RecyclerView; public class FragmentMessages extends FragmentEx { private ViewGroup view; + private TextView tvSupport; private ImageButton ibHintActions; private RecyclerView rvMessage; private TextView tvNoEmail; private ProgressBar pbWait; + private Group grpSupport; private Group grpHintActions; private Group grpReady; private FloatingActionButton fab; @@ -110,17 +112,30 @@ public class FragmentMessages extends FragmentEx { setHasOptionsMenu(true); // Get controls + tvSupport = view.findViewById(R.id.tvSupport); ibHintActions = view.findViewById(R.id.ibHintActions); rvMessage = view.findViewById(R.id.rvFolder); tvNoEmail = view.findViewById(R.id.tvNoEmail); pbWait = view.findViewById(R.id.pbWait); - grpReady = view.findViewById(R.id.grpReady); + grpSupport = view.findViewById(R.id.grpSupport); grpHintActions = view.findViewById(R.id.grpHintActions); + grpReady = view.findViewById(R.id.grpReady); fab = view.findViewById(R.id.fab); - // Wire controls final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); + + // Wire controls + + tvSupport.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); + fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro"); + fragmentTransaction.commit(); + } + }); + ibHintActions.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -363,6 +378,7 @@ public class FragmentMessages extends FragmentEx { super.onActivityCreated(savedInstanceState); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); + grpSupport.setVisibility(prefs.getBoolean("pro", false) ? View.GONE : View.VISIBLE); grpHintActions.setVisibility(prefs.getBoolean("message_actions", false) ? View.GONE : View.VISIBLE); final DB db = DB.getInstance(getContext()); diff --git a/app/src/main/res/layout/fragment_folders.xml b/app/src/main/res/layout/fragment_folders.xml index a12dbc65..c9b4637f 100644 --- a/app/src/main/res/layout/fragment_folders.xml +++ b/app/src/main/res/layout/fragment_folders.xml @@ -16,6 +16,7 @@ android:gravity="center_vertical" android:minHeight="33dp" android:text="@string/title_hint_folder_actions" + android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textColor="?android:attr/textColorPrimary" app:layout_constraintEnd_toStartOf="@+id/ibHintActions" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/fragment_messages.xml b/app/src/main/res/layout/fragment_messages.xml index 59087f13..19661d47 100644 --- a/app/src/main/res/layout/fragment_messages.xml +++ b/app/src/main/res/layout/fragment_messages.xml @@ -21,6 +21,27 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + + + app:layout_constraintTop_toBottomOf="@id/vSeparatorSupport" /> + + All pro features are activated All pro features activated Invalid response + FairEmail needs your help. Tap to purchase pro features to keep the project going. Log Debug info