LucasGGamerM
|
a849ced203
|
fix(notifications-banner): fix banner layout
|
2023-10-03 07:26:18 -03:00 |
|
LucasGGamerM
|
3f253c1211
|
fix(polls): fix poll options being wonky
|
2023-10-01 16:10:50 -03:00 |
|
LucasGGamerM
|
2f8b6acd58
|
fix(notifications-badge): use correct coloring for inner number
|
2023-09-30 19:23:01 -03:00 |
|
Henry Hiles
|
fda89a8d36
|
Change color
|
2023-09-30 15:35:21 -04:00 |
|
LucasGGamerM
|
b9bf1e6601
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/TranslateStatus.java
# mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java
# mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/FeaturedHashtagsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/model/TranslatedStatus.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposePollViewController.java
# mastodon/src/main/res/layout/display_item_text.xml
# mastodon/src/main/res/menu/hashtag_timeline.xml
# mastodon/src/main/res/values/styles.xml
|
2023-09-30 13:32:50 -03:00 |
|
sk
|
4ee229ea79
|
Merge remote-tracking branch 'upstream/master' into try-to-merge-upstream
|
2023-09-29 20:59:12 +02:00 |
|
sk
|
c261214e49
|
implement new translation
|
2023-09-29 18:46:26 +02:00 |
|
LucasGGamerM
|
debf8c52a1
|
Merge remote-tracking branch 'mastodon/master'
# Conflicts:
# fastlane/metadata/android/fi-FI/full_description.txt
# fastlane/metadata/android/th-TH/full_description.txt
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/TranslateStatus.java
# mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java
# mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/FeaturedHashtagsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFeaturedFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchQueryFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposePollViewController.java
# mastodon/src/main/res/layout/display_item_text.xml
# mastodon/src/main/res/menu/post.xml
# mastodon/src/main/res/values/styles.xml
|
2023-09-28 13:52:48 -03:00 |
|
LucasGGamerM
|
f3a1e7cf58
|
fix(poll-options): fix poll options layout when screen is too small and there are multiple lines in a poll option
cc: @FineFindus
|
2023-09-25 08:41:14 -03:00 |
|
LucasGGamerM
|
ebcafbf90d
|
Merge branch 'fix/long-poll-options'
|
2023-09-25 08:21:11 -03:00 |
|
FineFindus
|
54ec1d781a
|
fix: show multiline poll options
|
2023-09-24 10:57:23 +02:00 |
|
LucasGGamerM
|
77e19b4d6f
|
fix(compose): make 'This post will be saved as a draft' view work better on smaller screens
cc: @sk22
|
2023-09-20 10:31:59 -03:00 |
|
LucasGGamerM
|
18857e6233
|
refactor(compose): remove unnecessary drawables
|
2023-09-20 10:26:08 -03:00 |
|
LucasGGamerM
|
4aee67382b
|
refactor(compose): move publish button icon coloring to compose_button.xml
|
2023-09-20 10:12:37 -03:00 |
|
LucasGGamerM
|
3656402277
|
fix(compose): fix bottom bar icons tint
This uses the action_bar_icons.xml color scheme to dictate the colors of the compose bottom bar items
|
2023-09-20 10:06:03 -03:00 |
|
LucasGGamerM
|
6cab15b4c6
|
fix(file-display-tem): fix title text padding
|
2023-09-19 11:44:08 -03:00 |
|
LucasGGamerM
|
ec3670d562
|
fix(reply-icon): fix reply icon side text coloring
|
2023-09-18 11:35:16 -03:00 |
|
LucasGGamerM
|
8a0852d1a4
|
fix(video-player): fixes coloring on video player items
|
2023-09-18 11:18:42 -03:00 |
|
LucasGGamerM
|
b7d06a47db
|
fix(compose): fixes compose language button being too thin when
You can see its too thin by tapping on it and seeing the button shadow, which indicates its too thin
|
2023-09-17 13:03:18 -03:00 |
|
LucasGGamerM
|
f0a5799eea
|
fix: fix warning status display item background being too bright
|
2023-09-17 12:50:10 -03:00 |
|
LucasGGamerM
|
5cda112129
|
refactor(PreviewlessMedia): move margin value to layout file
|
2023-09-17 09:26:33 -03:00 |
|
Grishka
|
6d84f28600
|
Hashtag following
closes #684, closes #233
|
2023-09-12 07:49:14 +03:00 |
|
Grishka
|
1b4dc01c74
|
Post translation
closes #267, closes #671, closes #502
|
2023-09-12 06:00:40 +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
|
77dee59b9c
|
fix string and tweak banner margin
closes sk22#812
|
2023-09-09 01:24:36 +02:00 |
|
sk
|
efa003a9a5
|
implement bidirectional missing posts gap
|
2023-09-08 21:16:42 +02: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 |
|
sk
|
a10e661b21
|
fix wrong info banner color
closes sk22#790
|
2023-09-04 23:37:34 +02:00 |
|
sk
|
4975bde76f
|
fix tab layout horizontal paddings
|
2023-09-04 23:33:35 +02:00 |
|
FineFindus
|
10a8b195b1
|
fix: move tabbar padding to tabbar items (#792)
* feat: increase padding without labels
* fix: move tabbar padding to individual items
|
2023-09-04 22:19:47 +02:00 |
|
sk
|
6f273df060
|
use single-line linear layout
|
2023-09-04 19:54:07 +02:00 |
|
LucasGGamerM
|
33f4dd4716
|
fix: compose fragment bottom drafts button being not centered
|
2023-09-04 10:31:01 -03:00 |
|
LucasGGamerM
|
93ca187f1c
|
fix: use bigger bot icon on header display item
|
2023-09-04 07:56:17 -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 |
|
LucasGGamerM
|
c3f3a9be7e
|
feat: update edit note confirmation button design (again)
|
2023-09-03 09:23:33 -03:00 |
|
LucasGGamerM
|
677fb4e4da
|
fix: readds bot icon to timelines
This was accidentally removed during the great merge, but its back again
|
2023-09-02 21:02:11 -03: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 |
|
LucasGGamerM
|
0edaffee59
|
fix: fix Warning item title being cut off
|
2023-08-29 09:05:33 -03:00 |
|
LucasGGamerM
|
7c3b4128de
|
feat: use better color background for extended footer
|
2023-08-28 21:25:35 -03:00 |
|
LucasGGamerM
|
77fca4d763
|
fix: fix bottom bar labels ellipsizing wrongly on devices with a smaller screen
|
2023-08-28 21:03:00 -03:00 |
|
sk
|
83e84836b5
|
fix slightly wrong margins
closes sk22#778
|
2023-08-28 22:47:43 +02:00 |
|
sk
|
ceec18ff5e
|
fix divider not being full-width
|
2023-08-28 22:33:19 +02:00 |
|
sk
|
d36ad43700
|
fix reporting crashing the app
|
2023-08-28 22:26:53 +02:00 |
|
LucasGGamerM
|
d93bcd9241
|
feat: use ellipsize for settings items
IDK why It can't just continue on the next line :(
|
2023-08-28 17:23:00 -03:00 |
|
LucasGGamerM
|
a9cd67a64e
|
fix: fix wrong coloring on the follow suggestions fragment bottom bar
|
2023-08-28 08:44:01 -03:00 |
|
LucasGGamerM
|
52955b6c42
|
fix: fix wrong tap-to-reveal string
|
2023-08-28 08:27:42 -03:00 |
|
LucasGGamerM
|
6318745fe7
|
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
# Conflicts:
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AccountCardStatusDisplayItem.java
|
2023-08-27 13:51:42 -03:00 |
|
LucasGGamerM
|
9777bf9c6c
|
fix: make relocated publish button gone by default
Same also applies to the top drafts button
|
2023-08-27 13:37:08 -03:00 |
|