Commit Graph

613 Commits

Author SHA1 Message Date
tom79 f157a13709 One service per socket 2017-09-09 11:38:26 +02:00
PhotonQyv d3f870c708 Merge remote-tracking branch 'remotes/tom-repo/develop' into YandexTranslationFixes 2017-09-09 09:58:36 +01:00
PhotonQyv d4d68be59d Added some comments. 2017-09-09 09:55:52 +01:00
PhotonQyv 7f244824ea Added some comments. 2017-09-09 09:53:04 +01:00
PhotonQyv 618516df0c Added some extra replacements to the yandexTranslateToText() method. 2017-09-09 09:51:03 +01:00
tom79 38f44d0ff5 Some margins 2017-09-08 19:01:16 +02:00
tom79 b50f239cc8 Fixes flag position 2017-09-08 18:53:16 +02:00
tom79 9dedaa0f7a Flags new toots. 2017-09-08 18:30:49 +02:00
tom79 e55c982808 Moves the translation button. 2017-09-08 18:20:02 +02:00
PhotonQyv 5a33e32113 Merged in PhotonQyv/mastodon_etalab/YetAnother_GoogleTranslateFix (pull request #106)
YetAnother GoogleTranslateFix
2017-09-08 10:14:17 +00:00
PhotonQyv 1b3f6fe4b4 Added the other variant that might happen, though I've not come across it as yet. 2017-09-07 18:21:47 +01:00
PhotonQyv 35d879e7e2 Fixes an issue where Google Translate splits up the special tags that are used to replace URLs (leading to "__ u1__" in translated version), which means that the URL doesn't get put back in. 2017-09-07 18:03:54 +01:00
tom79 55cdb41780 Fixes a bug when coming from notifications and the toot is displayed twice. 2017-09-07 19:01:28 +02:00
tom79 1cc9df1de1 Uses a hack to avoid the use of a new library + keeps new emoji in csv file of course. 2017-09-06 18:53:58 +02:00
PhotonQyv 366f85d7ad Merged in PhotonQyv/mastodon_etalab/InterestingGoogleEmojis (pull request #105)
Fix a Google Translate issue
2017-09-06 16:09:00 +00:00
PhotonQyv a73a1b53e0 Fixed an issue with Google Translate not translating a particular toot, hopefully fixes other toots that were failing, though I've ony come across one, so far. 2017-09-06 16:53:56 +01:00
tom79 6fa229d808 Forces refresh when fragments get visible 2017-09-06 16:17:19 +02:00
tom79 67d565430d Removes cache clear in onResume 2017-09-06 15:26:58 +02:00
tom79 d26ebec568 Merge branch 'develop' of https://bitbucket.org/tom79/mastodon_etalab into develop 2017-09-06 07:48:53 +02:00
tom79 ad5fe3f87e Fixes issue with toots displayed twice 2017-09-06 07:48:44 +02:00
PhotonQyv affd83b18b Merged in PhotonQyv/mastodon_etalab/TranslationFix (pull request #104)
TranslationFix
2017-09-06 05:47:47 +00:00
PhotonQyv 3956ef680d Reformatted the line of code to make it easier to see. 2017-09-05 20:38:45 +01:00
PhotonQyv 241407887a Fixes an issue where a '/' on the end of a URL in a toot to be translated causes the __u?__ tag to remain after translation. 2017-09-05 20:37:11 +01:00
tom79 5a2bc65735 Fixes an issue with bubble counters 2017-09-05 19:29:28 +02:00
tom79 cd10fd7a76 Cancel notifications if new content has been read with the app 2017-09-05 19:12:54 +02:00
tom79 8c56dc0b2d Some improvements 2017-09-05 19:04:19 +02:00
tom79 7ef423abd8 Removes some useless methods 2017-09-04 19:01:41 +02:00
tom79 c8a4b2c3ae Retrieves URL in shared content + apply changes in both MainActivity 2017-09-04 07:36:04 +02:00
PhotonQyv 6c5e50a5ca Updated code to work if URL is embedded within other text in sharedText. 2017-09-03 23:30:56 +01:00
PhotonQyv 08024e5cca Some apps don't send the URL as the first part of the EXTRA_TEXT,
and cause app to crash, the BBC News app being one such,
in this case find where the URL is and strip that out into sharedText.

TODO: ASSUMES that URL is at end of sharedText!
2017-09-03 20:29:21 +01:00
tom79 d85452908b Removes unnecessary job 2017-09-03 18:39:25 +02:00
tom79 83c9a6c22b Improves unread toots/notifications - 2 2017-09-03 18:13:13 +02:00
tom79 418c79e64a Improves unread toots/notifications - 2017-09-03 16:35:45 +02:00
tom79 03d9be6cbf Merge branch 'develop' of https://bitbucket.org/tom79/mastodon_etalab into develop 2017-09-03 15:06:18 +02:00
tom79 22e10925fd Improves unread toots/notifications 2017-09-03 15:06:07 +02:00
PhotonQyv 3b09f953f2 Increased width of buttons so that Yandex's displays correctly with two lines of text rather then three. 2017-09-03 12:55:29 +01:00
tom79 f930023578 Fixes an issue when following devs 2017-09-03 12:49:10 +02:00
PhotonQyv 71f00c8a04 Altered the layout slightly to balance up the developer & contributor sections on larger screens. 2017-09-03 11:08:34 +01:00
tom79 3f429b1a4b Accounts are clickable when not remote in about page 2017-09-03 10:44:28 +02:00
tom79 940ecc2436 About page 2017-09-03 10:36:27 +02:00
tom79 7ddd55ef91 Fixes an issue in async 2017-09-02 19:37:18 +02:00
tom79 e1ce215328 prepares async 2017-09-02 19:15:29 +02:00
tom79 daac10d407 Prepares methods and values 2017-09-02 18:43:36 +02:00
tom79 79765d3649 Preview replies set to false by default 2017-09-02 18:18:59 +02:00
tom79 68d9ff9ba7 Improves counters 2017-09-02 18:17:00 +02:00
tom79 25271e1a1e Merge branch 'develop' of https://bitbucket.org/tom79/mastodon_etalab into develop 2017-09-02 17:45:37 +02:00
PhotonQyv 4f3b6cdac4 Merged in PhotonQyv/mastodon_etalab/PhotonQyv-Baseline (pull request #100)
Removed a Toast that is no longer needed.
2017-09-02 15:45:25 +00:00
tom79 0f5f712c6a Improves webview behavior 2017-09-02 17:44:59 +02:00
PhotonQyv 19ba21b2ee Removed a Toast that is no longer needed. 2017-09-02 16:25:01 +01:00
tom79 0939039a98 Improves webview behavior 2017-09-02 16:52:16 +02:00
tom79 6c97bf876c Improves spacing in toots. 2017-09-02 16:33:30 +02:00
tom79 95d10b052d Avoids to store toots when no content was changed (ie: replies). 2017-09-02 11:24:49 +02:00
tom79 1387111684 grab an extract of an article with title and picture when sharing (issue #10) 2017-09-02 10:59:07 +02:00
tom79 831eed8799 Simplify the process to retrieve remote picture and content (Mastalab logic). 2017-09-02 10:13:40 +02:00
tom79 21a86957de Merge branch 'develop' of https://bitbucket.org/tom79/mastodon_etalab into develop
# Conflicts:
#	app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
2017-09-01 19:58:41 +02:00
tom79 de6f245dcd image upload when sharing - 1 2017-09-01 19:14:42 +02:00
PhotonQyv 86ea3d96ff Merged in PhotonQyv/mastodon_etalab/URL_Extract (pull request #99)
URL Extract
2017-09-01 17:14:13 +00:00
PhotonQyv ef23418bb3 Sorting out extracts for shared URLs. Almost got it working, just one little step to work out. 2017-09-01 18:11:30 +01:00
tom79 587025748d Fixes German translation 2017-09-01 18:31:08 +02:00
tom79 82a0521eaf Fixes issue #11 2017-09-01 17:55:14 +02:00
tom79 cd1a441063 Commit apk for tests 2017-09-01 17:24:14 +02:00
tom79 7d3772a922 Allows to hide tabs. 2017-09-01 17:17:22 +02:00
tom79 7ec14069fd Improves streaming API + fixes an issue with blank text at the end of toots 2017-09-01 16:28:40 +02:00
PhotonQyv e27cd6a147 Sorting out extracts for shared URLs. 2017-09-01 14:02:09 +01:00
tom79 a82db61579 Restarts when connection was broken 2017-08-30 15:24:18 +02:00
tom79 6d5ebee334 compiled apk 2017-08-30 10:03:19 +02:00
tom79 afae6fff40 last improvements 2017-08-30 10:01:34 +02:00
tom79 8e4f47b464 removes asynctask from service to avoid indeterminate loading screen when app starts 2017-08-30 08:59:15 +02:00
tom79 44b71dbbe6 French translation 2017-08-30 07:17:44 +02:00
PhotonQyv 0d6c60844c Sorted out a basic colour choice for Notifications, when you have Silent turned on. NB. I can't test it as my phone only has red as a colour. 2017-08-29 20:10:41 +01:00
tom79 0c09a86800 Some improvements 2017-08-29 20:46:48 +02:00
tom79 120ce335fd Fixes potential crashes 2017-08-29 16:48:28 +02:00
tom79 71d533dadf Removes notifications coming from one of the accounts set in the app. 2017-08-29 16:36:40 +02:00
tom79 e27b3dad58 Security if websockets failed 2017-08-29 16:22:57 +02:00
tom79 87379854ff Merged in ActivityAbout_Tweak (pull request #97)
ActivityAbout Tweak
2017-08-29 14:02:52 +00:00
tom79 477c60c7aa new code 2017-08-29 15:57:51 +02:00
PhotonQyv 51f38b0d19 Tweaked the activity_about layout, since I'd noticed on a phone that the credit for Stéphane's logo wasn't shown. 2017-08-29 10:07:47 +01:00
PhotonQyv 0b60beb415 Removed some unneeded imports. 2017-08-29 08:54:14 +01:00
tom79 177e3b9953 Fixes a potential null value 2017-08-29 09:12:32 +02:00
tom79 a32d631ba8 Fixes potential crashes 2017-08-29 08:55:03 +02:00
tom79 a1b2db241b Fixes a bad behavior 2017-08-29 08:32:09 +02:00
tom79 cc3e327fc1 fixes last issues 2017-08-29 07:30:25 +02:00
PhotonQyv de037d1abe Merged in PhotonQyv/mastodon_etalab/TranslationFix (pull request #93)
TranslationFix
2017-08-28 17:27:41 +00:00
tom79 03ba9a2b88 Applies changes for fdroid product flavour 2017-08-28 19:25:19 +02:00
tom79 e3b031940d Last changes 2017-08-28 19:12:40 +02:00
tom79 3a366526b0 catch notifications 2017-08-28 19:04:13 +02:00
tom79 e11a19b86e Programs main jobs - removes useless ones. 2017-08-28 15:35:26 +02:00
tom79 182a391b72 Prepares jobs for streaming 2017-08-28 15:33:05 +02:00
tom79 d222ab3ff2 Changes methods in fragment and mainactivity 2017-08-28 15:30:15 +02:00
tom79 d43feffca8 Implements broadcasts 2017-08-28 15:01:45 +02:00
tom79 325d51187b New design api and events handler 2017-08-28 13:53:07 +02:00
PhotonQyv 56fde141be Corrected spacing. 2017-08-28 11:17:20 +01:00
PhotonQyv f043098e2a When a toot is translated the service used is displayed, also if using Google the 'Powered by...' TextView is clickable and directs you to "https://translate.google.com/", the same way as when using Yandex. 2017-08-28 11:12:41 +01:00
tom79 bcb75f2522 Fixes the layout for settings 2017-08-28 10:59:44 +02:00
tom79 ef92bd82dc Improves search feature by closing it after a search 2017-08-28 10:55:55 +02:00
tom79 18ee3cd762 Adds edition in showaccount activity + removes useless class + layout 2017-08-28 09:36:17 +02:00
tom79 b5da37d103 Creates activity and event click 2017-08-28 09:20:19 +02:00
tom79 1454a17e52 Prepares new nav header 2017-08-28 08:57:29 +02:00
PhotonQyv 45f1922750 Merged in PhotonQyv/mastodon_etalab/FixedNotification (pull request #91)
Fixed Notifications
2017-08-28 06:34:28 +00:00
PhotonQyv 39c9c4c188 Fixed Notifications. I messed up when I changed the code. Mastodon Boop now sounds again, and vibration works for silent notifications. 2017-08-27 22:32:29 +01:00
PhotonQyv 5db0b93f7f Video playback now loops for both video previously downloaded (and stored in cache), and video downloaded for the first time. 2017-08-27 21:46:14 +01:00
tom79 3c00646541 Fixes a FP with bubble counters when scrolling down notifications/home timeline 2017-08-27 17:17:52 +02:00
tom79 86b2872f80 Adds some icons in titles 2017-08-27 17:10:04 +02:00
tom79 4687a0d4d8 Prepares colors 2017-08-27 16:36:18 +02:00
tom79 3a3f612154 Prepares release 1.4.8 2017-08-27 10:06:41 +02:00
tom79 c4bf20483f Tabs improvements for status 2017-08-27 09:53:01 +02:00
tom79 035f2d800f Improvements for small screen sizes 2017-08-27 09:26:55 +02:00
tom79 f28b26b18e Fixes pp in top bar for api < 21 2017-08-26 19:44:39 +02:00
tom79 fcf7ce6f31 special behavior for API < 21 2017-08-26 19:39:11 +02:00
tom79 6340b853f6 Changes name of product flavors 2017-08-26 18:47:52 +02:00
tom79 53269383b7 Fixes the java dir - 2 2017-08-26 18:33:49 +02:00
tom79 06cbc37d73 Fixes the java dir 2017-08-26 18:31:21 +02:00
tom79 01a07a3221 Fixes a bug with toot button 2017-08-26 18:24:46 +02:00
tom79 59d2f04982 adds different version name for checks 2017-08-26 18:07:09 +02:00
tom79 d88b4323dc Separated classes for productFlavors 2017-08-26 17:53:13 +02:00
tom79 88b902d6d4 fixes the toot visibility issue back due to bad merge... 2017-08-26 16:57:44 +02:00
tom79 e7b9553b83 Fixes color issue with tab icons? Removes some errors 2017-08-26 16:39:59 +02:00
tom79 4836327b29 Fixes color issue with tab icons? 2017-08-26 16:38:10 +02:00
PhotonQyv 40cb287ea9 Merged in PhotonQyv/mastodon_etalab/Notification_Light (pull request #85)
Cleaned up code so that Defaults are set up correctly in notifyUser() method.
2017-08-26 14:34:52 +00:00
tom79 3363c8135b back before merge 2017-08-26 16:27:14 +02:00
PhotonQyv 5d9ec01224 Cleaned up code so that Defaults are set up correctly in notifyUser() method. 2017-08-26 15:11:41 +01:00
tom79 2eb00cc53a Fixes last bug with bubble counters 2017-08-26 15:51:03 +02:00
tom79 477607cf9a Fixes last bug with bubble counters 2017-08-26 15:50:10 +02:00
tom79 fac7350c25 Enable light notification for both modes 2017-08-26 11:35:39 +02:00
tom79 0b1e768223 Code cleaning 2017-08-26 11:04:48 +02:00
tom79 2887b2a5ca Code cleaning in activities 2017-08-26 10:57:08 +02:00
tom79 9c7eec1792 Fixes flag value after getting non null pager id 2017-08-26 10:04:09 +02:00
tom79 0de54269fa Merge remote-tracking branch 'origin/develop' into develop 2017-08-26 10:01:09 +02:00
tom79 3ad9a81e99 Fixes an issue with notifications 2017-08-26 10:00:53 +02:00
PhotonQyv fc56e216ed Merged in PhotonQyv/mastodon_etalab/Notification_Light (pull request #84)
Slowed the notification light down.
2017-08-26 08:00:16 +00:00
PhotonQyv 304c9913e4 Slowed the notification light down. 2017-08-26 08:44:26 +01:00
PhotonQyv 401a6d2b29 Merge remote-tracking branch 'remotes/tom-repo/develop' into MastodonBoop 2017-08-25 20:28:44 +01:00
PhotonQyv ae6e109bdf Merge remote-tracking branch 'remotes/tom-repo/develop' into MastodonBoop
# Conflicts:
#	app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
2017-08-25 20:28:17 +01:00
PhotonQyv 93dc95bb75 Added notification light, that may or may not be blue (on my phone it's red). 2017-08-25 19:54:42 +01:00
tom79 e42812ea5b Some changes with delay + 2 new german localizations (need to be updated) 2017-08-25 18:16:30 +02:00
tom79 1099718cfa Adds Google Translate 2017-08-25 16:42:45 +02:00
tom79 498a96f468 Displays translation button only when enabled. 2017-08-25 16:19:56 +02:00
tom79 d192777f38 Prepares drawers 2017-08-25 16:08:40 +02:00
tom79 1c1ab6a4e6 Prepares layouts + preferences 2017-08-25 15:53:04 +02:00
tom79 529a6d79f0 Merged in BadgeView (pull request #80)
BadgeView
2017-08-25 13:31:31 +00:00
tom79 69b6ec73f0 Fixes last issues 2017-08-25 15:30:35 +02:00
tom79 f89692411c Adds the management of counters into settings 2017-08-25 14:30:55 +02:00
tom79 24e21c0210 Prepares for settings + fixes a bug 2017-08-25 12:53:08 +02:00
tom79 ec760849ed Fixes some issues + 2 2017-08-25 12:45:42 +02:00
tom79 1289379582 Fixes some issues 2017-08-25 10:25:13 +02:00
tom79 7cd7b0e2e5 Layout improvements for tablets 2017-08-24 19:28:03 +02:00
tom79 166b472727 Improves tab layout + fixes an issue with two local/public timelines 2017-08-24 18:55:44 +02:00
tom79 c3bd364543 Some layout improvements 2017-08-24 18:05:57 +02:00
tom79 f8ad45bc9c Fixes some issues 2017-08-24 17:35:39 +02:00
tom79 697b7c8402 Adds German localization 2017-08-24 16:28:09 +02:00
tom79 34701d2dbb Some other implementations... 2017-08-24 15:57:35 +02:00
PhotonQyv 0839936721 Also now removes the correct text_url from a toot if its attachment is removed. 2017-08-24 14:55:18 +01:00
PhotonQyv 6d87ab0c75 Changed the code so that the shorter text_url of an attachment is added to the toot, to save a few characters, to give user a few more to use for their message. 2017-08-24 14:51:18 +01:00
tom79 f21881f697 Retrieves count of unread toots/notifications 2017-08-24 15:22:04 +02:00
tom79 48cf5732c0 Prepares method 2017-08-24 13:03:22 +02:00
tom79 384ca96a40 Prepares the layout 2017-08-24 11:56:29 +02:00
PhotonQyv b13e3b71fe Merge branch 'TargetApi' into ShowAccountActivity_ScrollToTop 2017-08-23 16:50:22 +01:00
PhotonQyv ca58e8912b Removed unneeded import. 2017-08-23 16:48:56 +01:00
PhotonQyv 45a872c9df Added scrollToTop() capability to the ShowAccountActivity's tabLayout. 2017-08-23 16:44:24 +01:00
tom79 9f2ff50923 Fixes a button color issue in light mode 2017-08-23 15:04:47 +02:00
PhotonQyv d259434999 Merge branch 'master' into TargetApi. 2017-08-23 11:12:57 +01:00
PhotonQyv 91cd17025d Merge branch 'master' into MastodonBoop 2017-08-23 11:06:42 +01:00
tom79 c26036f544 Prepares release 1.4.7 2017-08-23 11:40:58 +02:00
tom79 1ba2bc31cb Improves the layout for tablets 2017-08-23 11:05:11 +02:00
tom79 8a9f52a77a Merged in smooth_hide_header (pull request #75)
Smooth hide header
2017-08-23 08:41:09 +00:00
tom79 b9c5866fbe Improves the layout 2017-08-23 10:40:18 +02:00
tom79 d0a520cacf As the code was moved where it is needed, it would be useless to explain why this permission is needed 2017-08-23 10:27:21 +02:00
tom79 e90b33e188 Put the permission request when clicking to the button to choose a picture. 2017-08-23 10:17:01 +02:00
tom79 33d8df5835 Changes the behavior for show accounts 2017-08-23 09:56:42 +02:00
PhotonQyv 2e3839cbe0 Merged in PhotonQyv/mastodon_etalab/ImageIntent_Limited (pull request #74)
ImageIntent Limited
2017-08-23 05:55:34 +00:00
PhotonQyv be4cd3a2c4 Updated the code so that only a maximum of four (4) shared images are attached to a toot, the rest are quietly discarded. 2017-08-23 00:09:49 +01:00
PhotonQyv 4414ab28cc Merges tom-repo/develop changes. 2017-08-22 23:26:59 +01:00
PhotonQyv 43759cab28 I was using the wrong permission in the shouldShowRequestPermissionRationale() method call. 2017-08-22 21:02:35 +01:00
PhotonQyv b9a84d603d Updated to add a few comments and remove the Toasts. 2017-08-22 20:54:28 +01:00
PhotonQyv 49dfacf331 Working on Permissions. 2017-08-22 19:38:25 +01:00
PhotonQyv 809a0fd9b5 Removed the comment & TODO. 2017-08-22 19:03:29 +01:00
tom79 ca9e44163c Fixes string.xml 2017-08-22 19:19:46 +02:00
tom79 763ca5a831 Fixes some small issues with remote follows 2017-08-22 18:29:38 +02:00
tom79 6d98f0131e Merged in remote_follow (pull request #71)
Remote follow
2017-08-22 16:25:28 +00:00
tom79 9f2400e3be Fixes an issue with the API for remote follows 2017-08-22 18:24:41 +02:00
tom79 a45cc626c2 Adds remote follow & some improvements 2017-08-22 18:15:08 +02:00
tom79 6f463ec872 Finds accounts through web page 2017-08-22 17:34:26 +02:00
tom79 19e0460091 First release to search remote accounts for follows 2017-08-22 15:05:39 +02:00
tom79 cc8a2870d6 Small fix when sharing several images. 2017-08-22 11:59:25 +02:00
PhotonQyv 26afe43604 Merge Tom's develop changes. 2017-08-22 10:32:58 +01:00
PhotonQyv 1cd1d919e0 All toasts that I added are gone. Working fine for ACTION_SEND, fails miserably with ACTION_SEND_MULTIPLE.
Can't work out why! Help!
2017-08-22 10:31:58 +01:00
tom79 123facba2b Prepares remote follows 2017-08-22 11:24:38 +02:00
tom79 d8d4dfc265 Fixes potential crashes when the menu is not inflated 2017-08-22 10:32:50 +02:00
tom79 a12c79755d Merge accounts from the same instance in menu 2017-08-22 09:30:37 +02:00
tom79 123f45fca9 Fixes a small issue with account picker menu 2017-08-22 09:09:31 +02:00
PhotonQyv 8d43faf416 Merged in PhotonQyv/mastodon_etalab/ImageIntent (pull request #69)
ImageIndent: Removed an extra/repeat import statement.
2017-08-22 07:03:24 +00:00
tom79 7c057156f7 Improves account picker menu 2017-08-22 09:02:40 +02:00
tom79 4b1ec378d5 Fixes visibility of the replies in dm for locked accounts 2017-08-22 08:42:45 +02:00
PhotonQyv 19d3459b7c Re-written code in preparation for sorting out using ArrayLists correctly.
Need to remember to lose all the Toasts when I get the damn thing working properly.
2017-08-21 23:10:05 +01:00
PhotonQyv 5c67d8b3fc Updated. 2017-08-21 18:44:14 +01:00
PhotonQyv 2ffcd50706 Merge...
# Conflicts:
#	app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
2017-08-21 18:39:23 +01:00
PhotonQyv ac3be96bf3 Resolved a conflict between this branch and the current tom-repo/develop one. 2017-08-21 18:33:28 +01:00
PhotonQyv ff6923a203 Removed some extra brackets that got put in when I was playing with the logic. 2017-08-21 18:13:09 +01:00
PhotonQyv 64223f9015 Sort out multiple image sharing intent. 2017-08-21 18:09:45 +01:00
PhotonQyv 8240340132 Taken out the multiple intent filter. As I can't get my head around implementing it. 2017-08-21 18:06:51 +01:00