Skip to content

Commit

Permalink
Merge branch 'master' into flexmark_update
Browse files Browse the repository at this point in the history
  • Loading branch information
gsantner authored Aug 18, 2024
2 parents 31ecf9f + 92b30e1 commit 95270d3
Showing 1 changed file with 5 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,11 @@ public void onBindViewHolder(@NonNull FilesystemViewerViewHolder holder, int pos
final boolean isFile = file.isFile();

holder.description.setText(!_dopt.descModtimeInsteadOfParent || holder.title.getText().toString().equals("..")
? descriptionFile.getAbsolutePath() : formatFileDescription(file, _prefApp.getString("pref_key__file_description_format", "")));
? descriptionFile.getAbsolutePath() : formatFileDescription(file, _prefApp.getString("pref_key__file_description_format", "")));
holder.description.setTextColor(ContextCompat.getColor(_context, _dopt.secondaryTextColor));
holder.image.setImageResource(isSelected ? _dopt.selectedItemImage : isFile ? _dopt.fileImage : _dopt.folderImage);
holder.image.setColorFilter(ContextCompat.getColor(_context,
isSelected ? _dopt.accentColor : isFile? _dopt.fileColor : _dopt.folderColor),
isSelected ? _dopt.accentColor : isFile ? _dopt.fileColor : _dopt.folderColor),
android.graphics.PorterDuff.Mode.SRC_ATOP);
if (!isSelected && isFavourite) {
holder.image.setColorFilter(0xFFE3B51B);
Expand Down Expand Up @@ -668,7 +668,7 @@ private void loadFolder(final File folder, final @Nullable File toShow) {
for (final File externalFileDir : ContextCompat.getExternalFilesDirs(_context, null)) {
for (final File file : newData) {
final String absPath = file.getAbsolutePath();
final String absExt = externalFileDir.getAbsolutePath() ;
final String absExt = externalFileDir.getAbsolutePath();
if (!canWrite(file) && !absPath.equals("/") && absExt.startsWith(absPath)) {
final int depth = GsTextUtils.countChars(absPath, '/')[0];
if (depth < 3) {
Expand Down Expand Up @@ -736,6 +736,8 @@ private void loadFolder(final File folder, final @Nullable File toShow) {
if (_currentFile != null) {
_recyclerView.post(() -> {
showAndFlash(_currentFile);
final int position = getFilePosition(_currentFile);
if (position >= 0) notifyItemChanged(position);
_currentFile = null;
});
}
Expand Down

0 comments on commit 95270d3

Please sign in to comment.