owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,639 Commits 32 Branches 206 Tags
443a69b10d4defa58aea745d75234f57a60cbc99
Commit Graph

712 Commits

Author SHA1 Message Date
LucasGGamerM
443a69b10d feat: use correct title for confirmLogOut dialog 2023-06-04 11:00:02 -03:00
LucasGGamerM
9ef43cc6d3 feat: make nav bar color consistent with account switcher sheet 
Merge this commit and the one before this one @sk22
 2023-06-03 21:54:39 -03:00
LucasGGamerM
1d445b8b27 fix: compilation problems 2023-06-03 20:21:28 -03:00
LucasGGamerM
14175a9140 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.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/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.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/ListTimelinesFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.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/ThreadFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusFavoritesListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusReblogsListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverHashtagsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HashtagStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	mastodon/src/main/res/layout/item_account_switcher.xml
#	mastodon/src/main/res/values-ar-rDZ/strings_sk.xml
#	mastodon/src/main/res/values-es-rES/strings_sk.xml
#	mastodon/src/main/res/values-nl-rNL/strings_sk.xml
#	mastodon/src/main/res/values-pt-rPT/strings_sk.xml
#	mastodon/src/main/res/values-v31/colors.xml
#	mastodon/src/main/res/values/colors.xml
#	mastodon/src/main/res/values/styles.xml
 2023-06-03 19:56:16 -03:00
sk
fb8764bcd7 refactor ancestry, fix case regarding reply line 
fix case where reply line was removed despite having no direct ancestor
 2023-06-02 22:08:03 +02:00
sk
56a93288c4 reimplement thread ancestry 2023-06-02 19:05:18 +02:00
sk
d37e880993 don't close sheet after logging out 2023-06-02 01:45:30 +02:00
sk
3985de5b14 visually connect descendant replies in threads 
closes sk22#256
closes sk22#510
 2023-06-02 00:55:42 +02:00
sk
e175a721d4 remove additional padding with translate button 2023-06-02 00:17:50 +02:00
sk
798a43906f denser account switcher 
this one's for @experiencersinternational
 2023-06-01 18:46:53 +02:00
sk
b2d6879282 reimplement assist content 2023-06-01 18:02:33 +02:00
sk
5e7a00de3e fix crash when logging out active account 2023-05-31 10:05:31 +02:00
sk
357104efa9 set checked on basis of fragment's account id 
closes sk22#538
 2023-05-31 09:42:29 +02:00
sk
bb8027c7ef open externally opened content in main activity 
closes sk22#533
 2023-05-31 01:44:00 +02:00
sk
18ae3f4f61 Merge branch 'pr/FineFindus/531' 
Co-authored-by: FineFindus <63370021+finefindus@users.noreply.github.com>
 2023-05-30 22:46:08 +02:00
sk
10dfe0327e use new account switcher 2023-05-30 22:42:56 +02:00
sk
0985a4c968 getInstance returns optional 2023-05-30 18:57:17 +02:00
FineFindus
71b6b2f451 feat(share): add option open URL 2023-05-30 16:33:09 +02:00
LucasGGamerM
e9e491c0b0 feat: redesign account picker sheet 2023-05-30 16:25:04 +02:00
FineFindus
c73562fb75 feat(external-share): use AccountSwitcherSheet 2023-05-30 16:24:43 +02:00
sk
6832bfb95c don't display blocked_by relationship 
closes sk22#526
 2023-05-29 12:34:53 +02:00
Jacoco
b5f6687925 More Akkoma improvements (#524) 
* Only open account if domain matches
Akkoma will seemingly show results that don't match well. This checks if the domain matches before continuing

* Add "RE:" for quotes where it's missing

* Fix no hashtag history in search

* Skip not implemented discovery and select search on Pleroma

* Set proper max account fields for Pleroma

* Use Pleroma's non-standard poll limits

* Mark notifications as read properly on Pleroma

* Akkoma bubble timeline

* Respect Reply Visibility preference on all timelines

* vertically center if hashtag has no history

* only open account search result if uri equals

* add getInstance and isPleroma methods

* change timelines api, support compatibility checks

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-05-29 02:37:46 +02:00
sk
231f19d113 ugly workaround for sk22#520 
it's really, really ugly :(
 2023-05-28 22:14:03 +02:00
sk
9939d99c4b Merge branch 'fix/hashtags-crash-akkoma' 2023-05-28 19:54:39 +02:00
sk
8053e8bb05 fix hashtag search crash on akkoma servers 
closes mastodon#468
closes sk22#523
 2023-05-28 19:51:29 +02:00
Jacoco
83600087e1 Fix images being stretched on Pleroma (#522) 
Closes sk22#488

* Update image bounds after load when metadata is null

* Fix broken image layout in some scenarios

* Transition when image dimensions update

* Replace blurhash with accent color on Pleroma

* fall back to solid color regardless of server

* use fragment's context instead of passing it down

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-05-28 14:44:23 +02:00
LucasGGamerM
78e5f0f011 Merge pull request #202 from FineFindus/feat/filter-warning-click 
feat: reveal filter warning on click
 2023-05-27 09:41:02 -03:00
LucasGGamerM
73944675fa fix: fix compilation errors 2023-05-27 09:40:04 -03:00
LucasGGamerM
c6ded3d505 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/NotificationsListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/Filter.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java
#	mastodon/src/main/res/layout/display_item_file.xml
 2023-05-27 09:31:27 -03: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
FineFindus
201995849c feat: reveal filter warning on click 2023-05-27 11:12:43 +02:00
sk
a6ac68499c use url as fallback for remote url 2023-05-27 01:37:10 +02:00
sk
c10d7cfee4 use remote url; file name as fallback for alt text 2023-05-27 01:32:49 +02:00
LucasGGamerM
274bca84d9 Add display item for unknown/file attachments 
Co-authored-by: LucasGGamerM <lucassggabriel@gmail.com>
 2023-05-27 01:11:26 +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
LucasGGamerM
23f82197c6 Merge pull request #200 
Feat: Instance info
 2023-05-23 20:08:36 -03:00
LucasGGamerM
65c158391f Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
#	mastodon/src/main/res/layout/fragment_compose.xml
 2023-05-23 19:30:52 -03:00
FineFindus
0b08072dfc feat(instance-info): add options menu 2023-05-22 20:21:11 +02:00
Jacoco
8b502b605c Alternative content types (#516) 
* Akkoma content types

* Default content type preference

* per-account content types, compatible with glitch

* disable content types by default, change icon

* persist content type to state

* update string

* fall back to plain text if formatting enabled

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-05-22 17:56:50 +02:00
LucasGGamerM
40e20ead44 Merge pull request #195 
feat: hide reblogs count on non-rebloggable status
 2023-05-20 10:05:32 -03:00
LucasGGamerM
dfeba71abe Merge pull request #196 from FineFindus/feat/unfollow-confirmation 
Feat: show unfollow confirmation dialog
 2023-05-20 09:54:06 -03:00
LucasGGamerM
d403f4ef01 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java
 2023-05-16 18:26:23 -03:00
FineFindus
4843d574ca feat: show confirmation dialog on unfollow 2023-05-16 18:21:10 +02:00
FineFindus
0f0291074e refactor: remove seding duplicated follow request 2023-05-16 16:52:52 +02:00
FineFindus
e50df3ea6d feat: hide bossts on non-boostable status 2023-05-16 16:18:56 +02:00
FineFindus
4383b11947 refactor: move bosst check to status 2023-05-16 16:18:02 +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
LucasGGamerM
7020018bb7 fix: fixes remote attachments pointing to unexistent file in local server 
This fixes broken links to file attachments from calckey accounts on mastodon instances
 2023-05-13 21:29:59 -03:00
LucasGGamerM
0cd0b9d580 fix: fix crashes when previewUrl is null on calckey 2023-05-13 21:29:55 -03:00