Skip to content

Commit 4accc4e

Browse files
style(share): Add proper toolbar
Signed-off-by: Andy Scherzinger <[email protected]>
1 parent 4da3d1d commit 4accc4e

File tree

3 files changed

+52
-6
lines changed

3 files changed

+52
-6
lines changed

app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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);

app/src/main/res/layout/activity_note_share.xml

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
android:id="@+id/shareContainer"
1212
android:layout_width="match_parent"
1313
android:layout_height="match_parent"
14-
android:orientation="vertical"
15-
android:paddingTop="@dimen/spacer_1hx">
14+
android:orientation="vertical">
1615

1716
<LinearLayout
1817
android:id="@+id/loadingLayout"
@@ -42,6 +41,43 @@
4241

4342
</LinearLayout>
4443

44+
<com.google.android.material.appbar.MaterialToolbar
45+
android:id="@+id/toolbar"
46+
android:layout_width="match_parent"
47+
android:layout_height="wrap_content"
48+
app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp">
49+
50+
<LinearLayout
51+
android:layout_width="match_parent"
52+
android:layout_height="match_parent"
53+
android:gravity="center_vertical"
54+
android:orientation="vertical">
55+
56+
<TextView
57+
android:id="@+id/title"
58+
android:layout_width="match_parent"
59+
android:layout_height="wrap_content"
60+
android:ellipsize="end"
61+
android:lines="1"
62+
android:textColor="@color/fontAppbar"
63+
android:textSize="18sp"
64+
tools:text="Share Note" />
65+
66+
<TextView
67+
android:id="@+id/file_name"
68+
android:layout_width="match_parent"
69+
android:layout_height="wrap_content"
70+
android:ellipsize="end"
71+
android:lines="1"
72+
android:textColor="@color/fontAppbar"
73+
android:textSize="12sp"
74+
tools:text="Your Note Name.md"
75+
tools:visibility="visible" />
76+
77+
</LinearLayout>
78+
79+
</com.google.android.material.appbar.MaterialToolbar>
80+
4581
<LinearLayout
4682
android:id="@+id/search_container"
4783
tools:visibility="visible"

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -516,4 +516,5 @@
516516
<string name="ecosystem_apps_talk">Nextcloud Talk</string>
517517
<string name="ecosystem_apps_more">More Nextcloud Apps</string>
518518
<string name="ecosystem_apps_display_more">More</string>
519+
<string name="activity_sharing_title">Sharing</string>
519520
</resources>

0 commit comments

Comments
 (0)