summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorThomas <tschneider.ac@gmail.com>2022-12-03 18:44:07 +0100
committerThomas <tschneider.ac@gmail.com>2022-12-03 18:44:07 +0100
commit7ada093a0fa70c7f17bbe04c832f3fd673d5896f (patch)
treeadbed4dc934599017066c95feff3431f6fb74fb3 /app
parent27f1d594bb2aac1342901372be703896c708275d (diff)
parent29a5678a47d78736562fa22d4261d0d8baa3c53b (diff)
Merge branch 'develop'
Diffstat (limited to 'app')
-rw-r--r--app/build.gradle33
-rw-r--r--app/src/main/AndroidManifest.xml29
-rw-r--r--app/src/main/assets/release_notes/notes.json20
-rw-r--r--app/src/main/java/app/fedilab/android/BaseMainActivity.java64
-rw-r--r--app/src/main/java/app/fedilab/android/MainApplication.java24
-rw-r--r--app/src/main/java/app/fedilab/android/activities/AboutActivity.java11
-rw-r--r--app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java11
-rw-r--r--app/src/main/java/app/fedilab/android/activities/ActionActivity.java7
-rw-r--r--app/src/main/java/app/fedilab/android/activities/AnnouncementActivity.java6
-rw-r--r--app/src/main/java/app/fedilab/android/activities/BaseActivity.java95
-rw-r--r--app/src/main/java/app/fedilab/android/activities/BaseAlertDialogActivity.java123
-rw-r--r--app/src/main/java/app/fedilab/android/activities/BaseBarActivity.java126
-rw-r--r--app/src/main/java/app/fedilab/android/activities/BaseFragmentActivity.java5
-rw-r--r--app/src/main/java/app/fedilab/android/activities/BaseTransparentActivity.java126
-rw-r--r--app/src/main/java/app/fedilab/android/activities/CacheActivity.java8
-rw-r--r--app/src/main/java/app/fedilab/android/activities/ComposeActivity.java6
-rw-r--r--app/src/main/java/app/fedilab/android/activities/ContextActivity.java7
-rw-r--r--app/src/main/java/app/fedilab/android/activities/CustomSharingActivity.java8
-rw-r--r--app/src/main/java/app/fedilab/android/activities/DraftActivity.java9
-rw-r--r--app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java20
-rw-r--r--app/src/main/java/app/fedilab/android/activities/FilterActivity.java8
-rw-r--r--app/src/main/java/app/fedilab/android/activities/FollowRequestActivity.java6
-rw-r--r--app/src/main/java/app/fedilab/android/activities/FollowedTagActivity.java7
-rw-r--r--app/src/main/java/app/fedilab/android/activities/HashTagActivity.java80
-rw-r--r--app/src/main/java/app/fedilab/android/activities/InstanceActivity.java8
-rw-r--r--app/src/main/java/app/fedilab/android/activities/InstanceHealthActivity.java8
-rw-r--r--app/src/main/java/app/fedilab/android/activities/InstanceProfileActivity.java5
-rw-r--r--app/src/main/java/app/fedilab/android/activities/LoginActivity.java62
-rw-r--r--app/src/main/java/app/fedilab/android/activities/MastodonListActivity.java7
-rw-r--r--app/src/main/java/app/fedilab/android/activities/MediaActivity.java13
-rw-r--r--app/src/main/java/app/fedilab/android/activities/PartnerShipActivity.java11
-rw-r--r--app/src/main/java/app/fedilab/android/activities/ProfileActivity.java48
-rw-r--r--app/src/main/java/app/fedilab/android/activities/ProxyActivity.java2
-rw-r--r--app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java8
-rw-r--r--app/src/main/java/app/fedilab/android/activities/ReportActivity.java8
-rw-r--r--app/src/main/java/app/fedilab/android/activities/ScheduledActivity.java9
-rw-r--r--app/src/main/java/app/fedilab/android/activities/SearchResultTabActivity.java10
-rw-r--r--app/src/main/java/app/fedilab/android/activities/SettingsActivity.kt19
-rw-r--r--app/src/main/java/app/fedilab/android/activities/StatusHistoryActivity.java8
-rw-r--r--app/src/main/java/app/fedilab/android/activities/StatusInfoActivity.java6
-rw-r--r--app/src/main/java/app/fedilab/android/activities/SuggestionActivity.java9
-rw-r--r--app/src/main/java/app/fedilab/android/activities/TrendsActivity.java10
-rw-r--r--app/src/main/java/app/fedilab/android/activities/WebviewActivity.java255
-rw-r--r--app/src/main/java/app/fedilab/android/activities/WebviewConnectActivity.java326
-rw-r--r--app/src/main/java/app/fedilab/android/activities/admin/AdminAccountActivity.java9
-rw-r--r--app/src/main/java/app/fedilab/android/activities/admin/AdminActionActivity.java9
-rw-r--r--app/src/main/java/app/fedilab/android/activities/admin/AdminDomainBlockActivity.java10
-rw-r--r--app/src/main/java/app/fedilab/android/activities/admin/AdminReportActivity.java13
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/api/Field.java11
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/app/Account.java1
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/app/DomainsBlock.java132
-rw-r--r--app/src/main/java/app/fedilab/android/helper/CirclesDrawingView.java4
-rw-r--r--app/src/main/java/app/fedilab/android/helper/CountDrawable.java3
-rw-r--r--app/src/main/java/app/fedilab/android/helper/Helper.java121
-rw-r--r--app/src/main/java/app/fedilab/android/helper/MastodonHelper.java17
-rw-r--r--app/src/main/java/app/fedilab/android/helper/MediaHelper.java4
-rw-r--r--app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java57
-rw-r--r--app/src/main/java/app/fedilab/android/helper/SpannableHelper.java115
-rw-r--r--app/src/main/java/app/fedilab/android/helper/ThemeHelper.java235
-rw-r--r--app/src/main/java/app/fedilab/android/helper/TimelineHelper.java18
-rw-r--r--app/src/main/java/app/fedilab/android/sqlite/Sqlite.java4
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/AccountAdapter.java11
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/AccountFollowRequestAdapter.java13
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/AccountListAdapter.java7
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java103
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/ConversationAdapter.java29
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/FieldAdapter.java2
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/KeywordAdapter.java2
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/NotificationAdapter.java50
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java312
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/StatusHistoryAdapter.java31
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/SuggestionAdapter.java3
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/TagAdapter.java4
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/TopMenuAdapter.java117
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/admin/FragmentAdminAccount.java4
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/admin/FragmentAdminDomain.java4
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/admin/FragmentAdminReport.java4
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/login/FragmentLoginMain.java64
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/login/FragmentLoginRegisterMastodon.java2
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/media/FragmentMedia.java50
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentComposeSettings.java1
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentLanguageSettings.java1
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentThemingSettings.java544
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonAccount.java7
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonAnnouncement.java7
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonContext.java7
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonConversation.java8
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonDomainBlock.java7
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java7
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonSuggestion.java7
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTag.java7
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java24
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentNotificationContainer.java16
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentProfileTimeline.java4
-rw-r--r--app/src/main/java/app/fedilab/android/viewmodel/mastodon/AccountsVM.java4
-rw-r--r--app/src/main/java/app/fedilab/android/webview/CustomWebview.java52
-rw-r--r--app/src/main/java/app/fedilab/android/webview/FedilabWebChromeClient.java228
-rw-r--r--app/src/main/java/app/fedilab/android/webview/FedilabWebViewClient.java163
-rw-r--r--app/src/main/java/app/fedilab/android/webview/ProxyHelper.java166
-rw-r--r--app/src/main/res/drawable-anydpi-v24/ic_notification.xml2
-rw-r--r--app/src/main/res/drawable/blue_border.xml2
-rw-r--r--app/src/main/res/drawable/ic_baseline_account_circle_24.xml2
-rw-r--r--app/src/main/res/drawable/ic_baseline_audiotrack_24.xml2
-rw-r--r--app/src/main/res/drawable/ic_baseline_bookmark_24.xml4
-rw-r--r--app/src/main/res/drawable/ic_baseline_bookmark_border_24.xml4
-rw-r--r--app/src/main/res/drawable/ic_baseline_cached_24.xml2
-rw-r--r--app/src/main/res/drawable/ic_baseline_edit_note_24.xml2
-rw-r--r--app/src/main/res/drawable/ic_baseline_filter_asc_24.xml2
-rw-r--r--app/src/main/res/drawable/ic_baseline_filter_center_focus_24.xml2
-rw-r--r--app/src/main/res/drawable/ic_baseline_filter_desc_24.xml2
-rw-r--r--app/src/main/res/drawable/ic_baseline_keyboard_double_arrow_down_24.xml2
-rw-r--r--app/src/main/res/drawable/ic_baseline_keyboard_double_arrow_up_24.xml2
-rw-r--r--app/src/main/res/drawable/ic_baseline_manage_search_24.xml2
-rw-r--r--app/src/main/res/drawable/ic_baseline_message_24.xml2
-rw-r--r--app/src/main/res/drawable/ic_baseline_mode_comment_24.xml2
-rw-r--r--app/src/main/res/drawable/ic_baseline_mode_edit_message_24.xml2
-rw-r--r--app/src/main/res/drawable/ic_baseline_more_horiz_24.xml2