Commit Graph

399 Commits

Author SHA1 Message Date
tom79 cc8a2870d6 Small fix when sharing several images. 2017-08-22 11:59:25 +02:00
PhotonQyv c8a3e9a3f1 Merged in PhotonQyv/mastodon_etalab/ImageIntent (pull request #70)
ImageIntent
2017-08-22 09:37:34 +00: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 65c1453d79 Merged in PhotonQyv/mastodon_etalab/ImageIntent (pull request #68)
ImageIntent
2017-08-21 17:42:59 +00: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
tom79 1d17f808a9 Adds a fix to avoid to translate URLs and TAGs 2017-08-21 19:06:26 +02:00
PhotonQyv be47c3cead First pass at allowing user to share images from other apps to Mastalab. Currently only allows for single images. 2017-08-21 16:55:54 +01:00
tom79 907235878b Avoids to translate URLs and TAGs 2017-08-21 17:32:09 +02:00
tom79 874f482f02 Fixes some text color issues in light mode. Fixes an issue with icon colors when going back from settings in light mode. 2017-08-21 09:02:01 +02:00
tom79 a0bc2b9881 Merged in ClickToTop_FaBlMu (pull request #67)
ClickToTop FaBlMu
2017-08-20 16:55:22 +00:00
tom79 3373c84211 References to fragments are done with menu items. Generalizes the process for scrolling to top (fav/block/mute) for all layouts. 2017-08-20 18:46:32 +02:00
tom79 7369faa5d8 Simplify the process for titles (move code to change titles before returns) 2017-08-20 18:36:42 +02:00
PhotonQyv 1620b51da1 Added a fix for the toolbarTitle TextView not having the correct text if user selects Favourites from the menu and then selects one of the timelines from the menu. 2017-08-20 16:03:46 +01:00
PhotonQyv f5786bd4d6 Added code to allow user to return to top of Favourites/Blocked users/Muted users lists. 2017-08-20 15:53:41 +01:00
tom79 fd6fe5bf9e Adds the possibility to remove profile pictures for replies 2017-08-20 12:11:58 +02:00
PhotonQyv fe024fa833 Merged in PhotonQyv/mastodon_etalab/ClickToTop (pull request #65)
ClickToTop: User can click on toolbarTitle to return to top of Timelines & Notifications.
2017-08-20 05:53:26 +00:00
PhotonQyv e4e93469b4 Removed an extra carriage-return that isn't required. 2017-08-19 23:48:11 +01:00
PhotonQyv eb037a19e4 Spotted the wood, finally. Stopped fixating on tabLayout, and got what I needed from sharedpreferences instead. 2017-08-19 23:40:07 +01:00
PhotonQyv bbabc21abd Can't get code to do what I want, so here it is. I'll look again tomorrow. 2017-08-19 21:02:16 +01:00
PhotonQyv e59a7dc4e5 Decided to turn on check, so the new code only works if the tabLayout is not visible. 2017-08-19 19:28:25 +01:00
PhotonQyv 2dd0a6f34d Added code to scroll to the top of Status & Notification fragments on click of the toolbarTitle.
Commented out code would make this code only work if the TabLayout was GONE.
2017-08-19 19:25:21 +01:00
tom79 3501ac89f0 Force the flag to false when errors 2017-08-19 19:10:43 +02:00
tom79 5aeb018eb8 Fixes an issue with the flag which blocks to load more toots in home timeline 2017-08-19 19:02:42 +02:00
PhotonQyv 346ef1a954 Updated to @RequiresApi() notation in Helper.java and added it to ShowAccountActivity.java 2017-08-19 11:37:49 +01:00
PhotonQyv 811199ce5b Added TargetApi() annotation to onLoadingComplete() method to fix a warning. 2017-08-19 11:05:19 +01:00
PhotonQyv 18edbec7a6 Merged tom79/mastodon_etalab into master 2017-08-19 09:31:36 +01:00
tom79 8d0cd411af Push apk 1.4.6 2017-08-19 08:45:30 +02:00
tom79 5461e84a82 Merged in develop (pull request #64) 2017-08-19 06:32:51 +00:00
tom79 d4dbba3d3f Fixes issue with asynchronous call for replies. 2017-08-19 08:28:04 +02:00
PhotonQyv b049662d23 Merged tom79/mastodon_etalab into master 2017-08-18 19:14:35 +01:00
tom79 5ce8638e04 Merged in develop (pull request #63) 2017-08-18 17:30:14 +00:00
tom79 0d8642af49 Prepares release 1.4.6 2017-08-18 19:22:51 +02:00
tom79 25d50320f6 Some other minor changes 2017-08-18 19:22:04 +02:00
tom79 19017d3cf6 Fixes some color issues with about page 2017-08-18 18:29:43 +02:00
tom79 40f35369ca Improves replies mechanism with an asynchronous call once toots are loaded. 2017-08-18 17:50:54 +02:00
tom79 53175e187c Removes char limit 2017-08-18 16:54:43 +02:00