summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas <tschneider.ac@gmail.com>2022-12-09 18:15:26 +0100
committerThomas <tschneider.ac@gmail.com>2022-12-09 18:15:26 +0100
commit002bc4886b3f8af75b03d364c9599f68463fead1 (patch)
tree13d6b4bc0430e12bfb966ea106918562f723b7f2
parent5290173184bfda87c7337a790d6a31ff061e81e6 (diff)
parent6710ef2e1f04c0b18cfd159b7523b3b4090aacf5 (diff)
Merge branch 'develop'3.10.0
-rw-r--r--app/build.gradle8
-rw-r--r--app/src/main/assets/release_notes/notes.json20
-rw-r--r--app/src/main/java/app/fedilab/android/activities/BaseActivity.java9
-rw-r--r--app/src/main/java/app/fedilab/android/activities/BaseAlertDialogActivity.java7
-rw-r--r--app/src/main/java/app/fedilab/android/activities/BaseBarActivity.java7
-rw-r--r--app/src/main/java/app/fedilab/android/activities/BaseTransparentActivity.java7
-rw-r--r--app/src/main/java/app/fedilab/android/activities/FollowedTagActivity.java4
-rw-r--r--app/src/main/java/app/fedilab/android/activities/ProfileActivity.java21
-rw-r--r--app/src/main/java/app/fedilab/android/activities/SearchResultTabActivity.java3
-rw-r--r--app/src/main/java/app/fedilab/android/activities/SettingsActivity.kt1
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/api/Account.java6
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/api/Announcement.java2
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/api/Attachment.java2
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/api/Field.java4
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/api/Poll.java2
-rw-r--r--app/src/main/java/app/fedilab/android/client/entities/api/Status.java28
-rw-r--r--app/src/main/java/app/fedilab/android/helper/CustomEmoji.java36
-rw-r--r--app/src/main/java/app/fedilab/android/helper/Helper.java4
-rw-r--r--app/src/main/java/app/fedilab/android/helper/SpannableHelper.java99
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/AccountAdapter.java7
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/AccountFollowRequestAdapter.java10
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/AccountListAdapter.java10
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/AnnouncementAdapter.java10
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java11
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/ConversationAdapter.java51
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/DomainBlockAdapter.java10
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/InstanceRegAdapter.java7
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/NotificationAdapter.java86
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java586
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/StatusDraftAdapter.java11
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/StatusHistoryAdapter.java4
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/StatusScheduledAdapter.java2
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/SuggestionAdapter.java8
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/TagAdapter.java10
-rw-r--r--app/src/main/java/app/fedilab/android/ui/drawer/admin/AdminAccountAdapter.java13
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentCustomDarkSettings.java57
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentCustomLightSettings.java57
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentThemingSettings.java59
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonConversation.java17
-rw-r--r--app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java12
-rw-r--r--app/src/main/java/app/fedilab/android/viewmodel/mastodon/NotificationsVM.java6
-rw-r--r--app/src/main/java/app/fedilab/android/viewmodel/mastodon/TimelinesVM.java12
-rw-r--r--app/src/main/res/drawable/ic_baseline_bookmark_24.xml2
-rw-r--r--app/src/main/res/drawable/ic_baseline_photo_24.xml10
-rw-r--r--app/src/main/res/drawable/ic_baseline_repeat_24.xml2
-rw-r--r--app/src/main/res/drawable/ic_baseline_star_24.xml2
-rw-r--r--app/src/main/res/drawable/ic_repeat.xml11
-rw-r--r--app/src/main/res/drawable/ic_round_bookmark_24.xml10
-rw-r--r--app/src/main/res/drawable/ic_round_bookmark_border_24.xml10
-rw-r--r--app/src/main/res/drawable/ic_round_more_horiz_24.xml10
-rw-r--r--app/src/main/res/drawable/ic_round_repeat_24.xml10
-rw-r--r--app/src/main/res/drawable/ic_round_reply_24.xml10
-rw-r--r--app/src/main/res/drawable/ic_round_star_24.xml10
-rw-r--r--app/src/main/res/drawable/ic_round_star_border_24.xml10
-rw-r--r--app/src/main/res/drawable/ic_star_outline.xml8
-rw-r--r--app/src/main/res/layout/drawer_account.xml13
-rw-r--r--app/src/main/res/layout/drawer_account_list.xml22
-rw-r--r--app/src/main/res/layout/drawer_admin_account.xml15
-rw-r--r--app/src/main/res/layout/drawer_announcement.xml12
-rw-r--r--app/src/main/res/layout/drawer_conversation.xml14
-rw-r--r--app/src/main/res/layout/drawer_domain_block.xml13
-rw-r--r--app/src/main/res/layout/drawer_follow.xml13
-rw-r--r--app/src/main/res/layout/drawer_instance_reg.xml15
-rw-r--r--app/src/main/res/layout/drawer_status.xml109
-rw-r--r--app/src/main/res/layout/drawer_status_draft.xml14
-rw-r--r--app/src/main/res/layout/drawer_status_filtered.xml9
-rw-r--r--app/src/main/res/layout/drawer_status_filtered_hide.xml9
-rw-r--r--app/src/main/res/layout/drawer_status_history.xml14
-rw-r--r--app/src/main/res/layout/drawer_status_scheduled.xml14
-rw-r--r--app/src/main/res/layout/drawer_status_simple.xml14
-rw-r--r--app/src/main/res/layout/drawer_suggestion.xml14
-rw-r--r--app/src/main/res/layout/drawer_tag.xml14
-rw-r--r--app/src/main/res/layout/layout_media.xml3
-rw-r--r--app/src/main/res/navigation/nav_graph_settings.xml11
-rw-r--r--app/src/main/res/values-ar/strings.xml15
-rw-r--r--app/src/main/res/values-ber/strings.xml2
-rw-r--r--app/src/main/res/values-bn/strings.xml2
-rw-r--r--app/src/main/res/values-br/strings.xml2
-rw-r--r--app/src/main/res/values-cs/strings.xml2
-rw-r--r--app/src/main/res/values-cy/strings.xml2
-rw-r--r--app/src/main/res/values-el/strings.xml2
-rw-r--r--app/src/main/res/values-eo/strings.xml2
-rw-r--r--app/src/main/res/values-fa/strings.xml2
-rw-r--r--app/src/main/res/values-hi/strings.xml2
-rw-r--r--app/src/main/res/values-hu/strings.xml2
-rw-r--r--app/src/main/res/values-hy/strings.xml2
-rw-r--r--app/src/main/res/values-id/strings.xml2
-rw-r--r--app/src/main/res/values-kab/strings.xml2
-rw-r--r--app/src/main/res/values-ko/strings.xml2
-rw-r--r--app/src/main/res/values-ml/strings.xml2
-rw-r--r--app/src/main/res/values-night/themes.xml188
-rw-r--r--app/src/main/res/values-no/strings.xml2
-rw-r--r--app/src/main/res/values-oc/strings.xml2
-rw-r--r--app/src/main/res/values-pl/strings.xml2
-rw-r--r--app/src/main/res/values-pt/strings.xml2
-rw-r--r--app/src/main/res/values-ro/strings.xml2
-rw-r--r--app/src/main/res/values-si/strings.xml2
-rw-r--r--app/src/main/res/values-sl/strings.xml2
-rw-r--r--app/src/main/res/values-sr/strings.xml2
-rw-r--r--app/src/main/res/values-uk/strings.xml2
-rw-r--r--app/src/main/res/values/colors.xml118
-rw-r--r--app/src/main/res/values/strings.xml39
-rw-r--r--app/src/main/res/values/themes.xml11
-rw-r--r--app/src/main/res/xml/pref_custom_dark.xml50
-rw-r--r--app/src/main/res/xml/pref_custom_light.xml51
-rw-r--r--app/src/main/res/xml/pref_theming.xml48
-rw-r--r--src/fdroid/fastlane/metadata/android/en/changelogs/440.txt4
-rw-r--r--src/fdroid/fastlane/metadata/android/en/changelogs/441.txt3
-rw-r--r--src/fdroid/fastlane/metadata/android/en/changelogs/442.txt11
-rw-r--r--src/fdroid/fastlane/metadata/android/en/changelogs/443.txt16
110 files changed, 1790 insertions, 585 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 4ab8912db..ef78a3c72 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
defaultConfig {
minSdk 21
targetSdk 32
- versionCode 439
- versionName "3.9.4"
+ versionCode 443
+ versionName "3.10.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
flavorDimensions "default"
@@ -79,7 +79,11 @@ allprojects {
dependencies {
implementation project(':autoimageslider')
implementation 'androidx.appcompat:appcompat:1.5.1'
+
implementation 'com.google.android.material:material:1.7.0'
+
+ implementation 'com.jaredrummler:colorpicker:1.1.0'
+
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation "com.google.code.gson:gson:2.9.1"
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
diff --git a/app/src/main/assets/release_notes/notes.json b/app/src/main/assets/release_notes/notes.json
index 3a01fdffd..0a3ee24c6 100644
--- a/app/src/main/assets/release_notes/notes.json
+++ b/app/src/main/assets/release_notes/notes.json
@@ -1,5 +1,25 @@
[
{
+ "version": "3.10.0",
+ "code": "443",
+ "note": "Added:\n- Dracula theme\n- Customize message colors\n- Enable/Disable Card presentation\n\nChanged:\n- Colors for some themes\n- Space between buttons\n\nFixed:\n- Animated profile pictures not displayed\n- Mentions broken in profile bio and fields\n- Jumps with fit preview images when scrolling up\n- Fetch more button broken with cache\n- Tag patterns in URL break the link\n- Typo in followed tags"
+ },
+ {
+ "version": "3.9.7",
+ "code": "442",
+ "note": "Added:\n- Dracula theme\n\nChanged:\n- Colors for Light/Dark/Black themes\n\nFixed:\n- Animated profile pictures not displayed\n- Mentions broken in profile bio and fields\n- Tag patterns in URL break the link\n- Typo in followed tags"
+ },
+ {
+ "version": "3.9.6",
+ "code": "441",
+ "note": "Fixed:\n- Jumps with fit preview images when scrolling up\n- Fetch more button broken with cache"
+ },
+ {
+ "version": "3.9.5",
+ "code": "440",
+ "note": "Fixed:\n- Custom emoji are not always displayed\n- Jumps in timeline when using \"fit preview images\"\n- Dark theme: timeline buttons without toggle"
+ },
+ {
"version": "3.9.4",
"code": "439",
"note": "Changed:\n- Remove card presentation\n- Link color for black theme\n\nFixed:\n- Crash when changing the theme"
diff --git a/app/src/main/java/app/fedilab/android/activities/BaseActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseActivity.java
index be483f80e..2f2b870f8 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BaseActivity.java
@@ -83,6 +83,10 @@ public class BaseActivity extends AppCompatActivity {
setTheme(R.style.BlackAppTheme);
currentThemeId = R.style.BlackAppTheme;
break;
+ case "DRACULA":
+ setTheme(R.style.DraculaAppTheme);
+ currentThemeId = R.style.DraculaAppTheme;
+ break;
}
break;
}
@@ -113,6 +117,11 @@ public class BaseActivity extends AppCompatActivity {
setTheme(R.style.BlackAppTheme);
currentThemeId = R.style.BlackAppTheme;
break;
+ case "DRACULA":
+ AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+ setTheme(R.style.DraculaAppTheme);
+ currentThemeId = R.style.DraculaAppTheme;
+ break;
}
}
super.onCreate(savedInstanceState);
diff --git a/app/src/main/java/app/fedilab/android/activities/BaseAlertDialogActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseAlertDialogActivity.java
index 220526dc5..48b51a25b 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseAlertDialogActivity.java
+++ b/