-
Notifications
You must be signed in to change notification settings - Fork 471
Expand file tree
/
Copy path0001-Added-support-for-image-thumbnails-basic-version.patch
More file actions
172 lines (161 loc) · 6.87 KB
/
0001-Added-support-for-image-thumbnails-basic-version.patch
File metadata and controls
172 lines (161 loc) · 6.87 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
From 419ea7856e2ade808006ec29cb97278d397461a7 Mon Sep 17 00:00:00 2001
From: Gregor Santner <gsantner@mailbox.org>
Date: Wed, 8 Jan 2020 19:51:46 +0100
Subject: [PATCH] Added support for image thumbnails (basic version)
Optimized imports
Moved ImageLoaderTask and changed FsViewerAdapter
---
.../opoc/ui/FilesystemViewerAdapter.java | 29 ++++++-
.../gsantner/opoc/util/ImageLoaderTask.java | 79 +++++++++++++++++++
2 files changed, 104 insertions(+), 4 deletions(-)
create mode 100644 app/src/main/java/net/gsantner/opoc/util/ImageLoaderTask.java
diff --git a/app/src/main/java/net/gsantner/opoc/ui/FilesystemViewerAdapter.java b/app/src/main/java/net/gsantner/opoc/ui/FilesystemViewerAdapter.java
index 4dc5b5fd..6e8dd27e 100644
--- a/app/src/main/java/net/gsantner/opoc/ui/FilesystemViewerAdapter.java
+++ b/app/src/main/java/net/gsantner/opoc/ui/FilesystemViewerAdapter.java
@@ -11,6 +11,7 @@
package net.gsantner.opoc.ui;
import android.content.Context;
+import android.graphics.Bitmap;
import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.NonNull;
@@ -31,6 +32,7 @@ import android.widget.TextView;
import android.widget.Toast;
import net.gsantner.markor.R;
+import net.gsantner.opoc.util.ImageLoaderTask;
import java.io.File;
import java.io.FilenameFilter;
@@ -47,7 +49,7 @@ import butterknife.BindView;
import butterknife.ButterKnife;
@SuppressWarnings({"WeakerAccess", "unused"})
-public class FilesystemViewerAdapter extends RecyclerView.Adapter<FilesystemViewerAdapter.ilesystemViewerViewHolder> implements Filterable, View.OnClickListener, View.OnLongClickListener, Comparator<File>, FilenameFilter {
+public class FilesystemViewerAdapter extends RecyclerView.Adapter<FilesystemViewerAdapter.ilesystemViewerViewHolder> implements Filterable, View.OnClickListener, View.OnLongClickListener, Comparator<File>, FilenameFilter, ImageLoaderTask.OnImageLoadedListener<FilesystemViewerAdapter.ilesystemViewerViewHolder> {
//########################
//## Static
//########################
@@ -143,12 +145,23 @@ public class FilesystemViewerAdapter extends RecyclerView.Adapter<FilesystemView
holder.description.setTextColor(ContextCompat.getColor(_context, _dopt.secondaryTextColor));
holder.image.setImageResource(file.isDirectory() ? _dopt.folderImage : _dopt.fileImage);
+
+ final boolean isImage = ((filename.toLowerCase().endsWith(".jpg")) || (filename.toLowerCase().endsWith(".png")));
+
+ if (isImage) {
+ ImageLoaderTask<ilesystemViewerViewHolder> taskLoadImage = new ImageLoaderTask<>(this, _context, true, holder);
+ taskLoadImage.execute(file);
+ }
+
if (_currentSelection.contains(file)) {
holder.image.setImageResource(_dopt.selectedItemImage);
}
- holder.image.setColorFilter(ContextCompat.getColor(_context,
- _currentSelection.contains(file) ? _dopt.accentColor : _dopt.secondaryTextColor),
- android.graphics.PorterDuff.Mode.SRC_ATOP);
+
+ if (!isImage) {
+ holder.image.setColorFilter(ContextCompat.getColor(_context,
+ _currentSelection.contains(file) ? _dopt.accentColor : _dopt.secondaryTextColor),
+ android.graphics.PorterDuff.Mode.SRC_ATOP);
+ }
if (_dopt.itemSidePadding > 0) {
int dp = (int) (_dopt.itemSidePadding * _context.getResources().getDisplayMetrics().density);
@@ -239,6 +252,14 @@ public class FilesystemViewerAdapter extends RecyclerView.Adapter<FilesystemView
);
}
+ @Override
+ public void onImageLoaded(Bitmap bitmap, ilesystemViewerViewHolder holder) {
+ try {
+ holder.image.setImageBitmap(bitmap);
+ } catch(Exception ignored) {
+ }
+ }
+
public class TagContainer {
public final File file;
public final int position;
diff --git a/app/src/main/java/net/gsantner/opoc/util/ImageLoaderTask.java b/app/src/main/java/net/gsantner/opoc/util/ImageLoaderTask.java
new file mode 100644
index 00000000..4007595c
--- /dev/null
+++ b/app/src/main/java/net/gsantner/opoc/util/ImageLoaderTask.java
@@ -0,0 +1,79 @@
+/*#######################################################
+ *
* Maintained 2017-2025 by Gregor Santner <gsantner AT mailbox DOT org>
+ *
+ * License of this file: Apache 2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * https://github.com/gsantner/opoc/#licensing
+ *
+#########################################################*/
+package net.gsantner.opoc.util;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.os.AsyncTask;
+import android.support.v4.content.ContextCompat;
+
+import net.gsantner.markor.R;
+import net.gsantner.markor.util.AppSettings;
+import net.gsantner.markor.util.ContextUtils;
+
+import java.io.File;
+
+
+public class ImageLoaderTask<T> extends AsyncTask<File, Void, Bitmap> {
+ private final static int MAX_DIMENSION = 5000;
+ private final static int MAX_SIZE = 64;
+
+ public interface OnImageLoadedListener<T> {
+ void onImageLoaded(Bitmap bitmap, T callbackParam);
+ }
+
+ private final Context _context;
+ private final OnImageLoadedListener _listener;
+ private final T _callbackParam;
+ private final boolean _loadThumbnail;
+
+ public ImageLoaderTask(OnImageLoadedListener listener, Context context, boolean loadThumbnail, T callbackParam) {
+ _listener = listener;
+ _context = context;
+ _callbackParam = callbackParam;
+ _loadThumbnail = loadThumbnail;
+ }
+
+ private Bitmap loadStorageImage(File pathToImage) {
+ File cacheFile = new File(_context.getCacheDir(), pathToImage.getAbsolutePath().substring(1));
+ ContextUtils cu = ContextUtils.get();
+ Bitmap bitmap;
+ try {
+ if (_loadThumbnail) {
+ if (cacheFile.exists()) {
+ bitmap = cu.loadImageFromFilesystem(cacheFile, MAX_SIZE);
+ } else {
+ bitmap = cu.loadImageFromFilesystem(pathToImage, MAX_SIZE);
+ cu.writeImageToFile(cacheFile, bitmap, Bitmap.CompressFormat.JPEG, 65);
+ }
+ } else {
+ bitmap = cu.loadImageFromFilesystem(pathToImage, MAX_SIZE);
+ }
+ } catch (NullPointerException nul) {
+ int expImage = AppSettings.get().isDarkThemeEnabled() ? R.drawable.ic_file_white_24dp : R.drawable.ic_file_gray_24dp;
+ bitmap = cu.drawableToBitmap(ContextCompat.getDrawable(_context, expImage));
+ }
+
+ return bitmap;
+ }
+
+ @Override
+ protected Bitmap doInBackground(File... params) {
+ return loadStorageImage(params[0]);
+ }
+
+ @Override
+ protected void onPostExecute(Bitmap bitmap) {
+ super.onPostExecute(bitmap);
+ if (_listener != null)
+ _listener.onImageLoaded(bitmap, _callbackParam);
+ }
+}
--
2.17.1