Skip to content

Commit a07567c

Browse files
alperozturk96alperozturk96
authored
Merge pull request nextcloud#16497 from nextcloud/backport/16418/stable-3.36
[stable-3.36] fix(share): icons
2 parents 1a4ad62 + ca57062 commit a07567c

4 files changed

Lines changed: 33 additions & 18 deletions

File tree

‎app/src/main/java/com/owncloud/android/ui/adapter/LinkShareViewHolder.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,11 @@ internal class LinkShareViewHolder(itemView: View) : RecyclerView.ViewHolder(ite
134134

135135
if (TextUtils.isEmpty(permissionName) || (isSecureFileDrop(publicShare) && encrypted)) {
136136
binding.permissionName.visibility = View.GONE
137-
return
137+
} else {
138+
binding.permissionName.visibility = View.VISIBLE
139+
binding.permissionName.text = permissionName
138140
}
139141

140-
binding.permissionName.text = permissionName
141-
binding.permissionName.visibility = View.VISIBLE
142142
viewThemeUtils?.androidx?.colorPrimaryTextViewElement(binding.permissionName)
143143
}
144144

‎app/src/main/res/layout/file_details_share_internal_share_link.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
android:background="@drawable/round_bgnd"
2323
android:contentDescription="@string/share"
2424
android:id="@+id/copy_internal_link_icon"
25-
android:layout_gravity="top"
25+
android:layout_gravity="center"
2626
android:layout_height="@dimen/share_icon_size"
2727
android:layout_marginEnd="@dimen/standard_margin"
2828
android:layout_marginStart="@dimen/standard_margin"

‎app/src/main/res/layout/file_details_share_link_share_item.xml‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,38 +63,47 @@
6363

6464
<androidx.appcompat.widget.AppCompatTextView
6565
android:id="@+id/permission_name"
66+
android:visibility="gone"
67+
tools:visibility="visible"
6668
android:layout_width="wrap_content"
6769
android:layout_height="wrap_content"
6870
android:gravity="center_vertical"
6971
android:singleLine="true"
7072
tools:text="@string/placeholder_view_only"
73+
android:drawablePadding="@dimen/standard_quarter_margin"
7174
app:drawableEndCompat="@drawable/ic_baseline_arrow_drop_down_24"
7275
app:drawableTint="@color/primary"
73-
app:drawableRightCompat="@drawable/ic_baseline_arrow_drop_down_24"
7476
android:textColor="@color/primary"
7577
android:textSize="@dimen/two_line_secondary_text_size" />
7678
</LinearLayout>
7779

78-
<ImageView
80+
<com.google.android.material.button.MaterialButton
7981
android:id="@+id/copy_link"
80-
android:layout_width="wrap_content"
81-
android:layout_height="wrap_content"
82+
style="?attr/materialIconButtonStyle"
83+
android:layout_width="@dimen/minimum_size_for_touchable_area"
84+
android:layout_height="@dimen/minimum_size_for_touchable_area"
8285
android:layout_gravity="center_vertical"
8386
android:contentDescription="@string/copy_link"
8487
android:paddingStart="@dimen/standard_padding"
8588
android:paddingTop="@dimen/standard_quarter_margin"
8689
android:paddingEnd="@dimen/standard_padding"
8790
android:paddingBottom="@dimen/standard_quarter_margin"
8891
android:scaleType="fitCenter"
89-
android:src="@drawable/ic_content_copy" />
92+
app:iconTint="@color/secondary_text_color"
93+
app:icon="@drawable/ic_content_copy"
94+
app:iconGravity="textStart" />
9095

91-
<ImageView
96+
<com.google.android.material.button.MaterialButton
9297
android:id="@+id/overflow_menu"
93-
android:layout_width="wrap_content"
94-
android:layout_height="match_parent"
98+
style="?attr/materialIconButtonStyle"
99+
android:layout_gravity="center"
100+
android:layout_width="@dimen/minimum_size_for_touchable_area"
101+
android:layout_height="@dimen/minimum_size_for_touchable_area"
95102
android:contentDescription="@string/overflow_menu"
96103
android:paddingStart="@dimen/standard_padding"
97104
android:paddingEnd="@dimen/standard_padding"
98-
android:src="@drawable/ic_dots_vertical" />
105+
app:icon="@drawable/ic_dots_vertical"
106+
app:iconTint="@color/secondary_text_color"
107+
app:iconGravity="textStart" />
99108

100109
</LinearLayout>

‎app/src/main/res/layout/file_details_share_share_item.xml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,24 +51,30 @@
5151

5252
<androidx.appcompat.widget.AppCompatTextView
5353
android:id="@+id/permission_name"
54+
android:visibility="gone"
55+
tools:visibility="visible"
5456
android:layout_width="wrap_content"
5557
android:layout_height="wrap_content"
5658
android:gravity="center_vertical"
5759
android:singleLine="true"
5860
android:textColor="@color/primary"
5961
android:textSize="@dimen/two_line_secondary_text_size"
62+
android:drawablePadding="4dp"
6063
app:drawableEndCompat="@drawable/ic_baseline_arrow_drop_down_24"
61-
app:drawableRightCompat="@drawable/ic_baseline_arrow_drop_down_24"
6264
app:drawableTint="@color/primary"
6365
tools:text="@string/placeholder_view_only" />
6466
</LinearLayout>
6567

66-
<ImageView
68+
<com.google.android.material.button.MaterialButton
6769
android:id="@+id/overflow_menu"
68-
android:layout_width="wrap_content"
69-
android:layout_height="match_parent"
70+
style="?attr/materialIconButtonStyle"
71+
android:layout_gravity="center"
72+
android:layout_width="@dimen/minimum_size_for_touchable_area"
73+
android:layout_height="@dimen/minimum_size_for_touchable_area"
7074
android:contentDescription="@string/overflow_menu"
7175
android:paddingStart="@dimen/standard_padding"
7276
android:paddingEnd="@dimen/standard_padding"
73-
android:src="@drawable/ic_dots_vertical" />
77+
app:icon="@drawable/ic_dots_vertical"
78+
app:iconTint="@color/secondary_text_color"
79+
app:iconGravity="textStart" />
7480
</LinearLayout>

0 commit comments

Comments
 (0)