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

Move context menu creation and processing from Activity to Fragment

Browse Source
This commit is contained in:
Sebastian Kürten
2021-01-07 14:57:50 +01:00
parent 7da57a1a1b
commit 63ae41994b
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsActivity.java
View File

@@ -2,8 +2,6 @@ package org.briarproject.briar.android.conversation;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.ContactId;
@@ -71,17 +69,8 @@ public class ConversationSettingsActivity extends BriarActivity implements
if (item.getItemId() == android.R.id.home) { if (item.getItemId() == android.R.id.home) {
onBackPressed(); onBackPressed();
return true; return true;
} else if (item.getItemId() == R.id.action_help) {
// TODO: display dialog
} }
return false; return false;
} }
@Override
public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.help_action, menu);
return super.onCreateOptionsMenu(menu);
}
} }

25
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsFragment.java
View File

@@ -3,6 +3,9 @@ package org.briarproject.briar.android.conversation;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Switch; import android.widget.Switch;
@@ -71,6 +74,12 @@ public class ConversationSettingsFragment extends BaseFragment {
listener.getActivityComponent().inject(this); listener.getActivityComponent().inject(this);
} }
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setHasOptionsMenu(true);
}
@Override @Override
public View onCreateView(LayoutInflater inflater, public View onCreateView(LayoutInflater inflater,
@Nullable ViewGroup container, @Nullable ViewGroup container,
@@ -126,4 +135,20 @@ public class ConversationSettingsFragment extends BaseFragment {
}); });
} }
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
inflater.inflate(R.menu.help_action, menu);
super.onCreateOptionsMenu(menu, inflater);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == R.id.action_help) {
// TODO: display dialog
return true;
}
return super.onOptionsItemSelected(item);
}
} }