Commit Graph

399 Commits

Author SHA1 Message Date
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
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 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