1berry/mastodon-android
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make rule hints expand on tap

Browse Source
This commit is contained in:
Grishka 2025-05-22 11:18:06 +03:00
parent 65ecf6fba0
commit 8f6ea2ea05
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mastodon/src/main/java/org/joinmastodon/android/model/Instance.java
View File

@ -88,6 +88,7 @@ public abstract class Instance extends BaseModel{
public transient CharSequence parsedText;
public transient CharSequence parsedHint;
public transient boolean hintExpanded;
private Translation findTranslationForCurrentLocale(){
if(translations==null || translations.isEmpty())

15
mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/InstanceRuleViewHolder.java
View File

@ -11,8 +11,9 @@ import org.joinmastodon.android.model.Instance;
import org.joinmastodon.android.ui.text.HtmlParser;
import me.grishka.appkit.utils.BindableViewHolder;
import me.grishka.appkit.views.UsableRecyclerView;
public class InstanceRuleViewHolder extends BindableViewHolder<Instance.Rule>{
public class InstanceRuleViewHolder extends BindableViewHolder<Instance.Rule> implements UsableRecyclerView.DisableableClickable{
private final TextView text, number, hint;
private int position;
@ -44,5 +45,17 @@ public class InstanceRuleViewHolder extends BindableViewHolder<Instance.Rule>{
hint.setVisibility(View.VISIBLE);
hint.setText(item.parsedHint);
}
hint.setMaxLines(item.hintExpanded ? Integer.MAX_VALUE : 2);
}
@Override
public boolean isEnabled(){
return hint.getVisibility()==View.VISIBLE;
}
@Override
public void onClick(){
item.hintExpanded=!item.hintExpanded;
hint.setMaxLines(item.hintExpanded ? Integer.MAX_VALUE : 2);
}
}

1
mastodon/src/main/res/layout/item_server_rule.xml
View File

@ -48,6 +48,7 @@
android:textSize="14sp"
android:textColor="?colorM3OnSurfaceVariant"
android:textAlignment="viewStart"
android:ellipsize="end"
tools:text="No discrimination, including (but not limited to) racism, sexism, homophobia or transphobia."/>
</RelativeLayout>