Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 19:59:05 +01:00
Code Issues Projects Releases Wiki Activity

Add Mailbox entry into settings

Browse Source
This commit is contained in:
Torsten Grote
2022-02-08 09:09:12 -03:00
parent 065ceb8e98
commit 8b3dae6daf
6 changed files with 52 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
View File

@@ -36,7 +36,7 @@ public class SettingsFragment extends PreferenceFragmentCompat {
private static final String PREF_KEY_FEEDBACK = "pref_key_send_feedback";
private static final String PREF_KEY_DEV = "pref_key_dev";
private static final String PREF_KEY_EXPLODE = "pref_key_explode";
private static final String PREF_KEY_SHARE_APP = "pref_key_share_app";
private static final String PREF_KEY_MAILBOX = "pref_key_mailbox";
@Inject
ViewModelProvider.Factory viewModelFactory;
@@ -70,6 +70,17 @@ public class SettingsFragment extends PreferenceFragmentCompat {
prefAvatar.setVisible(false);
}
Preference prefMailbox =
requireNonNull(findPreference(PREF_KEY_MAILBOX));
if (viewModel.shouldEnableMailbox()) {
prefMailbox.setOnPreferenceClickListener(preference -> {
// TODO show mailbox status/onboarding
return true;
});
} else {
prefMailbox.setVisible(false);
}
Preference prefFeedback =
requireNonNull(findPreference(PREF_KEY_FEEDBACK));
prefFeedback.setOnPreferenceClickListener(preference -> {

4
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsViewModel.java
View File

@@ -161,6 +161,10 @@ class SettingsViewModel extends DbViewModel implements EventListener {
return featureFlags.shouldEnableProfilePictures();
}
boolean shouldEnableMailbox() {
return featureFlags.shouldEnableMailbox();
}
private void loadOwnIdentityInfo() {
runOnDbThread(() -> {
try {

12
briar-android/src/main/res/drawable/ic_mailbox.xml Normal file
View File

@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:width="24dp"
android:height="24dp"
android:tint="?android:attr/textColorPrimary"
android:viewportWidth="24"
android:viewportHeight="24"
tools:ignore="NewApi">
<path
android:fillColor="#ffffff"
android:pathData="m5.0782,2c-0.5245,0 -1.0278,0.2105 -1.3987,0.5848C3.3085,2.959 3.1,3.4663 3.1,3.9956V16.7677c0,0.5293 0.2085,1.0377 0.5794,1.412 0.3709,0.3742 0.8742,0.5836 1.3987,0.5836H15.8509l3.589,3.0261C20.0193,22.278 20.9,21.862 20.9,21.1001V3.9956C20.9,3.4663 20.6915,2.959 20.3206,2.5848 19.9497,2.2105 19.4464,2 18.9218,2ZM6.2648,5.1927H17.7352v5.6502h-4.0073v1.9542h1.4659c0.2643,0 0.3966,0.3227 0.2098,0.5113l-3.1602,3.1881c-0.1159,0.1169 -0.3036,0.1169 -0.4195,0L8.6637,13.3084C8.4768,13.1198 8.6091,12.7971 8.8734,12.7971H10.3394V10.8429H6.2648Z" />
</vector>

3
briar-android/src/main/res/values/strings.xml
View File

@@ -612,6 +612,9 @@
<string name="choose_ringtone_title">Choose ringtone</string>
<string name="cannot_load_ringtone">Cannot load ringtone</string>
<!-- Mailbox -->
<string name="mailbox_settings_title">Mailbox</string>
<!-- Conversation Settings -->
<string name="disappearing_messages_title">Disappearing messages</string>
<string name="disappearing_messages_explanation_long">Turning on this setting will make new

5
briar-android/src/main/res/xml/settings.xml
View File

@@ -24,6 +24,11 @@
app:fragment="org.briarproject.briar.android.settings.NotificationsFragment"
app:icon="@drawable/ic_notifications" />
<Preference
android:key="pref_key_mailbox"
android:title="@string/mailbox_settings_title"
app:icon="@drawable/ic_mailbox" />
<PreferenceCategory
android:key="pref_key_actions"
android:layout="@layout/preferences_category"