Skip to content
Merged
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 @@ -10,6 +10,7 @@ package com.owncloud.android.ui.adapter
import android.content.Context
import android.view.View
import com.afollestad.sectionedrecyclerview.SectionedViewHolder
import com.nextcloud.utils.extensions.setVisibleIf
import com.nextcloud.utils.thumbnail.ThumbnailArguments
import com.nextcloud.utils.thumbnail.ThumbnailGenerator
import com.owncloud.android.databinding.UnifiedSearchCurrentDirectoryItemBinding
Expand Down Expand Up @@ -42,6 +43,8 @@ class UnifiedSearchCurrentDirItemViewHolder(
binding.filename.text = filename
}

binding.favoriteAction.setVisibleIf(file.isFavorite)

thumbnailGenerator.setThumbnail(
file,
binding.thumbnail,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ class UnifiedSearchItemViewHolder(
val entryType = entry.getType()
bindThumbnail(entry, file, entryType)
bindMoreButton(entry, file)
binding.favoriteAction.setVisibleIf(file?.isFavorite == true)
binding.unifiedSearchItemLayout.setOnClickListener {
searchEntryOnClick(entry, entryType)
}
Expand Down
54 changes: 38 additions & 16 deletions app/src/main/res/layout/unified_search_current_directory_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,50 @@
android:gravity="center_vertical"
android:orientation="horizontal">

<FrameLayout
android:id="@+id/thumbnail_layout"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="@dimen/standard_list_item_size"
android:layout_height="@dimen/standard_list_item_size">

<ImageView
android:id="@+id/thumbnail"
android:layout_width="@dimen/file_icon_size"
android:layout_height="@dimen/file_icon_size"
android:layout_gravity="center"
android:contentDescription="@null"
android:src="@drawable/folder" />
<FrameLayout
android:id="@+id/thumbnail_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

<ImageView
android:id="@+id/thumbnail"
android:layout_width="@dimen/file_icon_size"
android:layout_height="@dimen/file_icon_size"
android:contentDescription="@null"
android:src="@drawable/folder" />

<com.elyeproj.loaderviewlibrary.LoaderImageView
android:id="@+id/thumbnail_shimmer"
android:layout_width="@dimen/file_icon_size"
android:layout_height="@dimen/file_icon_size"
android:layout_gravity="center"
<com.elyeproj.loaderviewlibrary.LoaderImageView
android:id="@+id/thumbnail_shimmer"
android:layout_width="@dimen/file_icon_size"
android:layout_height="@dimen/file_icon_size"
android:visibility="gone"
app:corners="8" />

</FrameLayout>

<ImageView
android:id="@+id/favorite_action"
android:layout_width="@dimen/list_item_favorite_action_layout_width"
android:layout_height="@dimen/list_item_favorite_action_layout_height"
android:contentDescription="@string/favorite"
android:scaleType="fitCenter"
android:src="@drawable/favorite"
android:visibility="gone"
app:corners="8" />
app:layout_constraintBottom_toTopOf="@+id/thumbnail_layout"
app:layout_constraintEnd_toEndOf="@+id/thumbnail_layout"
app:layout_constraintStart_toEndOf="@+id/thumbnail_layout"
app:layout_constraintTop_toTopOf="@+id/thumbnail_layout"
tools:visibility="visible" />

</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

<LinearLayout
android:id="@+id/titleContainer"
Expand Down
85 changes: 55 additions & 30 deletions app/src/main/res/layout/unified_search_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,50 +15,75 @@
android:gravity="center_vertical"
android:orientation="horizontal">

<FrameLayout
android:id="@+id/thumbnail_layout"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="@dimen/standard_list_item_size"
android:layout_height="@dimen/standard_list_item_size">

<ImageView
android:id="@+id/thumbnail"
android:layout_width="@dimen/file_icon_size"
android:layout_height="@dimen/file_icon_size"
android:layout_gravity="center"
android:contentDescription="@null"
android:src="@drawable/ic_find_in_page" />
<FrameLayout
android:id="@+id/thumbnail_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

<ImageView
android:id="@+id/thumbnail_overlay_icon"
android:layout_width="@dimen/iconized_single_line_item_icon_size"
android:layout_height="@dimen/iconized_single_line_item_icon_size"
android:layout_gravity="center"
android:contentDescription="@null"
android:padding="@dimen/standard_quarter_padding"
android:src="@drawable/ic_lock"
android:visibility="gone"
app:tint="@color/text_color_inverse"
tools:visibility="visible" />
<ImageView
android:id="@+id/thumbnail"
android:layout_width="@dimen/file_icon_size"
android:layout_height="@dimen/file_icon_size"
android:contentDescription="@null"
android:src="@drawable/ic_find_in_page" />

<com.elyeproj.loaderviewlibrary.LoaderImageView
android:id="@+id/thumbnail_shimmer"
android:layout_width="@dimen/file_icon_size"
android:layout_height="@dimen/file_icon_size"
android:layout_gravity="center"
android:visibility="gone"
app:corners="8" />
<ImageView
android:id="@+id/thumbnail_overlay_icon"
android:layout_width="@dimen/iconized_single_line_item_icon_size"
android:layout_height="@dimen/iconized_single_line_item_icon_size"
android:layout_gravity="center"
android:contentDescription="@null"
android:padding="@dimen/standard_quarter_padding"
android:src="@drawable/ic_lock"
android:visibility="gone"
app:tint="@color/text_color_inverse"
tools:visibility="visible" />

<com.elyeproj.loaderviewlibrary.LoaderImageView
android:id="@+id/thumbnail_shimmer"
android:layout_width="@dimen/file_icon_size"
android:layout_height="@dimen/file_icon_size"
android:visibility="gone"
app:corners="8" />

</FrameLayout>

<ImageView
android:id="@+id/localFileIndicator"
android:layout_width="@dimen/list_item_local_file_indicator_layout_width"
android:layout_height="@dimen/list_item_local_file_indicator_layout_height"
android:layout_gravity="bottom|end"
android:contentDescription="@string/downloader_download_succeeded_ticker"
android:scaleType="fitCenter"
android:src="@drawable/ic_synced"
android:visibility="gone" />
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/thumbnail_layout"
app:layout_constraintEnd_toEndOf="@+id/thumbnail_layout"
app:layout_constraintStart_toEndOf="@+id/thumbnail_layout"
app:layout_constraintTop_toBottomOf="@+id/thumbnail_layout" />

<ImageView
android:id="@+id/favorite_action"
android:layout_width="@dimen/list_item_favorite_action_layout_width"
android:layout_height="@dimen/list_item_favorite_action_layout_height"
android:contentDescription="@string/favorite"
android:scaleType="fitCenter"
android:src="@drawable/favorite"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/thumbnail_layout"
app:layout_constraintEnd_toEndOf="@+id/thumbnail_layout"
app:layout_constraintStart_toEndOf="@+id/thumbnail_layout"
app:layout_constraintTop_toTopOf="@+id/thumbnail_layout"
tools:visibility="visible" />

</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

<LinearLayout
android:id="@+id/titleContainer"
Expand Down
Loading