LucasGGamerM
17227cdb7d
Merge pull request #214
...
feat: Add haptic feedback on boost/favourite/bookmark
2023-06-26 17:24:23 -03:00
LucasGGamerM
fd0a741ff2
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
2023-06-21 15:50:10 -03:00
sk
a70d39065c
add some new icons
2023-06-21 10:44:54 +02:00
FineFindus
be425282a6
Hashtag timelines with multiple tags ( #584 )
...
* feat(api/hashtag): add any, all, and none parameter
* feat(timeline/hashtag): load with any, all and none parameter
* feat(timeline/hashtag): save any, all and none in timeline definition
* feat: set hastag parameter in UI
* feat: move strings to string res
* feat: show hint for tags
* refactor: use method for setting up tags text
* improve edit dialog, allow creating hashtag timelines
* add chips for hashtags
* add option for displaying only local posts in hashtag
* improve layout and wording
---------
Co-authored-by: sk <sk22@mailbox.org >
2023-06-21 01:38:51 +02:00
Schuyler Cebulskie
ede7305fe9
feat: Add haptic feedback on boost/favourite/bookmark
2023-06-16 20:36:10 -04:00
LucasGGamerM
a501a41cb2
fix: fix wrong coloring for the new distinctive enabled post notifications icon
...
cc: @sk22
This is a fix to my earlier commit, please also merge it over at Mega!
2023-06-15 21:25:23 -03:00
LucasGGamerM
5709389322
feat: add distinctive bell icon for when post notifications are enabled
...
cc: @sk22
I will cc you a lot from now on, as I have realized Mega has a few design rough edges I feel personally obligated to give back the fix to. Primarily wrong coloring on a few text views here and there.
For putting colors onto things, I always a true black tone and the green visual option, because those options specifically make the mismatched colors a lot more apparent.
2023-06-15 21:21:58 -03:00
LucasGGamerM
1beba48b66
Merge remote-tracking branch 'megalodon_weblate/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
# mastodon/src/main/res/values-pt-rBR/strings_sk.xml
2023-06-15 14:58:12 -03:00
sk
6595a088fb
support exclusive lists
...
closes sk22#576
2023-06-15 19:21:26 +02:00
LucasGGamerM
dc66b27c8a
feat: add camera shortcut to compose screen
2023-06-11 16:48:19 -03:00
LucasGGamerM
e2c62aa76b
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/requests/accounts/GetAccountByHandle.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/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.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/PaginatedAccountListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Account.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/ClickableLinksDelegate.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/layout/display_item_footer.xml
# mastodon/src/main/res/values/dimens.xml
2023-06-09 18:09:23 -03:00
sk
35bf858a83
auto-reveal equal spoilers in threads
2023-06-09 14:54:03 +02:00
sk
4258c55b88
implement fetching listings from remote instances
2023-06-06 17:04:29 +02:00
sk
ac4458e106
fix badged toolbar icons with new appkit version
2023-06-05 18:07:22 +02:00
sk
d4fbb298c1
use sp for reply line inline icons
2023-06-04 22:57:06 +02:00
sk
2aeb5f03d6
remove unused sp drawables
2023-06-04 22:32:54 +02:00
sk
5432f2590c
fine-tune footer layout
2023-06-04 05:00:48 +02: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
10dfe0327e
use new account switcher
2023-05-30 22:42:56 +02:00
LucasGGamerM
c6ded3d505
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Filter.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java
# mastodon/src/main/res/layout/display_item_file.xml
2023-05-27 09:31:27 -03:00
LucasGGamerM
ec11a5e8e3
feat: update visual appearance settings icon
2023-05-27 09:10:24 -03:00
sk
f933bdbc53
button with ripple for files and instance picker
2023-05-27 01:13:32 +02:00
LucasGGamerM
274bca84d9
Add display item for unknown/file attachments
...
Co-authored-by: LucasGGamerM <lucassggabriel@gmail.com >
2023-05-27 01:11:26 +02:00
FineFindus
8befbb5a62
refactor(settings): adjust icon color
2023-05-26 20:12:41 +02:00
LucasGGamerM
23f82197c6
Merge pull request #200
...
Feat: Instance info
2023-05-23 20:08:36 -03:00
LucasGGamerM
65c158391f
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/res/layout/fragment_compose.xml
2023-05-23 19:30:52 -03:00
FineFindus
56835b4f2d
feat: show blocked domains
2023-05-22 21:37:56 +02:00
FineFindus
c43f734101
feat(instance-info): replace moderated server icon
2023-05-22 20:29:05 +02:00
FineFindus
0b08072dfc
feat(instance-info): add options menu
2023-05-22 20:21:11 +02:00
Jacoco
8b502b605c
Alternative content types ( #516 )
...
* Akkoma content types
* Default content type preference
* per-account content types, compatible with glitch
* disable content types by default, change icon
* persist content type to state
* update string
* fall back to plain text if formatting enabled
---------
Co-authored-by: sk <sk22@mailbox.org >
2023-05-22 17:56:50 +02:00
LucasGGamerM
3fda9e9eab
feat: add file attachments view
...
This also fixes crashes on Calckey due to now being able to handle any type of attachment.
@sk22 this is also great for you
2023-05-13 21:29:16 -03:00
LucasGGamerM
01ae9ba7f5
fix: re-add missing drawable
...
This is the second commit for that, now I added it to git
2023-04-27 15:40:58 -03:00
LucasGGamerM
26ab5a7f55
build: re-add missing drawable
2023-04-27 15:14:02 -03:00
LucasGGamerM
00d6f29285
feat: increase corner radius of auto updater view
2023-04-16 21:39:27 -03:00
LucasGGamerM
ee1a4edbe1
fix: discrepant colors in account picker
2023-04-15 12:43:07 -03:00
LucasGGamerM
665a0176b9
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/res/layout/fragment_splash.xml
2023-04-14 14:27:42 -03:00
sk
3ad46926f1
Merge remote-tracking branch 'upstream/master'
2023-04-13 21:46:45 +02:00
Grishka
0de227ab9c
Use fixed colors for SplashFragment
...
fixes #561
2023-04-12 18:47:02 +03:00
Grishka
4f8d8f0c8d
Welcome fragment redesign again
...
# Conflicts:
# mastodon/src/main/res/values/strings.xml
# mastodon/src/main/res/values/styles.xml
2023-04-07 22:44:28 +03:00
LucasGGamerM
0589612df9
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# README.md
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.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/ComposeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/NotificationAction.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.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/text/ClickableLinksDelegate.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/MediaAttachmentViewController.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/layout/display_item_gifv.xml
# mastodon/src/main/res/layout/display_item_photo.xml
# mastodon/src/main/res/layout/display_item_video.xml
# mastodon/src/main/res/menu/post.xml
# mastodon/src/main/res/menu/profile.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-fr-rFR/strings_sk.xml
# mastodon/src/main/res/values-gl-rES/strings_sk.xml
# mastodon/src/main/res/values-in-rID/strings_sk.xml
# mastodon/src/main/res/values-pl-rPL/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# metadata/it-IT/full_description.txt
# metadata/zh-Hans/short_description.txt
2023-03-21 20:25:51 -03:00
sk
5395855775
feat: implement notification badge using markers from @sk22.
...
Thank you a lot man! This improvement is amazing
2023-03-21 19:55:34 -03:00
LucasGGamerM
1680c635dc
Revert "feat(tabs/notifications): add unread badge"
...
This reverts commit 4ecd525f
2023-03-21 19:47:51 -03:00
sk
ff272179e7
implement notification badge using markers
2023-03-21 00:52:20 +01:00
LucasGGamerM
c0484de506
feat: add toggle to disable double tap to swipe action
2023-03-19 11:20:46 -03:00
sk
e2193e8e3c
reply line below, compact above
2023-03-15 21:24:25 +01:00
LucasGGamerM
04ed9e76f2
feat: increase corner radius of search box and login box
2023-03-11 20:01:58 -03:00
LucasGGamerM
ae11e78d78
refactor: increase border radius of inline buttons
2023-03-06 20:20:52 -03:00
FineFindus
4ecd525f13
feat(tabs/notifications): add unread badge
2023-03-01 21:44:11 +01:00
LucasGGamerM
1e2dd3dec6
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.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/ui/utils/UiUtils.java
2023-02-17 17:40:06 -03:00
sk
6b9b6710cf
enable remote-following accounts
...
closes sk22#431
2023-02-16 19:44:39 +01:00
