@@ -108,6 +108,8 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
108108 executorService = Executors .newSingleThreadScheduledExecutor ();
109109 binding = ActivityNoteShareBinding .inflate (getLayoutInflater ());
110110 setContentView (binding .getRoot ());
111+ setSupportActionBar (binding .toolbar );
112+ binding .toolbar .setNavigationOnClickListener (v -> backPressed ());
111113 registerResultLauncher ();
112114 initializeArguments ();
113115 initializeOnBackPressedDispatcher ();
@@ -127,14 +129,18 @@ private void initializeOnBackPressedDispatcher() {
127129 getOnBackPressedDispatcher ().addCallback (this , new OnBackPressedCallback (true ) {
128130 @ Override
129131 public void handleOnBackPressed () {
130- Intent intent = new Intent (NoteShareActivity .this , MainActivity .class );
131- intent .addFlags (Intent .FLAG_ACTIVITY_CLEAR_TOP | Intent .FLAG_ACTIVITY_SINGLE_TOP );
132- startActivity (intent );
133- finish ();
132+ backPressed ();
134133 }
135134 });
136135 }
137136
137+ private void backPressed () {
138+ Intent intent = new Intent (NoteShareActivity .this , MainActivity .class );
139+ intent .addFlags (Intent .FLAG_ACTIVITY_CLEAR_TOP | Intent .FLAG_ACTIVITY_SINGLE_TOP );
140+ startActivity (intent );
141+ finish ();
142+ }
143+
138144 private void initializeArguments () {
139145 Bundle bundler = getIntent ().getExtras ();
140146 note = BundleExtensionsKt .getSerializableArgument (bundler , ARG_NOTE , Note .class );
@@ -156,6 +162,8 @@ private void initializeArguments() {
156162 repository .getSharesForNotesAndSaveShareEntities ();
157163
158164 runOnUiThread (() -> {
165+ binding .title .setText (R .string .activity_sharing_title );
166+ binding .fileName .setText (note .getTitle ());
159167 binding .searchContainer .setVisibility (View .VISIBLE );
160168 binding .sharesList .setVisibility (View .VISIBLE );
161169 binding .sharesList .setAdapter (new ShareeListAdapter (this , new ArrayList <>(), this , account ));
@@ -798,6 +806,7 @@ private void updateShare(OCShare share) {
798806 public void applyBrand (int color ) {
799807 final var util = BrandingUtil .of (color , this );
800808 util .platform .themeStatusBar (this );
809+ util .material .themeToolbar (binding .toolbar );
801810 util .androidx .themeToolbarSearchView (binding .searchView );
802811 util .platform .colorCircularProgressBar (binding .loadingLayoutIndicator , ColorRole .PRIMARY );
803812 util .platform .themeHorizontalProgressBar (binding .progressBar );
0 commit comments