LucasGGamerM
|
8c321c4f0d
|
build: add use camera feature flag to manifest
|
2023-08-20 11:54:16 -03:00 |
|
LucasGGamerM
|
93818903c8
|
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
# Conflicts:
# README.md
# build.gradle
# mastodon/build.gradle
# mastodon/src/main/AndroidManifest.xml
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.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/api/requests/accounts/SetAccountMuted.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.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/HomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/PinnableStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.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/account_list/BaseAccountListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingFollowSuggestionsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Attachment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java
# mastodon/src/main/java/org/joinmastodon/android/ui/M3AlertDialogBuilder.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AudioStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/InsetStatusItemDecoration.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/color/button_bg_secondary_dark_on_light.xml
# mastodon/src/main/res/color/button_text_primary_light_on_dark.xml
# mastodon/src/main/res/drawable/bg_image_alt_text_overlay.xml
# mastodon/src/main/res/drawable/bg_rect_4dp_ripple.xml
# mastodon/src/main/res/drawable/bg_search_field.xml
# mastodon/src/main/res/drawable/ic_fluent_save_24_regular.xml
# mastodon/src/main/res/layout/compose_action.xml
# mastodon/src/main/res/layout/compose_media_thumb.xml
# mastodon/src/main/res/layout/compose_poll_option.xml
# mastodon/src/main/res/layout/display_item_footer.xml
# mastodon/src/main/res/layout/display_item_header.xml
# mastodon/src/main/res/layout/display_item_text.xml
# mastodon/src/main/res/layout/fragment_compose.xml
# mastodon/src/main/res/layout/fragment_profile.xml
# mastodon/src/main/res/layout/item_instance_category.xml
# mastodon/src/main/res/layout/item_report_choice.xml
# mastodon/src/main/res/layout/item_settings_footer.xml
# mastodon/src/main/res/layout/item_settings_switch.xml
# mastodon/src/main/res/layout/item_settings_theme.xml
# mastodon/src/main/res/layout/item_settings_theme_subitem.xml
# mastodon/src/main/res/layout/item_settings_update.xml
# mastodon/src/main/res/layout/tab_bar.xml
# mastodon/src/main/res/menu/mute_duration.xml
# mastodon/src/main/res/values-de-rDE/strings_sk.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-fa/strings_sk.xml
# mastodon/src/main/res/values-night/colors.xml
# mastodon/src/main/res/values-nl-rNL/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# mastodon/src/main/res/values-zh-rCN/strings_sk.xml
# mastodon/src/main/res/values/attrs.xml
# mastodon/src/main/res/values/ids.xml
# mastodon/src/main/res/values/styles.xml
# metadata/es/changelogs/83.txt
|
2023-08-20 11:36:16 -03:00 |
|
LucasGGamerM
|
e7654affa7
|
feat: add FileProvider class from AndroidX
This is for getting high quality camera images, and was a requirement for the code I need.
|
2023-06-12 13:49:03 -03:00 |
|
LucasGGamerM
|
dc66b27c8a
|
feat: add camera shortcut to compose screen
|
2023-06-11 16:48:19 -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
|
2c0ec28803
|
Panic responder (#512)
* feat: add panic responder
* refactor: logOut before removing session
* fix(panic): close app after logOut to avoid crash
* build: reset gradle.properties
|
2023-05-20 13:20:25 +02:00 |
|
LucasGGamerM
|
d7287441ca
|
build: fix compilation errors
|
2023-04-22 14:47:53 -03:00 |
|
LucasGGamerM
|
5b391b44d3
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/github/AndroidManifest.xml
# mastodon/src/main/res/values-de-rDE/strings_sk.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-eu-rES/strings_sk.xml
# mastodon/src/main/res/values-ko-rKR/strings_sk.xml
# mastodon/src/main/res/values-pl-rPL/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# metadata/es/changelogs/83.txt
# metadata/fr/short_description.txt
# metadata/gl-ES/changelogs/83.txt
|
2023-04-22 13:53:50 -03:00 |
|
sk
|
b6186a349f
|
update gradle
|
2023-04-20 16:03:57 +02:00 |
|
LucasGGamerM
|
4d0790dcec
|
fix: fix keyboard moving over edittext views
Merge this @sk22, as its particularly annoying for when editing account roles on a shorter screen
|
2023-04-19 15:01:21 -03:00 |
|
LucasGGamerM
|
64e681c227
|
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/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# metadata/de-DE/changelogs/83.txt
# metadata/en-US/changelogs/83.txt
|
2023-04-12 13:04:31 -03:00 |
|
FineFindus
|
a59587eb62
|
fix(auth): use BuildType depended redirect uri
|
2023-04-09 15:46:30 +02:00 |
|
sk
|
cceb0b4c6c
|
Merge remote-tracking branch 'upstream/master'
|
2023-03-24 19:33:40 +01:00 |
|
Grishka
|
0112bfa9c4
|
Fix #547
|
2023-03-22 02:38:58 +03:00 |
|
FineFindus
|
05168b9826
|
feat(external-share): use transparent background
|
2023-03-17 20:38:56 +01:00 |
|
LucasGGamerM
|
6fa930aa9f
|
Revert "feat: add android 14s predictive back gesture. Fixes #116"
This reverts commit 736ec4dbf9.
|
2023-03-11 20:18:27 -03:00 |
|
LucasGGamerM
|
736ec4dbf9
|
feat: add android 14s predictive back gesture. Fixes #116
|
2023-03-11 20:14:58 -03:00 |
|
Grishka
|
6e314f0ea5
|
Fix #509
|
2023-01-27 14:44:46 -03:00 |
|
LucasGGamerM
|
247dea3af0
|
Chaging string in title
|
2023-01-27 14:24:44 -03:00 |
|
sk
|
f5d4e2a0b5
|
Merge remote-tracking branch 'upstream/master'
|
2023-01-22 03:44:30 +01:00 |
|
Grishka
|
c67b2b35f3
|
Fix #509
|
2023-01-22 02:08:55 +03:00 |
|
LucasGGamerM
|
f0bd9233b7
|
IT FINALLY FUCKING COMPILES
|
2022-12-22 11:27:52 -03:00 |
|
sk
|
2160a26648
|
add vibration when copying username
|
2022-12-22 08:47:52 -03:00 |
|
sk
|
ae7152aca7
|
Merge branch 'feature/long-press-copy-url'
|
2022-12-19 15:15:03 +01:00 |
|
sk
|
0ada05bf3a
|
add vibration when copying username
|
2022-12-19 15:06:17 +01:00 |
|
LucasGGamerM
|
8d0fe18b70
|
Fixing the notification color, and app name
|
2022-12-10 09:33:36 -03:00 |
|
LucasGGamerM
|
2ccbffa165
|
Merge branch 'main' into fork
# Conflicts:
# README.md
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/color/button_text_primary_light_on_dark.xml
# mastodon/src/main/res/drawable/logo.xml
# mastodon/src/main/res/layout/item_settings_color_picker.xml
# mastodon/src/main/res/menu/color_picker.xml
# mastodon/src/main/res/values-night/styles.xml
# mastodon/src/main/res/values-v27/colors.xml
# mastodon/src/main/res/values/colors.xml
# mastodon/src/main/res/values/strings.xml
# mastodon/src/main/res/values/styles.xml
|
2022-12-09 19:08:35 -03:00 |
|
LucasGGamerM
|
b465c09cc8
|
Fixing the "Megalodon" name on logging into a new account
|
2022-12-08 15:01:46 -03:00 |
|
LucasGGamerM
|
8c1f76d7fa
|
Initial Moshidon "release"
|
2022-12-06 19:17:07 -03:00 |
|
sk
|
6c5bb69ba9
|
move custom strings into separate files
|
2022-11-30 23:16:14 +01:00 |
|
sk
|
6203ded864
|
Merge branch 'main' into fork
|
2022-11-28 12:07:35 +01:00 |
|
sk
|
9a52cc033a
|
set custom redirect uri
closes #89
|
2022-11-28 10:00:57 +01:00 |
|
sk
|
96a56873c3
|
add long-click to copy username
|
2022-11-21 20:14:45 +01:00 |
|
Julien Humbert
|
21927d2e25
|
Add missing line in Android Manifest
|
2022-11-07 12:32:20 +09:00 |
|
Grishka
|
367057421b
|
Declare and request notifications permission (should fix #262)
|
2022-10-26 02:46:23 +03:00 |
|
Grishka
|
94c864c8ac
|
Photo viewer & video player UI
|
2022-04-20 15:23:52 +03:00 |
|
Grishka
|
0661ce265a
|
System share support
|
2022-04-05 17:59:04 +03:00 |
|
Grishka
|
a0cbf0fa31
|
Push notifications
|
2022-04-03 23:54:31 +03:00 |
|
Grishka
|
a5cd675c17
|
Add launcher icon
|
2022-02-23 02:39:45 +03:00 |
|
Grishka
|
4e59930d15
|
Audio player
|
2022-02-22 14:01:48 +03:00 |
|
Grishka
|
2dcd3c765f
|
Dark theme WIP
|
2022-02-17 21:06:18 +03:00 |
|
Grishka
|
b3a99e0764
|
Tooting of text toots
|
2022-01-17 21:50:48 +03:00 |
|
Grishka
|
dfbc1fd2e2
|
Basic status rendering
|
2022-01-17 13:27:34 +03:00 |
|
Grishka
|
42d5f52ff5
|
Initial
|
2022-01-14 15:02:10 +03:00 |
|