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

fix: fix inconsistencies with the follow button on OnboardingFollowSuggestionsFragment

This commit is contained in:
LucasGGamerM 2023-04-19 16:33:22 -03:00
parent f70a9cbe3f
commit 29777c2513
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingFollowSuggestionsFragment.java
View File

@ -260,7 +260,7 @@ public class OnboardingFollowSuggestionsFragment extends RecyclerFragment<Parsed
private class SuggestionViewHolder extends BindableViewHolder<ParsedAccount> implements ImageLoaderViewHolder, UsableRecyclerView.Clickable{ private class SuggestionViewHolder extends BindableViewHolder<ParsedAccount> implements ImageLoaderViewHolder, UsableRecyclerView.Clickable{
private final TextView name, username, bio; private final TextView name, username, bio;
private final ImageView avatar; private final ImageView avatar;
private final Button actionButton; private final ProgressBarButton actionButton;
private final ProgressBar actionProgress; private final ProgressBar actionProgress;
private final View actionWrap; private final View actionWrap;
@ -337,6 +337,7 @@ public class OnboardingFollowSuggestionsFragment extends RecyclerFragment<Parsed
} }
private void setActionProgressVisible(boolean visible){ private void setActionProgressVisible(boolean visible){
actionButton.setTextVisible(!visible);
actionProgress.setVisibility(visible ? View.VISIBLE : View.GONE); actionProgress.setVisibility(visible ? View.VISIBLE : View.GONE);
actionButton.setClickable(!visible); actionButton.setClickable(!visible);
} }

6
mastodon/src/main/res/layout/item_user_row.xml
View File

@ -27,7 +27,7 @@
android:layout_marginTop="18dp" android:layout_marginTop="18dp"
android:layout_marginStart="-8dp"> android:layout_marginStart="-8dp">
<Button <org.joinmastodon.android.ui.views.ProgressBarButton
android:id="@+id/action_btn" android:id="@+id/action_btn"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -43,7 +43,6 @@
style="?android:progressBarStyleSmall" style="?android:progressBarStyleSmall"
android:elevation="10dp" android:elevation="10dp"
android:outlineProvider="none" android:outlineProvider="none"
android:indeterminateTint="?colorButtonText"
android:visibility="gone"/> android:visibility="gone"/>
</FrameLayout> </FrameLayout>
@ -60,7 +59,6 @@
android:singleLine="true" android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
android:textAppearance="@style/m3_title_medium" android:textAppearance="@style/m3_title_medium"
android:textColor="?colorM3OnSurface"
tools:text="User Name"/> tools:text="User Name"/>
<TextView <TextView
@ -75,7 +73,6 @@
android:ellipsize="end" android:ellipsize="end"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textAppearance="@style/m3_title_small" android:textAppearance="@style/m3_title_small"
android:textColor="?colorM3OnSurfaceVariant"
tools:text="\@username@server.social"/> tools:text="\@username@server.social"/>
<TextView <TextView
@ -87,7 +84,6 @@
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:textAppearance="@style/m3_body_medium" android:textAppearance="@style/m3_body_medium"
android:textColor="?colorM3OnSurface"
tools:text="Description"/> tools:text="Description"/>
</RelativeLayout> </RelativeLayout>