LucasGGamerM
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
LucasGGamerM
24df7d49d5
feat: make ProfileFragment not reloadable when in edit mode
2023-06-03 21:46:23 -03:00
LucasGGamerM
ac7c1c8497
fix: wrong pixel launcher url for customLocalTimelines
2023-06-03 20:30:24 -03:00
LucasGGamerM
d72f66b9bf
fix: NPE when getInstance().pleroma.metadata.fieldsLimits is null
2023-06-03 20:25:27 -03:00
LucasGGamerM
1d445b8b27
fix: compilation problems
2023-06-03 20:21:28 -03:00
LucasGGamerM
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
sk
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
sk
56a93288c4
reimplement thread ancestry
2023-06-02 19:05:18 +02:00
sk
02e3421f98
fix null pointer exception
2023-06-02 19:03:29 +02:00
LucasGGamerM
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
sk
d37e880993
don't close sheet after logging out
2023-06-02 01:45:30 +02:00
sk
bfcff1e19f
fix null pointer exception
...
closes sk22#539
2023-06-02 01:34:31 +02:00
sk
f373e7df3e
put code in method, add todo
2023-06-02 01:16:21 +02:00
sk
3985de5b14
visually connect descendant replies in threads
...
closes sk22#256
closes sk22#510
2023-06-02 00:55:42 +02:00
LucasGGamerM
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
sk
e175a721d4
remove additional padding with translate button
2023-06-02 00:17:50 +02:00
sk
d9784ebc31
use /about web uri for akkoma
2023-06-01 19:28:46 +02:00
sk
f241092277
use isInstanceAkkoma()
2023-06-01 19:22:01 +02:00
sk
0702703d78
normalize instance uri
2023-06-01 19:13:03 +02:00
sk
2c4504bad3
fix current fragment detection
2023-06-01 19:12:50 +02:00
sk
798a43906f
denser account switcher
...
this one's for @experiencersinternational
2023-06-01 18:46:53 +02:00
sk
41cb0f2e09
implement assist url in instance rules
2023-06-01 18:38:45 +02:00
sk
b2d6879282
reimplement assist content
2023-06-01 18:02:33 +02:00
LucasGGamerM
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
sk
89afc05d5c
Merge branch 'main' into pr/FineFindus/530
2023-06-01 16:32:04 +02:00
sk
ee20ee0722
include mentions in reply from notification
...
closes sk22#536
2023-05-31 12:42:48 +02:00
sk
02f9f8c8ea
always update active account, but not others
2023-05-31 12:23:04 +02:00
sk
5e7a00de3e
fix crash when logging out active account
2023-05-31 10:05:31 +02:00
sk
2858aeb55e
only set last account id if creating new activity
2023-05-31 09:45:24 +02:00
sk
357104efa9
set checked on basis of fragment's account id
...
closes sk22#538
2023-05-31 09:42:29 +02:00
sk
bb8027c7ef
open externally opened content in main activity
...
closes sk22#533
2023-05-31 01:44:00 +02:00
sk
f9dd787009
fix rules crashing the app
...
closes sk22#535
2023-05-31 00:19:38 +02:00
sk
18ae3f4f61
Merge branch 'pr/FineFindus/531'
...
Co-authored-by: FineFindus <63370021+finefindus@users.noreply.github.com >
2023-05-30 22:46:08 +02:00
sk
10dfe0327e
use new account switcher
2023-05-30 22:42:56 +02:00
Jacoco
1d1e921137
Fix GoToSocial crash when markers are null ( #529 )
2023-05-30 19:07:34 +02:00
sk
0985a4c968
getInstance returns optional
2023-05-30 18:57:17 +02:00
sk
8df589c103
safer file writing
2023-05-30 18:56:55 +02:00
LucasGGamerM
3ac9c09338
feat: shows toolbar when scrolled past title
...
This still needs to be redone with the same style as the profile fragment
2023-05-30 13:19:04 -03:00
FineFindus
71b6b2f451
feat(share): add option open URL
2023-05-30 16:33:09 +02:00
FineFindus
d85940ded8
fix: re-add removed imports
2023-05-30 16:28:04 +02:00
LucasGGamerM
e9e491c0b0
feat: redesign account picker sheet
2023-05-30 16:25:04 +02:00
FineFindus
c73562fb75
feat(external-share): use AccountSwitcherSheet
2023-05-30 16:24:43 +02:00
FineFindus
3feacb59c8
feat(external-share): use transparent background
2023-05-30 16:19:28 +02:00
FineFindus
a033d711c1
feat: show page URL in recents
2023-05-30 15:40:20 +02:00
LucasGGamerM
ba31afda27
fix: fixes wrong status bar background color on light mode in settings
...
This addresses #204
2023-05-29 20:24:13 -03:00
sk
32081b71f5
throw exception if no instance for session
2023-05-29 13:31:42 +02:00
sk
6832bfb95c
don't display blocked_by relationship
...
closes sk22#526
2023-05-29 12:34:53 +02:00
sk
4c379b67a3
only auto-open search on pleroma instances
2023-05-29 03:33:31 +02:00
sk
3a2ae1ce71
clean up preferences when removing account
2023-05-29 02:40:15 +02:00
sk
c80afaf9c0
avoid sessions without instance info
2023-05-29 02:40:02 +02:00
