diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsFragment.java index 6425211f5..eb2b87b44 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsFragment.java @@ -8,6 +8,7 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import android.widget.Button; import android.widget.Switch; import org.briarproject.bramble.api.db.DatabaseExecutor; @@ -96,6 +97,11 @@ public class ConversationSettingsFragment extends BaseFragment { viewModel.setAutoDeleteTimerEnabled(value); }); + Button buttonLearnMore = contentView.findViewById(R.id.buttonLearnMore); + buttonLearnMore.setOnClickListener(e -> { + showLearnMoreDialog(); + }); + viewModel = ViewModelProviders.of(requireActivity(), viewModelFactory) .get(ConversationViewModel.class); @@ -145,10 +151,17 @@ public class ConversationSettingsFragment extends BaseFragment { @Override public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == R.id.action_help) { - // TODO: display dialog + showLearnMoreDialog(); return true; } return super.onOptionsItemSelected(item); } + private void showLearnMoreDialog() { + ConversationSettingsLearnMoreDialog + dialog = new ConversationSettingsLearnMoreDialog(); + dialog.show(requireActivity().getSupportFragmentManager(), + ConversationSettingsLearnMoreDialog.TAG); + } + } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsLearnMoreDialog.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsLearnMoreDialog.java new file mode 100644 index 000000000..43776a617 --- /dev/null +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsLearnMoreDialog.java @@ -0,0 +1,44 @@ +package org.briarproject.briar.android.conversation; + +import android.app.Dialog; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; + +import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; +import org.briarproject.briar.R; + +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.FragmentActivity; + +@MethodsNotNullByDefault +public class ConversationSettingsLearnMoreDialog extends DialogFragment { + + final static String TAG = + ConversationSettingsLearnMoreDialog.class.getName(); + + static ConversationSettingsLearnMoreDialog newInstance() { + return new ConversationSettingsLearnMoreDialog(); + } + + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + FragmentActivity activity = requireActivity(); + + AlertDialog.Builder builder = + new AlertDialog.Builder(activity, R.style.BriarDialogTheme); + + LayoutInflater inflater = LayoutInflater.from(getContext()); + View view = inflater.inflate( + R.layout.fragment_conversation_settings_learn_more, null); + builder.setView(view); + + builder.setTitle(R.string.disappearing_messages_title); + builder.setNeutralButton(R.string.ok, null); + + return builder.create(); + } + + +} diff --git a/briar-android/src/main/res/layout/fragment_conversation_settings_learn_more.xml b/briar-android/src/main/res/layout/fragment_conversation_settings_learn_more.xml new file mode 100644 index 000000000..bc1ac40ed --- /dev/null +++ b/briar-android/src/main/res/layout/fragment_conversation_settings_learn_more.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file