Skip to content

Commit 1e951a0

Browse files
style(sharing): make external/app sharing within Android more clear and platform-aligned
Signed-off-by: Andy Scherzinger <[email protected]>
1 parent c1e6d8c commit 1e951a0

File tree

4 files changed

+28
-11
lines changed

4 files changed

+28
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,7 @@ public void applyBrand(int color) {
803803
util.platform.themeHorizontalProgressBar(binding.progressBar);
804804
util.platform.colorViewBackground(getWindow().getDecorView());
805805
util.platform.colorViewBackground(binding.getRoot());
806-
util.platform.colorTextButtons(binding.btnShareButton);
806+
util.material.colorMaterialButtonPrimaryOutlined(binding.btnShareButton);
807807
}
808808

809809
@Override
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<!--
2+
~ Nextcloud Notes - Android Client
3+
~
4+
~ SPDX-FileCopyrightText: 2018-2025 Google LLC
5+
~ SPDX-License-Identifier: Apache-2.0
6+
-->
7+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
8+
android:width="24dp"
9+
android:height="24dp"
10+
android:autoMirrored="true"
11+
android:tint="?attr/colorControlNormal"
12+
android:viewportWidth="960"
13+
android:viewportHeight="960">
14+
<path
15+
android:fillColor="@android:color/white"
16+
android:pathData="M640,680L583,624L767,440L583,256L640,200L880,440L640,680ZM80,760L80,600Q80,517 138.5,458.5Q197,400 280,400L527,400L383,256L440,200L680,440L440,680L383,624L527,480L280,480Q230,480 195,515Q160,550 160,600L160,760L80,760Z" />
17+
</vector>

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,18 +93,18 @@
9393

9494
<com.google.android.material.button.MaterialButton
9595
android:id="@+id/btnShareButton"
96+
style="@style/Widget.Material3.Button.OutlinedButton"
9697
android:layout_width="match_parent"
9798
android:layout_height="wrap_content"
98-
style="@style/Widget.Material3.Button.TextButton"
99-
android:paddingStart="@dimen/spacer_3x"
100-
android:paddingEnd="@dimen/zero"
101-
android:text="@string/note_share_activity_share_note"
102-
android:textAlignment="textStart"
99+
android:layout_marginStart="@dimen/spacer_2x"
100+
android:layout_marginEnd="@dimen/spacer_2x"
101+
android:text="@string/note_share_activity_send_copy_to"
103102
android:textColor="@color/text_color"
104-
app:iconPadding="@dimen/share_button_padding"
105-
app:iconTint="@color/text_color"
106-
app:icon="@drawable/ic_share_white_24dp"
107-
app:iconGravity="start" />
103+
app:cornerRadius="@dimen/button_corner_radius"
104+
app:icon="@drawable/ic_forward"
105+
app:iconGravity="textStart"
106+
app:iconPadding="@dimen/spacer_1x"
107+
app:iconTint="@color/text_color" />
108108

109109
<LinearLayout
110110
android:id="@+id/shared_with_you_container"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<string name="note_share_activity_user_icon_content_description">note share user icon</string>
6666
<string name="note_share_activity_contact_icon_content_description">note share contact icon</string>
6767
<string name="note_share_activity_shared_with_you">Shared with you by %1$s</string>
68-
<string name="note_share_activity_share_note">Share note</string>
68+
<string name="note_share_activity_send_copy_to">Send copy to</string>
6969
<string name="note_share_activity_search_text">Name, Federated Cloud ID or email address…</string>
7070
<string name="note_share_activity_share_link">Share link</string>
7171
<string name="note_share_activity_resharing_not_allowed">Policy or permissions prevent resharing</string>

0 commit comments

Comments
 (0)