3aead05ad4
feat: use megalogon's lighter grays on colors.xml
2023-06-03 22:03:41 -03:00
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
24df7d49d5
feat: make ProfileFragment not reloadable when in edit mode
2023-06-03 21:46:23 -03:00
ac7c1c8497
fix: wrong pixel launcher url for customLocalTimelines
2023-06-03 20:30:24 -03:00
d72f66b9bf
fix: NPE when getInstance().pleroma.metadata.fieldsLimits is null
2023-06-03 20:25:27 -03:00
1d445b8b27
fix: compilation problems
2023-06-03 20:21:28 -03:00
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
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
e04fd8a004
bump version
2023-06-02 19:10:08 +02:00
ada70ae1b5
Merge remote-tracking branch 'upstream/l10n_master'
2023-06-02 19:09:44 +02:00
5fdec0900e
Translated using Weblate (Galician)
...
Currently translated at 100.0% (292 of 292 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/gl/
2023-06-02 17:09:12 +00:00
56a93288c4
reimplement thread ancestry
2023-06-02 19:05:18 +02:00
02e3421f98
fix null pointer exception
2023-06-02 19:03:29 +02:00
df7b53e10f
feat(settings): move timeline settings around
...
This moves the button to the topmost item on pleroma based instances
2023-06-02 13:48:26 -03:00
fdbf331432
New translations strings.xml (Bengali)
2023-06-02 18:01:03 +02:00
aed86ac6f0
New translations strings.xml (Bengali)
2023-06-02 16:50:10 +02:00
3a13d4d6c0
New translations strings.xml (Bengali)
2023-06-02 05:45:51 +02:00
f5336564d0
New translations strings.xml (Bengali)
2023-06-02 04:39:21 +02:00
1ce49c68fe
bump version
2023-06-02 01:45:55 +02:00
d37e880993
don't close sheet after logging out
2023-06-02 01:45:30 +02:00
6fdb81a01f
Merge remote-tracking branch 'upstream/l10n_master'
2023-06-02 01:37:14 +02:00
f9d6827572
Translated using Weblate (Ukrainian)
...
Currently translated at 100.0% (292 of 292 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/uk/
2023-06-01 23:36:24 +00:00
10bf72b9ff
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (292 of 292 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/id/
2023-06-01 23:36:24 +00:00
800f929a15
Translated using Weblate (French)
...
Currently translated at 100.0% (292 of 292 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fr/
2023-06-01 23:36:24 +00:00
bfcff1e19f
fix null pointer exception
...
closes sk22#539
2023-06-02 01:34:31 +02:00
f373e7df3e
put code in method, add todo
2023-06-02 01:16:21 +02:00
3985de5b14
visually connect descendant replies in threads
...
closes sk22#256
closes sk22#510
2023-06-02 00:55:42 +02:00
4d75621384
fix(settings): fix on theme change crash
...
This fixes such bug by only registering for listening to events on the onCreate method, and not on the onViewCreated method. For some wacky reason, when the activity gets recreated, the onViewCreated method runs again, but the onDestroy method doesn't, which makes the fragment register for events twice without unregistering, which causes the app to crash. Also refactors some duplicate code.
2023-06-01 19:46:45 -03:00
e175a721d4
remove additional padding with translate button
2023-06-02 00:17:50 +02:00
d9784ebc31
use /about web uri for akkoma
2023-06-01 19:28:46 +02:00
f241092277
use isInstanceAkkoma()
2023-06-01 19:22:01 +02:00
0702703d78
normalize instance uri
2023-06-01 19:13:03 +02:00
2c4504bad3
fix current fragment detection
2023-06-01 19:12:50 +02:00
07ca5a8b77
New translations strings.xml (Bengali)
2023-06-01 19:07:10 +02:00
798a43906f
denser account switcher
...
this one's for @experiencersinternational
2023-06-01 18:46:53 +02:00
41cb0f2e09
implement assist url in instance rules
2023-06-01 18:38:45 +02:00
e12c0fb81f
bump version
2023-06-01 18:10:30 +02:00
ac39f119e2
Translated using Weblate (Dutch)
...
Currently translated at 88.4% (253 of 286 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/nl/
2023-06-01 16:08:59 +00:00
016faf3df0
Translated using Weblate (Galician)
...
Currently translated at 99.6% (285 of 286 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/gl/
2023-06-01 16:08:59 +00:00
b2d6879282
reimplement assist content
2023-06-01 18:02:33 +02:00
6926a212f4
New translations strings.xml (Bengali)
2023-06-01 17:46:40 +02:00
addb6e06bf
feat(settings): add horizontal padding to SettingsFooterItem
...
This addresses a minor annoyance where the version name would be glued to the sides of the display
2023-06-01 11:55:31 -03:00
8ea752fbf7
fix: fix updateItem not updating state after UpdateState change
...
This fixes the auto updater on the new settings redesign
2023-06-01 11:51:26 -03:00
89afc05d5c
Merge branch 'main' into pr/FineFindus/530
2023-06-01 16:32:04 +02:00
936f39161b
New translations strings.xml (German)
2023-05-31 20:11:48 +02:00
ee20ee0722
include mentions in reply from notification
...
closes sk22#536
2023-05-31 12:42:48 +02:00
02f9f8c8ea
always update active account, but not others
2023-05-31 12:23:04 +02:00
de3a252884
not as huge share sheet heading
2023-05-31 10:12:12 +02:00
5e7a00de3e
fix crash when logging out active account
2023-05-31 10:05:31 +02:00
2858aeb55e
only set last account id if creating new activity
2023-05-31 09:45:24 +02:00
LucasGGamerM
sk
Espasant3
Eugen Rochko
ihor_ck
Linerly
Choukajohn
Oliebol