summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/build.gradle4
-rw-r--r--app/src/main/AndroidManifest.xml17
-rw-r--r--app/src/main/assets/release_notes/notes.json10
-rw-r--r--app/src/main/java/app/fedilab/android/BaseMainActivity.java69
-rw-r--r--app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java23
-rw-r--r--app/src/main/java/app/fedilab/android/activities/ActionActivity.java18
-rw-r--r--app/src/main/java/app/fedilab/android/activities/CacheActivity.java6
-rw-r--r--app/src/main/java/app/fedilab/android/activities/ComposeActivity.java15
-rw-r--r--app/src/main/java/app/fedilab/android/activities/FilterActivity.java9
-rw-r--r--app/src/main/java/app/fedilab/android/activities/InstanceActivity.java22
-rw-r--r--app/src/main/java/app/fedilab/android/activities/MastodonListActivity.java47
-rw-r--r--app/src/main/java/app/fedilab/android/activities/ProfileActivity.java97
-rw-r--r--app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java53
-rw-r--r--app/src/main/java/app/fedilab/android/activities/SearchResultTabActivity.java3
-rw-r--r--app/src/main/java/app/fedilab/android/activities/SuggestionActivity.java61
-rw-r--r--app/src/main/java/app/fedilab/android/activities/admin/AdminAccountActivity.java (renamed from app/src/main/java/app/fedilab/android/activities/AdminAccountActivity.java)11
-rw-r--r--app/src/main/java/app/fedilab/android/activities/admin/AdminActionActivity.java (renamed from app/src/main/java/app/fedilab/android/activities/AdminActionActivity.java)83
-rw-r--r--app/src/main/java/app/fedilab/android/activities/admin/AdminDomainBlockActivity.java159
-rw-r--r--app/src/main/java/app/fedilab/android/activities/admin/AdminReportActivity.java (renamed from app/src/main/java/app/fedilab/android/activities/AdminReportActivity.java)10
-rw-r--r--app/src/main/java/app/fedilab/android/client/endpoints/MastodonAccountsService.java5
-rw-r--r--app/src/main/java/app/fedilab/android/client/endpoints/MastodonAdminService.java84
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/api/Domains.java22
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/api/Status.java4
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/api/Suggestion.java27
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/api/Suggestions.java22
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/api/admin/AdminAccount.java (renamed from app/src/main/java/app/fedilab/android/client/entities/api/AdminAccount.java)81
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/api/admin/AdminAccounts.java (renamed from app/src/main/java/app/fedilab/android/client/entities/api/AdminAccounts.java)4
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/api/admin/AdminDomainBlock.java43
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/api/admin/AdminDomainBlocks.java26
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/api/admin/AdminEmailDomainBlock.java36
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/api/admin/AdminIp.java29
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/api/admin/AdminIpBlock.java37
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/api/admin/AdminMeasure.java45
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/api/admin/AdminReport.java (renamed from app/src/main/java/app/fedilab/android/client/entities/api/AdminReport.java)25
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/api/admin/AdminReports.java (renamed from app/src/main/java/app/fedilab/android/client/entities/api/AdminReports.java)4
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/app/StatusCache.java143
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/app/Timeline.java4
-rw-r--r--app/src/main/java/app/fedilab/android/helper/CustomEmoji.java7
-rw-r--r--app/src/main/java/app/fedilab/android/helper/Helper.java87
-rw-r--r--app/src/main/java/app/fedilab/android/helper/NotificationsHelper.java116
-rw-r--r--app/src/main/java/app/fedilab/android/helper/SpannableHelper.java61
-rw-r--r--app/src/main/java/app/fedilab/android/helper/TimelineHelper.java1
-rw-r--r--app/src/main/java/app/fedilab/android/helper/itemtouchhelper/SimpleItemTouchHelperCallback.java2
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java9
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/DomainBlockAdapter.java95
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/FieldAdapter.java13
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/FilterAdapter.java7
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/ReorderBottomMenuAdapter.java4
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/ReorderTabAdapter.java74
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java89
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/SuggestionAdapter.java143
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/admin/AdminAccountAdapter.java (renamed from app/src/main/java/app/fedilab/android/ui/drawer/AdminAccountAdapter.java)9
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/admin/AdminDomainAdapter.java101
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/admin/ReportAdapter.java (renamed from app/src/main/java/app/fedilab/android/ui/drawer/ReportAdapter.java)4
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/admin/FragmentAdminAccount.java8
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/admin/FragmentAdminDomain.java256
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/admin/FragmentAdminReport.java8
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/login/FragmentLoginMain.java4
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonDomainBlock.java214
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java3
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonSuggestion.java161
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentNotificationContainer.java28
-rw-r--r--app/src/main/java/app/fedilab/android/ui/pageadapter/FedilabNotificationPageAdapter.java8
-rw-r--r--app/src/main/java/app/fedilab/android/viewmodel/mastodon/AccountsVM.java54
-rw-r--r--app/src/main/java/app/fedilab/android/viewmodel/mastodon/AdminVM.java228
-rw-r--r--app/src/main/java/app/fedilab/android/viewmodel/mastodon/AppsVM.java10
-rw-r--r--app/src/main/java/app/fedilab/android/viewmodel/mastodon/NotificationsVM.java74
-rw-r--r--app/src/main/java/app/fedilab/android/viewmodel/mastodon/TimelinesVM.java78
-rw-r--r--app/src/main/res/drawable/ic_baseline_account_circle_24.xml2
-rw-r--r--app/src/main/res/drawable/ic_baseline_filter_asc_24.xml15
-rw-r--r--app/src/main/res/drawable/ic_baseline_filter_desc_24.xml10
-rw-r--r--app/src/main/res/drawable/ic_baseline_person_add_alt_1_24.xml2
-rw-r--r--app/src/main/res/drawable/ic_baseline_report_24.xml10
-rw-r--r--app/src/main/res/layout/activity_actions.xml16
-rw-r--r--app/src/main/res/layout/activity_admin_actions.xml14
-rw-r--r--app/src/main/res/layout/activity_admin_domainblock.xml162
-rw-r--r--app/src/main/res/layout/activity_drafts.xml3
-rw-r--r--app/src/main/res/layout/activity_filters.xml3
-rw-r--r--app/src/main/res/layout/activity_followed_tags.xml1
-rw-r--r--app/src/main/res/layout/activity_instance.xml45
-rw-r--r--app/src/main/res/layout/activity_list.xml1
-rw-r--r--app/src/main/res/layout/activity_status_info.xml3
-rw-r--r--app/src/main/res/layout/activity_suggestions.xml31
-rw-r--r--app/src/main/res/layout/drawer_admin_domain.xml57
-rw-r--r--app/src/main/res/layout/drawer_domain_block.xml53
-rw-r--r--app/src/main/res/layout/drawer_status.xml2
-rw-r--r--app/src/main/res/layout/drawer_status_filtered.xml4
-rw-r--r--app/src/main/res/layout/drawer_suggestion.xml109
-rw-r--r--app/src/main/res/layout/fragment_pagination.xml17
-rw-r--r--app/src/main/res/layout/fragment_scheduled.xml3
-rw-r--r--app/src/main/res/layout/popup_notification_settings.xml16
-rw-r--r--app/src/main/res/menu/activity_main_drawer.xml6
-rw-r--r--app/src/main/res/menu/menu_admin_domain.xml9
-rw-r--r--app/src/main/res/menu/menu_main_list.xml6
-rw-r--r--app/src/main/res/menu/option_toot.xml5
-rw-r--r--app/src/main/res/values-cs/strings.xml71
-rw-r--r--app/src/main/res/values-de/strings.xml104
-rw-r--r--app/src/main/res/values-fr/strings.xml13
-rw-r--r--app/src/main/res/values-gl/strings.xml401
-rw-r--r--app/src/main/res/values-ja/strings.xml19
-rw-r--r--app/src/main/res/values-pt/strings.xml125
-rw-r--r--app/src/main/res/values-sc/strings.xml12
-rw-r--r--app/src/main/res/values-tr/strings.xml25
-rw-r--r--app/src/main/res/values/strings.xml54
-rw-r--r--app/src/main/res/xml/pref_notifications.xml18
-rw-r--r--src/fdroid/fastlane/metadata/android/de/changelogs/393.txt2
-rw-r--r--src/fdroid/fastlane/metadata/android/de/changelogs/397.txt1
-rw-r--r--src/fdroid/fastlane/metadata/android/en/changelogs/432.txt13
-rw-r--r--src/fdroid/fastlane/metadata/android/en/changelogs/433.txt18
-rw-r--r--src/fdroid/fastlane/metadata/android/ja/changelogs/390.txt5
-rw-r--r--src/fdroid/fastlane/metadata/android/ja/changelogs/391.txt5
-rw-r--r--src/fdroid/fastlane/metadata/android/ja/changelogs/393.txt2
-rw-r--r--src/fdroid/fastlane/metadata/android/ja/changelogs/394.txt1
-rw-r--r--src/fdroid/fastlane/metadata/android/ja/changelogs/395.txt2
-rw-r--r--src/fdroid/fastlane/metadata/android/ja/title.txt1
115 files changed, 4087 insertions, 724 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 0b28e4e70..a677471aa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
defaultConfig {
minSdk 21
targetSdk 31
- versionCode 431
- versionName "3.7.4"
+ versionCode 433
+ versionName "3.8.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
flavorDimensions "default"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8a5a34ba2..be259dfde 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -201,7 +201,7 @@
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/account" />
<activity
- android:name=".activities.AdminAccountActivity"
+ android:name=".activities.admin.AdminAccountActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/account" />
<activity
@@ -210,7 +210,7 @@
android:label="@string/account"
android:theme="@style/AppThemeBar" />
<activity
- android:name=".activities.AdminReportActivity"
+ android:name=".activities.admin.AdminReportActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/report"
android:theme="@style/AppThemeBar" />
@@ -243,7 +243,16 @@
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/action_about"
android:theme="@style/AppThemeBar" />
-
+ <activity
+ android:name=".activities.admin.AdminDomainBlockActivity"
+ android:configChanges="keyboardHidden|orientation|screenSize"
+ android:label="@string/blocked_domains"
+ android:theme="@style/AppThemeBar" />
+ <activity
+ android:name=".activities.SuggestionActivity"
+ android:configChanges="keyboardHidden|orientation|screenSize"
+ android:label="@string/Suggestions"
+ android:theme="@style/AppThemeBar" />
<activity
android:name=".activities.PartnerShipActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
@@ -255,7 +264,7 @@
android:label="@string/interactions"
android:theme="@style/AppThemeBar" />
<activity
- android:name=".activities.AdminActionActivity"
+ android:name=".activities.admin.AdminActionActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/administration"
android:theme="@style/AppThemeBar" />
diff --git a/app/src/main/assets/release_notes/notes.json b/app/src/main/assets/release_notes/notes.json
index 9d9f8e1f7..ce67924f3 100644
--- a/app/src/main/assets/release_notes/notes.json
+++ b/app/src/main/assets/release_notes/notes.json
@@ -1,5 +1,15 @@
[
{
+ "version": "3.8.0",
+ "code": "433",
+ "note": "Added:\n- List of blocked domains (allow to unblock)\n- Support gemini links\n- Suggested followers\n- Mod/Adm: Manage instance blocked domains\n- Open messages with another account\n- Allow to disable notifications for admins\n- Sort lists\n\nChanged:\n- Allow search term to be edited\n\nFixed:\n- Drafts deleted with no warning\n- Remove lists from \"Manage timelines\"\n- App crashes when proxy is set\n- Filter not synced after being edited\n- Some crashes / improvements"
+ },
+ {
+ "version": "3.7.5",
+ "code": "432",
+ "note": "Added:\n- List of blocked domains (allow to unblock)\n- Support gemini links\n- Suggested followers\n\nChanged:\n- Allow search term to be edited\n\nFixed:\n- Drafts deleted with no warning\n- App crashes when proxy is set\n- Filter not synced after being edited\n- Some crashes"
+ },
+ {
"version": "3.7.4",
"code": "431",
"note": "Added:\n- Full support to new filters for Mastodon 4\n- Visit profiles without being authenticated / Allow to display all their messages\n\nChanged:\n- Compose view takes the whole width even in threads\n- Accounts can be timed-mute from their profile\n\nFixed:\n- Draft stored when replying \"no\" or dialog prompted without changes\n- Empty pages when starting the app\n- Saving and sharing media fails on some devices\n- Add support for admin notifications\n- Copying content of a message"
diff --git a/app/src/main/java/app/fedilab/android/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/BaseMainActivity.java
index 4682d6318..f98860b45 100644
--- a/app/src/main/java/app/fedilab/android/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/BaseMainActivity.java
@@ -95,7 +95,6 @@ import java.util.regex.Pattern;