Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 12:49:55 +01:00
Code Issues Projects Releases Wiki Activity

Add settings item for settings screen

Browse Source
This commit is contained in:
Sebastian Kürten
2020-12-11 10:04:19 +01:00
parent 5ca24c0c10
commit e313f61b9e
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
View File

@@ -386,6 +386,8 @@ public class ConversationActivity extends BriarActivity
observeOnce(viewModel.getPrivateMessageFormat(), this, format -> { observeOnce(viewModel.getPrivateMessageFormat(), this, format -> {
boolean visible = format == TEXT_IMAGES_AUTO_DELETE; boolean visible = format == TEXT_IMAGES_AUTO_DELETE;
menu.findItem(R.id.action_auto_delete).setVisible(visible); menu.findItem(R.id.action_auto_delete).setVisible(visible);
menu.findItem(R.id.action_conversation_settings)
.setVisible(visible);
}); });
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
@@ -413,6 +415,9 @@ public class ConversationActivity extends BriarActivity
viewModel.setAutoDeleteTimerEnabled(enabled); viewModel.setAutoDeleteTimerEnabled(enabled);
item.setChecked(enabled); item.setChecked(enabled);
return true; return true;
case R.id.action_conversation_settings:
// TODO: show settings
return true;
case R.id.action_delete_all_messages: case R.id.action_delete_all_messages:
askToDeleteAllMessages(); askToDeleteAllMessages();
return true; return true;

7
briar-android/src/main/res/menu/conversation_actions.xml
View File

@@ -24,6 +24,13 @@
app:showAsAction="never" app:showAsAction="never"
tools:visible="true" /> tools:visible="true" />
<item
android:id="@+id/action_conversation_settings"
android:title="@string/menu_item_conversation_settings"
android:visible="false"
app:showAsAction="never"
tools:visible="true" />
<item <item
android:id="@+id/action_delete_all_messages" android:id="@+id/action_delete_all_messages"
android:title="@string/delete_all_messages" android:title="@string/delete_all_messages"

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

@@ -166,6 +166,7 @@
<string name="set_contact_alias_hint">Contact name</string> <string name="set_contact_alias_hint">Contact name</string>
<string name="set_alias_button">Change</string> <string name="set_alias_button">Change</string>
<string name="menu_item_auto_delete">Disappearing messages</string> <string name="menu_item_auto_delete">Disappearing messages</string>
<string name="menu_item_conversation_settings">Conversation settings</string>
<string name="delete_all_messages">Delete all messages</string> <string name="delete_all_messages">Delete all messages</string>
<string name="dialog_title_delete_all_messages">Confirm Message Deletion</string> <string name="dialog_title_delete_all_messages">Confirm Message Deletion</string>
<string name="dialog_message_delete_all_messages">Are you sure that you want to delete all messages?</string> <string name="dialog_message_delete_all_messages">Are you sure that you want to delete all messages?</string>