summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas <tschneider.ac@gmail.com>2024-01-16 17:54:54 +0100
committerThomas <tschneider.ac@gmail.com>2024-01-16 17:54:54 +0100
commit1f2e6c4327eb5aca4a06829c21530da5c8f13a1d (patch)
tree285eaec81dd9f9bc1680d12e582df2a892457725
parenta1370693fb564d48aa56a602b7b912e864480f74 (diff)
parent886b74c171f3e92f9bb394150a1ce99cf3491d76 (diff)
Merge branch 'develop'3.27.0
Diffstat
-rw-r--r--.gitea/issue_template/bug.md3
-rw-r--r--.gitea/issue_template/feature.md3
-rw-r--r--app/build.gradle4
-rw-r--r--app/src/main/assets/release_notes/notes.json5
-rw-r--r--app/src/main/java/app/fedilab/android/BaseMainActivity.java333
-rw-r--r--app/src/main/java/app/fedilab/android/activities/AboutActivity.java20
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/activities/AccountReportActivity.java27
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/activities/ActionActivity.java24
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/activities/BaseActivity.java1
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java579
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/activities/ContextActivity.java150
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/activities/CustomSharingActivity.java22
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/activities/DirectMessageActivity.java87
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/activities/EditProfileActivity.java21
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/activities/FollowedTagActivity.java3
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/activities/HashTagActivity.java76
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/activities/InstanceHealthActivity.kt100
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/activities/MastodonListActivity.java53
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/activities/MediaActivity.java38
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/activities/PartnerShipActivity.java16
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/activities/ProfileActivity.java137
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/activities/ReorderTimelinesActivity.java47
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/activities/ReportActivity.java75
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/activities/SearchResultTabActivity.java27
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/activities/StatusInfoActivity.java24
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/activities/TimelineActivity.java45
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminAccountActivity.java49
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminActionActivity.java27
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminDomainBlockActivity.java35
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminReportActivity.java58
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/client/entities/api/EmojiInstance.java27
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Tag.java3
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/client/entities/app/CachedBundle.java413
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/helper/BlurHashDecoder.kt32
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/helper/ComposeHelper.java5
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/helper/CrossActionHelper.java94
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java131
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/helper/PinnedTimelineHelper.java3
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java135
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/helper/ThemeHelper.java10
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/helper/TranslateHelper.java2
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/helper/itemtouchhelper/SimpleItemTouchHelperCallback.java6
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/helper/settings/TimePreferenceDialogFragment.java3
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/imageeditor/EditImageActivity.java22
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/imageeditor/base/BaseActivity.java6
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/jobs/ComposeWorker.java99
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/services/CustomReceiver.java8
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/drawer/AccountAdapter.java35
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/drawer/AccountFollowRequestAdapter.java18
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/drawer/AccountsSearchTopBarAdapter.java20
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java54
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ConversationAdapter.java23
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ImageAdapter.java38
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/drawer/NotificationAdapter.java70
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/drawer/SliderAdapter.java22
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java374
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusDirectMessageAdapter.java40
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusDraftAdapter.java15
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusScheduledAdapter.java14
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/drawer/SuggestionAdapter.java18
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/drawer/TagAdapter.java15
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/drawer/TagsSearchAdapter.java21
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/drawer/admin/AdminAccountAdapter.java17
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/fragment/media/FragmentMedia.java19
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/fragment/media/FragmentMediaProfile.java43
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentComposeSettings.java11
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentExtraFeaturesSettings.java15
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentHomeCacheSettings.java10
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentInterfaceSettings.java12
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentLanguageSettings.java9
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentNotificationsSettings.java32
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentThemingSettings.java16
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentTimelinesSettings.java14
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonAccount.java78
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonContext.java135
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonDirectMessage.java43
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonNotification.java72
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTag.java2
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java253
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentNotificationContainer.java39
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentProfileTimeline.java62
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/pageadapter/FedilabNotificationPageAdapter.java60
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/pageadapter/FedilabProfilePageAdapter.java37
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/pageadapter/FedilabProfileTLPageAdapter.java17
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/pageadapter/FedilabScheduledPageAdapter.java14
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/AccountsVM.java8
-rw-r--r--app/src/main/java/app/fedilab/android/peertube/activities/PeertubeActivity.java2
-rw-r--r--app/src/main/java/app/fedilab/android/peertube/activities/PeertubeMainActivity.java1
-rw-r--r--app/src/main/java/app/fedilab/android/peertube/client/RetrofitPeertubeAPI.java9
-rw-r--r--app/src/main/java/app/fedilab/android/peertube/fragment/SettingsFragment.java1
-rw-r--r--app/src/main/java/app/fedilab/android/peertube/helper/Helper.java3
-rw-r--r--app/src/main/java/app/fedilab/android/peertube/services/RetrieveInfoService.java2
-rw-r--r--app/src/main/java/app/fedilab/android/peertube/webview/MastalabWebChromeClient.java6
-rw-r--r--app/src/main/java/app/fedilab/android/sqlite/Sqlite.java19
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/FragmentLoginPickInstanceMastodon.java14
-rw-r--r--app/src/main/res/layouts/mastodon/layout/activity_search_result_tabs.xml2
-rw-r--r--app/src/main/res/layouts/mastodon/layout/drawer_tag_search.xml13
-rw-r--r--app/src/main/res/values-ar/strings.xml44
-rw-r--r--app/src/main/res/values-bg/strings.xml411
-rw-r--r--app/src/main/res/values-de/strings.xml6
-rw-r--r--app/src/main/res/values-eo/strings.xml37
-rw-r--r--app/src/main/res/values-fr/strings.xml5
-rw-r--r--app/src/main/res/values-gl/strings.xml15
-rw-r--r--app/src/main/res/values-ia/strings.xml31
-rw-r--r--app/src/main/res/values-zh-rCN/strings.xml1
-rw-r--r--app/src/main/res/values/strings.xml2
-rw-r--r--app/src/main/res/xml/pref_interface.xml7
-rw-r--r--app/src/main/res/xml/pref_timelines.xml2
-rw-r--r--src/fdroid/fastlane/metadata/android/bg/short_description.txt1
-rw-r--r--src/fdroid/fastlane/metadata/android/bg/title.txt1
-rw-r--r--src/fdroid/fastlane/metadata/android/en/changelogs/506.txt1
-rw-r--r--src/fdroid/fastlane/metadata/android/en/changelogs/507.txt2
-rw-r--r--src/fdroid/fastlane/metadata/android/en/changelogs/508.txt1
-rw-r--r--src/fdroid/fastlane/metadata/android/en/changelogs/509.txt