LucasGGamerM
17a59b5db4
fix: fix hide with a warning posts without alt text
2023-08-29 08:20:11 -03: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
93818903c8
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
...
# Conflicts:
# README.md
# build.gradle
# mastodon/build.gradle
# mastodon/src/main/AndroidManifest.xml
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
# mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetAccountMuted.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.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/EditTimelinesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/PinnableStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.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/fragments/StatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingFollowSuggestionsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Attachment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java
# mastodon/src/main/java/org/joinmastodon/android/ui/M3AlertDialogBuilder.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AudioStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/InsetStatusItemDecoration.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/color/button_bg_secondary_dark_on_light.xml
# mastodon/src/main/res/color/button_text_primary_light_on_dark.xml
# mastodon/src/main/res/drawable/bg_image_alt_text_overlay.xml
# mastodon/src/main/res/drawable/bg_rect_4dp_ripple.xml
# mastodon/src/main/res/drawable/bg_search_field.xml
# mastodon/src/main/res/drawable/ic_fluent_save_24_regular.xml
# mastodon/src/main/res/layout/compose_action.xml
# mastodon/src/main/res/layout/compose_media_thumb.xml
# mastodon/src/main/res/layout/compose_poll_option.xml
# mastodon/src/main/res/layout/display_item_footer.xml
# mastodon/src/main/res/layout/display_item_header.xml
# mastodon/src/main/res/layout/display_item_text.xml
# mastodon/src/main/res/layout/fragment_compose.xml
# mastodon/src/main/res/layout/fragment_profile.xml
# mastodon/src/main/res/layout/item_instance_category.xml
# mastodon/src/main/res/layout/item_report_choice.xml
# mastodon/src/main/res/layout/item_settings_footer.xml
# mastodon/src/main/res/layout/item_settings_switch.xml
# mastodon/src/main/res/layout/item_settings_theme.xml
# mastodon/src/main/res/layout/item_settings_theme_subitem.xml
# mastodon/src/main/res/layout/item_settings_update.xml
# mastodon/src/main/res/layout/tab_bar.xml
# mastodon/src/main/res/menu/mute_duration.xml
# mastodon/src/main/res/values-de-rDE/strings_sk.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-fa/strings_sk.xml
# mastodon/src/main/res/values-night/colors.xml
# mastodon/src/main/res/values-nl-rNL/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# mastodon/src/main/res/values-zh-rCN/strings_sk.xml
# mastodon/src/main/res/values/attrs.xml
# mastodon/src/main/res/values/ids.xml
# mastodon/src/main/res/values/styles.xml
# metadata/es/changelogs/83.txt
2023-08-20 11:36:16 -03:00
Botiplz
ae5d2a7ed3
Formatting
2023-07-22 19:50:58 +02:00
Botiplz
6ed7d24513
PR comments:
...
- StatusFilterPredicate sets clientFilters bases on settings
- Reverted changes on SettingsFragment
- Resources in strings_mo.xml
- removed duplicate comments
- conditional in onBind method
2023-07-22 19:41:01 +02:00
Botiplz
605ba441d3
Option "Show media posts with missing alt text"
2023-07-22 16:58:15 +02:00
LucasGGamerM
e1a262ec5f
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/fragments/HomeTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.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/res/values-it-rIT/strings_sk.xml
# metadata/de-DE/changelogs/83.txt
# metadata/de-DE/changelogs/94.txt
# metadata/en-US/changelogs/94.txt
# metadata/es/changelogs/94.txt
# metadata/fr/title.txt
# metadata/my-MM/title.txt
# metadata/my/short_description.txt
# metadata/pt-PT/changelogs/59.txt
# metadata/pt-PT/changelogs/61.txt
# metadata/pt-PT/full_description.txt
# metadata/pt-PT/short_description.txt
# metadata/pt-PT/title.txt
2023-06-13 14:03:50 -03:00
LucasGGamerM
e7654affa7
feat: add FileProvider class from AndroidX
...
This is for getting high quality camera images, and was a requirement for the code I need.
2023-06-12 13:49:03 -03:00
sk
e43d6c35d8
update languages
2023-06-10 22:10:13 +02:00
sk
b2d6879282
reimplement assist content
2023-06-01 18:02:33 +02:00
sk
c38eb545b1
use matched filter for determining warning title
...
fixes a bug where, when multiple filters apply, the
WarningFilteredStatusDisplayItem would not check if the warning applies to the
current context. now, matched filter is determined through the predicate
(though not exactly what a predicate is supposed to do, i guess) and passed
down to the WarningFilteredStatusDisplayItem. cc @LucasGGamerM
2023-05-27 13:09:36 +02:00
sk
6abfe6ddd7
add unit tests for status filter predicate
2023-05-26 17:02:39 +02:00
sk
a6fd6ae135
add javadoc
2023-05-26 02:37:25 +02:00
sk
99f0817bdb
generalize filtering logic
2023-05-26 02:07:50 +02:00
sk
220cd35d82
fix context not checked for warnings
...
closes sk22#518
2023-05-25 21:25:09 +02:00
Jacoco
a9ab9cb249
Fix crashes on Calckey and GoToSocial ( #515 )
...
* Fix crashes on calckey and gts
* Use url if previewUrl is null
2023-05-14 23:26:03 +02:00
sk
2e84faa505
update languages
2023-04-23 17:08:51 +02:00
sk
41a70a353c
distinct default languages
...
closes sk22#487
2023-04-07 18:21:23 +02:00
sk
21fc35230c
Merge remote-tracking branch 'upstream/master'
2023-03-13 18:51:26 +01:00
Grishka
4a695b2a83
Use a single display item for the image attachment grid
2023-03-06 02:25:13 +03:00
sk22
618840c76a
Display filtered posts with a warning ( #406 )
...
* copy changes from @LucasGGamerM
* simplify building filter item
* fix adapter ranges
* change filter item styling
closes sk22#209
Co-authored-by: LucasGGamerM <71328265+LucasGGamerM@users.noreply.github.com >
2023-02-03 18:33:15 +01:00
sk
423e919e16
fix crash
2023-02-01 10:25:24 +01:00
sk
e282d54f99
Merge remote-tracking branch 'upstream/master'
2023-01-31 00:00:56 +01:00
sk
29ad08f2ea
fix crashes
...
closes sk22#393
closes sk22#394
2023-01-30 23:46:32 +01:00
Grishka
b153a64373
Signup flow redesign WIP
2023-01-30 01:54:13 +03:00
sk
c66e576461
adapt upstream changes
2023-01-26 01:09:08 +01:00
sk
331d490f4f
Merge remote-tracking branch 'upstream/master'
2023-01-26 00:56:48 +01:00
Grishka
bcb3e217cd
More onboarding updates
2023-01-26 01:38:29 +03:00
Thiago 'Jedi' Abreu
c3abf8c05c
Better handling of filter expiration date ( #212 )
...
* Better handling of filter expiration date
* Simplify Thread and Home Timeline filtering
2022-12-29 13:32:22 +01:00
Thiago 'Jedi' Abreu
6220ce6780
Implement 4.0 filters with hide action ( #202 )
...
* adding new "filtered" field for status
* respect "hide" filter action on status
* handling expire date for filter
closes #161
2022-12-28 14:49:45 +01:00
sk
600be455a3
save languages per account
2022-12-10 22:17:51 +01:00
sk
e45e2c31d1
use mastodon languages list
...
fix #139
2022-12-10 21:07:34 +01:00
Grishka
187693883c
Fix #94
...
TODO support 4.0 filteing
2022-11-21 14:10:30 +04:00
Grishka
a58a279e8c
Client-side filtering is annoying
2022-04-29 17:25:32 +03:00
Grishka
102fbeee1a
Display photo attachments as a grid
2022-02-02 16:23:09 +03:00
Grishka
c885a5fc28
Better char counter and custom emoji in compose
2022-02-02 09:40:29 +03:00
