summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas <tschneider.ac@gmail.com>2022-12-26 18:16:45 +0100
committerThomas <tschneider.ac@gmail.com>2022-12-26 18:16:45 +0100
commit089d6b9ba81a22cd1ce10b9da081145a1ee918c5 (patch)
treee4bf4ca78a1123815e9fa006d14be6d35169fddf
parent8e3b146a77aa54efdc20fdc6c43ff679480c887b (diff)
parentb9eca58ccb409ba3c84746d09ab67907507a0701 (diff)
Merge branch 'develop'3.13.0
-rw-r--r--app/build.gradle10
-rw-r--r--app/src/main/AndroidManifest.xml3
-rw-r--r--app/src/main/assets/quotes/famous.json8206
-rw-r--r--app/src/main/assets/release_notes/notes.json20
-rw-r--r--app/src/main/assets/themes/contributors/Fedilab_theme_ACN.csv15
-rw-r--r--app/src/main/assets/themes/contributors/Fedilab_theme_Breeze_Dark_Yellow.csv13
-rw-r--r--app/src/main/assets/themes/contributors/Fedilab_theme_Cyberpunk_Neon.csv15
-rw-r--r--app/src/main/assets/themes/contributors/Fedilab_theme_Dark_Elephant.csv15
-rw-r--r--app/src/main/assets/themes/contributors/Fedilab_theme_Grey_Orange.csv15
-rw-r--r--app/src/main/assets/themes/contributors/Fedilab_theme_Gruvbox_OLED.csv15
-rw-r--r--app/src/main/assets/themes/contributors/Fedilab_theme_Less_Angry_Orange.csv15
-rw-r--r--app/src/main/assets/themes/contributors/Fedilab_theme_Mondstern_Fedilab.csv15
-rw-r--r--app/src/main/assets/themes/contributors/Fedilab_theme_Nocturnal.csv13
-rw-r--r--app/src/main/assets/themes/contributors/Fedilab_theme_Photon_Dark.csv15
-rw-r--r--app/src/main/assets/themes/contributors/Fedilab_theme_Solarized_Cyan_Accent.csv15
-rw-r--r--app/src/main/assets/themes/contributors/Fedilab_theme_Solarized_Dark_Purple.csv15
-rw-r--r--app/src/main/assets/themes/cyanea_themes.json47
-rw-r--r--app/src/main/java/app/fedilab/android/BaseMainActivity.java45
-rw-r--r--app/src/main/java/app/fedilab/android/activities/BaseActivity.java11
-rw-r--r--app/src/main/java/app/fedilab/android/activities/BaseBarActivity.java9
-rw-r--r--app/src/main/java/app/fedilab/android/activities/BaseTransparentActivity.java9
-rw-r--r--app/src/main/java/app/fedilab/android/activities/ComposeActivity.java24
-rw-r--r--app/src/main/java/app/fedilab/android/activities/ContextActivity.java22
-rw-r--r--app/src/main/java/app/fedilab/android/activities/InstanceHealthActivity.java6
-rw-r--r--app/src/main/java/app/fedilab/android/activities/MediaActivity.java6
-rw-r--r--app/src/main/java/app/fedilab/android/client/endpoints/MastodonStatusesService.java2
-rw-r--r--app/src/main/java/app/fedilab/android/client/endpoints/MastodonTimelinesService.java4
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/api/Pagination.java1
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/api/Results.java1
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/app/Quotes.java34
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/app/RemoteInstance.java2
-rw-r--r--app/src/main/java/app/fedilab/android/helper/CacheHelper.java2
-rw-r--r--app/src/main/java/app/fedilab/android/helper/Helper.java117
-rw-r--r--app/src/main/java/app/fedilab/android/helper/MastodonHelper.java1
-rw-r--r--app/src/main/java/app/fedilab/android/helper/MediaHelper.java207
-rw-r--r--app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java146
-rw-r--r--app/src/main/java/app/fedilab/android/helper/SpannableHelper.java25
-rw-r--r--app/src/main/java/app/fedilab/android/helper/TimelineHelper.java30
-rw-r--r--app/src/main/java/app/fedilab/android/imageeditor/EditImageActivity.java89
-rw-r--r--app/src/main/java/app/fedilab/android/imageeditor/tools/EditingToolsAdapter.java2
-rw-r--r--app/src/main/java/app/fedilab/android/interfaces/ProgressListener.java5
-rw-r--r--app/src/main/java/app/fedilab/android/jobs/ComposeWorker.java12
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/AccountAdapter.java8
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java92
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/ReorderTabAdapter.java11
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java107
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonAccount.java52
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTag.java68
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java60
-rw-r--r--app/src/main/java/app/fedilab/android/viewmodel/mastodon/AccountsVM.java4
-rw-r--r--app/src/main/java/app/fedilab/android/viewmodel/mastodon/SearchVM.java7
-rw-r--r--app/src/main/java/app/fedilab/android/viewmodel/mastodon/StatusesVM.java6
-rw-r--r--app/src/main/java/app/fedilab/android/viewmodel/mastodon/TimelinesVM.java4
-rw-r--r--app/src/main/res/drawable/bg_compose_panels.xml5
-rw-r--r--app/src/main/res/drawable/ic_compose_attachment_play.xml6
-rw-r--r--app/src/main/res/drawable/ic_eraser.xml1
-rw-r--r--app/src/main/res/drawable/ic_insert_emoticon.xml1
-rw-r--r--app/src/main/res/drawable/ic_oval.xml1
-rw-r--r--app/src/main/res/drawable/ic_text.xml1
-rw-r--r--app/src/main/res/layout/activity_edit_image.xml1
-rw-r--r--app/src/main/res/layout/activity_profile.xml1
-rw-r--r--app/src/main/res/layout/compose_attachment_item.xml79
-rw-r--r--app/src/main/res/layout/drawer_account.xml6
-rw-r--r--app/src/main/res/layout/drawer_status.xml8
-rw-r--r--app/src/main/res/layout/drawer_status_compose.xml423
-rw-r--r--app/src/main/res/menu/option_nitter_timeline.xml12
-rw-r--r--app/src/main/res/values-ar/strings.xml63
-rw-r--r--app/src/main/res/values-cs/strings.xml26
-rw-r--r--app/src/main/res/values-de/strings.xml32
-rw-r--r--app/src/main/res/values-eo/strings.xml120
-rw-r--r--app/src/main/res/values-fr/strings.xml17
-rw-r--r--app/src/main/res/values-gl/strings.xml15
-rw-r--r--app/src/main/res/values-it/strings.xml11
-rw-r--r--app/src/main/res/values-pt/strings.xml156
-rw-r--r--app/src/main/res/values-sc/strings.xml3
-rw-r--r--app/src/main/res/values-tr/strings.xml3
-rw-r--r--app/src/main/res/values/strings.xml8
-rw-r--r--app/src/main/res/values/themes.xml5
-rw-r--r--app/src/main/res/xml/pref_interface.xml8
-rw-r--r--app/src/main/res/xml/pref_timelines.xml7
-rw-r--r--cropper/build.gradle22
-rw-r--r--cropper/src/main/AndroidManifest.xml3
-rw-r--r--cropper/src/main/java/com/theartofdev/edmodo/cropper/BitmapCroppingWorkerTask.java354
-rw-r--r--cropper/src/main/java/com/theartofdev/edmodo/cropper/BitmapLoadingWorkerTask.java176
-rw-r--r--cropper/src/main/java/com/theartofdev/edmodo/cropper/BitmapUtils.java923
-rw-r--r--cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImage.java1048
-rw-r--r--cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageActivity.java367
-rw-r--r--cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageAnimation.java123
-rw-r--r--cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageOptions.java541
-rw-r--r--cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageView.java2296
-rw-r--r--cropper/src/main/java/com/theartofdev/edmodo/cropper/CropOverlayView.java1118
-rw-r--r--cropper/src/main/java/com/theartofdev/edmodo/cropper/CropWindowHandler.java405
-rw-r--r--cropper/src/main/java/com/theartofdev/edmodo/cropper/CropWindowMoveHandler.java786
-rw-r--r--cropper/src/main/res/drawable-hdpi/crop_image_menu_flip.pngbin262 -> 0 bytes
-rw-r--r--cropper/src/main/res/drawable-hdpi/crop_image_menu_rotate_left.pngbin634 -> 0 bytes
-rw-r--r--cropper/src/main/res/drawable-hdpi/crop_image_menu_rotate_right.pngbin617 -> 0 bytes
-rw-r--r--cropper/src/main/res/drawable-xhdpi/crop_image_menu_flip.pngbin259 -> 0 bytes
-rw-r--r--cropper/src/main/res/drawable-xhdpi/crop_image_menu_rotate_left.pngbin798 -> 0 bytes
-rw-r--r--cropper/src/main/res/drawable-xhdpi/crop_image_menu_rotate_right.pngbin787 -> 0 bytes
-rw-r--r--cropper/src/main/res/drawable-xxhdpi/crop_image_menu_flip.pngbin417 -> 0 bytes
-rw-r--r--cropper/src/main/res/drawable-xxhdpi/crop_image_menu_rotate_left.pngbin1181 -> 0 bytes
-rw-r--r--cropper/src/main/res/drawable-xxhdpi/crop_image_menu_rotate_right.pngbin1165 -> 0 bytes
-rw-r--r--cropper/src/main/res/drawable-xxxhdpi/crop_image_menu_flip.pngbin508 -> 0 bytes
-rw-r--r--cropper/src/main/res/drawable-xxxhdpi/crop_image_menu_rotate_left.pngbin1577 -> 0 bytes
-rw-r--r--cropper/src/main/res/drawable-xxxhdpi/crop_image_menu_rotate_right.pngbin1570 -> 0 bytes
-rw-r--r--cropper/src/main/res/layout/crop_image_activity.xml5
-rw-r--r--cropper/src/main/res/layout/crop_image_view.xml25
-rw-r--r--cropper/src/main/res/menu/crop_image_menu.xml35
-rw-r--r--cropper/src/main/res/values-ar/strings.xml16
-rw-r--r--cropper/src/main/res/values-cs/strings.xml16
-rw-r--r--cropper/src/main/res/values-de/strings.xml16
-rw-r--r--cropper/src/main/res/values-es-rGT/strings.xml12
-rw-r--r--cropper/src/main/res/values-es/strings.xml12
-rw-r--r--cropper/src/main/res/values-fa/strings.xml11
-rw-r--r--cropper/src/main/res/values-fr/strings.xml12
-rw-r--r--cropper/src/main/res/values-he/strings.xml16
-rw-r--r--cropper/src/main/res/values-hi/strings.xml11
-rw-r--r--cropper/src/main/res/values-id/strings.xml12
-rw-r--r--cropper/src/main/res/values-in/strings.xml12
-rw-r--r--cropper/src/main/res/values-it/strings.xml16
-rw-r--r--cropper/src/main/res/values-ja/strings.xml11
-rw-r--r--cropper/src/main/res/values-ko/strings.xml16
-rw-r--r--cropper/src/main/res/values-ms/strings.xml12
-rw-r--r--cropper/src/main/res/values-nb/strings.xml16
-rw-r--r--cropper/src/main/res/values-nl/strings.xml16
-rw-r--r--cropper/src/main/res/values-pl/strings.xml16
-rw-r--r--cropper/src/main/res/values-pt-rBR/strings.xml14
-rw-r--r--cropper/src/main/res/va