Commit graph

2088 commits

Author SHA1 Message Date
tibbi
af84b8e9e3 allow changing the volume by finger dragging on the right side of the video 2017-08-06 18:35:28 +02:00
tibbi
dc42dd566f show hidden items in viewpager only if the selected item is hidden 2017-08-06 16:54:58 +02:00
tibbi
15c20ab758 add a volume slider at the video fragments right side 2017-08-06 16:44:00 +02:00
tibbi
1074043c93 update commons to 2.25.1 for proper alphanumeric sorting 2017-08-06 14:08:17 +02:00
tibbi
a493595207 compare directory paths incasesensitively on the first screen 2017-08-06 13:38:54 +02:00
tibbi
7fa71c5302 add null checks at toggleItemSelection of adapters 2017-08-06 12:21:31 +02:00
tibbi
178c92c993 move the thumbnail video icon to the top left corner 2017-08-06 12:20:12 +02:00
tibbi
f2a25d5fa3 update version to 2.12.6 (122) 2017-08-05 18:22:23 +02:00
tibbi
6ed4c15f9e added slideshow to release notes 2017-08-05 18:22:15 +02:00
tibbi
b98ac025db update commons to 2.25.0 2017-08-05 18:19:43 +02:00
tibbi
9ee1273995 fix #171, change multiselector to use colored circle Check icons 2017-08-05 17:02:18 +02:00
tibbi
15159de4e9 add colored background to the currently selected directory thumbnail 2017-08-05 16:55:12 +02:00
tibbi
fa775e35e3 replace the selected directory foreground marker with a temporary check icon 2017-08-05 16:34:49 +02:00
tibbi
5c448081f0 hide the Use fade animations slideshow toggle for now 2017-08-05 16:23:52 +02:00
tibbi
5b3fa44432 add a new slideshow setup toggle for including photos 2017-08-05 16:12:19 +02:00
tibbi
3f1cfab633 properly handle launching videos in slideshows 2017-08-05 15:53:02 +02:00
tibbi
74e6c69473 filter out videos, or shuffle the media at slideshow when appropriate 2017-08-05 14:52:42 +02:00
tibbi
3757616a47 hide the keyboard at togglig a slideshow setup checkbox 2017-08-05 14:05:51 +02:00
tibbi
c47ddc536d show a toast if the slideshow ended + implement moving backwards 2017-08-05 13:34:30 +02:00
tibbi
e3a5b9356e adding a new slideshow option, moving backwards 2017-08-05 12:33:57 +02:00
tibbi
86a5107cc6 adding some basic slideshow functionality 2017-08-05 12:27:48 +02:00
tibbi
1d04016c9b create the system for toggling the slideshow 2017-08-04 23:10:22 +02:00
tibbi
1dec1b7457 store values set at the slideshow setup dialog 2017-08-04 22:53:43 +02:00
tibbi
c06fe43a68 adding an initial slideshow setup dialog 2017-08-04 21:19:04 +02:00
tibbi
8ff6c8d1f7 adding a slideshow menu button 2017-08-04 20:36:29 +02:00
gregory678
cbfe2bcd55 One more quick update 2017-08-04 12:16:02 +02:00
gregory678
12c10c4bf2 Updates and fixes 2017-08-04 11:45:34 +02:00
gregory678
28f03124e9 Updates and fixes 2017-08-04 11:31:36 +02:00
tibbi
3fe5aaa451 move the protection related things in the Commons library 2017-08-03 23:43:04 +02:00
tibbi
bdf2c574cd update version to 2.12.5 2017-08-03 20:51:17 +02:00
tibbi
799da5710d update Commons to 2.23.7 2017-08-03 20:51:00 +02:00
tibbi
a61ed6a1b0 update version to 2.12.4 (120) 2017-08-03 18:27:50 +02:00
tibbi
a48c44ff93 update commons to 2.23.6 2017-08-03 18:25:31 +02:00
tibbi
af961126ae update version to 2.12.3 (119) 2017-08-02 23:48:09 +02:00
tibbi
4bfe5953d0 added pattern/pin protection to release notes 2017-08-02 23:47:31 +02:00
tibbi
7f8cb4b801 disable lint on production builds 2017-08-02 23:44:35 +02:00
tibbi
4d48faa44f take the protection related strings from Commons 2017-08-02 23:44:26 +02:00
tibbi
53948f8d90 properly color the Check icon at the pin tab 2017-08-02 23:25:11 +02:00
tibbi
f269c70e56 make fragment in photoVideoActivity nullable 2017-08-02 23:14:56 +02:00
tibbi
ae3555b1c5 add some array size checks at deleting from media/directory view 2017-08-02 23:12:48 +02:00
tibbi
6e1f56f864 do not allow swiping the protection viewpager when a password is set 2017-08-02 22:56:26 +02:00
tibbi
45e1fba535 update commons to 2.23.2 2017-08-02 22:25:02 +02:00
tibbi
51f07c9fa6 store the protection type too, pattern/pin 2017-08-02 22:14:05 +02:00
tibbi
f0ace2f57d add the functionality to the PIN fragment 2017-08-02 00:00:32 +02:00
tibbi
805633dfb6 move the HashListener interface in a separate file 2017-08-01 23:34:28 +02:00
tibbi
2684fde107 show asterisks at inserting pin 2017-08-01 22:18:12 +02:00
tibbi
16a5637d71 add the numbers grid at the Pin tab 2017-08-01 21:53:59 +02:00
tibbi
67d6b0482e add asterisks at entering pin code 2017-07-31 22:44:55 +02:00
tibbi
b10306a9b9 use the primary color for selecting tablayout current item 2017-07-31 22:24:48 +02:00
tibbi
05da8af5e0 sync the viewpager with tablayout at the security dialog 2017-07-31 22:10:32 +02:00
tibbi
615c49407d rename PatternDialog to SecurityDialog 2017-07-31 22:00:22 +02:00
tibbi
9099aa176d remove some redundant variables 2017-07-30 23:13:02 +02:00
tibbi
02ee4dcc03 create a viewpager for switching between pattern/pin protection 2017-07-30 23:07:53 +02:00
tibbi
a55943f0f0 make the temporary hidden visibility toggling clearer 2017-07-29 22:08:12 +02:00
tibbi
5811f0dc56 adding the Pattern lock view license 2017-07-29 22:06:24 +02:00
tibbi
f789ecdf02 apply the pattern protection to temporarily showing hidden folders too 2017-07-29 21:56:45 +02:00
tibbi
2b518ec4f2 protect toggling Show hidden media with the pattern when appropriate 2017-07-29 21:48:55 +02:00
tibbi
f039afaca6 require the pattern for disabling password protection 2017-07-29 21:20:21 +02:00
tibbi
fff519b521 adding a pattern protection to the toggle button 2017-07-29 20:13:19 +02:00
tibbi
d9056ed057 add the password protection toggle button 2017-07-29 17:48:25 +02:00
tibbi
be72e3fa0d adding some password protection related strings 2017-07-29 17:42:00 +02:00
tibbi
859b692109 updating some formatting at the polish translation 2017-07-26 18:26:29 +02:00
gregory678
eb4a93b5f6 Update strings.xml 2017-07-26 17:57:46 +02:00
gregory678
c755f88c51 Polish language update
Lots of untranslated and buggy strings "fixed"
2017-07-26 17:52:34 +02:00
Alberto Rodriguez
00c309535b Spanish translate
Excellent app!!
2017-07-19 20:46:40 -04:00
Sérgio Marques
e81cb5e825 Update strings.xml 2017-07-19 21:38:50 +01:00
tibbi
21c534cc71 updating a german string 2017-07-15 10:30:08 +02:00
tibbi
60ad5f3a48 show the Delete menu as first at long pressing directories 2017-07-10 21:54:03 +02:00
tibbi
0f8f573d94 make sure the "Save as" menu button is visible after rotating fullscreen media 2017-07-10 21:51:21 +02:00
tibbi
dc973cd9e1 update version to 2.12.2 2017-07-09 23:28:54 +02:00
tibbi
0f7d6c84a7 updating commons to 2.22.5 2017-07-09 23:27:29 +02:00
tibbi
8e5cdf78cd updating release notes 2017-07-09 23:27:19 +02:00
tibbi
9ea9c77294 add a toggle for replacing Share with Rotate at fullscreen media 2017-07-09 20:34:14 +02:00
tibbi
dfb382adeb add an additional share menu button to fullscreen view 2017-07-09 20:17:57 +02:00
tibbi
5c88ce9fa8 update PhotoView to 2.1.2 2017-07-09 19:47:54 +02:00
tibbi
ce41e5b7b9 convert mMedia to a mutable list before providing to MyPagerAdapter 2017-07-09 13:58:08 +02:00
tibbi
a355b0a7b8 update kotlin to 1.1.3-2 2017-07-09 13:36:16 +02:00
tibbi
8f135b30a8 updating some German strings 2017-07-09 10:59:15 +02:00
tibbi
3df76261e0 fix #302, add a toggle for disabling leak canary 2017-07-09 09:28:26 +02:00
Tibor Kaputa
16391bce10 Merge pull request #300 from anthologist/master
Update italian
2017-07-09 00:24:29 +02:00
en2sv
d29b0be048 Update Swedish translation 2017-07-08 20:25:08 +02:00
anthologist
722a7d1a42 update italian 2017-07-08 11:59:29 +02:00
tibbi
d4fcf8038d update version to 2.12.1 2017-07-02 09:08:02 +02:00
tibbi
13980f9a8e make sure we populate the viewpager from the main thread 2017-07-02 09:07:34 +02:00
tibbi
2acbc1a02e add some activity checks at clearing Glide load 2017-07-02 08:52:31 +02:00
tibbi
fe63873c04 update version to 2.12.0 2017-07-01 15:38:24 +02:00
tibbi
7aa83fbff0 update Commons to 2.22.3 2017-07-01 15:29:38 +02:00
tibbi
8f628e33a4 replace top margin with padding at the destination directory picker 2017-07-01 11:46:40 +02:00
tibbi
61fb25332d add a menu button for disabling Temporarily show hidden 2017-07-01 10:04:47 +02:00
tibbi
0b7a5a30f3 update leak canary to 1.5.1 2017-07-01 09:05:37 +02:00
tibbi
5b5f81fda5 update Commons and Glide 2017-07-01 00:04:31 +02:00
tibbi
33396362cb updating a german string 2017-06-30 21:51:53 +02:00
tibbi
ff3cc19402 remove a space at the proguard rules file 2017-06-30 21:47:01 +02:00
tibbi
b6b3a8f4af reenable fullscreen image fast loading 2017-06-29 19:09:20 +02:00
tibbi
e7dd7185e2 updating release notes 2017-06-29 19:05:49 +02:00
tibbi
512fb94717 update version to 2.11.5 2017-06-29 19:04:26 +02:00
tibbi
02c651581e disable fast loading of fullscreen images for a test build 2017-06-29 19:04:08 +02:00
tibbi
3ec99cd43b fix #263, add an indicator to directories located on sd cards 2017-06-28 23:56:07 +02:00
tibbi
e0702ee7cb update commons to 2.21.17 2017-06-28 23:49:47 +02:00
tibbi
7b8640a77a use the previous way of image rotating at sd card files and non jpgs 2017-06-28 22:58:52 +02:00
tibbi
d3d64865af couple changes related to toggling fullscreen 2017-06-28 21:56:36 +02:00
tibbi
bb81275b79 make mediaplayer at onStopTrackingTouch of video fragment nullable 2017-06-27 22:36:39 +02:00
tibbi
3c37407315 modify exif metadata at rotating image from fullscreen mode + autosave it 2017-06-27 22:35:21 +02:00
tibbi
0ed110210b update commons to 2.21.16 2017-06-27 20:49:56 +02:00
tibbi
4869605781 update version to 2.11.4 2017-06-26 23:57:00 +02:00
tibbi
3a4f05ba91 hide the video seekbar too if initial system ui hiding is enabled 2017-06-26 23:56:48 +02:00
tibbi
49df8130cf changing the current fragment retriever at viewpager activity 2017-06-26 23:30:32 +02:00
tibbi
66561179bd adding the automatic system ui hiding in the release notes 2017-06-26 23:26:51 +02:00
tibbi
f282c5b0af call notifyDataSetChanged on the viewpager adapter earlier 2017-06-26 23:24:44 +02:00
tibbi
a0b9dc7754 do not allow long pressing items if its a third party pick intent 2017-06-26 23:15:09 +02:00
tibbi
bbdf72b52e hide system ui at opening fullscreen media if set so 2017-06-26 23:03:10 +02:00
tibbi
c42be23acc add a toggle for hiding system ui at fullscreen media automatically 2017-06-26 22:52:00 +02:00
tibbi
19a2aa71bf make adapters nullable at resume too 2017-06-26 22:30:36 +02:00
tibbi
f14d34a3e4 make adapters at changing column counts nullable 2017-06-26 22:27:35 +02:00
tibbi
6b72e098b0 update kotlin to 1.1.3 2017-06-26 22:01:17 +02:00
tibbi
43768ea728 update commons to 2.21.15 2017-06-25 23:58:59 +02:00
tibbi
d6d99e6b4b reactivate proguard 2017-06-25 16:09:54 +02:00
tibbi
a0ec489a9a update version to 2.11.3 2017-06-24 23:19:49 +02:00
tibbi
a0011dcf5d update version to 2.11.2 2017-06-24 23:16:02 +02:00
tibbi
b8a4c2a1b0 adding horizontal scrolling to release notes 2017-06-24 23:15:55 +02:00
tibbi
e045adce89 disable proguard for a build 2017-06-24 23:12:57 +02:00
tibbi
2658c52809 add some top margin to the destination picker 2017-06-24 23:05:53 +02:00
tibbi
52c636f176 recheck scroll direction on resume 2017-06-24 22:57:20 +02:00
tibbi
f2b1ef2c3b handle horizontal scrolling at copy/move destination picker too 2017-06-24 22:07:47 +02:00
tibbi
5604d1f8b5 adding support for horizontal scrolling 2017-06-24 21:42:53 +02:00
tibbi
1afb293977 update commons to 2.21.13 2017-06-24 19:08:46 +02:00
tibbi
71249d0a1e fill the viewpager at the viewpager activity only when its ready 2017-06-24 19:04:00 +02:00
tibbi
e87cc4a86d add an extra check at initializing video media player at menu visibility change 2017-06-24 18:56:38 +02:00
tibbi
418c313d2d updating some german strings 2017-06-23 17:39:07 +02:00
tibbi
e284c5b8b9 take the Out of memory error from Commons library 2017-06-22 22:51:42 +02:00
tibbi
7bad8bc54f adding a round launcher icon 2017-06-21 23:54:15 +02:00
tibbi
a8a3e69c30 reuse the "Temporarily show hidden" string from Commons lib 2017-06-21 22:27:49 +02:00
tibbi
09441f80c7 couple adapter changes 2017-06-20 22:41:27 +02:00
tibbi
e8168db2f7 use the MyScalableRecyclerView from the commons lib 2017-06-20 21:22:42 +02:00
tibbi
c6066bcdc4 remove the static variables from MyScalableRecyclerView 2017-06-20 21:02:58 +02:00
tibbi
aed1d64e43 make drag selection at recyclerview disabled by default 2017-06-20 20:51:30 +02:00
tibbi
54c56c559e make zooming disabled by default in the recyclerview 2017-06-19 23:41:57 +02:00
tibbi
39196be6d5 make sure the folder or image name doesnt stretch beyond the image 2017-06-19 22:19:35 +02:00
fiepi
8642ba23fa update simplified chinese 2017-06-19 19:09:47 +08:00
tibbi
c956832d98 update version to 2.11.1 2017-06-19 07:46:25 +02:00
tibbi
12a0cb9f0a add a null check at photo fragment 2017-06-19 07:45:36 +02:00
tibbi
034f3b5c56 make sure mSurfaceView isnt null when initing media player 2017-06-19 07:44:10 +02:00
tibbi
3367a9a0d3 update version to 2.11.0 2017-06-18 23:39:25 +02:00
tibbi
74aa953cc5 hide the horizontal scrolling toggle for now 2017-06-18 23:37:55 +02:00
tibbi
a3876f67cd update the way of retrieving default column counts 2017-06-18 23:33:52 +02:00
tibbi
a2e9c53d8e update some counts of default columns 2017-06-18 23:18:50 +02:00
tibbi
1402de7a3d check thumbnail scrolling on resume 2017-06-18 23:13:06 +02:00
tibbi
6dd4be62d8 avoid refetching media at changing some settings 2017-06-18 22:21:54 +02:00
tibbi
048acd9b03 properly refresh thumbnails at changing column count 2017-06-18 22:15:16 +02:00
tibbi
435a7693e5 send the scroll orientation to thumbnails 2017-06-18 21:44:53 +02:00
tibbi
5319a184f3 small cleanup at thumbnail adapters 2017-06-18 21:40:00 +02:00
tibbi
2734fe9615 add a toggle for scrolling thumbnails horizontally 2017-06-18 21:16:40 +02:00
tibbi
5be34f27ee set thumbnail holder properties based on the scroll orientation 2017-06-18 21:12:50 +02:00
tibbi
88de8a4d2a set scrolling orientation based on the user setting 2017-06-18 20:52:21 +02:00
tibbi
f740150d49 set MySquareImageView size depending on the thumbnail scrolling orientation 2017-06-18 20:36:37 +02:00
tibbi
561c81dd42 finish the editor activity only if another editor has been picked 2017-06-18 20:05:47 +02:00
tibbi
1d04e60dff allow opening the image with a different editor from our editor 2017-06-18 19:56:45 +02:00
tibbi
47ec461139 release the mediaplayer if something goes wrong at init 2017-06-18 19:08:53 +02:00
tibbi
99f14bfee1 try reinitializing the mediaplayer when it becomes the selected fragment 2017-06-18 19:06:14 +02:00
tibbi
77b7608636 remove the unused displayAspectRatio variable 2017-06-18 18:19:03 +02:00
tibbi
7850b13d4f update commons to 2.21.4 2017-06-18 18:17:33 +02:00
tibbi
5f4a926faa calculate double click scaling factor differently 2017-06-18 16:01:45 +02:00
tibbi
db9ddac55d update commons to 2.21.3 2017-06-18 13:18:07 +02:00
tibbi
4cc38a7927 update commons to 2.21.0 2017-06-18 13:00:07 +02:00
Tibor Kaputa
11de090947 Merge branch 'master' into master 2017-06-18 09:52:58 +02:00
tibbi
861fafcc83 capitalize GIFs 2017-06-18 09:51:12 +02:00
mueller-ma
0220901edb Update strings.xml 2017-06-18 00:14:38 +02:00
mueller-ma
f6d494f7e2 change "Set as wallpaper" to "Set as" 2017-06-17 23:38:44 +02:00
tibbi
6ed5a00315 change "Set as wallpaper" to "Set as" 2017-06-16 23:30:04 +02:00
tibbi
11ad99a202 update commons to 2.20.2 2017-06-16 23:22:28 +02:00
tibbi
0fcac3deff store column count separate for portrait and landscape 2017-06-15 22:57:58 +02:00
tibbi
68c6186fa7 dont do anything if an action menu is clicked at photoVideoActivity without media 2017-06-15 22:33:11 +02:00
tibbi
7772577883 do not cache animated gif thumbnails 2017-06-15 22:09:23 +02:00
tibbi
29de80ff79 adding an extra size check at directory adapter 2017-06-15 21:53:23 +02:00
tibbi
b0be8c0481 add an aditional check at determining if Edit menu button will be shown 2017-06-15 21:46:31 +02:00
tibbi
9452d96e75 catch FileNotFoundException at returning GetImageContent intent result 2017-06-15 21:39:19 +02:00
tibbi
5d2528b415 check for null mediaplayer at dragging video progress 2017-06-15 21:35:08 +02:00
tibbi
62da5a0477 Merge branch 'master' of github.com:SimpleMobileTools/Simple-Gallery 2017-06-15 21:28:20 +02:00
tibbi
e7406110a1 send a notifyDataSetChanged to the viewpager adapter at fullscreen media 2017-06-15 21:27:43 +02:00
Sérgio Marques
067a205edf Create strings.xml 2017-06-14 22:22:18 +01:00
tibbi
1123497341 update kotlin to 1.1.2-5 2017-06-14 22:46:13 +02:00
Tibor Kaputa
fca9a76dc1 Merge pull request #279 from marciozomb13/patch-2
Update strings.xml
2017-06-08 09:01:25 +02:00
WanderMax
30b0516c7c make fix for Chinese simplified translation 2017-06-08 09:19:39 +08:00
Marcio Zomb13
a127aa9b02 Update strings.xml
Added missed strings PT-BR
2017-06-07 20:11:24 -03:00
tibbi
4e8ec2acee do not stop temporarily showing hidden folders when leaving thumbnails view 2017-06-07 20:06:23 +02:00
Tibor Kaputa
e15d6d8507 properly open manually included folders 2017-06-07 16:07:01 +02:00
Tibor Kaputa
178b3b2d4d update version to 2.10.10 2017-06-07 09:28:34 +02:00
Tibor Kaputa
06530e78b8 recheck media 1 second after refreshing too 2017-06-07 09:27:45 +02:00
Tibor Kaputa
c99af62996 update commons to 2.20.1 2017-06-07 09:09:54 +02:00
tibbi
22ccf1d297 add custom folder covers in release notes 2017-06-06 23:40:16 +02:00
tibbi
659f355ca1 update version to 2.10.9 2017-06-06 23:37:18 +02:00
tibbi
13620df112 properly include files from manually Included folders 2017-06-06 23:26:48 +02:00
tibbi
868a98acfa update commons to 2.20.0 2017-06-06 22:53:05 +02:00
tibbi
0f135c845b use local variables at fetching media 2017-06-06 22:47:16 +02:00
tibbi
3de178a5eb add the setting string for horizontal scrolling 2017-06-06 22:39:32 +02:00
tibbi
53261310a2 properly reuse thumbnails media list at fullscreen view 2017-06-06 22:30:55 +02:00
tibbi
6dc1323252 correcting a check at getting current medium at viewpager 2017-06-06 22:26:35 +02:00
tibbi
e98de74ae4 fix #115, allow setting a custom image as 2017-06-06 21:24:06 +02:00
tibbi
add3320c4a allow setting up custom album covers 2017-06-06 21:16:19 +02:00
tibbi
866b8b77b4 rename PickAlbumDialog to PickDirectoryDialog 2017-06-06 20:25:31 +02:00
tibbi
e05ef4a9f2 add the menu buttons for changing album cover 2017-06-06 20:00:45 +02:00
tibbi
9676a78c1d add some strings related to changing album cover photo 2017-06-06 19:27:54 +02:00
tibbi
b8dc90de87 add line number keeping in proguard 2017-06-06 17:52:57 +02:00
tibbi
3001ea4a23 adding a crashfix at updating actionbar title 2017-06-03 08:37:52 +02:00
tibbi
7337efd6da update version to 2.10.8 2017-06-02 22:48:33 +02:00
tibbi
e26f7fe93e use "Hide folder" instead of "Hide" if un/hiding folders 2017-06-02 22:48:24 +02:00
tibbi
d480aab063 catch out of memory errors at setting wallpaper 2017-06-02 22:41:01 +02:00
tibbi
ea42c4f1aa catch exceptions at fetching media 2017-06-02 22:17:30 +02:00
tibbi
5a4b6065fb fix #270, temporarily show hidden files when opening a third party intent 2017-06-02 21:57:31 +02:00
tibbi
52e95827ec update commons to 2.19.4 2017-06-02 21:40:49 +02:00
tibbi
5beadedfe2 small tweak to viewpager cursor 2017-05-31 23:39:13 +02:00
tibbi
6248f0db76 reuse the same list of media at thumbnails and fullscreen view 2017-05-31 23:36:43 +02:00
tibbi
d2713635d5 add an additional null check at surfaceholder of video fragment 2017-05-31 23:20:34 +02:00
tibbi
f4ddc12911 add another check at getting current media of viewpager 2017-05-31 23:04:56 +02:00
tibbi
0e38255961 fix a different type of contact photo picking too 2017-05-31 22:06:54 +02:00
tibbi
7358bb7cce handle Crop intent for setting contact photo etc 2017-05-31 20:36:20 +02:00
fiepi
5bec63969c Update Simplified Chinese 2017-05-30 23:22:14 +08:00
tibbi
dd3fe03341 update version to 2.10.7 2017-05-29 23:08:06 +02:00
tibbi
d7740ae7b8 fix the condition checking if Editor was opened via a Crop intent 2017-05-29 21:39:56 +02:00
tibbi
5758b2eee1 reuse the list of media files of thumbnail view at the fullscreen view 2017-05-29 21:21:47 +02:00
tibbi
28a2f59514 use a different function for getting screen size on kitkat 2017-05-29 21:00:23 +02:00
tibbi
ec22c274dd update Commons to 2.19.0 2017-05-29 20:55:10 +02:00
tibbi
ee44432665 request an overwrite confirmation when replacing the original image with edited 2017-05-29 20:06:56 +02:00
tibbi
630e4e11b8 update commons to 2.18.8 2017-05-28 23:59:38 +02:00
Tibor Kaputa
56b7627875 Merge pull request #269 from smarquespt/patch-2
Update strings.xml
2017-05-28 23:50:03 +02:00
tibbi
124cf8960d add a couple null checks at multiselectors 2017-05-28 23:37:12 +02:00
Sérgio Marques
4c3a318e17 Update strings.xml 2017-05-28 22:29:19 +01:00
tibbi
a04d2d80b6 move cursor closing in the function using it 2017-05-28 23:17:06 +02:00
tibbi
18b714f9c3 do not continue at setting up the video if theres an error 2017-05-28 23:11:28 +02:00
tibbi
e3f0d7ea56 do not cache media while temporarily showing hidden is enabled 2017-05-28 23:09:00 +02:00
tibbi
1b53acd096 disable temporarily showing hidden folders only on destroy 2017-05-28 23:02:40 +02:00
fiepi
39c86a6d11 Simplified Chinese translation 2017-05-28 13:00:39 +08:00
tibbi
3794016da6 update commons to 2.18.5 2017-05-26 16:23:13 +02:00
tibbi
bc3e31c447 update commons to 2.18.3 2017-05-26 16:03:23 +02:00
tibbi
fa5a5651ad remove a file validity check at deleting from thumbnails view 2017-05-26 15:41:24 +02:00
tibbi
9b83fb2424 hide Resize option and fix aspect ratio at editor if its a crop intent 2017-05-26 10:23:19 +02:00
tibbi
cc37504610 update version to 2.10.6 2017-05-26 09:38:59 +02:00
tibbi
9d7834f294 add an aditional null check at videofragments 2017-05-26 09:38:35 +02:00
tibbi
64fa74f6cd remove some explicit thread creations for toasts 2017-05-26 09:30:14 +02:00
tibbi
2c73864d74 catch exceptions at creating nomedia files on sd cards 2017-05-26 09:29:02 +02:00
tibbi
e53d6a5c20 do not try closing the media fetching cursor twice 2017-05-26 09:26:20 +02:00
tibbi
8e5f72f59b hide hidden folders only when appropriate 2017-05-26 09:10:40 +02:00
tibbi
6ee2e067b8 update app version to 2.10.5 2017-05-26 09:10:25 +02:00
tibbi
9c258370b5 update commons to 2.18.1 2017-05-25 23:45:00 +02:00
tibbi
39f4bd9684 add an extra check to prevent rechecking media when the app is in background 2017-05-25 23:41:25 +02:00
tibbi
4a4a054314 optimize getting the last files modified timestamp 2017-05-25 23:37:16 +02:00
tibbi
448fa72017 check last media change at media too, but in a background thread 2017-05-25 22:16:23 +02:00
tibbi
2cc9d1051c recheck every 3 seconds if some media changed at folders view 2017-05-25 22:04:19 +02:00
tibbi
ddb6310937 add a function for updating directory adapter 2017-05-25 21:23:59 +02:00
tibbi
faf1e19a87 split the media getter into 2 functions 2017-05-24 23:02:33 +02:00
tibbi
e1b461e2f1 small edits at videoplayer setup 2017-05-24 22:49:01 +02:00
tibbi
128f90d50b fix #250, zoom in to fit the screen on doubleclick 2017-05-24 22:42:30 +02:00
tibbi
4174769235 get real display size at viewpager, including status bar height 2017-05-24 22:27:34 +02:00
tibbi
8d3125ca17 make sure to exclude .nomedia folders at "Show all folders content" 2017-05-24 21:20:38 +02:00
tibbi
9272fbc3a3 make some variables in ChangeSortingDialog private 2017-05-24 21:17:23 +02:00
tibbi
234b2ed933 do not show hidden or excluded folders at "Show all folders content" view 2017-05-24 20:37:56 +02:00
tibbi
5c7ede90de update commons to 2.18.0 2017-05-24 19:58:57 +02:00
tibbi
be57954630 update version to 2.10.4 2017-05-21 20:41:09 +02:00
tibbi
19ea96814e do not rescan the folder after removing nomedia 2017-05-21 20:39:01 +02:00
tibbi
f5eb3c931e hide folders whose parent contains .nomedia when appropriate 2017-05-21 20:16:45 +02:00
tibbi
4f0ccf0cd0 update version to 2.10.3 2017-05-21 19:16:45 +02:00
tibbi
9942f94fc3 hide folders that should be hidden 2017-05-21 19:16:29 +02:00
tibbi
22100542d5 update version to 2.10.2 2017-05-21 12:58:27 +02:00
tibbi
61e4127053 remove some redundant functions 2017-05-21 12:58:13 +02:00
tibbi
d4a8560d2c add some more conditions to folder visibility checking 2017-05-21 12:58:07 +02:00
tibbi
387c063376 show .nomedia folders if appropriate 2017-05-21 12:55:33 +02:00
tibbi
32e963dc71 update version to 2.10.1 2017-05-21 09:18:46 +02:00
tibbi
b564da6b91 catch exceptions thrown during media obtaining 2017-05-21 09:17:52 +02:00
tibbi
a763509a1a update version to 2.10.0 2017-05-20 23:23:13 +02:00
tibbi
53c8ea1531 use dark background if selected so at photovideoactivity too 2017-05-20 23:19:51 +02:00
tibbi
42fa1c1368 add new strings related to displaying gifs only 2017-05-20 23:06:40 +02:00
tibbi
558dba3408 properly redraw the thumbnails at renaming an item 2017-05-20 23:01:07 +02:00
tibbi
7302898826 display filenames at thumbnails if selected so 2017-05-20 22:38:40 +02:00
tibbi
0a3cf1c32a update Commons to 2.17.9 2017-05-20 22:31:28 +02:00
tibbi
de7ad3b9fb update kotlin to 1.1.2-3 2017-05-20 22:28:36 +02:00
tibbi
c735b13907 reuse the media getting context extension at filling folders 2017-05-20 21:49:00 +02:00
tibbi
4c7efca86d move the media getter in a context extension 2017-05-20 21:33:21 +02:00
tibbi
946f143409 remove the stoping feature of media getter asynctask 2017-05-20 21:25:48 +02:00
tibbi
06fe8a669a sort the media already at fetching from mediastore, to save time 2017-05-20 21:19:55 +02:00
tibbi
2a7baf14d2 some edits to getMediaAsyncTask 2017-05-20 21:06:42 +02:00
tibbi
c0bb740c87 load 1 image per side initially at viewpager for faster loading 2017-05-20 19:27:54 +02:00
tibbi
3a98da85fe optimize getting media with Show All 2017-05-20 16:49:01 +02:00
tibbi
987f333c5c if a filename is empty, try getting it from the path 2017-05-20 12:59:20 +02:00
tibbi
cc814d8d45 go back to the mediastore way of fetching media 2017-05-20 09:34:59 +02:00
tibbi
b2f9bbdf2c remove the cursor extensions 2017-05-20 08:56:28 +02:00
anthologist
3ec97bb555 Update/fix italian 2017-05-19 23:40:05 +02:00
tibbi
277ded39ab wrap the wallpaper setter in a try-catch block 2017-05-19 21:20:14 +02:00
tibbi
25b31eb5a7 adding a null check at deleting files 2017-05-19 20:57:58 +02:00
tibbi
8603661873 add a null check at setting video size 2017-05-19 20:51:30 +02:00
tibbi
9e788d9453 add some null checks to deselecting items 2017-05-19 20:30:35 +02:00
Eduardo Caron
d214fe1a48 improvements on brazilian translation 2017-05-18 15:34:06 -03:00
tibbi
8bc3389749 updating some german strings by M.B. 2017-05-16 21:15:33 +02:00
tibbi
8f528bd49c update version to 2.9.1 2017-05-14 20:51:58 +02:00
tibbi
55f6f934ff add some null checks to checking if primary color changed 2017-05-14 20:43:03 +02:00
tibbi
87b722bac3 properly update some stuff if the primary color changes 2017-05-14 20:32:01 +02:00
tibbi
1c96f5ced7 refresh the directories after copy too 2017-05-14 20:10:35 +02:00
tibbi
b6bbc8abd7 properly update the items after delete 2017-05-14 19:43:51 +02:00
tibbi
311d28242f set image select state only after its already init 2017-05-14 17:29:02 +02:00
tibbi
ae6b53d464 properly select the files to delete 2017-05-14 17:15:05 +02:00
tibbi
74da4b454b remove the static variables from the MediaAdapter 2017-05-14 17:09:25 +02:00
tibbi
ab9c70d8d6 remove the Static fields of DirectoryAdapter 2017-05-14 15:12:57 +02:00
tibbi
883e6ce511 reset autoscroll related things on action_up 2017-05-14 15:09:16 +02:00
tibbi
78e0ef3552 fix #239, update Commons to properly display copy/move toast messages 2017-05-14 13:08:57 +02:00
tibbi
2ba7ffeb63 remove a redundant code block 2017-05-14 12:56:20 +02:00
tibbi
f76951a070 fix deleting items from thumbnails view 2017-05-14 12:11:38 +02:00
tibbi
9e4d53684a add a null check to surfaceholder 2017-05-14 12:05:57 +02:00
tibbi
dccca19844 use a black background at fullscreen media if selected so 2017-05-14 12:01:16 +02:00
tibbi
a780d36a6e add a setting for always using dark background at fullscreen media 2017-05-14 11:50:30 +02:00
tibbi
7aa7b6e2da add drag selection to media thumbnails screen 2017-05-14 10:40:35 +02:00
sebastian05067
f35e5eee4e Update strings.xml 2017-05-13 16:41:31 -05:00
tibbi
ebc61660d4 refactor the MediaAdapter a bit 2017-05-13 23:28:45 +02:00
tibbi
ffe7742334 use an interface for selecting items with drag selection 2017-05-13 23:03:27 +02:00
tibbi
c174b7d395 add Drag selection to directories 2017-05-13 21:10:13 +02:00
tibbi
44a71c032b rewrite the Directory adapter, prepare it for drag-selection 2017-05-13 17:39:07 +02:00
Sérgio Marques
951bc86143 Update strings.xml 2017-05-10 22:12:33 +01:00
tibbi
30fb78d8fa add a missing quote escaping 2017-05-10 21:27:00 +02:00
tibbi
a78035c446 add flipping to the app description 2017-05-10 21:06:21 +02:00
tibbi
1b5aee578e add a new string for always using dark background at fullscreen media 2017-05-10 21:02:30 +02:00
anthologist
a5c260a535 update 2017-05-09 17:04:27 +02:00
sebastian05067
1cb4e66030 string.xml
Updating Spanish strings - 06-may-2017

Some small fixes in Google Play Store traslation
2017-05-06 10:50:13 -05:00
Primokorn
43194c50e1 Update french strings.xml 2017-05-02 13:53:18 +02:00
tibbi
27ddd1fb57 update version to 2.9.0 2017-04-26 23:10:21 +02:00
tibbi
7257fc7926 pass the context instead of whole activity on a couple places 2017-04-26 23:04:01 +02:00
tibbi
25d3eebb4f remove some redundant functions 2017-04-26 23:03:49 +02:00
tibbi
11a98d69fe prepare 2 images on both sides at the fullscreen view 2017-04-26 23:03:37 +02:00
tibbi
2503aead44 update commons to 2.17.6 2017-04-26 22:42:43 +02:00
tibbi
49c66427a2 allow hiding/unhiding files from the fullscreen view too 2017-04-26 21:59:17 +02:00
tibbi
2e8da56e2d add the file renaming functionality itself 2017-04-26 20:54:47 +02:00
tibbi
40c4a9aec1 add hide/unhide menu items to media activity cab 2017-04-26 20:23:04 +02:00
tibbi
0ee20b4604 show the "Temporarily show hidden" menu item only when hidden media arent shown 2017-04-26 20:09:08 +02:00
tibbi
2b95a7f529 add a "Temporarily show hidden" menu button to media view 2017-04-26 19:58:50 +02:00
tibbi
f137f3db06 show hidden files only when should 2017-04-26 19:54:47 +02:00
tibbi
27becd9247 replace the "Show hidden folders" option with "Show hidden media" 2017-04-26 19:50:19 +02:00
tibbi
73313a73b5 use a "hide" text at menus instead of "hide folder" 2017-04-26 19:18:59 +02:00
tibbi
a05ecbe861 try prefetching directories after install, before first app launch 2017-04-25 23:23:36 +02:00
Marcio Zomb13
993f7ce8cd Minor improvements to pt-br translation 2017-04-24 19:55:54 -03:00
tibbi
61ba26a636 do not make GlideRotateTransformation context a local variable 2017-04-24 23:11:35 +02:00
tibbi
9ef7491d58 show a toast message at saving edited image 2017-04-24 23:02:56 +02:00
tibbi
4786fc7c54 save the images on a background thread 2017-04-24 22:56:24 +02:00
tibbi
972916f6b2 update commons to 2.17.3 2017-04-24 22:47:47 +02:00
tibbi
f94c09a83c adding a couple more checks at saving edited file 2017-04-24 22:14:09 +02:00
tibbi
dfc99e68e4 do not delete the image if rotating fails, related to #234 2017-04-24 21:44:50 +02:00
tibbi
6810b3f68b fix #235, generate a different file uri for setting wallpaper if one fails 2017-04-24 20:27:47 +02:00
tibbi
6111b4be72 lets show CropImageView guidelines on touch 2017-04-19 22:30:22 +02:00
tibbi
82260ff42f update commons to 2.17.2 2017-04-19 20:47:56 +02:00
AVM77
a8f5814427 Update strings.xml 2017-04-19 19:31:37 +03:00
tibbi
2b12bf5d53 do not show the Pull to refresh spinning thing when loading cached images 2017-04-18 22:22:49 +02:00
tibbi
476e4d4522 updating the german strings 2017-04-18 22:19:31 +02:00
tibbi
175d528460 flip folder_view and open_camera menu items 2017-04-18 22:17:22 +02:00
tibbi
409ecbe4b5 use the copy/move functionality from the commons library 2017-04-18 19:31:22 +02:00
tibbi
3629f0ff55 refactor the copy/mvoe functionality a bit 2017-04-18 19:16:59 +02:00
tibbi
99666b0173 remove some redundant functions 2017-04-18 18:57:24 +02:00
tibbi
df7a0cfc53 update version to 2.8.6 2017-04-17 22:38:37 +02:00
tibbi
5e1076357c update commons to 2.16.9 2017-04-17 22:38:27 +02:00
tibbi
b629ea33fc update version to 2.8.5 2017-04-17 21:38:07 +02:00
tibbi
4959a11ca9 clear actMode of adapters on destroy 2017-04-17 21:33:23 +02:00
tibbi
5a954febf4 show the cached folders immediately as possible copy/move destinations at the dialog 2017-04-17 21:22:31 +02:00
tibbi
69a8a35016 update commons to 2.16.8 2017-04-17 20:59:31 +02:00
tibbi
7fd1538009 reset scalremove scalable recyclerview zoom listener on pause 2017-04-17 20:53:34 +02:00
tibbi
cb9353c31a toggle fullscreen at clicking outside videos too 2017-04-17 20:31:59 +02:00
tibbi
d914f0bb53 add leak canary for detecting memory leaks at debug builds 2017-04-17 20:31:50 +02:00
tibbi
c4c19f82af fix #182, allow overwriting existing files after rotating on fullscreen view 2017-04-17 19:24:20 +02:00
tibbi
e41ae2554c implement the flipping functionality at the edit activity 2017-04-17 19:14:13 +02:00
tibbi
0cecfb4a6f use a signature at loading fullscreen images with glide 2017-04-17 19:01:04 +02:00
tibbi
c23f15749d add flip menu items to the viewpager and editor activities 2017-04-17 18:41:11 +02:00
tibbi
e120154741 remove mdpi drawables 2017-04-17 18:24:45 +02:00
tibbi
2553776bec add flipping icon 2017-04-17 18:24:20 +02:00
tibbi
b2f78f20ae update image cropper to 2.4.0 2017-04-17 18:24:14 +02:00
tibbi
9c9e7bec2b fix #231, properly handle some more image pick intents 2017-04-17 18:12:24 +02:00
tibbi
8849db924e show the refreshing icon at opening the gallery 2017-04-17 17:59:05 +02:00
tibbi
dab8442119 updating some german strings by M. B. 2017-04-17 11:55:43 +02:00
Sérgio Marques
8051032f9d Update strings.xml 2017-04-15 16:25:11 +01:00
tibbi
a397006529 use rgb_555 decoding for jpgs 2017-04-15 11:28:47 +02:00
tibbi
0c63ff1794 updating some flip related strings 2017-04-14 14:42:47 +02:00
tibbi
9a7f8ed228 update the video seekbar color depending on the primary color 2017-04-14 14:10:41 +02:00
tibbi
252376a591 update version to 2.8.4 2017-04-13 23:02:17 +02:00
tibbi
fcd9f1a94c add Portrait wallpapers and Properties dialog changes in release notes 2017-04-13 23:01:44 +02:00
tibbi
7e95356310 remove the photofragment clear function 2017-04-13 22:56:14 +02:00
tibbi
196cc3bffd update commons to 2.16.4 2017-04-13 22:55:38 +02:00
tibbi
4e9e491f13 check for null resultdata data at third party intents 2017-04-12 23:32:54 +02:00
tibbi
0598d0f34c make sure subsampling views background is transparent if the image fails to load 2017-04-12 21:55:10 +02:00
tibbi
14bce04017 increase the clickable area of the fullscreen video play button 2017-04-12 21:39:27 +02:00
tibbi
671e10087a avoid intializing mediaplayer with invalid surface 2017-04-12 21:35:51 +02:00
tibbi
a93d4be112 fix a typo at photo fragment visibility check 2017-04-12 20:08:34 +02:00
tibbi
57a076d65c use the extension function for formatting video time 2017-04-12 19:40:31 +02:00
tibbi
37c40b8de7 minor style edits 2017-04-12 19:32:31 +02:00
tibbi
47a10afbb7 show the button for temporarily displaying hidden folders at third party intents 2017-04-12 18:39:05 +02:00
AVM77
1a6578e7f6 Update strings.xml 2017-04-11 21:41:51 +03:00
Rodrigo
3fcd75a6dd Update strings.xml 2017-04-11 12:23:01 -03:00
Stefan
8816078cba Update strings.xml 2017-04-10 22:02:37 +02:00
tibbi
2b4d712912 shorten some model variable names 2017-04-10 21:04:19 +02:00
tibbi
7cc41bb86e add a try catch block around creating nomedia files on Android 4 2017-04-10 20:46:42 +02:00
tibbi
da67107b83 allow toggling between portrait and landscape aspect ratio at wallpaper picker 2017-04-10 20:35:56 +02:00
tibbi
3221d30bef add an icon for changing wallpaper aspect ratio 2017-04-10 19:59:34 +02:00
tibbi
15b39b501d use the file output stream creator from Commons lib 2017-04-09 22:41:53 +02:00
tibbi
49f7fc389a update commons to 2.16.3 2017-04-09 22:32:38 +02:00
tibbi
95d3701b80 make view_pager non nullable 2017-04-09 18:42:29 +02:00
tibbi
4c4bbb0320 properly show the media for Android 4.1 2017-04-08 18:21:44 +02:00
tibbi
b9baa182cb update commons to 2.16.1 2017-04-07 20:41:45 +02:00
Sérgio Marques
75fe470d47 Portuguese update 2017-04-06 23:10:23 +01:00
tibbi
8cd9a0b320 update version to 2.8.3 2017-04-04 21:50:44 +02:00
tibbi
eeaf854144 fix some errors at loading fullscreen images 2017-04-04 21:48:59 +02:00
tibbi
259f517a18 make "media" a global variable at getMediaAsyncTask 2017-04-04 21:40:12 +02:00
tibbi
9c0cecc76f use a thread pool executor for the asynctasks 2017-04-04 18:16:34 +02:00
tibbi
5d0ff30e67 remove some return statements 2017-04-04 18:12:07 +02:00
Tibor Kaputa
e54cadfbdc avoid deleting Downloads folder 2017-04-04 16:01:20 +02:00
tibbi
c965150450 update version to 2.8.2 2017-04-03 21:33:46 +02:00
tibbi
a2f1512588 fix directory sorting 2017-04-03 21:33:40 +02:00
tibbi
8bddcbf0ef update version to 2.8.1 2017-04-03 18:50:14 +02:00
tibbi
ebc6c2ef3d allow zooming in a lot more at fullscreen photos 2017-04-03 18:40:08 +02:00
tibbi
94258a57fa add cache signatures to thumbnails 2017-04-03 18:35:09 +02:00
tibbi
152a56c32b do not attempt loading thumbnails after being loaded from cache 2017-04-03 18:29:30 +02:00
tibbi
8545ab8430 add some null checks to data folder getter 2017-04-03 18:20:24 +02:00
tibbi
a02744ebac updating some turkish strings 2017-04-02 20:25:28 +02:00
tibbi
3e03deef90 show the keyboard at "Save as" dialog 2017-04-02 19:39:55 +02:00
tibbi
6ca3c30b9c zoom in more on double click 2017-04-02 09:23:09 +02:00
Rodrigo
f62009fee5 Update strings.xml 2017-04-01 18:50:36 -03:00
tibbi
79b1be0782 update version to 2.8.0 2017-04-01 23:16:49 +02:00
tibbi
d160b5b158 updating the release notes 2017-04-01 23:16:30 +02:00
tibbi
e2c37d9afa fix #217, #209, improving autorotation 2017-04-01 23:09:05 +02:00
tibbi
3cae9361d6 implement screen rotation by aspect ratio 2017-04-01 21:55:33 +02:00
tibbi
0296c383b9 add more screen rotating options 2017-04-01 21:17:49 +02:00
tibbi
576f2a431a use Subsampling at a couple more image formats 2017-04-01 19:31:11 +02:00
Justin Jacobs
6ff17351cc Use subsamplingScaleImageView for PNGs 2017-04-01 13:24:31 -04:00
tibbi
2759a476aa exclude ...Android/data folder by default, it usually contains garbage 2017-04-01 18:55:39 +02:00
tibbi
ed59c51b99 reimplement copy and move at folder and thumbnail views 2017-04-01 18:29:39 +02:00
tibbi
bc54d58dbe remove the redundant onCreate function of SimpleActivity 2017-04-01 18:14:28 +02:00
tibbi
aefa630c1a store copyMoveCallback a bit further at the process 2017-04-01 18:12:51 +02:00
tibbi
a963a13fc7 get the source path at copy/move from the first item 2017-04-01 18:08:49 +02:00
tibbi
8d1145e038 use a callback for copy/move result 2017-04-01 17:59:14 +02:00
tibbi
77d8bce189 move the copyMoveFilesTo into SimpleActivity 2017-04-01 17:32:13 +02:00
tibbi
57a0baa253 add the copy move dialog 2017-04-01 17:09:24 +02:00
tibbi
9a0cde9796 remove the leftovers of CopyDialog 2017-04-01 16:58:17 +02:00
tibbi
627ddeea0a add a helper function for getting the current path at viewpager activity 2017-04-01 16:33:30 +02:00
tibbi
dc2e621d6b split copy and move to 2 items 2017-04-01 16:18:47 +02:00
tibbi
aae7c39058 set a background to subsampled images to avoid glitches at too small images 2017-04-01 15:55:12 +02:00
tibbi
edf60b77b3 use subsampling image view only on the current image 2017-04-01 15:39:35 +02:00
tibbi
7a3acad04b use subsamplingScaleImageView for fullscreen images again 2017-04-01 12:00:32 +02:00
tibbi
599f93b458 add a arraylist size check at copy dialog 2017-04-01 09:23:34 +02:00
tibbi
0228f5505a make the big play video icon smaller 2017-03-30 18:20:32 +02:00
tibbi
d2afd2de94 avoid showing the Hide folder confirmation twice if initially hiding 2 2017-03-30 18:17:27 +02:00
Rodrigo
7f8cb19b9b Update strings.xml 2017-03-30 03:56:06 -03:00
tibbi
b231227813 update fastscroller handle color if it changed 2017-03-29 19:05:54 +02:00
tibbi
a2f2e57b85 do not load 2 images per side, aint nobody got memory for that 2017-03-28 22:03:00 +02:00
Rodrigo
627e797dc2 Update strings.xml 2017-03-28 12:21:42 -03:00
Tibor Kaputa
40c0b81757 add a brazil version of the portuguese strings 2017-03-28 09:18:59 +02:00
Sérgio Marques
c8b2cf411d Portuguese update 2017-03-26 00:00:51 +00:00
tibbi
68ecd8e242 updating the Turkish strings 2017-03-25 15:52:46 +01:00
tibbi
f5d616e781 update version to 2.7.4 2017-03-25 14:30:27 +01:00
tibbi
6403dc61d3 added the new settings into release notes 2017-03-25 14:30:17 +01:00