diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java index 4e26251753..d10959ba27 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java @@ -40,6 +40,7 @@ import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.CompoundButton; import android.widget.EditText; +import android.widget.ImageButton; import android.widget.SeekBar; import android.widget.Spinner; import android.widget.TextView; @@ -57,6 +58,7 @@ import java.util.ArrayList; import java.util.List; public class FragmentOptionsBehavior extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener { + private ImageButton ibHelp; private SwitchCompat swSyncOnlaunch; private SwitchCompat swDoubleBack; private SwitchCompat swConversationActions; @@ -120,6 +122,7 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe // Get controls + ibHelp = view.findViewById(R.id.ibHelp); swSyncOnlaunch = view.findViewById(R.id.swSyncOnlaunch); swDoubleBack = view.findViewById(R.id.swDoubleBack); swConversationActions = view.findViewById(R.id.swConversationActions); @@ -164,6 +167,13 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); + ibHelp.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false); + } + }); + swDoubleBack.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java b/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java index 695623eabd..36155be8c2 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java @@ -44,6 +44,7 @@ import android.widget.AdapterView; import android.widget.Button; import android.widget.CompoundButton; import android.widget.EditText; +import android.widget.ImageButton; import android.widget.Spinner; import android.widget.TextView; @@ -56,6 +57,7 @@ import androidx.lifecycle.Lifecycle; import androidx.preference.PreferenceManager; public class FragmentOptionsConnection extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener { + private ImageButton ibHelp; private SwitchCompat swMetered; private Spinner spDownload; private SwitchCompat swRoaming; @@ -99,6 +101,7 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre // Get controls + ibHelp = view.findViewById(R.id.ibHelp); swMetered = view.findViewById(R.id.swMetered); spDownload = view.findViewById(R.id.spDownload); swRoaming = view.findViewById(R.id.swRoaming); @@ -133,6 +136,13 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); boolean debug = prefs.getBoolean("debug", false); + ibHelp.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false); + } + }); + swMetered.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java index 6c1954f26f..b2439da463 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java @@ -64,6 +64,7 @@ import java.util.ArrayList; import java.util.List; public class FragmentOptionsDisplay extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener { + private ImageButton ibHelp; private Button btnTheme; private Spinner spStartup; private SwitchCompat swCards; @@ -215,6 +216,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer // Get controls + ibHelp = view.findViewById(R.id.ibHelp); btnTheme = view.findViewById(R.id.btnTheme); spStartup = view.findViewById(R.id.spStartup); swCards = view.findViewById(R.id.swCards); @@ -348,6 +350,13 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); + ibHelp.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false); + } + }); + btnTheme.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java b/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java index 43096b04dc..5fad0daccd 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java @@ -81,6 +81,7 @@ import java.util.List; public class FragmentOptionsEncryption extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener, OpenPgpServiceConnection.OnBound { + private ImageButton ibHelp; private ImageButton ibInfo; private SwitchCompat swSign; private SwitchCompat swEncrypt; @@ -127,6 +128,8 @@ public class FragmentOptionsEncryption extends FragmentBase View view = inflater.inflate(R.layout.fragment_options_encryption, container, false); // Get controls + + ibHelp = view.findViewById(R.id.ibHelp); ibInfo = view.findViewById(R.id.ibInfo); swSign = view.findViewById(R.id.swSign); swEncrypt = view.findViewById(R.id.swEncrypt); @@ -178,6 +181,13 @@ public class FragmentOptionsEncryption extends FragmentBase final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); + ibHelp.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false); + } + }); + ibInfo.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java index 827ed41c81..10d50374a4 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java @@ -93,6 +93,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc private boolean resumed = false; private List> languages = new ArrayList<>(); + private ImageButton ibHelp; private SwitchCompat swPowerMenu; private SwitchCompat swExternalSearch; private SwitchCompat swSortAnswers; @@ -264,6 +265,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc // Get controls + ibHelp = view.findViewById(R.id.ibHelp); swPowerMenu = view.findViewById(R.id.swPowerMenu); swExternalSearch = view.findViewById(R.id.swExternalSearch); swSortAnswers = view.findViewById(R.id.swSortAnswers); @@ -375,6 +377,13 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); + ibHelp.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false); + } + }); + swPowerMenu.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java b/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java index e9824a3167..a6b5aa2dbb 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java @@ -58,6 +58,7 @@ import androidx.preference.PreferenceManager; import java.util.List; public class FragmentOptionsNotifications extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener { + private ImageButton ibHelp; private Button btnManage; private ImageButton ibClear; private Button btnManageDefault; @@ -138,6 +139,7 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared // Get controls + ibHelp = view.findViewById(R.id.ibHelp); btnManage = view.findViewById(R.id.btnManage); ibClear = view.findViewById(R.id.ibClear); btnManageDefault = view.findViewById(R.id.btnManageDefault); @@ -200,6 +202,13 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); boolean debug = prefs.getBoolean("debug", false); + ibHelp.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false); + } + }); + final Intent manage = new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS) .putExtra("app_package", getContext().getPackageName()) .putExtra("app_uid", getContext().getApplicationInfo().uid) diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java b/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java index 774454cbf2..edc3e514e0 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java @@ -63,6 +63,7 @@ import java.text.SimpleDateFormat; import java.util.Locale; public class FragmentOptionsPrivacy extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener { + private ImageButton ibHelp; private SwitchCompat swConfirmLinks; private SwitchCompat swCheckLinksDbl; private SwitchCompat swBrowseLinks; @@ -126,6 +127,7 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer // Get controls + ibHelp = view.findViewById(R.id.ibHelp); swConfirmLinks = view.findViewById(R.id.swConfirmLinks); swCheckLinksDbl = view.findViewById(R.id.swCheckLinksDbl); swBrowseLinks = view.findViewById(R.id.swBrowseLinks); @@ -172,6 +174,13 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); + ibHelp.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false); + } + }); + swConfirmLinks.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java index 2afcaeef1c..72f0031b27 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java @@ -38,6 +38,7 @@ import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.CompoundButton; +import android.widget.ImageButton; import android.widget.RadioButton; import android.widget.RadioGroup; import android.widget.Spinner; @@ -54,6 +55,7 @@ import java.util.List; import java.util.Objects; public class FragmentOptionsSend extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener { + private ImageButton ibHelp; private SwitchCompat swKeyboard; private SwitchCompat swKeyboardNoFullscreen; private SwitchCompat swSuggestNames; @@ -127,6 +129,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc // Get controls + ibHelp = view.findViewById(R.id.ibHelp); swKeyboard = view.findViewById(R.id.swKeyboard); swKeyboardNoFullscreen = view.findViewById(R.id.swKeyboardNoFullscreen); swSuggestNames = view.findViewById(R.id.swSuggestNames); @@ -198,6 +201,13 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); + ibHelp.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false); + } + }); + swKeyboard.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java index fb9cafb945..c722976f11 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java @@ -63,6 +63,7 @@ import java.util.List; import java.util.Objects; public class FragmentOptionsSynchronize extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener { + private ImageButton ibHelp; private SwitchCompat swEnabled; private SwitchCompat swOptimize; private ImageButton ibOptimizeInfo; @@ -131,6 +132,7 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr // Get controls + ibHelp = view.findViewById(R.id.ibHelp); swEnabled = view.findViewById(R.id.swEnabled); swOptimize = view.findViewById(R.id.swOptimize); ibOptimizeInfo = view.findViewById(R.id.ibOptimizeInfo); @@ -190,6 +192,13 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); + ibHelp.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Helper.view(v.getContext(), Helper.getSupportUri(v.getContext()), false); + } + }); + swEnabled.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { diff --git a/app/src/main/res/layout/fragment_options_behavior.xml b/app/src/main/res/layout/fragment_options_behavior.xml index 9aa71ffba8..6368347017 100644 --- a/app/src/main/res/layout/fragment_options_behavior.xml +++ b/app/src/main/res/layout/fragment_options_behavior.xml @@ -21,18 +21,30 @@ android:id="@+id/tvDefault" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginHorizontal="3dp" - android:drawableStart="@drawable/twotone_support_24" - android:drawablePadding="6dp" + android:layout_marginStart="3dp" android:gravity="center_vertical" + android:minHeight="36dp" android:text="@string/title_advanced_default" android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textColor="?android:attr/textColorPrimary" android:textStyle="italic" - app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintEnd_toStartOf="@+id/ibHelp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + + + + + + + + + + + + + + + +