summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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/mastodon/activities/MediaActivity.java5
-rw-r--r--app/src/main/res/layouts/mastodon/layout/activity_media_pager.xml4
-rw-r--r--src/fdroid/fastlane/metadata/android/en/changelogs/494.txt5
5 files changed, 21 insertions, 2 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 1d3cd4824..cab8fabe1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
defaultConfig {
minSdk 21
targetSdk 33
- versionCode 493
- versionName "3.23.0"
+ versionCode 494
+ versionName "3.23.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
flavorDimensions "default"
diff --git a/app/src/main/assets/release_notes/notes.json b/app/src/main/assets/release_notes/notes.json
index 88e1572e9..c55b7acb6 100644
--- a/app/src/main/assets/release_notes/notes.json
+++ b/app/src/main/assets/release_notes/notes.json
@@ -1,5 +1,10 @@
[
{
+ "version": "3.23.1",
+ "code": "494",
+ "note": "Added:\n- Scrollable media description\n\nFixed:\n- Crashes with profiles"
+ },
+ {
"version": "3.23.0",
"code": "493",
"note": "Added:\n- Add preview for app icons\n- Two new app icons\n\nFixed:\n- Fix Nitter feeds\n- Crash with Pixelfed accounts\n- Lingva encoding issue\n- Avoid sleep mode for media activity\n- Videos are played simultaneously\n- Voice messages for Android 10+\n- Punycode not supported for domains"
diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/MediaActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/MediaActivity.java
index 5e9b2e1e6..c5313a297 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/activities/MediaActivity.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/activities/MediaActivity.java
@@ -26,6 +26,7 @@ import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
+import android.text.method.ScrollingMovementMethod;
import android.view.Menu;
import android.view.MenuItem;
import android.view.MotionEvent;
@@ -150,6 +151,10 @@ public class MediaActivity extends BaseTransparentActivity implements OnDownload
startActivity(intentContext);
});
}
+
+ binding.mediaDescription.setMovementMethod(new ScrollingMovementMethod());
+ binding.mediaDescriptionTranslated.setMovementMethod(new ScrollingMovementMethod());
+
if (description != null && description.trim().length() > 0 && description.trim().compareTo("null") != 0) {
binding.mediaDescription.setText(description);
binding.translate.setOnClickListener(v -> {
diff --git a/app/src/main/res/layouts/mastodon/layout/activity_media_pager.xml b/app/src/main/res/layouts/mastodon/layout/activity_media_pager.xml
index 497fe1397..d82c2896a 100644
--- a/app/src/main/res/layouts/mastodon/layout/activity_media_pager.xml
+++ b/app/src/main/res/layouts/mastodon/layout/activity_media_pager.xml
@@ -35,6 +35,8 @@
android:id="@+id/media_description"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:maxHeight="300dp"
+ android:scrollbars="vertical"
android:layout_gravity="center_horizontal|bottom"
android:background="#AA000000"
android:gravity="center"
@@ -50,6 +52,8 @@
<TextView
android:id="@+id/media_description_translated"
android:layout_width="0dp"
+ android:maxHeight="300dp"
+ android:scrollbars="vertical"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom"
android:layout_marginBottom="70dp"
diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/494.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/494.txt
new file mode 100644
index 000000000..57af3912d
--- /dev/null
+++ b/src/fdroid/fastlane/metadata/android/en/changelogs/494.txt
@@ -0,0 +1,5 @@
+Added:
+- Scrollable media description
+
+Fixed:
+- Crashes with profiles \ No newline at end of file