LucasGGamerM
0589612df9
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# README.md
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
# mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/NotificationAction.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/ClickableLinksDelegate.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/MediaAttachmentViewController.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/layout/display_item_gifv.xml
# mastodon/src/main/res/layout/display_item_photo.xml
# mastodon/src/main/res/layout/display_item_video.xml
# mastodon/src/main/res/menu/post.xml
# mastodon/src/main/res/menu/profile.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-fr-rFR/strings_sk.xml
# mastodon/src/main/res/values-gl-rES/strings_sk.xml
# mastodon/src/main/res/values-in-rID/strings_sk.xml
# mastodon/src/main/res/values-pl-rPL/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# metadata/it-IT/full_description.txt
# metadata/zh-Hans/short_description.txt
2023-03-21 20:25:51 -03:00
Jacoco
132b672441
Improvements for Pleroma/Akkoma ( #445 )
...
* Reply Visibility on Plemora
* Sort statuses in thread
* Get default visibility and language from account if preferences fail
* Fix for Mentions tab in notifications on Pleroma
* Mark status as sensitive if not already when spoilertext is present
* Integrating Pleroma quoting for new posts
* move string to strings_sk
* use null instead of empty string
* change string
* fix crash due to null value
* update string
---------
Co-authored-by: sk <sk22@mailbox.org >
2023-03-21 20:01:47 -03:00
sk
f4365ed163
fix context menu resizing
...
closes sk22#467
2023-03-20 19:17:22 +01:00
Jacoco
f852dac1e5
Improvements for Pleroma/Akkoma ( #445 )
...
* Reply Visibility on Plemora
* Sort statuses in thread
* Get default visibility and language from account if preferences fail
* Fix for Mentions tab in notifications on Pleroma
* Mark status as sensitive if not already when spoilertext is present
* Integrating Pleroma quoting for new posts
* move string to strings_sk
* use null instead of empty string
* change string
* fix crash due to null value
* update string
---------
Co-authored-by: sk <sk22@mailbox.org >
2023-03-16 00:49:11 +01:00
FineFindus
3619be71ab
feat: add mute timer
2023-03-06 21:55:32 +01:00
LucasGGamerM
6404d9cf9a
Revert "Hardcoding fosstodon and having a half working thing"
...
This reverts commit 08a3ec99ce
2023-02-20 11:20:01 -03:00
LucasGGamerM
1837e5204b
Revert "Its half working"
...
This reverts commit a445baf3f0
2023-02-20 11:20:01 -03:00
LucasGGamerM
a445baf3f0
Its half working
2023-02-18 19:40:49 -03:00
LucasGGamerM
08a3ec99ce
Hardcoding fosstodon and having a half working thing
2023-02-18 19:27:43 -03:00
LucasGGamerM
1e2dd3dec6
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
2023-02-17 17:40:06 -03:00
sk
6b9b6710cf
enable remote-following accounts
...
closes sk22#431
2023-02-16 19:44:39 +01:00
LucasGGamerM
ce3f8ce1b5
Fixing thy icons
2023-01-27 16:08:46 -03:00
sk
e647b37143
replace visibility icons
2023-01-27 15:37:31 -03:00
sk
d94c3e3d9b
change list icon
2023-01-27 15:37:25 -03:00
sk
7cc791ccd9
dividers and alignments
...
nobody knows the trouble i've seen
2023-01-27 15:35:01 -03:00
sk
21f816860f
improve local visibility compatibility
2023-01-27 15:33:10 -03:00
sk
1af82fde61
implement local-only posting
2023-01-27 15:20:47 -03:00
sk
b9a997730a
move edit timelines option
2023-01-27 14:48:18 -03:00
sk
5fd17778f4
remove add media string
2023-01-27 14:47:50 -03:00
sk
d49733695d
add back file opener
...
closes sk22#328
2023-01-27 14:46:49 -03:00
sk
d79c4ad650
rearrange home menus
2023-01-27 14:46:16 -03:00
sk
50baffefbe
add lists to status header
2023-01-27 14:37:41 -03:00
sk22
b63c0010a9
Pinnable timelines ( #338 )
...
* implement draggable list
* implement pinning timelines
* fix TimelineDefinition equals not working
* implement removing timelines
* implement pinned lists/hashtags
* per-account pinned timelines
* implement pin button
* fix issues with pinning
* improve pin button
* improve pinning timelines
* implement custom icons
* fix home switcher menu
* make hashtags pinnable
* edit timelines in options menu
2023-01-27 14:32:04 -03:00
sk
17e1cd1fe9
replace visibility icons
2023-01-25 23:51:42 +01:00
sk
d7aceffc8f
change list icon
2023-01-25 23:41:07 +01:00
sk
8bdbb2adef
dividers and alignments
...
nobody knows the trouble i've seen
2023-01-25 22:55:14 +01:00
sk
5de23581fe
improve local visibility compatibility
2023-01-25 16:49:15 +01:00
LucasGGamerM
5b1188ce97
Merge pull request #55 from FineFindus/feat/profile-menu
...
feat(profile): move options to overflow menu
2023-01-24 18:16:50 -03:00
FineFindus
bdcafd2564
feat(profile): move options to overflow menu
2023-01-24 20:42:41 +01:00
sk
2358d3c602
implement local-only posting
2023-01-24 16:04:17 +01:00
LucasGGamerM
d7004824fb
Decoupling moshidon strings from megalodon
2023-01-23 18:47:07 -03:00
sk
a26ddfe70f
move edit timelines option
2023-01-23 10:25:44 +01:00
sk
87bc01d985
remove add media string
2023-01-22 03:26:18 +01:00
sk
3a6ace53d5
add back file opener
...
closes sk22#328
2023-01-22 01:06:49 +01:00
sk
1e825c979c
rearrange home menus
2023-01-22 00:43:17 +01:00
sk
95cb04530f
add lists to status header
2023-01-21 21:39:11 +01:00
sk22
88851a085e
Pinnable timelines ( #338 )
...
* implement draggable list
* implement pinning timelines
* fix TimelineDefinition equals not working
* implement removing timelines
* implement pinned lists/hashtags
* per-account pinned timelines
* implement pin button
* fix issues with pinning
* improve pin button
* improve pinning timelines
* implement custom icons
* fix home switcher menu
* make hashtags pinnable
* edit timelines in options menu
2023-01-21 02:17:47 +01:00
sk
4db87feec4
Making sure it compiles!
2023-01-20 17:30:12 -03:00
sk22
b7ccf1144c
New home layout with public timelines ( #288 )
...
* add dummy popup menu
* add pager to home fragment
* reduce pager sensitivity
* remove timelines from discover fragment
* add fabs to timelines
* change info banner color
* add back toolbar functionality
* update icons on navigate
* handle back press
* add lists and hashtags
* use tabs
* improve timeline title
* tweak switcher behavior
* fix show new posts button appearance
* hide show new posts button on reload
* tweak show new posts animations
* work around crash theme switch
* enable disabling federated timeline
Thanks @sk22!
2023-01-20 17:30:11 -03:00
LucasGGamerM
060745869b
Revert "New home layout with public timelines ( #288 )"
...
This reverts commit 78d0add808
2023-01-20 11:19:20 -03:00
sk22
78d0add808
New home layout with public timelines ( #288 )
...
* add dummy popup menu
* add pager to home fragment
* reduce pager sensitivity
* remove timelines from discover fragment
* add fabs to timelines
* change info banner color
* add back toolbar functionality
* update icons on navigate
* handle back press
* add lists and hashtags
* use tabs
* improve timeline title
* tweak switcher behavior
* fix show new posts button appearance
* hide show new posts button on reload
* tweak show new posts animations
* work around crash theme switch
* enable disabling federated timeline
2023-01-20 11:17:26 -03:00
sk
eb41d77d54
implement soft-blocking
...
sk22#297
2023-01-18 14:03:36 -03:00
sk
af953e294d
move lists and change icons
2023-01-18 13:51:39 -03:00
LucasGGamerM
7504a1b9cb
Revert "move lists and change icons"
...
This reverts commit 3842ecb0d1
2023-01-18 13:47:29 -03:00
LucasGGamerM
60ee781004
Revert "Revert "move lists and change icons""
...
This reverts commit 4b88ce5115
2023-01-18 13:47:29 -03:00
LucasGGamerM
4b88ce5115
Revert "move lists and change icons"
...
This reverts commit d0ad5561
2023-01-18 13:45:41 -03:00
sk
3842ecb0d1
move lists and change icons
2023-01-18 13:44:30 -03:00
sk
ed9813f093
implement creating lists
...
re: sk22#30
2023-01-18 13:34:34 -03:00
sk
8e507e7970
move post notifications into home
...
closes sk22#314
2023-01-18 12:29:33 +01:00
sk
e75d350b7a
implement soft-blocking
...
sk22#297
2023-01-16 23:56:32 +01:00
