diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java index 0e5616e2a..f2db62bd9 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java @@ -59,6 +59,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.PopupMenu; import android.widget.ProgressBar; +import android.widget.ScrollView; import android.widget.TextView; import android.widget.Toast; @@ -107,6 +108,7 @@ import org.joinmastodon.android.ui.utils.TransferSpeedTracker; import org.joinmastodon.android.ui.utils.UiUtils; import org.joinmastodon.android.ui.views.ComposeEditText; import org.joinmastodon.android.ui.views.ComposeMediaLayout; +import org.joinmastodon.android.ui.views.LinkedTextView; import org.joinmastodon.android.ui.views.ReorderableLinearLayout; import org.joinmastodon.android.ui.views.SizeListenerLinearLayout; import org.joinmastodon.android.utils.MastodonLanguage; @@ -180,6 +182,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr private View sensitiveItem; private View pollAllowMultipleItem; private View scheduleDraftView; + private ScrollView scrollView; + private boolean initiallyScrolled = false; private TextView scheduleDraftText; private CheckBox pollAllowMultipleCheckbox; private TextView pollDurationView; @@ -295,10 +299,11 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr mainEditTextWrap=view.findViewById(R.id.toot_text_wrap); charCounter=view.findViewById(R.id.char_counter); charCounter.setText(String.valueOf(charLimit)); + scrollView=view.findViewById(R.id.scroll_view); - selfName=view.findViewById(R.id.name); - selfUsername=view.findViewById(R.id.username); - selfAvatar=view.findViewById(R.id.avatar); + selfName=view.findViewById(R.id.self_name); + selfUsername=view.findViewById(R.id.self_username); + selfAvatar=view.findViewById(R.id.self_avatar); HtmlParser.setTextWithCustomEmoji(selfName, self.displayName, self.emojis); selfUsername.setText('@'+self.username+'@'+instanceDomain); ViewImageLoader.load(selfAvatar, null, new UrlImageLoaderRequest(self.avatar)); @@ -559,6 +564,71 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr }); spoilerEdit.addTextChangedListener(new SimpleTextWatcher(e->updateCharCounter())); if(replyTo!=null){ + View replyWrap = view.findViewById(R.id.reply_wrap); + scrollView.getViewTreeObserver().addOnGlobalLayoutListener(() -> { + int scrollHeight = scrollView.getHeight(); + if (replyWrap.getMinimumHeight() != scrollHeight) { + replyWrap.setMinimumHeight(scrollHeight); + if (!initiallyScrolled) { + initiallyScrolled = true; + scrollView.post(() -> { + int bottom = scrollView.getChildAt(0).getBottom(); + int sy = scrollView.getScrollY(); + int sh = scrollView.getHeight(); + scrollView.scrollBy(0, bottom - (sy + sh)); + }); + } + } + }); + View originalPost = view.findViewById(R.id.original_post); + originalPost.setVisibility(View.VISIBLE); + originalPost.setOnClickListener(v->{ + Bundle args=new Bundle(); + args.putString("account", accountID); + args.putParcelable("status", Parcels.wrap(replyTo)); + imm.hideSoftInputFromWindow(view.getWindowToken(), 0); + Nav.go(getActivity(), ThreadFragment.class, args); + }); + + ImageView avatar = view.findViewById(R.id.avatar); + ViewImageLoader.load(avatar, null, new UrlImageLoaderRequest(replyTo.account.avatar)); + ViewOutlineProvider roundCornersOutline=new ViewOutlineProvider(){ + @Override + public void getOutline(View view, Outline outline){ + outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), V.dp(12)); + } + }; + avatar.setOutlineProvider(roundCornersOutline); + avatar.setClipToOutline(true); + avatar.setOnClickListener(v->{ + Bundle args=new Bundle(); + args.putString("account", accountID); + args.putParcelable("profileAccount", Parcels.wrap(replyTo.account)); + Nav.go(getActivity(), ProfileFragment.class, args); + }); + + ((TextView) view.findViewById(R.id.name)).setText(replyTo.account.displayName); + ((TextView) view.findViewById(R.id.username)).setText(replyTo.account.getDisplayUsername()); + view.findViewById(R.id.visibility).setVisibility(View.GONE); + Drawable visibilityIcon = getActivity().getDrawable(switch(replyTo.visibility){ + case PUBLIC -> R.drawable.ic_fluent_earth_20_regular; + case UNLISTED -> R.drawable.ic_fluent_people_community_20_regular; + case PRIVATE -> R.drawable.ic_fluent_people_checkmark_20_regular; + case DIRECT -> R.drawable.ic_fluent_mention_20_regular; + }); + ImageView moreBtn = view.findViewById(R.id.more); + moreBtn.setImageDrawable(visibilityIcon); + moreBtn.setBackground(null); + TextView timestamp = view.findViewById(R.id.timestamp); + if (replyTo.editedAt==null) timestamp.setText(UiUtils.formatRelativeTimestamp(getContext(), replyTo.createdAt)); + else timestamp.setText(getString(R.string.edited_timestamp, UiUtils.formatRelativeTimestamp(getContext(), replyTo.editedAt))); + if (replyTo.spoilerText != null && !replyTo.spoilerText.isBlank()) { + view.findViewById(R.id.spoiler_header).setVisibility(View.VISIBLE); + ((TextView) view.findViewById(R.id.spoiler_title_inline)).setText(replyTo.spoilerText); + } + + ((LinkedTextView) view.findViewById(R.id.text)).setText(HtmlParser.parse(replyTo.content, replyTo.emojis, replyTo.mentions, replyTo.tags, accountID)); + replyText.setText(getString(R.string.in_reply_to, replyTo.account.displayName)); int visibilityNameRes = switch (replyTo.visibility) { case PUBLIC -> R.string.visibility_public; @@ -567,24 +637,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr case DIRECT -> R.string.visibility_private; }; replyText.setContentDescription(getString(R.string.in_reply_to, replyTo.account.displayName) + ". " + getString(R.string.post_visibility) + ": " + getString(visibilityNameRes)); - Drawable visibilityIcon = getActivity().getDrawable(switch(replyTo.visibility){ - case PUBLIC -> R.drawable.ic_fluent_earth_20_regular; - case UNLISTED -> R.drawable.ic_fluent_people_community_20_regular; - case PRIVATE -> R.drawable.ic_fluent_people_checkmark_20_regular; - case DIRECT -> R.drawable.ic_fluent_mention_20_regular; - }); - visibilityIcon.setBounds(0, 0, V.dp(20), V.dp(20)); - Drawable replyArrow = getActivity().getDrawable(R.drawable.ic_fluent_arrow_reply_20_filled); - replyArrow.setBounds(0, 0, V.dp(20), V.dp(20)); - replyText.setCompoundDrawables(replyArrow, null, visibilityIcon, null); - replyText.setOnClickListener(v->{ - Bundle args=new Bundle(); - args.putString("account", accountID); - args.putParcelable("status", Parcels.wrap(replyTo)); - imm.hideSoftInputFromWindow(view.getWindowToken(), 0); - Nav.go(getActivity(), ThreadFragment.class, args); - }); ArrayList mentions=new ArrayList<>(); String ownID=AccountSessionManager.getInstance().getAccount(accountID).self.id; if(!replyTo.account.id.equals(ownID)) diff --git a/mastodon/src/main/res/layout/display_item_text.xml b/mastodon/src/main/res/layout/display_item_text.xml index 812c78b6d..08a3fe331 100644 --- a/mastodon/src/main/res/layout/display_item_text.xml +++ b/mastodon/src/main/res/layout/display_item_text.xml @@ -56,7 +56,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:gravity="center_vertical"> + android:gravity="center_vertical" + android:visibility="gone"> + tools:text="@string/sk_translate_post"/> - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - + android:elevation="0dp" + android:hint="@string/content_warning" + android:inputType="textMultiLine|textCapSentences" + android:visibility="gone" + android:textColorHint="?android:textColorSecondary" + android:background="@drawable/bg_cw_edit" + android:padding="16dp" + android:minHeight="56dp" + android:textSize="16sp" + tools:visibility="visible"/> + + android:layout_marginBottom="-12dp" + android:paddingHorizontal="16dp" + android:paddingTop="16dp" + android:paddingBottom="6dp" + android:textAppearance="@style/m3_title_small" + android:drawableStart="@drawable/ic_fluent_arrow_reply_20_filled" + tools:drawableEnd="@drawable/ic_fluent_earth_20_regular" + android:drawableTint="?android:textColorSecondary" + android:drawablePadding="6dp" + android:singleLine="true" + android:ellipsize="end" + android:background="?android:selectableItemBackground"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:background="?android:selectableItemBackground" + android:visibility="gone"> - + android:text="@string/sk_mark_media_as_sensitive" /> - - - - - - - - -