Commit graph

1206 commits

Author SHA1 Message Date
kyori
ad888854bc Use SimpleDateFormatter repeatedly. 2018-08-20 20:56:22 +09:00
kyori
4264fc42d6 Add process for when the createdAt is null. 2018-08-20 19:29:58 +09:00
kyori
b4bb80c4d5 Stop initializing String. 2018-08-20 17:47:19 +09:00
Konrad Pozniak
440a351e06 fix AccountActivity recreating after rotation 2018-08-20 10:11:36 +02:00
Evgeny Petrov
7369a82b26 [Ru] string hotfix (#775)
Changed the wrong form of "black" theme string
2018-08-19 12:17:09 +02:00
Quentí
dbbc1e406f Update Occitan translation (#776) 2018-08-19 12:16:56 +02:00
Konrad Pozniak
322a567e52 fix wrong activity transition of LoginActivity 2018-08-18 13:03:30 +02:00
Konrad Pozniak
7442f5bca8 fix bug where deleting profile field was not possible 2018-08-18 09:12:57 +02:00
Marcin Mikołajczak
632be33af8 Update Polish translation (#768)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-08-17 21:00:03 +02:00
kyori
219eafe6fc Prevent query SharedPreference in adapters. 2018-08-17 14:42:15 +09:00
kyori
6d1ec78984 Annotate on same line. 2018-08-17 10:21:55 +09:00
kyori
e83dd16942 Do not use absolute time by default. 2018-08-17 10:19:50 +09:00
Anna e só
5d7c2df434 Updated pt-rBR translation (#765) 2018-08-16 20:38:27 +02:00
jeroenpraat
fd378f2e31 Updating Dutch strings for v3 (#761) 2018-08-16 20:37:59 +02:00
Isak Holmström
d0b40dba6d Updated with new strings, added new translations for mute (#760) 2018-08-16 20:37:44 +02:00
ButterflyOfFire
8eef3991ec Updated ar (Arabic) translation (#758)
* add more aggressive proguard config

* even more optimizations

* Updated ar (Arabic) translation

Commit made via Stringlate
2018-08-16 20:37:23 +02:00
Evgeny Petrov
e973a68160 [RU] Language update 20180815 (#759)
* Updated Russian language

* Updated RU language according to 970551adee

* [RU] Language update
2018-08-16 20:34:50 +02:00
kyori
1d657a65a7 Show absolute time in Notifications tab 2018-08-16 23:10:21 +09:00
kyori
ca3a5791e3 Show absolute time 2018-08-16 22:51:23 +09:00
Conny Duck
4b4e58302f fix splashscreen navigationbar color on Android 27+ 2018-08-15 22:17:26 +02:00
Conny Duck
8b04361771 update translations 2018-08-15 21:23:54 +02:00
Konrad Pozniak
8930d277e6
add new elephant friends (#757)
* add new elephant friends

* add art license

* fix typo
2018-08-15 20:51:35 +02:00
Konrad Pozniak
04c842afc4
fix OOM crash when trying to caption large image (#756) 2018-08-15 20:47:36 +02:00
Konrad Pozniak
f022944e90
add possibility to change profile fields, refactor (#751)
* refactor EditProfileActivity, add profile fields

* preserve transparency when cropping profile images

* dont validate profile fields on client side

* revert unintentional change in card_frame_dark.xml

* improve activity_edit_profile layout for tablets

* Revert "improve activity_edit_profile layout for tablets"

This reverts commit 20ff3d167c39b15566e017108b33fe58690a8482.

* improve activity_edit_profile layout for tablets

* fix bug in EditProfileActivity, add snackbar

* improve EditProfileActivity code

* use events instead of shared prefs to communicate profile update
2018-08-15 20:47:09 +02:00
Conny Duck
b9e433c77f fix crash in ViewThreadFragment 2018-08-15 11:20:57 +02:00
Conny Duck
c38d2ad25e small improvements for MediaUtils 2018-08-15 11:06:54 +02:00
eleete0712
ef1fa0ca94 show CW in system notification for CW'd statuses (#754)
* show CW in system notification for CW'd statuses

* show spoiler text instead of generic CW message
2018-08-13 22:59:30 +02:00
Conny Duck
aa64a879f1 fix bug where unmuting would unmute wrong account 2018-08-12 20:19:44 +02:00
nailyk
4f50bb5566 Translates: FR: Add missing translation (#744)
* Add missing `title_statuses_with_replies` french translation.

Signed-off-by: nailyk-fr <jenkins@nailyk.fr>
2018-08-08 22:31:43 +02:00
Conny Duck
ce7270cdb2 fix the activity transitions (again 🙄) 2018-08-07 23:08:53 +02:00
Conny Duck
eee48e48d1 make small avatars in notifications rounded again 2018-08-07 21:44:25 +02:00
Conny Duck
e8b1787f9c improve Arabic translation (thx to @BoF@mstdn.fr) 2018-07-31 21:30:24 +02:00
Conny Duck
9a42999451 improve activity slide in/out handling 2018-07-31 21:25:25 +02:00
Konrad Pozniak
2b246fc379 fix "load more" placeholder changing height after being clicked 2018-07-30 16:28:43 +02:00
Konrad Pozniak
9b422a97fe
Custom emojis in drawer (#737)
* upgrade MaterialDrawer

* improve CustomEmojiHelper so now any parent view can be used for invalidation

* cleanup MainActivity a bit

* add emojiList to account database and show compatEmojis and custom emojis in drawer

* improve perf of drawer profile update

* fix account switching

* reuse gson, break after profile item was found
2018-07-30 15:43:27 +02:00
Konrad Pozniak
b5a8915845
add possibility to view avatars fullscreen (#724)
* add possibility to view avatars fullscreen

* improve codestyle
2018-07-30 15:42:45 +02:00
Ivan Kupalov
133808891d Add RoundedImageView for avatars (#739)
* Add RoundedImageView for avatars

* RoundedImageView: Remove unused things, fix touchable area
2018-07-30 15:36:22 +02:00
qwazix
562beacfc1 Add black theme (#726)
* Add black theme

On amoled screens a completely black theme helps save battery,
besides looking awesome!

* Fix first set of merge request issues except the dialog.

* Black theme inherits from dark and only the different values
  are declared
* Make nav bar translucent (for some reason content does not
  go behind it in main activity. Need to investigate)
* Remove nav bar line
* Fix toolbar color

* Fix dialog issue with black theme.

Revert translucent navigation.

* Translations updated, as well as possible from online sources.

* Make login screen respect black theme
2018-07-30 15:31:35 +02:00
Ivan Kupalov
6fcb3cb495 Add image descriptions indicator (#697)
* Add image descriptions indicator. Closes #683

* Add bg for description indicator, change symbol

* Use icon for image description indicator
2018-07-30 15:20:53 +02:00
Isak Holmström
80bf2f361c Improved swedish translation (#735)
* Update strings.xml

* Updated strings.xml

Added the missing string-arrays and fixed some better language.
2018-07-28 16:30:43 +02:00
Sylke Vicious
ab3e68cd48 Update Italian strings.xml (#733)
added missing strings manually
2018-07-28 12:01:16 +02:00
Konrad Pozniak
2a6f6c4092
work around crash on Android 8 (#731) 2018-07-26 23:31:20 +02:00
Konrad Pozniak
dbdc597207
fix bug where home timeline was never showing "load more" button (#729) 2018-07-25 21:50:09 +02:00
jeroenpraat
21ce92f8da Dutch strings: one extra update (#725) 2018-07-24 19:04:00 +02:00
Konrad Pozniak
7f648b1acd
improve dependency injection (#723) 2018-07-23 21:59:10 +02:00
Konrad Pozniak
61f3f6c928
Improve media resizing (#722)
* improve MediaUtils.getImageThumbnail so it does not load the whole bitmap into memory

* load thumbnails in device specific sizes
2018-07-23 21:55:09 +02:00
Conny Duck
67f4479e86 fix some lint warnings, use kotlin view imports in ModalTimeLineActivity 2018-07-23 15:18:33 +02:00
Conny Duck
0102a4bd60 fix bug where revoking a follow request was not possible 2018-07-22 14:34:55 +02:00
Sylke Vicious
5538c8c5e7 Updated it (Italian) translation (#721)
* increase cache size & dont cache full size media

* Updated it (Italian) translation

Commit made via Stringlate

* remove unnecessary backslash
2018-07-22 13:53:21 +02:00
Isak Holmström
80fae95f41 Update swedish translation (#720) 2018-07-22 13:48:52 +02:00
Conny Duck
4d3a6a6226 fix Dutch string (thx to jeroenpraat) 2018-07-17 22:11:47 +02:00
Conny Duck
e67261f80d normalize domains before saving them to database 2018-07-17 22:05:46 +02:00
Conny Duck
ee812e3130 improve Dutch strings (thx to jeroenpraat) 2018-07-16 21:05:07 +02:00
Konrad Pozniak
4d1fc5ecb0 improve gradle build to support nightly builds 2018-07-16 19:01:34 +02:00
Konrad Pozniak
b887196c31 fix crash when opening profiles with default emojis selected 2018-07-14 21:36:47 +02:00
Konrad Pozniak
aa5eb9f99a
increase cache size & dont cache full size media (#710) 2018-07-14 17:12:57 +02:00
Conny Duck
f50cac4b0c fix AccountActivity tabs not stretching on tablets 2018-07-12 22:21:51 +02:00
Conny Duck
6f179fccaa fix crash in TimelineFragment 2018-07-12 21:21:53 +02:00
Conny Duck
145e30870d fix Dutch string (thx to jeroenpraat) 2018-07-10 19:56:16 +02:00
Conny Duck
e56386ea84 fix bug where sending toot is not possible despite it being below character limit 2018-07-10 19:48:41 +02:00
Conny Duck
7739af2109 update Dutch strings (thx to jeroenpraat) 2018-07-09 11:11:48 +02:00
Conny Duck
699049f930 apply font size setting to image alt text 2018-07-09 09:03:24 +02:00
Conny Duck
4df93c49cb fix crash in AccountMediaFragment (again) 2018-07-09 08:59:06 +02:00
Conny Duck
b7da5f7a29 fix another crash in ViewThreadFragment 2018-07-08 19:21:19 +02:00
Conny Duck
884f889737 updated Dutch strings (thx to jeroenpraat) 2018-07-08 18:26:09 +02:00
Conny Duck
b82ab6bb4f fix custom emojis in mention autocomplete 2018-07-08 14:40:56 +02:00
Conny Duck
26529b19d5 fix crash in AccountMediaFragment 2018-07-08 11:41:08 +02:00
Conny Duck
67f90d050c fix crash in TimelineFragment 2018-07-08 10:16:19 +02:00
Conny Duck
b2c0ed69f6 fix crash in ViewThreadFragment 2018-07-07 12:09:15 +02:00
Conny Duck
a65ee0a7bb fix extra backslash in swedish translation 2018-07-07 09:28:25 +02:00
Conny Duck
ef9e931428 fix regex filter not affecting spoilertext 2018-07-05 21:59:38 +02:00
Conny Duck
c452b8f281 Merge branch 'master' of https://github.com/Vavassor/Tusky 2018-07-05 21:36:16 +02:00
Conny Duck
d900e1d8cd fix crash in TimelineFragment 2018-07-05 21:32:49 +02:00
Conny Duck
0c1893ff6e update german translation 2018-07-05 21:18:57 +02:00
Conny Duck
28940169c6 enable custom emoji fonts for all api levels again 2018-07-05 21:14:32 +02:00
Ivan Kupalov
8c20d5dd93 Fix crash on receiving event in timeline (#704) 2018-07-02 22:12:27 +02:00
Anna e só
3a0f86ebde 🌎: Improved Brazilian Portuguese translations (#701)
* Added exported .xml from Stringlate

* Added missing strings for theme and privacy

* Added more missing strings

* Added strings for pull notification intervals

* Fixed "hora" to "horas"
2018-07-02 14:22:22 +02:00
Conny Duck
b02a8f2c7e improve german translation 2018-07-02 14:07:16 +02:00
Conny Duck
c10cc59a8a enable custom emojis in follow notifications 2018-07-01 15:57:26 +02:00
Conny Duck
e63dd50682 fix tests 2018-07-01 14:51:45 +02:00
Conny Duck
1d8d1efb5b enable custom emojis in notification messages 2018-07-01 14:44:38 +02:00
Conny Duck
3410fad62c only disable emoji fonts on Lollipop and lower 2018-07-01 14:35:11 +02:00
Conny Duck
0930fab72b fix crash on old mastodon instances 2018-07-01 13:34:35 +02:00
Konrad Pozniak
030a201da6
disable emoji fonts on Android 5 (#698) 2018-07-01 10:18:00 +02:00
Konrad Pozniak
1c5df27f91
use ACTION_GET_CONTENT for media selection again, fix uri permissions (#695) 2018-06-28 22:22:29 +02:00
Anna e só
c7c2b5feb9 update Brazilian Portuguese translation (#696) 2018-06-28 22:22:20 +02:00
Evgeny Petrov
8509aab303 Updated Russian language (#691)
* Updated Russian language

* Updated RU language according to 970551adee
2018-06-27 18:39:33 +02:00
Marcin Mikołajczak
2887fa0cd8 i18n: Update Polish translation (#692)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-06-27 18:38:19 +02:00
Conny Duck
77617ba9bf fix crash on timeline reloading 2018-06-25 18:20:45 +02:00
Conny Duck
b655985997 only reload timeline on pref change when necessary 2018-06-25 17:20:41 +02:00
Conny Duck
970551adee fix the emoji selection dialog 2018-06-25 16:23:43 +02:00
Conny Duck
9bda0c6c5d update german translation 2018-06-25 15:20:54 +02:00
Conny Duck
bfa1929365 remove unused strings 2018-06-25 14:55:45 +02:00
Conny Duck
50b0d1fb8d cleanup code 2018-06-25 14:49:00 +02:00
Conny Duck
3c685800d8 fix #650 notifications alerting multiple times 2018-06-25 14:08:36 +02:00
Konrad Pozniak
3c569c6ac9
add License activity (#689)
* convert AboutActivity to Kotlin, use BottomSheetActivity for account resolving

* improve AboutActivity

* new License activity

* fix filemojicompat url
2018-06-25 13:02:34 +02:00
Ivan Kupalov
570d7e3597 Do not scroll to top on timeline refresh (#681)
* Do not scroll to top on timeline refresh

* Use dp for shifting timeline
2018-06-24 10:53:19 +02:00
Konrad Pozniak
e8d1b16b39
improve custom emoji support (#687) 2018-06-24 09:53:23 +02:00
Conny Duck
6e43d3fbe8 remove extra translation to fix build 2018-06-18 13:58:14 +02:00
Konrad Pozniak
a42ce9b793
fix media resizing (#686)
* fix media resizing

* move exception catching out of method
2018-06-18 13:26:31 +02:00
Konrad Pozniak
63f9d99390
Account activity redesign (#662)
* Refactor-all-the-things version of the fix for issue #573

* Migrate SpanUtils to kotlin because why not

* Minimal fix for issue #573

* Add tests for compose spanning

* Clean up code suggestions

* Make FakeSpannable.getSpans implementation less awkward

* Add secondary validation pass for urls

* Address code review feedback

* Fixup type filtering in FakeSpannable again

* Make all mentions in compose activity use the default link color

* new layout for AccountActivity

* fix the light theme

* convert AccountActivity to Kotlin

* introduce AccountViewModel

* Merge branch 'master' into account-activity-redesign

# Conflicts:
#	app/src/main/java/com/keylesspalace/tusky/AccountActivity.java

* add Bot badge to profile

* parse custom emojis in usernames

* add possibility to cancel follow request

* add third tab on profiles

* add account fields to profile

* add support for moved accounts

* set click listener on account moved view

* fix tests

* use 24dp as statusbar size

* add ability to hide reblogs from followed accounts

* add button to edit own account to AccountActivity

* set toolbar top margin programmatically

* fix crash

* add shadow behind statusbar

* introduce ViewExtensions to clean up code

* move code out of offsetChangedListener for perf reasons

* clean up stuff

* add error handling

* improve type safety

* fix ConstraintLayout warning

* remove unneeded ressources

* fix event dispatching

* fix crash in event handling

* set correct emoji on title

* improve some things

* wrap follower/foillowing/status views
2018-06-18 13:26:18 +02:00
Ivan Kupalov
c450af7b0d Fix account media progress indicator (#684)
* Fix account media progress indicator

* Use Kotlin Android ext in AccountMediaFragment
2018-06-17 21:49:51 +02:00
Paul
87f007086f Complete french translation (#668) 2018-06-09 21:01:48 +02:00
Quentí
689d743559 Latest update for Occitan (#678) 2018-06-09 21:01:32 +02:00
Isak Alexander
c58608de43 add swedish translation (#674)
* Create string.xml

* Rename string.xml to strings.xml

* Update strings.xml

* 100% done

Swedish translation 100% done.

* Corrected first line with correct path.
2018-06-07 22:30:27 +02:00
Ivan Kupalov
7254a5d7d6 Add smaller and larger font options (fix #657) (#660)
* Add smaller and larger font options

* Fix test sizes, comment out translations
2018-06-07 22:19:39 +02:00
Conny Duck
e63efdde5d fix layout rotation 2018-06-07 22:11:03 +02:00
Conny Duck
6f34b9adab fix crash on tablets 2018-06-07 22:05:01 +02:00
Paul
30856a2f82 Enable boosting of own private toots, closes #664 (#666) 2018-05-28 21:29:06 +02:00
Ivan Kupalov
3756a1fd20
Add EventHub, add fav, reblog events, improve timelines (#562)
* Add AppStore, add fav, reblog events

* Add events, add handling to Timeline

* Add event handling to Notifications

* Mostly finish events

* Fix unsubscribing

* Cleanup timeline

* Fix newStatusEvent in thread, fix deleteEvent

* Insert new toots only in specific timelines

* Add missing else

* Rename AppStore to EventHub

* Fix tests

* Use DiffUtils for timeline

* Fix empty timeline bug. Improve loading placeholder

* Fix AsyncListDiff, loading indicator, "load more"

* Timeline fixes & improvements.

Fix infinite loading. Remove spinner correctly.
Don't refresh timeline without need.
2018-05-27 11:22:12 +03:00
Levi Bard
3a8d96346b fix rtl unicode formatting (#659)
* Isolate usernames when formatting, to improve interaction of RTL usernames with LTR locales (and vice versa)

* Add bidirectionality safeguards in NotificationHelper

* Cache bidirectionality formatter instance in NotificationsAdapter
2018-05-24 19:00:17 +02:00
Quentí
e79b47552e [i18n] Update for Occitan (#652)
* First commit update for Occitan

* Update strings.xml

* Update strings.xml
2018-05-21 21:48:38 +02:00
Konrad Pozniak
d4572a9d0e
some Optimizations for tablets (#647)
* show ComposeActivity as Dialog on tablets

* limit timeline width on large devices

* limit width on large devices for thread view and search

* increase media preview size on large devices
2018-05-16 19:14:53 +02:00
Levi Bard
7e1f5edeca Behave like Mastodon web ui and only count URLs as 23 characters when composing (#629)
* Refactor-all-the-things version of the fix for issue #573

* Migrate SpanUtils to kotlin because why not

* Minimal fix for issue #573

* Add tests for compose spanning

* Clean up code suggestions

* Make FakeSpannable.getSpans implementation less awkward

* Add secondary validation pass for urls

* Address code review feedback

* Fixup type filtering in FakeSpannable again

* Make all mentions in compose activity use the default link color
2018-05-16 19:14:26 +02:00
Conny Duck
41743b0dca fix crash in SearchFragment 2018-05-14 18:23:33 +02:00
Ivan Kupalov
23d84dfa66 Show image descriptions in gallery (#630)
* Add circleci

* Commit to maybe fix ci

* Suppress false positives in lint

* Disable linting for tests in ci

* Add image descriptions to gallery

* Fix test

* [CI] Attempt to fix OOM error

* [CI] Attempt to fix OOM error, 2

* Add option to open status from media

* fix theme issue

* increase linespacing on media description
2018-05-10 20:13:25 +02:00
Constantin A
1108652823 EmojiCompat support (#600)
* Add EmojiCompat

* EmojiCompat doesn' replace all emojis anymore

* This app should be now capable of loading a EmojiCompat-font located in a file somewhere inside the device's storage

* Should now replace all emojis

* Add EmojiCompat support to EditTextTyped

* Provide EmojiCompat fonts

* The app won't crash anymore when no emoji font is available.
Emoji font should now be located at [Private external app directory]/files/EmojiCompat.ttf

* Removed BundledEmojiCompat dependency

Since this EmojiCompat-implementation does not rely on BundledEmojiCompat, there's no reason to have it enabled.

* Update EditTextTyped.kt

Since connection isn't assigned to (I tried doing so), it can be declared final/val again.

* Update README.md

* Add some non-working emoji preferences

* Add a short font list for testing

* Finished implementation

* Add Twemoji to font list

* Update documentation, more comments

* Delete AssetEmojiCompat which is obsolete now

* Update the font list

* Update the font list

* Fix font list & add Exception handling for malformed JSON files (hopefully)

* More fixes. It should work now...

* Removed AssetEmojiCompat (again)

* Add most of the changes

* Improved the EmojiCompat dialog's style

* The font list is now based on a static layout without external files

* Re-add the real font URL for Twemoji

* Emoji-font captions are now translatable

* Removed one unused String (loading)

* Removed emoji fonts from this repo

* Applied changes from the PR change requests

* The correct emoji font will be selected after cancelling a change

* Add details on the EmojiCompat fonts available (not shown yet)

* Add licensing information on Twemoji and Blobmoji

* Reworked some strings

* Moved FileEmojiCompat to its own library

* Update FileEmojiCompat to the latest version (1.0.3)

* EmojiCompat bug should be fixed

* Better handling of failed downloads

* Removed one TODO

Signed-off-by: Constantin A <10349490+C1710@users.noreply.github.com>

* Update emoji attribution strings

Signed-off-by: Constantin A <10349490+C1710@users.noreply.github.com>

* Fixed some misspelled strings

Signed-off-by: Constantin A <10349490+C1710@users.noreply.github.com>
2018-05-10 11:16:56 +02:00
Conny Duck
d9c481cf1c make debug notifications distinguishable from prod notifications 2018-05-09 23:31:47 +02:00
Levi Bard
30fffcd9ca When replying, set default post visibility to the most restrictive of: original post visibility, default visibility preference. (#641)
Issue #636
2018-05-09 23:04:00 +02:00
Conny Duck
33c59cf578 remove unneeded notification channel 2018-05-08 22:36:04 +02:00
Conny Duck
e58fabbcc0 make notifications open notification tab again 2018-05-08 20:58:06 +02:00
Konrad Pozniak
27b4cf8739
1.8 fixes (#637)
* fix lint warnings

* upgrade dependencies

* auto cancel notifications

* improve dependency injection

* fix tests

* remove old comment from BaseActivity

* fix missing injectors
2018-05-08 19:15:10 +02:00
Konrad Pozniak
26fb180d1a update german translation (#638)
* update german translation

* fix capitalization
2018-05-08 11:42:28 +03:00
Evgeny Petrov
57e8a61cf0 [RU] New strings for 1.8 (#634)
I'm not sure whether we should use word "статусы" (statuses) or "посты" (posts). Or how to mix them in the right way
Anyway, here are the new strings.
2018-05-07 21:57:05 +03:00
Konrad Pozniak
a2bfef3101
move bottom sheet from fragments to activities (#628)
* move bottom sheet from fragments to activities

* move BottomSheetLogic to dedicated abstract Activity

* change tests

* improve code
2018-05-06 22:05:54 +02:00
nailyk
1c711eca22 Translates: FR: Remove unused strings (#632)
* Some strings are gone. Lets remove them.
2018-05-06 20:42:50 +02:00
Conny Duck
36a90d0856 fix crash when cancelling notifications 2018-05-06 13:17:17 +02:00
Conny Duck
67cf199b03 fix bug where media is not uploaded after ComposeActivity recreation 2018-05-06 13:02:02 +02:00
remi6397
e8c79cce65 Notification tweaks: Grouping and Quick Reply button (#587)
* Added notification grouping and Quick Reply button

* Legal stuff

* Coding style

* Check whether account still exists when sending a quick reply

* Add "compose" button

* Polish translation

* Improve strings

* Code style

* Cancel notification when user hits "compose" button

* Notification counter

* Make sure to open ComposeActivity for notification recipient account

* Add ability to request account switch when starting an activity
2018-05-06 11:07:10 +02:00
Quim Gil
aa48acdbec Missing "custom" equivalent in translation (#626)
Original English string is about "custom emojis" and therefore a better translation is "emojis personalizados". Note that "emoji" is a neologism accepted and understood in Spanish (see e.g. Spanish Wikipedia).
2018-05-03 22:19:50 +02:00
Ivan Kupalov
5f0641eb3e
[CI] Add CircleCI config (#621)
* Add circleci

* Commit to maybe fix ci

* Suppress false positives in lint

* Disable linting for tests in ci

* Remove unused comment
2018-05-02 23:50:19 +03:00
Levi Bard
0aeab2a983 Add tests for search functionality in SFragment (#617)
* Add tests for search functionality in SFragment

* Parameterize url matching tests

* Clean up / compartmentalize search tests

* Make SFragmentTest filesystem location match package name
2018-05-02 23:43:12 +03:00
Konrad Pozniak
5cfe6f8fa5
make search find statuses (#613) 2018-04-30 11:30:10 +02:00
nailyk
c72619b838 Translates: FR: Update strings (#616)
* Update needed strings.
 * Thanks to @treyssatvincent for the update in #560 !

Signed-off-by: nailyk-fr <nailyk_git@nailyk.fr>
2018-04-30 10:36:54 +02:00
Conny Duck
d90a011561 fix proxy settings 2018-04-30 10:34:38 +02:00
Levi Bard
ff7c54e739 Add tests for the custom toot character limit functionality (#599)
* Query instance for toot character limit
Fixes #393

* Move maximumTootCharacters to instance field

* Add caching for maximum toot characters, expanding on the emoji list storage

* Update formatting per review feedback

* Fix compose activity tests

* Rename mastodon api point for nicer interaction with kotlin

* Default emoji list to empty list instead of null, to appease json converters in failure cases

* Add test coverage for custom toot character limit setting

* Fix compiler warnings
2018-04-29 10:08:25 +02:00
Conny Duck
d4425c619a improve item_status_detailed layout for all font sizes 2018-04-29 09:06:26 +02:00
Konrad Pozniak
89f93eab85
Fix SparkButtons (#608)
* fix the SparkButtons

* dont notify adapter after boost/fav
2018-04-28 22:59:46 +02:00
Conny Duck
48c239338d set allowBackup to false 2018-04-28 21:19:38 +02:00
Ivan Kupalov
f3c6abdd4d Add expand/collapse button for threads (#609) 2018-04-28 16:17:01 +02:00
Ivan Kupalov
3dfe43dfb2 Open links in new tabs (#603) 2018-04-26 22:52:45 +02:00
Conny Duck
aecdbda375 fix crash when de/serializing InstanceEntity 2018-04-25 20:26:00 +02:00
Levi Bard
76eae44324 View links to statuses inside Tusky (#568)
* View links to statuses inside Tusky

* Only attempt to open links that look like mastodon statuses

* Add support for pleroma statuses

* Move "smells like mastodon" url check to click handler

* Add bottom sheet to notify users of post query status

* Improve architecture for managing search status

* Push everything into SFragment

* Add external lookup for non-locally-resolved account links

* Clean up copypasta from LinkHelper.setClickableText

* Apply PR feedback

* Migrate bottom sheet wrappers to CoordinatorLayout
2018-04-25 20:04:55 +02:00
Conny Duck
3f71c5495f Release 37 2018-04-23 19:28:11 +02:00
Konrad Pozniak
20033f844a fix emoji & toot size limit caching 2018-04-23 09:26:03 +02:00
Konrad Pozniak
23f7f04aa8 improve "save draft" dialog show condition 2018-04-22 21:04:19 +02:00
Konrad Pozniak
d9e29e2cb6 fix crash in MainActivity when clicking notification 2018-04-22 20:40:52 +02:00
Konrad Pozniak
b4ba457d89
Dependency injection improvement (#596)
* inject MastodonApi into LoginActivity

* inject AccountManager into MainActivity

* inject AccountManager into SplashActivity, convert to Kotlin

* inject AccountManager into AccountActivity

* inject AccountManager into LoginActivity

* inject AccountManager into NotificationsFragment and NotificationClearBroadcastReceiver, fix MainActivity

* ooops

* use same OkHttpClient for Retrofit & Picasso

* fix ordering of okhttp interceptors

* remove dependencies on TuskyApplication

* bugfix
2018-04-22 17:20:01 +02:00
Konrad Pozniak
d17ff3eb0f fix problems with selectable text in detailed status 2018-04-22 16:34:02 +02:00
Konrad Pozniak
787cfbc82a fix Kotlin compiler warning 2018-04-22 14:11:41 +02:00
Quentí
7dcd5aa21e new Occitan translation (#597)
* [OC] first version of the translation

I'll make more changes soon, so it matches the same wording as in the Mastodon UI.

* Update strings.xml

* Update strings.xml

* Update strings.xml

* Update strings.xml
2018-04-22 12:56:12 +02:00
Konrad Pozniak
79f7f884d9
fix sending notifications (this time for reals) (#594) 2018-04-22 10:37:09 +02:00
Levi Bard
e2adddf7b8 Query instance for toot character limit (#571)
* Query instance for toot character limit
Fixes #393

* Move maximumTootCharacters to instance field

* Add caching for maximum toot characters, expanding on the emoji list storage

* Update formatting per review feedback

* Fix compose activity tests

* Rename mastodon api point for nicer interaction with kotlin

* Default emoji list to empty list instead of null, to appease json converters in failure cases

* Use empty list helper

* Fix database migration
2018-04-22 10:35:46 +02:00
littlebelgianwriter
797132a643 New Dutch Translation (#593)
* New Dutch Translation

* Update strings.xml

* fix unescaped character
2018-04-22 09:57:36 +02:00
Óliver García Albertos
d99a18dc56 strings: Add spanish translations (#590)
* strings: Add spanish translations

I kept more or less the same length as the original english translations so everything should fit, although I'm unable to test them at the moment.
For every string I wasn't sure how to translate I checked it against the web interface equivalent from mastodon.social
For every alert or information provided by the app I used a polite verb form, while keeping casual ones for interactions between users.

* strings: Add missing spanish translation
2018-04-20 17:26:47 +02:00
Levi Bard
f66b2baf25 Fix unhandled exception when opening report activity (#592) 2018-04-20 17:22:40 +02:00
remi6397
1fdb624b4b Define "free software" (#591) 2018-04-20 17:21:52 +02:00
Conny Duck
7f5f0e8dd8 show error message when instance has no custom emojis 2018-04-17 22:39:55 +02:00
Conny Duck
145c6a8acb strip slashes from instance domain to avoid crash 2018-04-17 20:51:33 +02:00
Conny Duck
4bdcc9667e fix problem where send notification would stay on forever 2018-04-17 20:07:47 +02:00
Konrad Pozniak
63ab0ef839
Fix crash in EditProfileActivity on Android 8 (#585)
* fix bug where sometimes mentions where duplicated when replying

* fix for crash on Android 8
2018-04-17 19:25:56 +02:00
Conny Duck
b621f8f78d fix bug where sometimes mentions where duplicated when replying 2018-04-17 19:06:28 +02:00
Conny Duck
df5e3a1621 fix crash when loading timelines 2018-04-17 18:37:01 +02:00
remi6397
6ba5017341 Improved consistency of Polish translation. (#578) 2018-04-15 09:38:59 +02:00
Conny Duck
ae02fba437 remove unneeded takePersistableUriPermission
was a mistake to add this in the first place
2018-04-14 18:17:29 +02:00
aka-rin
cf5b810cc5 Update zh-XX Translations (#575)
* i18n: update zh-cn translations.

* i18n: update zh-sg translations.

* i18n: update zh-HK translations.

* i18n: update zh-MO translations.

* i18n: update zh-TW translations.
2018-04-14 16:55:05 +02:00
ButterflyOfFire
6fd27e20ec update arabic translation (#576)
* Add files via upload

* Updating arabic translation

* fix build error
2018-04-14 16:54:31 +02:00
Evgeny Petrov
80e8d8b014 Russian language updated (#574)
* Russian language updated

Please note that I made the translation with [Stringlate](https://github.com/LonamiWebs/Stringlate) so there might be some issues with formatting. Please let me know if any.

* Fixed quotes in <a href> tags
2018-04-14 14:34:01 +02:00
Conny Duck
d5e535fe1c update German translation 2018-04-14 14:33:45 +02:00
Conny Duck
28a85639ed upgrade minSdkVersion to 19 2018-04-14 13:56:48 +02:00
Marcin Mikołajczak
8b93b4379e i18n: Update Polish translation (#572)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-04-14 08:57:58 +02:00
Konrad Pozniak
27eefbf65a
ComposeActivity improvements (#548)
* do not add media urls to status text

* add scrolling to content

* add arrow icon and animation to replying-to toggle

* remove unnecessary compose_button_colors.xml

* improve toot button

* improve bottom bar, add bottom sheet for compose options, dedicated cw button

* fix crash on Android < API 21

* move media picking from dialog to bottom sheet

* add small style tootbutton

* fix colors/button background for light theme

* add icons to media chose bottom sheet

* improve hide media button, delete unused styles

* fix crash on dev build when taking photo

* consolidate drawables

* consolidate strings and ids, add tooltips to buttons

* allow media only toots

* change error message to show max size of upload correctly

* fix button color

* add emoji

* code cleanup

* Merge branch 'master' into compose_activity_refactoring

# Conflicts:
#	app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java

* fix hidden snackbar

* improve hint text color

* add SendTootService

* fix timeline refreshing

* toot saving and error handling for sendtootservice

* restructure some code

* convert EditTextTyped to Kotlin

* fixed pick media button disabled color

* force sensitive media when content warning is shown

* add db cache for emojis & fix tests

* reorder buttons to match mastodon web

* add possibility to cancel sending of toot

* correctly delete sent toots

* refresh SavedTootActivity after toot was sent

* remove unused resources

* correct params for toot saving in SendTootService

* consolidate strings

* bugfix

* remove unused resources

* fix notifications on old android for SendTootService

* fix crash
2018-04-13 22:37:21 +02:00
Conny Duck
8a23f034f0 prevent soft keyboard from opening automatically in EditProfileActivity 2018-04-11 19:15:22 +02:00
Conny Duck
066c46b2e4 fix tamil string 2018-04-11 19:07:31 +02:00
Manimaran.K
c5f6c070dc Translation for Tamil language (#569) 2018-04-10 22:47:06 +02:00
Conny Duck
54d45585e6 improve spoiler warning button & detailed status text size 2018-04-09 16:44:57 +02:00
Christian Paul
289954e7d4 Make German translation more consistent (#567)
* German translation: der Toot becomes der Beitrag

* German translation: Toot! becomes Teilen!

* German translation: berichtet becomes gemeldet

* German translation: NSFW-Inhalte become Heikle Inhalte

* German translation: Followers become Folgende

* German translation: Followanfrage becomes Folgeanfrage
2018-04-09 12:40:12 +02:00
Conny Duck
e8ec2bc274 fixed avatar_default not displaying correctly on the light theme 2018-04-07 16:09:07 +02:00
Conny Duck
6120072730 add disk cache for images 2018-04-06 22:04:14 +02:00
Gareth Murphy
6d6c9575c4 Add regular expression feed filtering (#557)
* Initial implementation of regex feed filtering

Mimics Mastodon web's functionality, but in a simpler form; a single
regular expression is shared across the home, local and federated feeds.

Strings are currently only provided in English and will need to be
translated.

* Fix buggy behaviour on filter regex update

* Validate regex filter input

Fixes buggy behaviour on inputting a regular expression feed filter by
testing the expression continuously as the user types, displaying an
error and disabling the 'OK' button of the dialog at any time it's not a
valid regular expression. Disables spelling suggestions in the input to
make the experience less frustrating and error prone.

Also fixes some generally buggy behaviour upon preference change,
specifically in cases where no Matcher was set prior to a new pattern
being set, which would cause the app to crash.

* Apply regex filter to spoiler text

* Get rid of empty catch block in regex filter code

* Make regex filter error string translatable
2018-04-05 22:58:44 +02:00
Conny Duck
21344866d3 fix note not displaying correctly in EditProfileActivity 2018-04-05 21:46:34 +02:00
Konrad Pozniak
8bca651f53 make text in detailed toots selectable 2018-04-01 15:45:08 +02:00
Konrad Pozniak
3708421362 add new avatar placeholder 2018-03-30 19:46:36 +02:00
Konrad Pozniak
2851e4d38b make avatar rounding independent of image size 2018-03-30 19:08:24 +02:00
Konrad Pozniak
1af0b6fd48 fixes a bug where the ProgressBar in NotificationsFragment would not show up 2018-03-30 09:56:09 +02:00
Conny Duck
3628b8431d add possibility to un/lock accounts 2018-03-27 20:46:53 +02:00
Conny Duck
361352c2e1 upgrade avatar size for Mastodon 2.3 2018-03-27 20:13:24 +02:00
Ivan Kupalov
a5cffe0fea Add Dagger (#554)
* Add Dagger DI

* Preemptively fix tests

* Add missing licenses

* DI fixes

* ci fixes
2018-03-27 19:47:00 +02:00
Conny Duck
720f7c6a0c fix issue where scrolling wont stop after jumping to top 2018-03-17 19:46:01 +01:00
Conny Duck
98b652b7a1 fix crash in StatusBaseViewHolder 2018-03-15 22:08:12 +01:00
Levi Bard
043ac58254 improve content warning button
* Use the entire content warning text + button as the hitbox for the "Show more/less" toggle

* Move the content warning toggle button to its own line and give it a little more space

* Move content warning elements into parent layout, remove now-superfluous FlowLayout

* Use marginTop/Bottom instead of Vertical, which is only in sdk 26+

* Update minimum width for content warning toggle button
2018-03-15 19:15:12 +01:00
aka-rin
c50d0319f3 Fix zh-xx translations (#551)
* Update strings.xml

* Update strings.xml

* Fix zh-cn, zh-sg, zh-hk translations.

* Update strings.xml

* Fix zh-mo, zh-tw translations.
2018-03-12 21:31:33 +01:00
INAGAKI Hiroshi
82021939b4 l10n: update Japanese translation (#549)
Update japanese translations for some new functions.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-03-11 09:42:21 +01:00
Ivan Kupalov
28e46c9cc0 Add ComposeActivity tests. Add ServiceLocator (#542) 2018-03-09 22:02:32 +01:00
Conny Duck
4e617dccc7 change the color of all SwipeRefreshLayouts to match the Tusky theme 2018-03-09 20:39:08 +01:00
Conny Duck
9e64bd1307 fix crash in LoginActivity 2018-03-09 19:54:24 +01:00
Conny Duck
44b79e31d4 fail silently when status card cannot be loaded for compatibility with Pleroma 2018-03-09 18:56:05 +01:00
Ivan Kupalov
e82c9dcd2a Compose close dialog + focus fix (#539) 2018-03-05 22:43:13 +01:00
Conny Duck
49e61bab83 fix strings 2018-03-05 15:02:26 +01:00
Conny Duck
37c5fe150e remove unused view from activities 2018-03-05 14:53:33 +01:00
Conny Duck
6e3faa8957 update dependencies, use new scheduleAsync of job library 2018-03-03 13:54:58 +01:00
Konrad Pozniak
71954a277e
convert entity classes to Kotlin data classes (#526)
* convert entity classes to Kotlin data classes

* more data classes, code style
2018-03-03 13:24:03 +01:00
ButterflyOfFire
2f7014e05a Improving arabic translation (#523)
Improving arabic translation
2018-03-03 10:33:26 +01:00
Conny Duck
59d254455d prevent saving of incomplete account information to database 2018-03-02 21:25:58 +01:00
Conny Duck
fec1dbc470 fix link header handling in AccountActivityFragment
- fixes douplication of users after undoing unblocks/unmutes
- removes unnecessary loading when scrolled to end of list
2018-03-02 20:56:09 +01:00
nailyk
a81f691689 Translates: FR: Do not use plural for follows_you (#537) 2018-03-02 20:53:01 +01:00
Conny Duck
ed60cc3a78 gracefully handle null statuses in notifications 2018-03-01 21:10:10 +01:00
Conny Duck
550235d40b only alert once on multiple notifications, fix order of notifications 2018-03-01 19:05:47 +01:00
Conny Duck
254be4b21c make it possible to switch accounts when active account fails to load 2018-02-27 19:38:32 +01:00
Conny Duck
d5ed2f9a40 fix a crash in MediaUtils 2018-02-25 15:46:32 +01:00
Conny Duck
49a74f57a5 fix a crash in ComposeActivity when trying to share images while logged out 2018-02-25 15:41:45 +01:00
Conny Duck
1f9eb41a9a update Tusky urls 2018-02-25 14:51:06 +01:00
nailyk
da54ab5890 Update FR translations (#533)
* Translation: FR: Correct media upload sentences

Signed-off-by: nailyk-fr <jenkins@nailyk.fr>

* Translation: FR: Make follow request sentence innumerable

Signed-off-by: nailyk-fr <jenkins@nailyk.fr>
2018-02-21 22:45:22 +01:00
Marcin Mikołajczak
eb15631c10 Update Polish translation (#532) 2018-02-19 17:43:25 +01:00
Conny Duck
14439c016c increase text size of detailed toot 2018-02-17 13:54:27 +01:00
Conny Duck
c766a203bf fix bug in rtl layout, remove unneeded xml attributes & dimen resources 2018-02-16 22:14:25 +01:00
Conny Duck
1e7725a4a0 fix rare crash when resizing image in EditProfileActivity & prevent upscaling of image 2018-02-15 19:29:03 +01:00
aka-rin
5ebb057828 Add Chinese Translations (#528)
* Add zh-CN translations (first version).

满眼生机转化钧, 天工人巧日争新。

* Add zh-TW translations (converted by OpenCC).

幹,我到底寫了三小……

* Add zh-HK translations (converted by OpenCC).

呢個翻譯真喺 On9!

* Fix some translations in zh-CN.

点一下,玩一年,装备不花一分钱~

* Fix some translations in zh-TW, too.

油條要超越板凳當凶器之首了嗎?

* Fix some translations in zh-HK, too...

大家小心流感

* Minor fixes in zh-CN translations.

翻譯比想象中要難啊……

* Add zh-SG translations (the same as zh-CN).

* Update zh-TW translations.

* Update zh-HK translations, too.

Still needs to be improved...

* Add zh-MO translations (the same as zh-HK).

Now it's all set!

* Fix a character in zh-CN translations...

Don't mind, don't mind...

* Fix the same character in zh-SG translations...

It's all my fault. 😂
2018-02-14 22:29:38 +01:00
Konrad Pozniak
17a122b293
Rewrite EditProfileActivity in Kotlin (#525)
* rewrite EditProfileActivity in Kotlin

* fix bug in MainActivity where profiles would duplicate

* fix code style
2018-02-12 22:04:18 +01:00
Konrad Pozniak
0b59b8d0ac
notification improvements (#522)
* correctly filter notifications on Api >= 26, other fixes and refactoring

* use correct areNotificationsEnabled method in MainActivity

* change notification led color
2018-02-12 22:03:08 +01:00
nailyk
c502e001d7 Translates: FR: Improve translations (#524)
* Add new translate related to multi account,
 * Adjust some translates notification related.

Signed-off-by: nailyk-fr <nailyk_git@nailyk.fr>
2018-02-10 21:13:54 +01:00
Conny Duck
e6d1e3278d fix wrong navbar color in ViewMediaActivity & ViewVideoActivity on Android 8.1+ 2018-02-09 23:25:48 +01:00
Conny Duck
1de45e7dd7 hide follow button on own profile correctly, code optimizations 2018-02-09 22:49:20 +01:00
Conny Duck
1a3907936d fix crash in ComposeActivity when account has no profile picture set 2018-02-08 19:17:08 +01:00
Conny Duck
5dbe3c927e fix timeline filtering not working after app restart 2018-02-08 19:12:02 +01:00
Conny Duck
274343a064 set the correct default theme in preferences 2018-02-05 11:29:08 +01:00
Conny Duck
6dd8c7a3ec fixes a crash when trying to share via Tusky while not logged in 2018-02-05 11:27:32 +01:00
Evgeny Petrov
ba46e90140 Russian translation for Tusky 1.5 (#513)
* Russian translation for Tusky 1.5
* Added multiaccount strings
* Added licence strings
* Added media caption strings
* Added lists strings
* Added HTTP proxy strings
* Added theme strings
* Some small fixes

* Tusky-RU: A small fix for "visually_impaired" strings

* Tusky-RU: Some fixes for "Proxy" strings.
"Blind" translating is bad :(
2018-02-04 15:16:01 +01:00
Conny Duck
5b8cbeb7e9 Release 32 2018-02-04 10:31:50 +01:00
Conny Duck
b5baaa89cf add database migration 2018-02-04 10:12:01 +01:00
Conny Duck
f76d90affd set proxy setting to default off 2018-02-04 09:32:05 +01:00
Conny Duck
305d67fd2c improve german translation 2018-02-04 09:30:29 +01:00
Conny Duck
9b6ca7ff42 remove unused resources 2018-02-03 23:43:06 +01:00
Conny Duck
f08efec0b6 simplify theme handling 2018-02-03 23:26:53 +01:00
Konrad Pozniak
92ae463b38
Multi account feature (#490)
* basic implementation

* improve LoginActivity

* darken drawer background image

* add current avatar in ComposeActivity

* add account name to logout dialog

* multi account support for notifications

* multi account support for notifications

* bugfixes & cleanup

* fix bug where somethings notifications would open with the wrong user

* correctly set active account in SFragment

* small improvements
2018-02-03 22:45:14 +01:00
Conny Duck
c9004f1d54 adjust follow button font size 2018-02-03 13:34:40 +01:00
Conny Duck
3524a67a7f simplify list_item layout 2018-02-03 13:24:12 +01:00
Conny Duck
adc91235ee reorganize manifest permissions 2018-01-31 22:24:08 +01:00
Conny Duck
3c795c6eef upgrade to minSdkVersion 18, fix some lint warnings 2018-01-31 21:57:50 +01:00
nailyk
2eaf727a1d Translate: Polish: Correct typo (#511)
* Add missing '!'. Should unbreak the build.
2018-01-30 18:24:08 +01:00
Conny Duck
6305f19f0c fix bug where sometimes a mention would be underlined 2018-01-29 22:11:32 +01:00
Marcin Mikołajczak
f18f759c10 Update Polish translation (#510)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-27 22:25:28 +01:00
remi6397
11105f4aac Theming improvements (#502)
* Split theme definitions into day and night

* Add support for Night Mode in code

* Add theme chooser in preferences

* Fix translations

* Adjust IDs

* Adjust preferences for custom themes

* UI tweaks for custom theme support

* Added code for custom theme support 🍅

* Fixed resource display in Kotlin 🍅

* Restored styles

* Updated strings

* Fixed getIdentifier() to fit into setTheme()

* Removed redundant resources

* Reset default theme to "Dusky"

* Fixed night mode handler to maintain compatibility

* Refactor functions to use helper methods

* Added license block

* Added preview to theme selector

* Added color identifier getter helper method

* Fixed reference in AccountMediaFragment

* Cleanup

* Fixed navbar foreground not changing color

* Fix fallback theme switch(){}

* Enable location-based daylight trigger

* Cleanup

* Modified theming strategy to reduce clutter in preferences

* Updated translations for latest version

* Removed "Default" theme flavor from settings

* Updated Polish translations 🇵🇱

* Modified TwilightManager handling code to support Android M's UiModeManager features and moved it to its own function

* Updated Polish translations 🇵🇱

* Cleanup; Fixed hardcoded string

* Added missing escape in string

* Removed permission request dialog.

As we now use native UiModeManager APIs that don't need special permission for Android 6.0 and above, we no longer need to bother user with Android M+ specific location permission request dialog.

* Increased readability of ThemeUtil class

* Refactored ThemeUtils.setAppNightMode method

* Cleanup
2018-01-20 13:39:01 +01:00
Conny Duck
8fa1320afe prevent crash in NotificationsAdapter when avatar url is not set 2018-01-15 17:06:21 +01:00
Ivan Kupalov
0426e8725a Set caption for media (#500) 2018-01-08 23:16:21 +01:00
Ivan Kupalov
6152043df3 Add basic lists support (#501) 2018-01-06 19:01:37 +01:00
ButterflyOfFire
dd9bba94bb Update Arabic translation #499) 2018-01-04 16:46:56 +03:00
Sergio López
7c83e0f87d implement support for HTTP proxy (#489)
This change allows the user to manually enter an unauthenticated proxy
configuration to be used for all API connections. This is mainly
intended for using Tusky with Tor (via Orbot or a local proxy).
2017-12-26 21:45:08 +01:00
Conny Duck
73342d38cf update arabic translations 2017-12-16 11:06:26 +01:00
Conny Duck
2e4fef69a1 add navigation bar color for API >= 27 2017-12-13 19:35:12 +01:00