no more vertical reblog/reply line layout

closes #834
sk22 · Oct 15, 2023 · a794131 · a794131
1 parent 864b6dc
commit a794131
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 23 deletions.
diff --git a/...ain/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java b/...ain/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java
@@ -111,9 +111,6 @@ public Holder(Activity activity, ViewGroup parent){
 			text=findViewById(R.id.text);
 			extraText=findViewById(R.id.extra_text);
 			separator=findViewById(R.id.separator);
-			parent.addOnLayoutChangeListener((v, l, t, right, b, ol, ot, oldRight, ob) -> {
-				if (right != oldRight) layoutLine();
-			});
 		}
 
 		private void bindLine(ReblogOrReplyLineStatusDisplayItem item, TextView text) {
@@ -144,24 +141,6 @@ public void onBind(ReblogOrReplyLineStatusDisplayItem item){
 			extraText.setVisibility(item.extra == null ? View.GONE : View.VISIBLE);
 			separator.setVisibility(item.extra == null ? View.GONE : View.VISIBLE);
 			itemView.setPadding(itemView.getPaddingLeft(), itemView.getPaddingTop(), itemView.getPaddingRight(), item.needBottomPadding ? V.dp(16) : 0);
-			layoutLine();
-		}
-
-		private void layoutLine() {
-			if(item.extra==null) return;
-			itemView.measure(
-					View.MeasureSpec.makeMeasureSpec(parent.getWidth(), View.MeasureSpec.EXACTLY),
-					View.MeasureSpec.UNSPECIFIED);
-			boolean isVertical = ((LinearLayout) itemView).getOrientation() == LinearLayout.VERTICAL;
-			extraText.setPaddingRelative(extraText.getPaddingStart(), item.extra != null && isVertical ? 0 : V.dp(16), extraText.getPaddingEnd(), extraText.getPaddingBottom());
-			separator.setVisibility(item.extra != null && !isVertical ? View.VISIBLE : View.GONE);
-			((LinearLayout) itemView).removeView(extraText);
-			if (isVertical) ((LinearLayout) itemView).addView(extraText);
-			else ((LinearLayout) itemView).addView(extraText, 0);
-			text.setText(isVertical ? item.fullText : item.text);
-			if (item.extra != null) {
-				extraText.setText(isVertical ? item.extra.fullText : item.extra.text);
-			}
 		}
 
 		@Override

diff --git a/mastodon/src/main/res/layout/display_item_reblog_or_reply_line.xml b/mastodon/src/main/res/layout/display_item_reblog_or_reply_line.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.joinmastodon.android.ui.views.AutoOrientationLinearLayout
+<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="horizontal"
 	android:layout_width="match_parent"
@@ -47,4 +47,4 @@
 		android:singleLine="true"
 		android:ellipsize="end"/>
 
-</org.joinmastodon.android.ui.views.AutoOrientationLinearLayout>
+</org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout>