owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,007 Commits 32 Branches 206 Tags
ccd313533b150e1db39ed416cac738dc112e4680
Commit Graph

742 Commits

Author SHA1 Message Date
FineFindus
42946eca44 Revert "feat: make profile note box be visible at all times" 
This reverts commit d6c05f0850.
 2023-12-23 11:23:51 +01:00
LucasGGamerM
18e3fadb26 refactor(profile-note): remove save button, automatically save on focus change/exit 2023-12-21 19:42:29 -03:00
LucasGGamerM
0364d95300 feat: make profile note box be consistent with the other text input boxes in the app 2023-12-21 19:34:47 -03:00
LucasGGamerM
69a2fc2d9f fix: remove duplicate view results button on poll footer 2023-11-28 14:34:15 -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
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
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
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
0ef879ebd3 feat: add option to view poll results 2023-11-16 22:16:28 +01:00
sk
99e881bb95 change string name 2023-11-15 16:46:24 +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
b21e2acdb6 fix metadata items being cut off 
closes sk22#921
closes sk22#648
 2023-11-13 19:11:04 +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
99e8a5372b Merge pull request #292 from FineFindus/feat/hide-empty-link-previews 
feat: hide empty link previews
 2023-11-08 14:51:53 -03:00
Otavio Pliger
022e61b2d0 Don't display empty image preview if thumbnail image is null 2023-11-02 09:13:55 +01: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
ff99e1023a Revert "use tonal background for see new posts button" 
This reverts commit 8009dc0a75.
 2023-10-20 16:23:02 +02:00
sk
8009dc0a75 use tonal background for see new posts button 2023-10-20 15:31:06 +02:00
sk
d624a04e18 fix see new posts button font size 2023-10-20 12:50:34 +02:00
sk
303461d803 take switcher width into account for button 2023-10-20 12:17:12 +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
70f5ec7500 update header layout 2023-10-19 16:54:07 +02:00
sk
39f76f9988 always show "boosted" text in reply/boost line 
closes sk22#874
 2023-10-18 21:21:03 +02:00
sk
5135653cd3 wow!! configurable first fraction 2023-10-18 21:11:48 +02:00
sk
53f0e2a933 change extra text size 2023-10-18 19:39:12 +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
fc09514a4d the pronouns are stored in the balls (extra text) 
also, improve max-width behavior
 2023-10-17 00:28:00 +02:00
sk
300fa97781 remove comment 2023-10-16 19:36:30 +02:00
sk
e8f0891f3a re-aligning buttons with avatar 2023-10-16 19:36:12 +02:00
sk
59ee1af75d fix border radius 
closes sk22#861
 2023-10-15 22:53:23 +02:00
sk
c04584dfa6 fix alignments 2023-10-15 21:17:38 +02:00
sk
190a3b5b08 use fluent dismiss button 2023-10-15 21:17:26 +02:00
sk
f5a67e65f0 fix missing content descriptions, button alignment 2023-10-15 21:16:42 +02:00
sk
a7941310bc no more vertical reblog/reply line layout 
closes sk22#834
 2023-10-15 20:11:03 +02:00
sk
9f0db755d1 fix text/buttons alignment, margin 
closes sk22#864
 2023-10-15 19:44:37 +02:00
LucasGGamerM
71970b2249 chora: make app compile again 2023-10-14 14:59:03 -03:00
LucasGGamerM
49dc34b256 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/src/main/res/layout/display_item_footer.xml
 2023-10-14 14:54:46 -03:00
LucasGGamerM
1ca95be7e0 fix(compose): fix publish button being cut off on small screens 2023-10-14 10:34:36 -03:00
sk
42fac30e63 wrap into full-width view 2023-10-13 23:50:49 +02:00
sk
18e7f14c16 remove duplicate selectable background 2023-10-13 23:49:54 +02:00
sk
7b263800a6 reduce button margins, realign buttons 
closes sk22#
 2023-10-13 23:27:49 +02:00
sk
17387a32b2 don't scale buttons with text 
re: sk22#787
 2023-10-13 23:04:45 +02:00
sk
3fe642c2f2 remove unwanted margin 2023-10-13 22:36:15 +02:00
sk
9225447409 use action bar icons color for toolbar 
closes sk22#860
 2023-10-13 22:27:53 +02:00
sk
db661b56cb fix inconsistent styles, fix non-sp font 
closes sk22#862
 2023-10-13 22:17:45 +02:00
LucasGGamerM
dafe233315 chore: make app compile again 2023-10-13 11:17:50 -03:00
LucasGGamerM
4107169c73 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/res/layout/fragment_compose.xml
 2023-10-13 11:16:10 -03:00