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

Fixing some icons

This commit is contained in:
LucasGGamerM 2023-01-02 12:12:55 -03:00
parent ac3875fe08
commit b92e6d2c48
2 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
View File

@ -106,6 +106,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
private ImageView avatar; private ImageView avatar;
private CoverImageView cover; private CoverImageView cover;
private View avatarBorder; private View avatarBorder;
private Button botIcon;
private TextView name, username, bio, followersCount, followersLabel, followingCount, followingLabel, postsCount, postsLabel; private TextView name, username, bio, followersCount, followersLabel, followingCount, followingLabel, postsCount, postsLabel;
private ProgressBarButton actionButton, notifyButton; private ProgressBarButton actionButton, notifyButton;
private ViewPager2 pager; private ViewPager2 pager;
@ -191,6 +192,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
followingCount=content.findViewById(R.id.following_count); followingCount=content.findViewById(R.id.following_count);
followingLabel=content.findViewById(R.id.following_label); followingLabel=content.findViewById(R.id.following_label);
followingBtn=content.findViewById(R.id.following_btn); followingBtn=content.findViewById(R.id.following_btn);
postsCount=content.findViewById(R.id.posts_count); postsCount=content.findViewById(R.id.posts_count);
postsLabel=content.findViewById(R.id.posts_label); postsLabel=content.findViewById(R.id.posts_label);
postsBtn=content.findViewById(R.id.posts_btn); postsBtn=content.findViewById(R.id.posts_btn);
@ -555,7 +557,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
if(relationship==null && !isOwnProfile) if(relationship==null && !isOwnProfile)
return; return;
inflater.inflate(isOwnProfile ? R.menu.profile_own : R.menu.profile, menu); inflater.inflate(isOwnProfile ? R.menu.profile_own : R.menu.profile, menu);
UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.bookmarks, R.id.followed_hashtags); UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.bookmarks, R.id.followed_hashtags, R.id.favorite, R.id.scheduled, R.id.share);
menu.findItem(R.id.share).setTitle(getString(R.string.share_user, account.getShortUsername())); menu.findItem(R.id.share).setTitle(getString(R.string.share_user, account.getShortUsername()));
if(isOwnProfile) if(isOwnProfile)
return; return;

33
mastodon/src/main/res/layout/fragment_profile.xml
View File

@ -176,18 +176,16 @@
<FrameLayout <FrameLayout
android:clipToPadding="false" android:clipToPadding="false"
android:paddingVertical="16dp" android:paddingVertical="16dp"
android:paddingLeft="8dp" android:paddingLeft="16dp"
android:paddingRight="4dp" android:paddingRight="4dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<org.joinmastodon.android.ui.views.ProgressBarButton <org.joinmastodon.android.ui.views.ProgressBarButton
android:id="@+id/notify_btn" android:id="@+id/notify_btn"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableStart="@drawable/ic_fluent_alert_24_selector"
android:paddingHorizontal="8dp" android:paddingHorizontal="8dp"
tools:ignore="SpeakableTextPresentCheck" /> android:drawableStart="@drawable/ic_fluent_alert_24_selector" />
<ProgressBar <ProgressBar
android:id="@+id/notify_progress" android:id="@+id/notify_progress"
@ -200,7 +198,6 @@
android:indeterminateTint="?colorButtonText" android:indeterminateTint="?colorButtonText"
android:outlineProvider="none" android:outlineProvider="none"
android:visibility="gone" /> android:visibility="gone" />
</FrameLayout> </FrameLayout>
<FrameLayout <FrameLayout
@ -210,7 +207,6 @@
android:paddingLeft="4dp" android:paddingLeft="4dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<org.joinmastodon.android.ui.views.ProgressBarButton <org.joinmastodon.android.ui.views.ProgressBarButton
android:id="@+id/profile_action_btn" android:id="@+id/profile_action_btn"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -231,43 +227,26 @@
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@id/name_wrap"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/avatar_border"
android:layout_alignParentStart="true"
android:layout_toStartOf="@id/profile_action_btn_wrap"
android:layout_alignParentEnd="true">
<TextView <TextView
android:id="@+id/name" android:id="@+id/name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/avatar_border"
android:layout_alignParentStart="true"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="17dp" android:layout_marginTop="17dp"
android:layout_marginBottom="0.4dp" android:layout_marginBottom="0.4dp"
android:layout_marginEnd="0dp" android:layout_toStartOf="@id/profile_action_btn_wrap"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textAppearance="@style/m3_headline_small" android:textAppearance="@style/m3_headline_small"
tools:text="Eugen" /> tools:text="Eugen" />
<Button
android:id="@+id/bot_icon"
android:layout_width="wrap_content"
android:layout_height="28dp"
android:layout_marginTop="14dp"
android:paddingHorizontal="8dp"
android:background="?colorWindowBackground"
android:drawableStart="@drawable/ic_fluent_bot_24_regular"
/>
</LinearLayout>
<TextView <TextView
android:id="@+id/username" android:id="@+id/username"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_below="@id/name_wrap" android:layout_below="@id/name"
android:paddingTop="4dp" android:paddingTop="4dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:textAppearance="@style/m3_title_medium" android:textAppearance="@style/m3_title_medium"