LucasGGamerM
28e816fd89
chore: fix build issues
2023-10-19 15:17:35 -03:00
LucasGGamerM
77081f6cc9
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBehaviorFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDisplayFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsNotificationsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/res/menu/profile_own.xml
2023-10-19 15:01:22 -03:00
sk
5db44cbf9d
don't save bidi-safe string in account
...
also support custom emoji in account switcher
closes sk22#859
2023-10-19 01:01:53 +02:00
sk
ed24e89a96
don't compare newly fetched posts to created post
...
closes sk22#866
2023-10-18 21:48:11 +02:00
sk
09577074a9
merge settings changes
2023-10-18 20:26:20 +02:00
LucasGGamerM
c5a61c3916
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/menu/profile.xml
# metadata/cy/full_description.txt
2023-10-18 08:21:03 -03:00
sk
5840c94395
isolate bi-directional text in display name
2023-10-17 01:03:06 +02:00
sk
9a985aad29
fix deleting boosted posts in profile
2023-10-14 01:47:13 +02:00
LucasGGamerM
07d2ad749e
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDisplayFragment.java
2023-10-12 21:25:16 -03:00
sk
50e313cff0
fix gap max_id when post before gap is filtered
...
hopefully fixes sk22#856
2023-10-13 02:22:03 +02:00
LucasGGamerM
ce3ca42c7a
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/api/session/AccountLocalPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDisplayFragment.java
# mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/NotificationHeaderStatusDisplayItem.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/displayitems/WarningFilteredStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/ColorPalette.java
# mastodon/src/main/res/color/bookmark_icon.xml
# mastodon/src/main/res/color/boost_icon.xml
# mastodon/src/main/res/color/favorite_icon.xml
# mastodon/src/main/res/layout/display_item_footer.xml
# mastodon/src/main/res/layout/tab_bar.xml
# mastodon/src/main/res/values/palettes.xml
# mastodon/src/main/res/values/styles.xml
# metadata/uk/changelogs/51.txt
# metadata/uk/changelogs/56.txt
# metadata/uk/changelogs/61.txt
# metadata/uk/full_description.txt
2023-10-12 14:58:23 -03:00
sk
de235ec7cc
use upstream filtering for warn item
2023-10-07 17:21:20 +02:00
sk
5ea2864bd5
Merge remote-tracking branch 'upstream/master'
2023-10-06 15:17:49 +02:00
Grishka
1f4152b588
Fix #705 and improve handling of unknown attachment dimensions
2023-10-03 02:52:07 +03:00
LucasGGamerM
6f180c0451
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java
# mastodon/src/main/res/values-pt-rBR/strings_sk.xml
# mastodon/src/main/res/values-ro-rRO/strings_sk.xml
2023-10-01 14:26:38 -03:00
Tyler Baker
95685d4de8
Feature: Support filtering custom emoji in reaction view ( #836 )
...
* Support filtering custom emojis in reaction keyboard.
* Move creation of EditText to conditional block.
* Clear unused comment
* Update requests variable when publishing filter results so the images displayed will be correct.
* Combine text fields in emoji reaction keyboard, create new initializer for EmojiCategory so it can be copied properly.
* Performance optimization and fixed a typo in filter.
* improve layout
---------
Co-authored-by: sk <sk22@mailbox.org >
2023-09-30 19:21:36 +02:00
LucasGGamerM
b9bf1e6601
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/TranslateStatus.java
# mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.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/FeaturedHashtagsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/model/TranslatedStatus.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposePollViewController.java
# mastodon/src/main/res/layout/display_item_text.xml
# mastodon/src/main/res/menu/hashtag_timeline.xml
# mastodon/src/main/res/values/styles.xml
2023-09-30 13:32:50 -03:00
Jacoco
1079f600bc
Revert "Fix media layout with unknown sizes" ( #827 )
...
This reverts commit a014fe9443
2023-09-30 18:25:52 +02:00
sk
4ee229ea79
Merge remote-tracking branch 'upstream/master' into try-to-merge-upstream
2023-09-29 20:59:12 +02:00
sk
c261214e49
implement new translation
2023-09-29 18:46:26 +02:00
LucasGGamerM
24048a677f
fix: make app compile again (again)
2023-09-28 14:07:31 -03:00
LucasGGamerM
debf8c52a1
Merge remote-tracking branch 'mastodon/master'
...
# Conflicts:
# fastlane/metadata/android/fi-FI/full_description.txt
# fastlane/metadata/android/th-TH/full_description.txt
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/TranslateStatus.java
# mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.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/FeaturedHashtagsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFeaturedFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchQueryFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposePollViewController.java
# mastodon/src/main/res/layout/display_item_text.xml
# mastodon/src/main/res/menu/post.xml
# mastodon/src/main/res/values/styles.xml
2023-09-28 13:52:48 -03:00
Grishka
d2de62ee55
Probably fix #703
2023-09-28 13:33:59 -03:00
Grishka
994ae0242c
Fix indexable setting
2023-09-28 13:23:22 -03:00
Grishka
6d6ab789a3
Privacy settings
2023-09-28 13:22:30 -03:00
Grishka
1724d8a532
Probably fix #703
2023-09-27 19:50:59 +03:00
Grishka
fe1cfa1d7b
Fix indexable setting
2023-09-22 21:33:21 +03:00
Grishka
39af05524d
Privacy settings
2023-09-20 21:44:28 +03:00
LucasGGamerM
17fc14de97
refactor(mute-conversations-toggle): implement event for StatusMuteChanged
2023-09-19 14:26:46 -03:00
LucasGGamerM
a6e6143157
Merge branch 'fix/akkoma_media_issue_fix'
2023-09-17 10:02:14 -03:00
Jacocococo
fd99879ffc
Revert "Fix media layout with unknown sizes"
...
This reverts commit a014fe9443
2023-09-14 17:16:03 +02:00
Grishka
6d84f28600
Hashtag following
...
closes #684 , closes #233
2023-09-12 07:49:14 +03:00
Grishka
1b4dc01c74
Post translation
...
closes #267 , closes #671 , closes #502
2023-09-12 06:00:40 +03:00
LucasGGamerM
61b20eea05
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/model/Account.java
2023-09-05 07:12:27 -03:00
Jacoco
454ec6b4c0
Fix errors when some entries were missing when retrieving account information ( #757 )
...
* Handle null avatar
* Handle empty account
2023-09-04 22:24:17 +02:00
LucasGGamerM
aeb0aa65a8
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/src/main/java/org/joinmastodon/android/api/session/AccountLocalPreferences.java
2023-09-01 14:11:19 -03:00
sk
807010893a
support static url for emoji reacts and keyboard
2023-09-01 14:38:55 +02:00
LucasGGamerM
74db111a4f
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/src/main/java/org/joinmastodon/android/api/session/AccountLocalPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
2023-08-31 14:36:59 -03:00
sk
9295cf4e9c
fix emoji reaction spacing not updating
...
closes sk22#784
2023-08-31 17:24:29 +02:00
LucasGGamerM
c4b7262e89
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
2023-08-29 10:41:09 -03:00
sk
696016bd8f
use hasSpoiler method
2023-08-28 23:29:18 +02:00
sk
cc46e09853
fix issue with visibility button
...
closes sk22#740
2023-08-28 23:24:56 +02:00
LucasGGamerM
5456f4fbea
refactor: tidy things up with the show posts with missing alt text
...
IT DOESNT WORK YET GODDAMNIT
2023-08-28 11:30:08 -03:00
LucasGGamerM
b294c998ae
Merge branch 'feature/hide_alttext'
...
# Conflicts:
# mastodon/src/androidTest/java/org/joinmastodon/android/utils/StatusFilterPredicateTest.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java
# mastodon/src/main/res/values-de-rDE/strings_mo.xml
# mastodon/src/main/res/values/strings_mo.xml
2023-08-28 10:15:18 -03:00
LucasGGamerM
6318745fe7
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
...
# Conflicts:
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AccountCardStatusDisplayItem.java
2023-08-27 13:51:42 -03:00
sk
91bf1b277f
fix null-pointer exception in filter result
...
closes sk22#774
2023-08-27 13:52:31 +02:00
LucasGGamerM
afc401c1f2
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/res/values-pl-rPL/strings_sk.xml
# mastodon/src/main/res/values-ru-rRU/strings_sk.xml
# metadata/ru/full_description.txt
2023-08-24 08:17:57 -03:00
sk
0afcdb2cdf
emoji reactions for announcements!
2023-08-23 22:56:11 +02:00
sk
d62899c990
fix reaction data and binding inconsistencies
2023-08-23 19:49:07 +02:00
sk
f50eac02d8
move adding reactions to reactions item
2023-08-21 22:40:19 +02:00
