owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,959 Commits 32 Branches 206 Tags
3d48443a239165aaa34b507ff3c0398aa1396bc1
Commit Graph

2613 Commits

Author SHA1 Message Date
LucasGGamerM
3d48443a23 fix: possibly fixes a crash where inReplyToId is null in a ThreadFragment 
cc: @sk22

Btw check the commit before this one, because there is a fix that applies for Megalodon there as well
 2023-12-08 09:45:18 -03:00
LucasGGamerM
a27ef27f8d fix: fixes unfollow dialog missing title 2023-12-06 16:30:47 -03:00
LucasGGamerM
b42862dd9b feat: add alt text translation to previewlessMedia items 2023-12-06 16:23:09 -03:00
LucasGGamerM
533032ca75 fix: fixes crashes when adding a hashtag timeline 
Closes #308
 2023-12-06 15:20:22 -03:00
LucasGGamerM
2ef3e7eab7 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollFooterStatusDisplayItem.java
 2023-11-28 14:31:42 -03:00
sk
f7dfebcbea fix schedule date picker not time zone safe 
closes sk22#940
 2023-11-27 22:20:12 +01:00
FineFindus
79d5067c97 feat: add option to view poll results (#935) 
* feat: add option to view poll results

* fix: button showing wrong text when refreshing

* fix: hide results button when voted

* remove unused string

* change view results layout, remove unused setting

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-11-27 21:44:53 +01:00
LucasGGamerM
ed986b11af chore: make app compile again 2023-11-27 16:41:17 -03:00
LucasGGamerM
6c94eb50ea Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
 2023-11-27 16:39:44 -03:00
FineFindus
70b9d08830 fix: hide link card to akkoma hastags (#939) 
* fix: hide link card to akkoma hastags

* generify method name

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-11-27 19:07:43 +01:00
LucasGGamerM
40711fbd28 fix: make purple color be before pink 
I don't like pink, It must be second
 2023-11-22 14:37:27 -03:00
LucasGGamerM
1525ef8bdf Merge branch 'feat/view-poll-results' 2023-11-17 17:00:23 -03:00
FineFindus
f5e1326d9f fix: hide results button when voted 2023-11-17 20:27:38 +01:00
LucasGGamerM
43fe03c943 Merge branch 'feat/view-poll-results' 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollFooterStatusDisplayItem.java
 2023-11-17 16:16:29 -03:00
LucasGGamerM
1ee96f3703 chore: make app compile again 2023-11-17 16:08:03 -03:00
LucasGGamerM
da5186c7b5 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.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/ProfileFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/DiffRemovedSpan.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
#	mastodon/src/main/res/drawable/bg_note_edit.xml
#	mastodon/src/main/res/layout/fragment_profile.xml
#	metadata/uk/full_description.txt
 2023-11-17 16:02:23 -03:00
FineFindus
dca68de77e fix: button showing wrong text when refreshing 2023-11-16 22:23:49 +01:00
FineFindus
0ef879ebd3 feat: add option to view poll results 2023-11-16 22:16:28 +01:00
sk
327aef0271 fix crash for non-github/debug builds 2023-11-15 18:47:07 +01:00
Jacoco
6b234209c6 Previewing posts on Akkoma (#933) 
* Previewing posts on Akkoma

* move preview property into status

* clean up code

* revert imm-related changes

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-11-15 15:17:29 +01:00
Jacoco
786ce78b08 Translations for Akkoma (#934) 
* Translations for Akkoma

* simplify akkoma translation code

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-11-15 14:32:56 +01:00
sk
d51e06b61f save latest crash log 
closes sk22#932
closes sk22#419
 2023-11-15 12:06:54 +01:00
LucasGGamerM
231d494955 Merge pull request #302 from FineFindus/fix/notification-filter-reset 
fix(notification/filter) rename reset button
 2023-11-14 19:17:05 -03:00
FineFindus
a64f6c1625 refactor(notifications/filter): move duplicated code to function 2023-11-14 22:51:37 +01:00
FineFindus
cb7586f973 fix(notifications/filter): update reset button title 2023-11-14 22:28:31 +01:00
FineFindus
a078bb3597 feat(settings): move unlisted replies to privacy page 2023-11-14 22:14:38 +01:00
sk
0c376d57e7 fix timeline editor messing with non-hashtag tls 2023-11-13 21:31:54 +01:00
sk
ee82772fee weather icons :) 2023-11-13 21:30:06 +01:00
sk
d5b6750abe fix hashtag options showing up for all timelines 2023-11-13 21:17:58 +01:00
sk
70328217c6 add bookmarks and favorites as timelines 
closes sk22#908
 2023-11-13 21:10:33 +01:00
sk
733fb3f53a re-add pre-releases setting 
closes sk22#906
 2023-11-13 21:02:06 +01:00
sk
f82eb96a35 increase translate timeout to 1 minute 
closes sk22#910
 2023-11-13 20:50:43 +01:00
sk
148952b96c update cache on poll vote 
closes sk22#924
 2023-11-13 20:48:16 +01:00
sk
52928e1577 increase default read timeout 
closes sk22#923
 2023-11-13 20:43:34 +01:00
sk
cd13777c06 fix report view, allow opening posts in list 
closes sk22#928
closes sk22#441
 2023-11-13 20:39:27 +01:00
sk
2b65aeb8b4 fix edit note item visible in context menu 2023-11-13 18:48:24 +01:00
Jacoco
a8dcb11094 feature: Display post that's being quoted on Akkoma (#927) 
* Displaying Akkoma quote status

* Dummy display items for quote posts

* Only remove quote-inline with RE:

* fix null reference (reply-to instead of quote status)

* fix text bottom padding in quote

* Postprocess status quote

* fix rounded bottom for quoted media

closes sk22#929

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-11-13 18:46:15 +01:00
sk
aa42873274 use verified/error text colors for diff 2023-11-12 23:01:46 +01:00
FineFindus
8a5b36db96 feat(profile): add note (#918) 
* feat(profile): add note

* simplify note code

* adjust spacing

* size and hitbox adjustments, progress

* profile menu item to add note

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-11-12 22:37:31 +01:00
FineFindus
0dcb9361ea fix(notification): allow clicking on status item to open profile 2023-11-11 19:27:35 +01:00
FineFindus
c85af5502d feat: translate media attachments and poll options (#916) 
* feat(status): translate media attachments

* feat(status): translate poll options

* fix(status/translation): do not require all fields

* feat(status/translation): support translating spoiler
 2023-11-10 20:44:06 +01:00
FineFindus
06698d3c52 feat: display edit history diff (#922) 
* build: add google's diff-match-patch

Copied from 62f2e689f4/java/src/name/fraser/neil/plaintext/diff_match_patch.java

* feat(status/edit-history): display diff for text

Closes https://github.com/sk22/megalodon/issues/789

* fix(status/edit-history): add fake poll id

* code style adjustments

* don't diff if only formatting changed

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-11-10 20:40:34 +01:00
S1m
2818672cda Fix NullPointerException when receiving push when killed (#914) 2023-11-10 20:15:45 +01:00
S1m
24794f28aa Fix: registering multi account for UnifiedPush (#907) 
* Register all account when enabling UnifiedPush
* Register new account to UnifiedPush if enabled
 2023-11-10 20:12:27 +01:00
FineFindus
50d1523210 feat: re-add 12 hour option to polls (#917) 2023-11-10 20:10:50 +01:00
sk
295cb74287 don't show translate for empty decoding 2023-11-10 16:30:46 +01:00
sk
95dd3ff068 fix translation language name 2023-11-10 16:13:43 +01:00
sk
d6aeb753fc allow exclamation/question marks in pronouns 2023-11-10 16:13:14 +01:00
sk
a085744038 fix missing parens on start of pronouns 2023-11-10 15:37:31 +01:00
sk
26391a6f14 hopefully fix string index out of bounds 
https://paste.crdroid.net/3FNRe7
 2023-11-10 15:37:03 +01:00