diff --git a/ToDo.txt b/ToDo.txt index 2efc490c..6ef98015 100644 --- a/ToDo.txt +++ b/ToDo.txt @@ -1,5 +1,8 @@ TODO +#10 Fast swiping through images does not work + load preview images.on zoom start load original image + #6 geo-picker extera_stream-uri(s) => blue: selected items via geo:, content: or file: diff --git a/app/src/main/java/de/k3b/android/androFotoFinder/directory/DirectoryListAdapter.java b/app/src/main/java/de/k3b/android/androFotoFinder/directory/DirectoryListAdapter.java index 8b640434..632f4f10 100644 --- a/app/src/main/java/de/k3b/android/androFotoFinder/directory/DirectoryListAdapter.java +++ b/app/src/main/java/de/k3b/android/androFotoFinder/directory/DirectoryListAdapter.java @@ -20,6 +20,8 @@ package de.k3b.android.androFotoFinder.directory; import android.content.Context; +import android.text.Html; +import android.text.Spanned; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -125,12 +127,15 @@ public View getGroupView(int groupIndex, boolean b, View view, ViewGroup viewGro } /** getFrom tree display text */ - static String getDirectoryDisplayText(String prefix, IDirectory directory, int options) { + static Spanned getDirectoryDisplayText(String prefix, IDirectory directory, int options) { StringBuilder result = new StringBuilder(); + boolean asHtml = (options & Directory.OPT_AS_HTML) != 0; + if (asHtml) result.append(""); if (prefix != null) result.append(prefix); result.append(directory.getRelPath()).append(" "); + if (asHtml) result.append(""); Directory.appendCount(result, directory, options); - return result.toString(); + return Html.fromHtml(result.toString()); } @Override diff --git a/fotolib2/src/main/java/de/k3b/io/Directory.java b/fotolib2/src/main/java/de/k3b/io/Directory.java index f2d2d981..3a1e5c8c 100644 --- a/fotolib2/src/main/java/de/k3b/io/Directory.java +++ b/fotolib2/src/main/java/de/k3b/io/Directory.java @@ -35,6 +35,7 @@ public class Directory implements IDirectory { public static final int OPT_SUB_DIR = 2; public static final int OPT_ITEM = 4; public static final int OPT_SUB_ITEM = 8; + public static final int OPT_AS_HTML = 0x100; public static final int OPT_ALL = 0xffff; public static final int OPT_NONE = 0; @@ -147,17 +148,20 @@ public static void appendCount(StringBuilder result, IDirectory _item, int optio int nonDirItemCount = ((options & OPT_ITEM) == 0) ? 0 : item.getNonDirItemCount(); int nonDirSubItemCount = ((options & OPT_SUB_ITEM) == 0) ? 0 : item.getNonDirSubItemCount(); - appendCount(result, "(", dirCount, subDirCount, ")"); - appendCount(result, ":(", nonDirItemCount, nonDirSubItemCount, ")"); + boolean asHtml = (options & OPT_AS_HTML) != 0; + appendCount(result, "(", dirCount, subDirCount, ")", asHtml); + appendCount(result, ":(", nonDirItemCount, nonDirSubItemCount, ")", asHtml); } } - private static void appendCount(StringBuilder result, String prefix, int count, int subCount, String suffix) { + private static void appendCount(StringBuilder result, String prefix, int count, int subCount, String suffix, boolean asHtml) { if ((count > 0) || (subCount > count)) { + if (asHtml) result.append(""); result.append(prefix); if (count > 0) result.append(count); if (subCount > count) result.append("+").append(subCount - count); result.append(suffix); + if (asHtml) result.append(""); } } diff --git a/statistics.txt b/statistics.txt index bbb152bb..31614d72 100644 --- a/statistics.txt +++ b/statistics.txt @@ -41,9 +41,9 @@ Unique visitors https://github.com/k3b/AndroFotoFinder/graphs/traffic 0906 5 0907 5 0908 4 -0909 v0.4.1.150909 in github -0910 -0911 +0909 3 v0.4.1.150909 in github +0910 5 v0.4.1.150910 in github +0911 12 v0.4.1.150911 in github 0912 0913 0914 diff --git a/wiki/History.md b/wiki/History.md index 319deefb..6b98396c 100644 --- a/wiki/History.md +++ b/wiki/History.md @@ -1,6 +1,6 @@ ## next version not released yet -## v0.4.2.* (not released yet) +## [v0.4.2.*](https://github.com/k3b/AndroFotoFinder/issues?q=milestone%3Av0.4.2) (not released yet) * [Geografic-Map](https://github.com/k3b/AndroFotoFinder/wiki/geographic-map) : * menu to open [Filter-View](https://github.com/k3b/AndroFotoFinder/wiki/Filter-View) @@ -8,13 +8,14 @@ * if [Geografic-Map](geographic-map) is opened without [intent-extra-de.k3b.extra.FILTER parameter](intentapi#filter) the map is opend with the last used filter. * improved menu "zoom to fit" * [Intent API](https://github.com/k3b/AndroFotoFinder/wiki/intentapi): support for [de.k3b.extra.FILTER string](intentapi#filter) -* [Folder- or Date-Picker](https://github.com/k3b/AndroFotoFinder/wiki/Folder-Picker)'s long-tapping-folder-contextmenu: - * menu "Show in new Gallery" opens a new prefiltered [Gallery-View](https://github.com/k3b/AndroFotoFinder/wiki/Gallery-View) +* [Folder- or Date-Picker](https://github.com/k3b/AndroFotoFinder/wiki/Folder-Picker): + * long-tapping-folder-contextmenu "Show in new Gallery" opens a new prefiltered [Gallery-View](https://github.com/k3b/AndroFotoFinder/wiki/Gallery-View) + * [#11](https://github.com/k3b/AndroFotoFinder/issues/11) Folder name in bold and counts in non-bold. * [Intent API](https://github.com/k3b/AndroFotoFinder/wiki/intentapi): intent VIEW mime="image/*" + data=file:xxx or android.intent.extra.STREAM=file:xxx * [Image-View](https://github.com/k3b/AndroFotoFinder/wiki/Image-View) if xxx is an existing image file. * else [Gallery-View](https://github.com/k3b/AndroFotoFinder/wiki/Gallery-View) where xxx is used as a path filter -## [v0.4.1.150911](https://github.com/k3b/AndroFotoFinder/releases/tag/v0.4.1.150911) +## [v0.4.1.150911](https://github.com/k3b/AndroFotoFinder/issues?q=milestone%3Av0.4.1) * [Gallery-View](https://github.com/k3b/AndroFotoFinder/wiki/Gallery-View) : * [Selection](Gallery-View#Multiselection): add/remove [all visible](Gallery-View#CurrentSet)