PatchesAndForks/FossifyGalleryVisibilityPatch
1
0
Fork 0
forked from Mirrors/FossifyGallery
Code Pull requests Activity

renaming a photo_name view to medium_name, as it is used at videos too

Browse source
This commit is contained in:
tibbi 2018-11-18 21:29:03 +01:00
parent a7dd63ff96
commit a0518f19ae
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/MediaAdapter.kt
View file

@ -162,7 +162,7 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList<Thumbnai
super.onViewRecycled(holder) super.onViewRecycled(holder)
if (!activity.isDestroyed) { if (!activity.isDestroyed) {
val itemView = holder.itemView val itemView = holder.itemView
visibleItemPaths.remove(itemView.photo_name?.tag) visibleItemPaths.remove(itemView.medium_name?.tag)
val tmb = itemView.medium_thumbnail val tmb = itemView.medium_thumbnail
if (tmb != null) { if (tmb != null) {
Glide.with(activity).clear(tmb) Glide.with(activity).clear(tmb)
@ -452,9 +452,9 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList<Thumbnai
val isSelected = selectedKeys.contains(medium.path.hashCode()) val isSelected = selectedKeys.contains(medium.path.hashCode())
view.apply { view.apply {
play_outline.beVisibleIf(medium.isVideo()) play_outline.beVisibleIf(medium.isVideo())
photo_name.beVisibleIf(displayFilenames || isListViewType) medium_name.beVisibleIf(displayFilenames || isListViewType)
photo_name.text = medium.name medium_name.text = medium.name
photo_name.tag = medium.path medium_name.tag = medium.path
val showVideoDuration = medium.isVideo() && config.showThumbnailVideoDuration val showVideoDuration = medium.isVideo() && config.showThumbnailVideoDuration
if (showVideoDuration) { if (showVideoDuration) {
@ -486,7 +486,7 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList<Thumbnai
} }
if (isListViewType) { if (isListViewType) {
photo_name.setTextColor(textColor) medium_name.setTextColor(textColor)
play_outline.applyColorFilter(textColor) play_outline.applyColorFilter(textColor)
} }
} }

4
app/src/main/res/layout/photo_video_item_grid.xml
View file

@ -20,7 +20,7 @@
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignRight="@+id/photo_name" android:layout_alignRight="@+id/medium_name"
android:layout_margin="@dimen/small_margin" android:layout_margin="@dimen/small_margin"
android:background="@drawable/circle_background" android:background="@drawable/circle_background"
android:padding="@dimen/tiny_margin" android:padding="@dimen/tiny_margin"
@ -56,7 +56,7 @@
android:visibility="gone"/> android:visibility="gone"/>
<TextView <TextView
android:id="@+id/photo_name" android:id="@+id/medium_name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignLeft="@+id/medium_thumbnail" android:layout_alignLeft="@+id/medium_thumbnail"

2
app/src/main/res/layout/photo_video_item_list.xml
View file

@ -28,7 +28,7 @@
android:visibility="gone"/> android:visibility="gone"/>
<TextView <TextView
android:id="@+id/photo_name" android:id="@+id/medium_name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignBottom="@+id/medium_thumbnail" android:layout_alignBottom="@+id/medium_thumbnail"