Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,11 @@ internal class LinkShareViewHolder(itemView: View) : RecyclerView.ViewHolder(ite

if (TextUtils.isEmpty(permissionName) || (isSecureFileDrop(publicShare) && encrypted)) {
binding.permissionName.visibility = View.GONE
return
} else {
binding.permissionName.visibility = View.VISIBLE
binding.permissionName.text = permissionName
}

binding.permissionName.text = permissionName
binding.permissionName.visibility = View.VISIBLE
viewThemeUtils?.androidx?.colorPrimaryTextViewElement(binding.permissionName)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
android:background="@drawable/round_bgnd"
android:contentDescription="@string/share"
android:id="@+id/copy_internal_link_icon"
android:layout_gravity="top"
android:layout_gravity="center"
android:layout_height="@dimen/share_icon_size"
android:layout_marginEnd="@dimen/standard_margin"
android:layout_marginStart="@dimen/standard_margin"
Expand Down
27 changes: 18 additions & 9 deletions app/src/main/res/layout/file_details_share_link_share_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,38 +63,47 @@

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/permission_name"
android:visibility="gone"
tools:visibility="visible"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:singleLine="true"
tools:text="@string/placeholder_view_only"
android:drawablePadding="@dimen/standard_quarter_margin"
app:drawableEndCompat="@drawable/ic_baseline_arrow_drop_down_24"
app:drawableTint="@color/primary"
app:drawableRightCompat="@drawable/ic_baseline_arrow_drop_down_24"
android:textColor="@color/primary"
android:textSize="@dimen/two_line_secondary_text_size" />
</LinearLayout>

<ImageView
<com.google.android.material.button.MaterialButton
android:id="@+id/copy_link"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?attr/materialIconButtonStyle"
android:layout_width="@dimen/minimum_size_for_touchable_area"
android:layout_height="@dimen/minimum_size_for_touchable_area"
android:layout_gravity="center_vertical"
android:contentDescription="@string/copy_link"
android:paddingStart="@dimen/standard_padding"
android:paddingTop="@dimen/standard_quarter_margin"
android:paddingEnd="@dimen/standard_padding"
android:paddingBottom="@dimen/standard_quarter_margin"
android:scaleType="fitCenter"
android:src="@drawable/ic_content_copy" />
app:iconTint="@color/text_color"
app:icon="@drawable/ic_content_copy"
app:iconGravity="textStart" />

<ImageView
<com.google.android.material.button.MaterialButton
android:id="@+id/overflow_menu"
android:layout_width="wrap_content"
android:layout_height="match_parent"
style="?attr/materialIconButtonStyle"
android:layout_gravity="center"
android:layout_width="@dimen/minimum_size_for_touchable_area"
android:layout_height="@dimen/minimum_size_for_touchable_area"
android:contentDescription="@string/overflow_menu"
android:paddingStart="@dimen/standard_padding"
android:paddingEnd="@dimen/standard_padding"
android:src="@drawable/ic_dots_vertical" />
app:icon="@drawable/ic_dots_vertical"
app:iconTint="@color/text_color"
app:iconGravity="textStart" />

</LinearLayout>
16 changes: 11 additions & 5 deletions app/src/main/res/layout/file_details_share_share_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,24 +51,30 @@

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/permission_name"
android:visibility="gone"
tools:visibility="visible"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:singleLine="true"
android:textColor="@color/primary"
android:textSize="@dimen/two_line_secondary_text_size"
android:drawablePadding="4dp"
app:drawableEndCompat="@drawable/ic_baseline_arrow_drop_down_24"
app:drawableRightCompat="@drawable/ic_baseline_arrow_drop_down_24"
app:drawableTint="@color/primary"
tools:text="@string/placeholder_view_only" />
</LinearLayout>

<ImageView
<com.google.android.material.button.MaterialButton
android:id="@+id/overflow_menu"
android:layout_width="wrap_content"
android:layout_height="match_parent"
style="?attr/materialIconButtonStyle"
android:layout_gravity="center"
android:layout_width="@dimen/minimum_size_for_touchable_area"
android:layout_height="@dimen/minimum_size_for_touchable_area"
android:contentDescription="@string/overflow_menu"
android:paddingStart="@dimen/standard_padding"
android:paddingEnd="@dimen/standard_padding"
android:src="@drawable/ic_dots_vertical" />
app:icon="@drawable/ic_dots_vertical"
app:iconTint="@color/text_color"
app:iconGravity="textStart" />
</LinearLayout>
Loading