owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/clickable-reply-line-compose' into fork

Browse Source
This commit is contained in:
sk
2022-11-28 18:28:31 +01:00
parent 5d1dc97ac3 924b974b4b
commit 4416dfcae3
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
View File

@@ -503,6 +503,13 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
replyArrow.setBounds(0, 0, V.dp(20), V.dp(20)); replyArrow.setBounds(0, 0, V.dp(20), V.dp(20));
replyText.setCompoundDrawables(replyArrow, null, visibilityIcon, null); 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<String> mentions=new ArrayList<>(); ArrayList<String> mentions=new ArrayList<>();
String ownID=AccountSessionManager.getInstance().getAccount(accountID).self.id; String ownID=AccountSessionManager.getInstance().getAccount(accountID).self.id;
if(!replyTo.account.id.equals(ownID)) if(!replyTo.account.id.equals(ownID))

10
mastodon/src/main/res/layout/fragment_compose.xml
View File

@@ -35,16 +35,18 @@
android:id="@+id/reply_text" android:id="@+id/reply_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginBottom="-12dp"
android:layout_marginRight="16dp" android:paddingHorizontal="16dp"
android:layout_marginTop="16dp" android:paddingTop="16dp"
android:paddingBottom="6dp"
android:textAppearance="@style/m3_title_small" android:textAppearance="@style/m3_title_small"
android:drawableStart="@drawable/ic_fluent_arrow_reply_20_filled" android:drawableStart="@drawable/ic_fluent_arrow_reply_20_filled"
tools:drawableEnd="@drawable/ic_fluent_earth_20_regular" tools:drawableEnd="@drawable/ic_fluent_earth_20_regular"
android:drawableTint="?android:textColorSecondary" android:drawableTint="?android:textColorSecondary"
android:drawablePadding="6dp" android:drawablePadding="6dp"
android:singleLine="true" android:singleLine="true"
android:ellipsize="end"/> android:ellipsize="end"
android:background="?android:selectableItemBackground"/>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"