Change layout for media descriptions (62951a4a) · Commits · Android-smartphones / Fedilab

app/src/main/java/app/fedilab/android/mastodon/activities/MediaActivity.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -186,7 +186,7 @@ public class MediaActivity extends BaseTransparentActivity implements OnDownload
		binding.mediaDescription.setMovementMethod(LinkMovementMethod.getInstance());
		binding.mediaDescriptionTranslated.setMovementMethod(LinkMovementMethod.getInstance());

		if (description != null && description.trim().length() > 0 && description.trim().compareTo("null") != 0) {
		if (description != null && !description.trim().isEmpty() && description.trim().compareTo("null") != 0) {
		binding.mediaDescription.setText(description);
		binding.translate.setOnClickListener(v -> {
		String descriptionToTranslate = attachments.get(mediaPosition - 1).description;
		@@ -234,7 +234,7 @@ public class MediaActivity extends BaseTransparentActivity implements OnDownload
		handler.removeCallbacksAndMessages(null);
		}
		handler = new Handler();
		if (description != null && description.trim().length() > 0 && description.trim().compareTo("null") != 0) {
		if (description != null && !description.trim().isEmpty() && description.trim().compareTo("null") != 0) {
		binding.mediaDescription.setText(linkify(MediaActivity.this, description), TextView.BufferType.SPANNABLE);
		}
		binding.translate.setOnClickListener(v -> {
		@@ -495,6 +495,7 @@ public class MediaActivity extends BaseTransparentActivity implements OnDownload
		this.fullscreen = fullscreen;
		if (!fullscreen) {
		showSystemUI();
		binding.descriptionContainer.setVisibility(View.VISIBLE);
		binding.mediaDescription.setVisibility(View.VISIBLE);
		if (mCurrentFragment != null) {
		mCurrentFragment.toggleController(true);
		@@ -505,6 +506,7 @@ public class MediaActivity extends BaseTransparentActivity implements OnDownload
		}
		} else {
		hideSystemUI();
		binding.descriptionContainer.setVisibility(View.GONE);
		binding.mediaDescription.setVisibility(View.GONE);
		if (mCurrentFragment != null) {
		mCurrentFragment.toggleController(false);

app/src/main/res/layouts/mastodon/layout/activity_media_pager.xml

+68 −53

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@
		android:animateLayoutChanges="true"
		android:background="@android:color/transparent">



		<androidx.viewpager.widget.ViewPager
		android:id="@+id/media_viewpager"
		android:layout_width="match_parent"
		@@ -31,27 +33,34 @@
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintTop_toTopOf="parent" />

		<androidx.constraintlayout.widget.ConstraintLayout
		android:id="@+id/description_container"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintEnd_toEndOf="parent"
		android:background="#AA000000"
		android:visibility="gone"
		tools:visibility="visible"
		app:layout_constraintStart_toStartOf="parent"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		<TextView
		android:id="@+id/media_description"
		android:fitsSystemWindows="true"
		android:paddingStart="10dp"
		android:paddingTop="10dp"
		android:paddingEnd="10dp"
		android:paddingBottom="10dp"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:maxHeight="300dp"
		android:scrollbars="vertical"
		android:layout_gravity="center_horizontal\|bottom"
		android:background="#AA000000"
		tools:text="@tools:sample/lorem/random"
		android:gravity="center"
		android:textColor="#ffffffff"
		android:textIsSelectable="true"
		android:visibility="gone"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintEnd_toStartOf="@+id/translate"
		app:layout_constraintStart_toStartOf="parent"
		tools:visibility="visible" />
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintStart_toStartOf="parent" />

		<TextView
		android:fitsSystemWindows="true"
		@@ -60,12 +69,11 @@
		android:paddingStart="10dp"
		android:paddingTop="10dp"
		android:paddingEnd="10dp"
		android:paddingBottom="10dp"
		android:maxHeight="300dp"
		android:scrollbars="vertical"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal\|bottom"
		android:background="#AA000000"

		android:gravity="center"
		android:textColor="#ffffffff"
		android:textIsSelectable="true"
		@@ -75,21 +83,28 @@
		app:layout_constraintStart_toStartOf="parent"
		tools:visibility="visible" />

		<androidx.constraintlayout.widget.Barrier
		android:id="@+id/media_description_barrier"
		android:layout_width="match_parent"
		android:layout_height="1dp"
		app:barrierDirection="bottom"
		app:constraint_referenced_ids="media_description,media_description_translated" />
		<com.google.android.material.button.MaterialButton

		android:id="@+id/translate"
		style="@style/Widget.Material3.Button.IconButton.Filled"
		style="@style/Widget.Material3.Button.ElevatedButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:contentDescription="@string/translate"
		android:visibility="gone"
		android:drawablePadding="5dp"
		android:text="@string/translate"
		app:icon="@drawable/ic_baseline_translate_24"
		app:iconPadding="0dp"
		app:layout_constraintBottom_toBottomOf="@+id/media_description"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintStart_toEndOf="@+id/media_description"
		tools:visibility="visible" />
		app:layout_constraintTop_toBottomOf="@+id/media_description_barrier" />

		</androidx.constraintlayout.widget.ConstraintLayout>
		<TextView
		android:id="@+id/original_message"
		android:layout_width="wrap_content"
		@@ -103,6 +118,6 @@
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintTop_toBottomOf="@+id/translate"
		app:layout_constraintTop_toTopOf="parent"
		tools:visibility="visible" />
		</androidx.constraintlayout.widget.ConstraintLayout>
		No newline at end of file