Commit Graph

799 Commits

Author SHA1 Message Date
stom79 10ad34cfc3 Merge branch 'ui_improvements' into recyclerview 2017-10-24 10:42:59 +02:00
stom79 32b753b3d9 Merge branch 'develop' into recyclerview
# Conflicts:
#	app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
#	app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
#	app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
#	app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
2017-10-24 10:30:49 +02:00
stom79 ace213df6e Starting two actionbars 2017-10-24 10:11:07 +02:00
tom79 328f77d54c Fixes notifications on Android O 2017-10-22 11:55:49 +02:00
tom79 28f1cf0958 Merge branch 'improves_stream_tl' into develop 2017-10-21 19:24:00 +02:00
tom79 998e6869be Avoids jumps 2017-10-21 19:19:11 +02:00
tom79 586535840f some cleaning 2017-10-21 17:15:52 +02:00
tom79 cef711a897 improves known status 2017-10-21 17:09:10 +02:00
tom79 201afec571 Some cleaning 2017-10-21 16:56:17 +02:00
tom79 e8997edae1 Merge branch 'develop' into improves_conversations
# Conflicts:
#	app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
#	app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveContextAsyncTask.java
#	app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveContextInterface.java
2017-10-21 16:36:05 +02:00
tom79 7b92d0feff Merge branch 'develop' into improves_conversations
# Conflicts:
#	app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
#	app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveContextAsyncTask.java
#	app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveContextInterface.java
2017-10-21 14:41:12 +02:00
tom79 3874c3495a Fixes issues 2017-10-21 14:35:36 +02:00
tom79 7d08b745e5 improves showconversation 2017-10-21 14:02:39 +02:00
tom79 e7da61bdd3 Fixes issue 2017-10-21 12:34:59 +02:00
tom79 bb6dca8d73 Merge branch 'support_custom_emojis' into develop 2017-10-21 12:33:03 +02:00
tom79 90d7e6e3a6 Display more replies in context 2017-10-21 12:32:27 +02:00
tom79 2c3a925cc9 Improves emojis support 2017-10-21 08:43:57 +02:00
tom79 c32b394160 Improves emojis support 2017-10-21 08:07:04 +02:00
tom79 f36ddba6f9 Emojis support 2017-10-20 19:58:46 +02:00
tom79 a22d61c63d Manages eomjis in helper 2017-10-20 07:11:44 +02:00
tom79 6cdfcd49c1 updates API 2017-10-20 06:57:53 +02:00
tom79 abd399a2da updates classes 2017-10-20 06:54:21 +02:00
tom79 25fde58655 Improves cross actions 2017-10-18 18:58:02 +02:00
tom79 01fc898c04 Changes the url for media which are unknown 2017-10-18 17:12:40 +02:00
tom79 098da433bd Detects unknown media 2017-10-18 17:07:50 +02:00
tom79 8bd6da0d6e Merge branch 'upgrade_android_job' into bug_fix 2017-10-18 17:06:04 +02:00
tom79 30cbb89f23 manages unknown type of media 2017-10-18 16:59:47 +02:00
tom79 2cdb21c33d Adds control on battery 2017-10-18 14:50:52 +02:00
tom79 f8696b129b Upgrades lib & some codes 2017-10-18 14:46:54 +02:00
tom79 1ad15d5e02 Merge branch 'bug_fix' into develop 2017-10-18 14:32:49 +02:00
tom79 8c7ec2b0f3 Fixes null pointer exceptions 2017-10-18 14:31:29 +02:00
tom79 d4842eda35 Fixes index of bound 2017-10-18 14:25:51 +02:00
tom79 ab2fe48b8c Fixes Issue #28 2017-10-18 09:42:20 +02:00
tom79 4dabcd1720 Merge branch 'bug_fix' into develop 2017-10-18 09:21:45 +02:00
tom79 4dad2bc4fb Avoids a bad cast 2017-10-18 09:15:19 +02:00
tom79 dfb84622bd Avoids deleted toots to be dealt 2017-10-18 09:10:07 +02:00
tom79 5c739d499a Moves my account to mastodon.social 2017-10-17 19:20:56 +02:00
tom79 faf995f0c9 Use String instead of Integer 2017-10-17 18:44:24 +02:00
tom79 b5a142b46a possible null pointer ... 2017-10-17 18:35:10 +02:00
Friedger a9a0c9388a use base classes for login and main activity, fixes #27 2017-10-17 13:13:35 +02:00
tom79 8ce0796e07 Avoid issue with icon color 2017-10-15 18:27:52 +02:00
tom79 d5c4175970 Search accounts: adds more info 2017-10-15 18:20:51 +02:00
tom79 febedc9b1f Fixes an issue when removing chars during a search 2017-10-15 18:16:10 +02:00
tom79 b1370143a7 Some improvements with show account activity 2017-10-15 15:40:19 +02:00
tom79 2cba689990 Some improvements with show account activity 2017-10-15 15:39:43 +02:00
tom79 f43a7ac0ac For tablets and with some improvements 2017-10-15 15:09:09 +02:00
tom79 07054739e1 Changes some buttons 2017-10-15 12:05:26 +02:00
tom79 39c5a2b9e2 Removes some useless due to bad layout 2017-10-15 11:57:03 +02:00
tom79 5d54bb3667 Small fix for color 2017-10-15 11:41:05 +02:00
tom79 ac334ba3a4 Some icon changes 2017-10-15 11:35:36 +02:00
tom79 dc6fba7214 Some other color improvements 2017-10-15 11:16:43 +02:00
tom79 8397d3fae3 Change position of some elements in toots 2017-10-15 10:47:41 +02:00
tom79 4cabc66d7b Changes some colors 2017-10-15 10:24:38 +02:00
tom79 7bf58eead8 Merge branch 'changes_font' into develop
# Conflicts:
#	app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
2017-10-15 09:34:48 +02:00
tom79 80377b9112 Changes police 2017-10-15 09:29:59 +02:00
tom79 f868f2a425 Adds filter by long click on the tab 2017-10-15 09:22:56 +02:00
tom79 3c6f9ccae8 Merge branch 'improves_toots' into develop 2017-10-14 17:50:34 +02:00
tom79 516ebe9ddc Improves some colors 2017-10-14 17:48:28 +02:00
tom79 4027fa75af Merge branch 'improves_toots' into develop 2017-10-14 16:46:42 +02:00
tom79 5525b6fc86 Merge branch 'bug_fixes_v60' into develop 2017-10-14 16:46:35 +02:00
tom79 423ebfe008 Fixes an issue when removing picture 2017-10-14 16:45:18 +02:00
tom79 35e3ffa541 Improves pictures 2017-10-14 16:43:18 +02:00
tom79 206810c69d Recyclerview beginning 2017-10-14 14:36:48 +02:00
tom79 67bd790a9e For tablets 2017-10-14 11:09:12 +02:00
tom79 513513046d Changes layout for accounts 2017-10-14 10:14:55 +02:00
tom79 880aa074a1 Fixes header issue api < 21 2017-10-13 19:38:36 +02:00
tom79 e0df1aea85 Merge branch 'improves_show_account' into develop 2017-10-13 19:25:27 +02:00
tom79 ba9563eeb0 Changes the way to manage scroll 2017-10-13 19:06:39 +02:00
tom79 e85b099bdf Removes my code already added by @PhotonQyv 2017-10-13 06:53:27 +02:00
tom79 b477c06c80 Merge branch 'changes_font' into develop 2017-10-13 06:52:08 +02:00
PhotonQyv e7d91131e1 Merged in PhotonQyv/mastodon_etalab/NotificationsListAdapter_FontChange (pull request #134)
Added code to change font for notifications (correct font).
2017-10-13 04:51:18 +00:00
tom79 5b8467c1c2 Adds font in notifications 2017-10-13 06:49:33 +02:00
PhotonQyv ed74bb765d Corrected the font name. 2017-10-12 23:47:41 +01:00
PhotonQyv ef08f55b16 Added code to change font for notifications. 2017-10-12 23:38:52 +01:00
PhotonQyv c87ad948c2 Added code to change font for translations too. 2017-10-12 22:30:34 +01:00
tom79 202ed4ad69 Merge branch 'changes_font' into develop 2017-10-12 18:29:32 +02:00
tom79 2cbbfe7971 Fixes small issue with top icon colors 2017-10-12 18:28:25 +02:00
tom79 d6c79a77c0 Adds Droid font 2017-10-12 18:11:57 +02:00
tom79 78751b2e5e Adds Droid font 2017-10-12 07:22:59 +02:00
tom79 6d6985cf59 Fixes issue with icon boost color 2017-10-12 07:10:59 +02:00
tom79 f191369889 Merge branch 'filter_toots' into develop 2017-10-11 17:41:20 +02:00
tom79 6ba2d68b7d removes some padding 2017-10-11 17:38:21 +02:00
tom79 dc1039bf17 Changes rounded corners 2017-10-11 17:18:32 +02:00
tom79 59874c498c Fixes an error when filtering answers 2017-10-11 17:08:44 +02:00
tom79 345cea6979 Merge branch 'bug_fixes_v60' into improves_toots 2017-10-11 16:15:46 +02:00
tom79 ab730ec91b Merge branch 'filter_toots' into improves_toots 2017-10-11 15:21:25 +02:00
tom79 4aad3f820a Some other changes 2017-10-11 15:21:02 +02:00
tom79 889356b2ce Some other changes 2017-10-11 14:58:52 +02:00
tom79 fea1c4eeaa new insert mail icons 2017-10-11 14:16:56 +02:00
tom79 e33fda3475 new insert photo icon 2017-10-11 14:09:28 +02:00
tom79 a334e444d9 Uses material design icons for favourites 2017-10-11 10:48:18 +02:00
tom79 c6a77e2b62 Fixes potential crashes when no status have been retrieved before first notifications 2017-10-11 10:11:59 +02:00
tom79 2175c17ce6 Filters boosts & replies in home timeline 2017-10-11 09:23:32 +02:00
tom79 e09dbbe307 Adds instance name after some usernames 2017-10-10 18:39:40 +02:00
tom79 47062a4bff Makes all account clickable after a search 2017-10-10 18:31:59 +02:00
tom79 9521bc931b Fixes potential index out of bounds when translating 2017-10-09 19:26:05 +02:00
tom79 bc06c01bd6 Working with both tags and accounts search 2017-10-09 18:55:25 +02:00
tom79 c9605d6720 Order searches 2017-10-09 18:41:16 +02:00
tom79 bae92796c5 Adds search on tags 2017-10-09 18:35:43 +02:00
tom79 dd3ac5394d Adds new icon launcher + adds thanks 2017-10-08 11:54:41 +02:00
tom79 c4b3b90444 Improves remote follow - 2 2017-10-07 18:34:29 +02:00
tom79 c6637eda44 Improves remote follow 2017-10-07 18:18:26 +02:00
tom79 9adeddb4e4 Fixes a bug with boost and cross-account actions 2017-10-07 14:18:02 +02:00
tom79 b6194eabfa Some improvements 2017-10-07 13:00:08 +02:00
tom79 5d954f6902 Fixes jumps in list 2017-10-07 10:16:48 +02:00
tom79 4d0c3dae7e Some fixes 2017-10-07 08:34:50 +02:00
tom79 becae0157a Fixes scroll 2017-10-06 07:16:12 +02:00
tom79 70ca5cb94e Opens account in built-in browser (from topbar) 2017-10-05 19:22:58 +02:00
tom79 e157e92956 Improves cross-account actions with long click 2017-10-05 19:09:56 +02:00
tom79 0f3c64978f Pin can only be done by owner + fixes an issue when query fails 2017-10-05 07:29:35 +02:00
tom79 563bb53f40 Limits cross-account actions to usual timelines (ie: removes them from notification timeline) 2017-10-05 07:16:56 +02:00
tom79 6768f382a8 Avoids to store toots when using cross actions with replies 2017-10-04 17:05:47 +02:00
tom79 26ec3d4a02 Limits actions for private/direct toots. 2017-10-04 16:46:04 +02:00
tom79 3b6159ced5 Adds in settings 2017-10-04 16:12:04 +02:00
tom79 ecb4d2255d Fixes some behaviors 2017-10-04 15:57:53 +02:00
tom79 db41068207 Some changes 2017-10-04 13:55:46 +02:00
tom79 b8a1a1fe8e Some fixes 2017-10-04 13:44:32 +02:00
tom79 a21b26a0ea Manages cross actions 2017-10-04 10:23:12 +02:00
tom79 b077ce3e31 Fixes an issue 2017-10-03 19:21:02 +02:00
tom79 7a77e3e995 Cross actions for reblogs/favourites 2017-10-03 19:16:15 +02:00
tom79 b45fa21c15 Adds methods to handle some errors 2017-10-01 19:01:32 +02:00
tom79 1cee3c9f81 Redraw menu when restoring 2017-10-01 19:01:15 +02:00
tom79 f071a25820 Fixes some issues with menu + prepares 1.4.9-rc-1 2017-10-01 15:36:14 +02:00
tom79 8c91f242ba Adds website url 2017-10-01 15:02:38 +02:00
tom79 8d7774da8f Merge branch 'filter_notifications' into develop 2017-10-01 14:50:45 +02:00
tom79 278af0b281 Fixes issue with click from alert dialog not opening drafts 2017-10-01 12:55:01 +02:00
tom79 65d4a10821 Adds in settings the possibility to disable all notifications
Fixes an issue with counter and FP when filtering notifications
2017-10-01 11:49:37 +02:00
tom79 e036c600e5 Adds clickable tab for notifications 2017-10-01 10:32:51 +02:00
tom79 760cd996a5 Fixes missing translations 2017-09-30 15:53:17 +02:00
tom79 f04fae7a3d Fixes truncate with toots 2017-09-30 11:49:18 +02:00
tom79 0813d65bb8 Fixes url from local streaming tl 2017-09-30 11:25:56 +02:00
tom79 9a85dbfe28 Last changes to manage local timeline with streaming api 2017-09-30 10:57:14 +02:00
tom79 bd9c0f527c fixes in copy/past 2017-09-30 09:01:36 +02:00
tom79 28450bd9b9 Adds changes in fragment 2017-09-30 09:00:00 +02:00
tom79 4e1faa6a67 Prepares service for local timeline 2017-09-30 08:48:44 +02:00
tom79 facade4974 Excludes from notifications values 2017-09-30 08:36:07 +02:00
tom79 0f773d3d7b Fixes an issue when killing service when app went in background 2017-09-30 08:29:39 +02:00
tom79 02e52334b6 Fixes visibility issue to avoid FP 2017-09-29 19:07:42 +02:00
tom79 f0a6abc5c1 Attaches menu to button 2017-09-29 18:59:14 +02:00
tom79 96f2b31a80 Last fixes 2017-09-29 18:53:45 +02:00
tom79 6276d90a0b Minimizes the code for popups 2017-09-29 18:44:20 +02:00
tom79 07a1026f76 Prepares new menu for general timelines 2017-09-29 18:29:56 +02:00
tom79 cc7313ed26 Restarts streaming if stopped for federated timeline (when app goes in foreground and tab is visible) 2017-09-29 16:22:36 +02:00
tom79 15b1809d87 Improves behavior when searching missing toots in federated timeline 2017-09-29 16:10:11 +02:00
tom79 336acdc30c Avoids conflicts with lock in accounts 2017-09-29 14:08:46 +02:00
tom79 178dfdb729 Streaming service for federated timeline stopped immediately when fragment lost focus 2017-09-29 07:19:30 +02:00
tom79 31f1fbff09 Avoids NRA when too much toots in federated timeline 2017-09-28 19:34:26 +02:00
tom79 7b9776f808 Some improvements 2017-09-27 17:52:23 +02:00
tom79 b0a4681a04 StartService when tab focused 2017-09-26 19:35:02 +02:00
tom79 1909522b3d Adds streaming API for federated timeline 2017-09-26 19:19:53 +02:00
tom79 ccfd09f9ca Fixes issue with remaining space left for counter 2017-09-26 07:11:57 +02:00
tom79 e73006fa49 Fixes last bug with broadcastreceiver 2017-09-24 19:27:04 +02:00
tom79 9bc6e4795e Fixes when loading next toots. 2017-09-24 18:44:42 +02:00
tom79 56190e49df Improves menu more in header 2017-09-24 16:51:08 +02:00
tom79 45b6478b20 Makes the profile picture icon in toolbar clickable to open menu 2017-09-24 15:05:00 +02:00
tom79 dea2993005 Enable button when an error occurs to upload new media 2017-09-24 11:59:54 +02:00
tom79 567b6d826e Carriage return for replies 2017-09-24 10:02:56 +02:00
tom79 357614e209 Fixes counter issue for new notifications 2017-09-24 08:52:16 +02:00
tom79 fbb22ed576 Merge branch 'improves_ui' into streaming_api 2017-09-24 08:48:06 +02:00
tom79 e154860248 Fixes counter issue for new toots 2017-09-24 08:47:25 +02:00
tom79 5aeffb8ad7 Some fixes 2017-09-23 18:27:45 +02:00
tom79 dbd14c68f4 Remove menu item in drawer which are already in tabs 2017-09-23 14:26:51 +02:00
tom79 8b48c8600b Move contextual menu 2017-09-23 14:14:15 +02:00
tom79 3abe414d53 Changes some layouts in header 2017-09-23 12:08:52 +02:00
tom79 5a0e4c8131 Fixes Issue #17 - 24 hour clock in Scheduled Toots 2017-09-23 11:31:25 +02:00
tom79 40099dfba1 Removes temp notifications/status when switching to another account 2017-09-23 11:25:55 +02:00
tom79 fa637bb45d - 2017-09-23 08:41:13 +02:00
tom79 ed179d54e7 Allows to force translation button to be displayed 2017-09-23 08:16:32 +02:00
tom79 85b64fbcbd Merge branch 'streaming_api' into develop 2017-09-23 08:06:29 +02:00
tom79 c4892f985c Improves streaming service 2017-09-23 08:05:52 +02:00
tom79 026c5443a3 Merge branch 'streaming_api' into develop 2017-09-22 19:49:56 +02:00
tom79 58865f8a7a Improves streaming service 2017-09-22 19:49:25 +02:00
tom79 7ba6a04192 Fixes replies bug 2017-09-22 14:44:00 +02:00
tom79 5c06197b58 Adds some fixes with strreaming api 2017-09-22 07:22:38 +02:00
tom79 3ad5493c3c Fixes some troubles with streaming api 2017-09-21 07:21:04 +02:00
tom79 8b900ddf55 Merge branch 'develop' into streaming_api 2017-09-20 17:53:43 +02:00
tom79 5f4e5e77c5 Issue #15 2017-09-20 16:53:46 +02:00
tom79 4c3a7f9058 Fixes a bug with auto-correct & some keyboards 2017-09-20 16:32:32 +02:00
tom79 042622f1b4 Fixes a bug with auto-correct & some keyboards 2017-09-20 16:30:21 +02:00
tom79 71a53225db Avoids to add twice same info (status/notifications) when cached 2017-09-20 15:08:07 +02:00
tom79 385d1fce72 Adds a control on the id which sends broadcast to activity 2017-09-20 15:00:47 +02:00
tom79 153dc8f15f Removes draft from db when sent + some other improvements 2017-09-20 14:51:15 +02:00
tom79 e961ecbff7 Adds fragment for drafts and entry in menu 2017-09-20 10:04:40 +02:00
tom79 f77155c3cc Delays the action and adds new mechanism to remove screenshot for mentions in notifications 2017-09-19 19:36:41 +02:00
tom79 394c3e05c5 Delays the action 2017-09-19 19:21:58 +02:00
tom79 47b9e84d51 Merge branch 'develop' into mention_toots 2017-09-19 19:00:14 +02:00
tom79 41868ccab1 Fixes crashes notifications 2017-09-19 18:20:40 +02:00
tom79 ac77f1393a Fixes crashes 2017-09-19 18:19:46 +02:00
tom79 6faf3b5780 Screenshots managed with drawers 2017-09-18 20:32:36 +02:00
tom79 8ef7a2cfd1 Direct & private toots can't be mentionned 2017-09-17 18:55:02 +02:00
tom79 5aeb317eca Last improvements for 1.4.9-beta-2 2017-09-17 16:28:33 +02:00
tom79 3f8e804982 Some improvements with follow/unfollow 2017-09-17 15:44:32 +02:00
tom79 abd1dbb14f Merge branch 'develop' of https://bitbucket.org/tom79/mastodon_etalab into develop 2017-09-17 15:36:29 +02:00
tom79 4740ba8dba Improves streaming API 2017-09-17 15:34:41 +02:00
tom79 df9f229746 Some layout adjustments 2017-09-17 12:25:21 +02:00
tom79 288d737393 Implements async task 2017-09-17 11:50:00 +02:00
tom79 13e1a97829 Updates layouts and drawer actions 2017-09-17 11:28:50 +02:00
tom79 881254f761 Improves streaming API 2017-09-17 10:55:55 +02:00
tom79 1ffea48ad2 Improves mechanism of mentions when toots have images. 2017-09-16 20:02:30 +02:00
tom79 4e253be459 Removes useless icon 2017-09-16 17:02:11 +02:00