Skip to content

Commit 609d9b4

Browse files
alperozturk96alperozturk96
committed
fix list
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
1 parent f61a14d commit 609d9b4

6 files changed

Lines changed: 46 additions & 43 deletions

File tree

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@
77
*/
88
package com.owncloud.android.ui.adapter
99

10+
import android.view.View
1011
import android.widget.TextView
1112

1213
internal interface ListGridItemViewHolder : ListViewHolder {
1314
val fileName: TextView
1415
val extension: TextView?
16+
val bidiFilename: TextView
17+
val bidiFilenameContainer: View
1518
}

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

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -545,21 +545,18 @@ private void updateLivePhotoIndicators(ListViewHolder holder, OCFile file) {
545545
private void setFilenameAndExtension(ListGridItemViewHolder holder, OCFile file) {
546546
final String filename = mStorageManager.getFilenameConsideringOfflineOperation(file);
547547
final var pair = FileStorageUtils.getFilenameAndExtension(filename, file.isFolder(), isRTL);
548-
final boolean isFolder = file.isFolder();
549548

550549
if (holder instanceof OCFileListGridItemViewHolder gridItemViewHolder) {
551550
handleGridMode(filename, gridItemViewHolder, pair, file);
552-
} else if (holder instanceof OCFileListItemViewHolder itemViewHolder) {
553-
handleListMode(itemViewHolder, filename, pair);
554551
} else {
555-
handleRecommendedMode(holder, pair, isFolder);
552+
handleListMode(holder, filename, pair);
556553
}
557554
}
558555

559556
private void handleGridMode(String filename, OCFileListGridItemViewHolder holder, Pair<String, String> filenamePair, OCFile file) {
560557
boolean containsBidiControlCharacters = FileStorageUtils.containsBidiControlCharacters(filename);
561558
ViewExtensionsKt.setVisibleIf(holder.getFileName(),!containsBidiControlCharacters);
562-
ViewExtensionsKt.setVisibleIf(holder.getBinding().bidiFilenameContainer, containsBidiControlCharacters);
559+
ViewExtensionsKt.setVisibleIf(holder.getBidiFilenameContainer(), containsBidiControlCharacters);
563560
final var extension = holder.getExtension();
564561

565562
if (containsBidiControlCharacters) {
@@ -577,35 +574,21 @@ private void handleGridMode(String filename, OCFileListGridItemViewHolder holder
577574
}
578575
}
579576

580-
private void handleListMode(OCFileListItemViewHolder holder,
577+
private void handleListMode(ListGridItemViewHolder holder,
581578
String filename,
582579
Pair<String, String> filenamePair) {
583580
final boolean containsBidiControlCharacters = FileStorageUtils.containsBidiControlCharacters(filename);
584581
ViewExtensionsKt.setVisibleIf(holder.getFileName(), !containsBidiControlCharacters);
585582
ViewExtensionsKt.setVisibleIf(holder.getBidiFilenameContainer(), containsBidiControlCharacters);
586583

587-
if (containsBidiControlCharacters) {
588-
holder.getBidiFilename().setText(filenamePair.getFirst());
589-
holder.getExtension().setText(filenamePair.getSecond());
590-
} else {
584+
if (!containsBidiControlCharacters) {
591585
holder.getFileName().setText(filename);
592-
}
593-
}
594-
595-
private void handleRecommendedMode(ListGridItemViewHolder holder,
596-
Pair<String, String> filenamePair,
597-
boolean isFolder) {
598-
holder.getFileName().setText(filenamePair.getFirst());
599-
600-
final var extension = holder.getExtension();
601-
if (extension == null) {
602586
return;
603587
}
604588

605-
if (isFolder) {
606-
extension.setVisibility(View.GONE);
607-
} else {
608-
extension.setVisibility(View.VISIBLE);
589+
holder.getBidiFilename().setText(filenamePair.getFirst());
590+
final var extension = holder.getExtension();
591+
if (extension != null) {
609592
extension.setText(filenamePair.getSecond());
610593
}
611594
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ class OCFileListGridItemViewHolder(var binding: GridItemBinding) :
2222
binding.root
2323
),
2424
ListGridItemViewHolder {
25-
val bidiFilename: TextView
25+
override val bidiFilename: TextView
2626
get() = binding.bidiFilename
27+
override val bidiFilenameContainer: View
28+
get() = binding.bidiFilenameContainer
2729
override val fileName: TextView
2830
get() = binding.Filename
2931
override val extension: TextView?

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ class OCFileListItemViewHolder(private var binding: ListItemBinding) :
4747
get() = binding.Filename
4848
override val extension: TextView
4949
get() = binding.extension
50-
val bidiFilename: TextView
50+
override val bidiFilename: TextView
5151
get() = binding.bidiFilename
52-
val bidiFilenameContainer: LinearLayout
52+
override val bidiFilenameContainer: View
5353
get() = binding.bidiFilenameContainer
5454
override val thumbnail: ImageView
5555
get() = binding.thumbnailLayout.thumbnail

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ class OCFileListRecommendedItemViewHolder(private val binding: RecommendedFileIt
2424
val reason: TextView get() = binding.reason
2525
override val fileName: TextView get() = binding.filename
2626
override val extension: TextView? get() = binding.extension
27+
override val bidiFilename: TextView get() = binding.bidiFilename
28+
override val bidiFilenameContainer: View get() = binding.bidiFilenameContainer
2729
override val thumbnail: ImageView get() = binding.thumbnail
2830
override val shimmerThumbnail: LoaderImageView get() = binding.thumbnailShimmer
2931
override val favorite: ImageView get() = binding.favoriteAction

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

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -140,53 +140,67 @@
140140

141141
<LinearLayout
142142
android:id="@+id/filename_and_reason_layout"
143-
android:layout_width="wrap_content"
143+
android:layout_width="0dp"
144144
android:layout_height="wrap_content"
145145
android:gravity="center"
146-
app:layout_constraintEnd_toEndOf="parent"
146+
app:layout_constraintEnd_toStartOf="@+id/more"
147147
app:layout_constraintBottom_toBottomOf="parent"
148148
app:layout_constraintStart_toStartOf="parent"
149149
app:layout_constraintTop_toBottomOf="@+id/thumbnail"
150150
android:orientation="vertical">
151151

152+
<TextView
153+
android:id="@+id/filename"
154+
android:layout_width="match_parent"
155+
android:layout_height="wrap_content"
156+
android:layout_marginVertical="@dimen/standard_quarter_margin"
157+
android:ellipsize="middle"
158+
android:gravity="center"
159+
android:textColor="@color/text_color"
160+
android:singleLine="true"
161+
android:textSize="@dimen/grid_item_text_size"
162+
tools:text="@string/placeholder_filename" />
163+
152164
<LinearLayout
153-
android:layout_width="wrap_content"
165+
android:id="@+id/bidi_filename_container"
166+
android:layout_width="match_parent"
154167
android:gravity="center"
155168
android:layout_height="wrap_content"
156169
android:layout_marginVertical="@dimen/standard_quarter_margin"
157-
android:orientation="horizontal">
170+
android:orientation="horizontal"
171+
android:visibility="gone"
172+
tools:visibility="visible">
158173

159174
<TextView
160-
android:id="@+id/filename"
175+
android:id="@+id/bidi_filename"
161176
android:layout_width="wrap_content"
162-
android:layout_height="match_parent"
177+
android:layout_height="wrap_content"
163178
android:maxWidth="@dimen/grid_container_default_max_file_name"
164-
android:layout_gravity="center"
165179
android:ellipsize="end"
166180
android:gravity="center"
167181
android:textColor="@color/text_color"
168182
android:singleLine="true"
169-
android:text="@string/placeholder_filename"
170-
android:textSize="@dimen/grid_item_text_size" />
183+
android:textSize="@dimen/grid_item_text_size"
184+
tools:text="@string/placeholder_filename" />
171185

172186
<TextView
173187
android:id="@+id/extension"
174188
android:layout_width="wrap_content"
175-
android:layout_height="match_parent"
189+
android:layout_height="wrap_content"
176190
android:ellipsize="start"
177191
android:gravity="center"
178192
android:textColor="@color/text_color"
179193
android:maxLines="1"
180-
android:text="@string/placeholder_extension"
181-
android:textSize="@dimen/grid_item_text_size" />
194+
android:textSize="@dimen/grid_item_text_size"
195+
tools:text="@string/placeholder_extension" />
182196

183197
</LinearLayout>
184198

185199
<TextView
186200
android:id="@+id/reason"
187-
android:layout_width="wrap_content"
188-
android:layout_height="match_parent"
189-
android:layout_gravity="center"
201+
android:layout_width="match_parent"
202+
android:layout_height="wrap_content"
203+
android:ellipsize="end"
190204
android:gravity="center"
191205
android:singleLine="true"
192206
android:textColor="@color/secondary_text_color"
@@ -201,7 +215,6 @@
201215
android:layout_height="@dimen/grid_bottom_view_height"
202216
android:layout_marginHorizontal="@dimen/standard_half_margin"
203217
android:contentDescription="@string/overflow_menu"
204-
app:layout_constraintStart_toEndOf="@+id/filename_and_reason_layout"
205218
app:layout_constraintBottom_toBottomOf="parent"
206219
app:layout_constraintTop_toBottomOf="@+id/thumbnail"
207220
app:layout_constraintEnd_toEndOf="parent"

0 commit comments

Comments
 (0)