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

412 Commits

Author SHA1 Message Date
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
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
sk
ee82772fee weather icons :) 2023-11-13 21:30:06 +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
LucasGGamerM
828d07d6b5 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposePollViewController.java
#	metadata/uk/changelogs/56.txt
 2023-10-25 20:10:41 -03:00
sk
02983c76b9 add mutuals follow button state 
closes sk22#890
 2023-10-22 23:09:35 +02:00
sk
3cf23474e3 fix issue with too-wide context menu icons 
closes sk22#893
 2023-10-22 22:10:25 +02:00
LucasGGamerM
894c8cacd6 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/build.gradle
 2023-10-21 09:32:19 -03:00
sk
47d1b182ac fix see new posts button design 2023-10-21 01:00:51 +02:00
sk
11c7816bb1 make show new posts button less disruptive 2023-10-20 11:43:35 +02:00
sk
b5eae13a16 introduce separate tonal selector backgrounds 2023-10-20 11:43:15 +02: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
d34c73c210 add options for locking account and default vis 2023-10-19 16:49:23 +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
59ee1af75d fix border radius 
closes sk22#861
 2023-10-15 22:53:23 +02:00
sk
190a3b5b08 use fluent dismiss button 2023-10-15 21:17:26 +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
40a34b07de add option to disable underlined links 
closes sk22#847
 2023-10-09 18:07:19 +02:00
sk
e9bd5a373a remove unused icons and replace some wrong ones 2023-10-09 17:39:18 +02:00
sk
a5c197b496 hearts everywhere 
closes sk22#846
 2023-10-08 13:04:26 +02:00
sk
c83dc51322 re-add ripple to filter warning 2023-10-07 15:43:16 +02:00
sk
6b38db9607 add heart symbol to extended footer 2023-10-07 12:08:37 +02:00
sk
baf756e163 allow using heart as fav icon ❤️ 
closes sk22#81
 2023-10-06 17:53:43 +02:00
sk
efc67fd7e8 remove inset poll styles 
closes sk22#801
 2023-10-06 17:26:59 +02:00
LucasGGamerM
d0c5a2ed2e Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/res/layout/display_item_poll_option.xml
#	mastodon/src/main/res/menu/profile_own.xml
#	mastodon/src/main/res/values-pt-rBR/strings_sk.xml
#	mastodon/src/main/res/values/strings_sk.xml
 2023-09-30 14:11:39 -03:00
FineFindus
6d085ae6f0 fix: show multiline poll options (#837) 
* fix: show multiline poll options

* fix resources not found exception

* don't force height on poll options

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-09-30 19:03:17 +02:00
sk
4ee229ea79 Merge remote-tracking branch 'upstream/master' into try-to-merge-upstream 2023-09-29 20:59:12 +02:00
Grishka
6d6ab789a3 Privacy settings 2023-09-28 13:22:30 -03:00
Grishka
39af05524d Privacy settings 2023-09-20 21:44:28 +03:00
LucasGGamerM
18857e6233 refactor(compose): remove unnecessary drawables 2023-09-20 10:26:08 -03:00
LucasGGamerM
851fa70563 feat: add mute conversations menu item 2023-09-19 12:13:03 -03:00
LucasGGamerM
8a0852d1a4 fix(video-player): fixes coloring on video player items 2023-09-18 11:18:42 -03:00
LucasGGamerM
1ba30a4d28 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/res/values-ar/strings_sk.xml
#	mastodon/src/main/res/values-fr-rFR/strings_sk.xml
#	mastodon/src/main/res/values-ja-rJP/strings_sk.xml
#	metadata/ar/short_description.txt
 2023-09-11 16:47:24 -03:00
sk
efa003a9a5 implement bidirectional missing posts gap 2023-09-08 21:16:42 +02:00
sk
9dd694ce2e Merge branch 'merge/load-more-direction' 2023-09-07 18:32:21 +02:00
LucasGGamerM
81d13537e3 fix: fixes incorrect icon coloring on compose fragment relocated publish button 2023-09-05 15:19:46 -03:00
LucasGGamerM
b6c951c026 feat: add indicatives/hints of what type of media is on an media item without preview 2023-09-05 14:51:32 -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
sk
2aba90f353 add media indicator for spoiler 
closes sk22#598
 2023-09-05 00:18:47 +02:00
LucasGGamerM
0e58b00086 fix: make use of correct coloring in filled button backgrounds (again) 2023-09-04 12:13:55 -03:00
LucasGGamerM
9f18844148 fix: make use of correct coloring in filled button backgrounds 2023-09-04 11:18:36 -03:00
LucasGGamerM
531ce568c0 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/res/drawable/ic_fluent_bot_20_filled.xml
#	mastodon/src/main/res/layout/display_item_header.xml
 2023-09-04 07:42:25 -03:00
FineFindus
8cd55fc365 feat: display icon for bots (#793) 
* feat(profile): display bot icon for bots

* feat(status): display bot icon

* use 16sp size and 4sp spacing

* don't add lock/bot icon as image spans

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-09-03 21:34:22 +02:00
Angelo Suzuki
2d24e50ff2 Add a setting for "Load missing posts behavior" 
This will make sure that items that are filtered out don't show up on the interface.
Fixes sk22#311
 2023-09-01 21:51:14 +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
1fa5a8436b highlight verified links again! 
closes sk22#713
 2023-08-29 00:18:12 +02: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
a3ee20f06e feat: increase roundness of the select instance button background 
Yes, this is the 3rd time I do this
 2023-08-28 08:33:52 -03:00
LucasGGamerM
639ecba380 feat: increase roundness of the Popup menus 2023-08-27 20:46:13 -03:00
LucasGGamerM
ed6961016e feat: increase roundness of the logon instance input field (again) 2023-08-27 20:41:41 -03:00