From 3104ddb4b668f0374f2ea513a58005a5c46f7fae Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Tue, 27 Dec 2022 18:26:35 -0300 Subject: [PATCH] More polishes the UI side a little more, now also hides the private note on the personal profile --- .../android/fragments/ProfileFragment.java | 49 ++++++++++++++++++- .../src/main/res/layout/fragment_profile.xml | 1 + 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java index 53dc5c636..1a6219086 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java @@ -117,7 +117,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList private CoverOverlayGradientDrawable coverGradient=new CoverOverlayGradientDrawable(); private float titleTransY; private View postsBtn, followersBtn, followingBtn; - private EditText nameEdit, bioEdit; + private EditText nameEdit, bioEdit, noteEdit; private ProgressBar actionProgress, notifyProgress; private FrameLayout[] tabViews; private TabLayoutMediator tabLayoutMediator; @@ -180,6 +180,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList name=content.findViewById(R.id.name); username=content.findViewById(R.id.username); bio=content.findViewById(R.id.bio); + noteEdit=content.findViewById(R.id.note_edit); followersCount=content.findViewById(R.id.followers_count); followersLabel=content.findViewById(R.id.followers_label); followersBtn=content.findViewById(R.id.followers_btn); @@ -444,6 +445,52 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList name.setText(ssb); setTitle(ssb); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if(isOwnProfile){ + noteEdit.setVisibility(View.GONE); + } + boolean isSelf=AccountSessionManager.getInstance().isSelf(accountID, account); if(account.locked){ diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml index 775ec0ebe..2000e718d 100644 --- a/mastodon/src/main/res/layout/fragment_profile.xml +++ b/mastodon/src/main/res/layout/fragment_profile.xml @@ -294,6 +294,7 @@ android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" + android:layout_marginBottom="4dp" android:textAppearance="@style/m3_body_large" android:textSize="16sp" android:background="@drawable/edit_text_border"